summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--testset/1/3TextColours1.cdrbin0 -> 3388 bytes
-rw-r--r--testset/1/3TextColours1.cdr.odg33
-rw-r--r--testset/1/3TextColours1.cdr.raw4
-rw-r--r--testset/1/3TextColours1.cdr.xhtml12
-rw-r--r--testset/1/3TextColours11.cdrbin0 -> 94986 bytes
-rw-r--r--testset/1/3TextColours11.cdr.odg155
-rw-r--r--testset/1/3TextColours11.cdr.raw214
-rw-r--r--testset/1/3TextColours11.cdr.xhtml148
-rw-r--r--testset/1/3TextColours21.cdrbin0 -> 1936241 bytes
-rw-r--r--testset/1/3TextColours21.cdr.odg150
-rw-r--r--testset/1/3TextColours21.cdr.raw210
-rw-r--r--testset/1/3TextColours21.cdr.xhtml146
-rw-r--r--testset/1/Palette1.cdrbin0 -> 10323 bytes
-rw-r--r--testset/1/Palette1.cdr.odg33
-rw-r--r--testset/1/Palette1.cdr.raw4
-rw-r--r--testset/1/Palette1.cdr.xhtml12
-rw-r--r--testset/1/Palette11.cdrbin0 -> 79316 bytes
-rw-r--r--testset/1/Palette11.cdr.odg174
-rw-r--r--testset/1/Palette11.cdr.raw116
-rw-r--r--testset/1/Palette11.cdr.xhtml58
-rw-r--r--testset/1/Palette21.cdrbin0 -> 1826139 bytes
-rw-r--r--testset/1/Palette21.cdr.odg177
-rw-r--r--testset/1/Palette21.cdr.raw116
-rw-r--r--testset/1/Palette21.cdr.xhtml58
-rw-r--r--testset/1/TextColours1.cdrbin0 -> 1678 bytes
-rw-r--r--testset/1/TextColours1.cdr.odg33
-rw-r--r--testset/1/TextColours1.cdr.raw4
-rw-r--r--testset/1/TextColours1.cdr.xhtml12
-rw-r--r--testset/1/TextColours11.cdrbin0 -> 94838 bytes
-rw-r--r--testset/1/TextColours11.cdr.odg107
-rw-r--r--testset/1/TextColours11.cdr.raw78
-rw-r--r--testset/1/TextColours11.cdr.xhtml60
-rw-r--r--testset/1/TextColours21.cdrbin0 -> 1931935 bytes
-rw-r--r--testset/1/TextColours21.cdr.odg102
-rw-r--r--testset/1/TextColours21.cdr.raw74
-rw-r--r--testset/1/TextColours21.cdr.xhtml58
-rw-r--r--testset/1/regression.in9
-rw-r--r--testset/10/3TextColours10.cdrbin0 -> 14060 bytes
-rw-r--r--testset/10/3TextColours10.cdr.odg155
-rw-r--r--testset/10/3TextColours10.cdr.raw214
-rw-r--r--testset/10/3TextColours10.cdr.xhtml148
-rw-r--r--testset/10/Palette10.cdrbin0 -> 14790 bytes
-rw-r--r--testset/10/Palette10.cdr.odg174
-rw-r--r--testset/10/Palette10.cdr.raw116
-rw-r--r--testset/10/Palette10.cdr.xhtml58
-rw-r--r--testset/10/TextColours10.cdrbin0 -> 13992 bytes
-rw-r--r--testset/10/TextColours10.cdr.odg107
-rw-r--r--testset/10/TextColours10.cdr.raw78
-rw-r--r--testset/10/TextColours10.cdr.xhtml60
-rw-r--r--testset/10/regression.in3
-rw-r--r--testset/11/3TextColours11.cdrbin0 -> 94986 bytes
-rw-r--r--testset/11/3TextColours11.cdr.odg155
-rw-r--r--testset/11/3TextColours11.cdr.raw214
-rw-r--r--testset/11/3TextColours11.cdr.xhtml148
-rw-r--r--testset/11/Palette11.cdrbin0 -> 79316 bytes
-rw-r--r--testset/11/Palette11.cdr.odg174
-rw-r--r--testset/11/Palette11.cdr.raw116
-rw-r--r--testset/11/Palette11.cdr.xhtml58
-rw-r--r--testset/11/TextColours11.cdrbin0 -> 94838 bytes
-rw-r--r--testset/11/TextColours11.cdr.odg107
-rw-r--r--testset/11/TextColours11.cdr.raw78
-rw-r--r--testset/11/TextColours11.cdr.xhtml60
-rw-r--r--testset/11/regression.in3
-rw-r--r--testset/12/3TextColours12.cdrbin0 -> 95090 bytes
-rw-r--r--testset/12/3TextColours12.cdr.odg155
-rw-r--r--testset/12/3TextColours12.cdr.raw214
-rw-r--r--testset/12/3TextColours12.cdr.xhtml148
-rw-r--r--testset/12/Palette12.cdrbin0 -> 79428 bytes
-rw-r--r--testset/12/Palette12.cdr.odg174
-rw-r--r--testset/12/Palette12.cdr.raw116
-rw-r--r--testset/12/Palette12.cdr.xhtml58
-rw-r--r--testset/12/TextColours12.cdrbin0 -> 94926 bytes
-rw-r--r--testset/12/TextColours12.cdr.odg107
-rw-r--r--testset/12/TextColours12.cdr.raw78
-rw-r--r--testset/12/TextColours12.cdr.xhtml60
-rw-r--r--testset/12/regression.in3
-rw-r--r--testset/13/3TextColours13.cdrbin0 -> 95282 bytes
-rw-r--r--testset/13/3TextColours13.cdr.odg155
-rw-r--r--testset/13/3TextColours13.cdr.raw214
-rw-r--r--testset/13/3TextColours13.cdr.xhtml148
-rw-r--r--testset/13/Palette13.cdrbin0 -> 80392 bytes
-rw-r--r--testset/13/Palette13.cdr.odg168
-rw-r--r--testset/13/Palette13.cdr.raw116
-rw-r--r--testset/13/Palette13.cdr.xhtml58
-rw-r--r--testset/13/TextColours13.cdrbin0 -> 95080 bytes
-rw-r--r--testset/13/TextColours13.cdr.odg107
-rw-r--r--testset/13/TextColours13.cdr.raw78
-rw-r--r--testset/13/TextColours13.cdr.xhtml60
-rw-r--r--testset/13/regression.in3
-rw-r--r--testset/14/3TextColours14.cdrbin0 -> 20450 bytes
-rw-r--r--testset/14/3TextColours14.cdr.odg155
-rw-r--r--testset/14/3TextColours14.cdr.raw214
-rw-r--r--testset/14/3TextColours14.cdr.xhtml148
-rw-r--r--testset/14/Palette14.cdrbin0 -> 18863 bytes
-rw-r--r--testset/14/Palette14.cdr.odg168
-rw-r--r--testset/14/Palette14.cdr.raw116
-rw-r--r--testset/14/Palette14.cdr.xhtml58
-rw-r--r--testset/14/TextColours14.cdrbin0 -> 15391 bytes
-rw-r--r--testset/14/TextColours14.cdr.odg107
-rw-r--r--testset/14/TextColours14.cdr.raw78
-rw-r--r--testset/14/TextColours14.cdr.xhtml60
-rw-r--r--testset/14/regression.in3
-rw-r--r--testset/15/3TextColours15.cdrbin0 -> 1389635 bytes
-rw-r--r--testset/15/3TextColours15.cdr.odg155
-rw-r--r--testset/15/3TextColours15.cdr.raw214
-rw-r--r--testset/15/3TextColours15.cdr.xhtml148
-rw-r--r--testset/15/Palette15.cdrbin0 -> 1388125 bytes
-rw-r--r--testset/15/Palette15.cdr.odg168
-rw-r--r--testset/15/Palette15.cdr.raw116
-rw-r--r--testset/15/Palette15.cdr.xhtml58
-rw-r--r--testset/15/TextColours15.cdrbin0 -> 1384682 bytes
-rw-r--r--testset/15/TextColours15.cdr.odg107
-rw-r--r--testset/15/TextColours15.cdr.raw78
-rw-r--r--testset/15/TextColours15.cdr.xhtml60
-rw-r--r--testset/15/regression.in3
-rw-r--r--testset/16/3TextColours16.cdrbin0 -> 1399327 bytes
-rw-r--r--testset/16/3TextColours16.cdr.odg150
-rw-r--r--testset/16/3TextColours16.cdr.raw210
-rw-r--r--testset/16/3TextColours16.cdr.xhtml146
-rw-r--r--testset/16/Palette16.cdrbin0 -> 1397082 bytes
-rw-r--r--testset/16/Palette16.cdr.odg177
-rw-r--r--testset/16/Palette16.cdr.raw116
-rw-r--r--testset/16/Palette16.cdr.xhtml58
-rw-r--r--testset/16/TextColours16.cdrbin0 -> 1390904 bytes
-rw-r--r--testset/16/TextColours16.cdr.odg102
-rw-r--r--testset/16/TextColours16.cdr.raw74
-rw-r--r--testset/16/TextColours16.cdr.xhtml58
-rw-r--r--testset/16/regression.in3
-rw-r--r--testset/17/3TextColours17.cdrbin0 -> 1938286 bytes
-rw-r--r--testset/17/3TextColours17.cdr.odg150
-rw-r--r--testset/17/3TextColours17.cdr.raw210
-rw-r--r--testset/17/3TextColours17.cdr.xhtml146
-rw-r--r--testset/17/Palette17.cdrbin0 -> 1826242 bytes
-rw-r--r--testset/17/Palette17.cdr.odg177
-rw-r--r--testset/17/Palette17.cdr.raw116
-rw-r--r--testset/17/Palette17.cdr.xhtml58
-rw-r--r--testset/17/TextColours17.cdrbin0 -> 1930110 bytes
-rw-r--r--testset/17/TextColours17.cdr.odg102
-rw-r--r--testset/17/TextColours17.cdr.raw74
-rw-r--r--testset/17/TextColours17.cdr.xhtml58
-rw-r--r--testset/17/regression.in3
-rw-r--r--testset/18/3TextColours18.cdrbin0 -> 1938295 bytes
-rw-r--r--testset/18/3TextColours18.cdr.odg150
-rw-r--r--testset/18/3TextColours18.cdr.raw210
-rw-r--r--testset/18/3TextColours18.cdr.xhtml146
-rw-r--r--testset/18/Palette18.cdrbin0 -> 1826245 bytes
-rw-r--r--testset/18/Palette18.cdr.odg177
-rw-r--r--testset/18/Palette18.cdr.raw116
-rw-r--r--testset/18/Palette18.cdr.xhtml58
-rw-r--r--testset/18/TextColours18.cdrbin0 -> 1930107 bytes
-rw-r--r--testset/18/TextColours18.cdr.odg102
-rw-r--r--testset/18/TextColours18.cdr.raw74
-rw-r--r--testset/18/TextColours18.cdr.xhtml58
-rw-r--r--testset/18/regression.in3
-rw-r--r--testset/19/3TextColours19.cdrbin0 -> 1938284 bytes
-rw-r--r--testset/19/3TextColours19.cdr.odg150
-rw-r--r--testset/19/3TextColours19.cdr.raw210
-rw-r--r--testset/19/3TextColours19.cdr.xhtml146
-rw-r--r--testset/19/Palette19.cdrbin0 -> 1826245 bytes
-rw-r--r--testset/19/Palette19.cdr.odg177
-rw-r--r--testset/19/Palette19.cdr.raw116
-rw-r--r--testset/19/Palette19.cdr.xhtml58
-rw-r--r--testset/19/TextColours19.cdrbin0 -> 1930123 bytes
-rw-r--r--testset/19/TextColours19.cdr.odg102
-rw-r--r--testset/19/TextColours19.cdr.raw74
-rw-r--r--testset/19/TextColours19.cdr.xhtml58
-rw-r--r--testset/19/regression.in3
-rw-r--r--testset/2/3TextColours12.cdrbin0 -> 95090 bytes
-rw-r--r--testset/2/3TextColours12.cdr.odg155
-rw-r--r--testset/2/3TextColours12.cdr.raw214
-rw-r--r--testset/2/3TextColours12.cdr.xhtml148
-rw-r--r--testset/2/3TextColours2.cdrbin0 -> 3981 bytes
-rw-r--r--testset/2/3TextColours2.cdr.odg33
-rw-r--r--testset/2/3TextColours2.cdr.raw4
-rw-r--r--testset/2/3TextColours2.cdr.xhtml12
-rw-r--r--testset/2/3TextColours22.cdrbin0 -> 1938295 bytes
-rw-r--r--testset/2/3TextColours22.cdr.odg150
-rw-r--r--testset/2/3TextColours22.cdr.raw210
-rw-r--r--testset/2/3TextColours22.cdr.xhtml146
-rw-r--r--testset/2/Palette12.cdrbin0 -> 79428 bytes
-rw-r--r--testset/2/Palette12.cdr.odg174
-rw-r--r--testset/2/Palette12.cdr.raw116
-rw-r--r--testset/2/Palette12.cdr.xhtml58
-rw-r--r--testset/2/Palette2.cdrbin0 -> 4239 bytes
-rw-r--r--testset/2/Palette2.cdr.odg33
-rw-r--r--testset/2/Palette2.cdr.raw4
-rw-r--r--testset/2/Palette2.cdr.xhtml12
-rw-r--r--testset/2/Palette22.cdrbin0 -> 1937560 bytes
-rw-r--r--testset/2/Palette22.cdr.odg177
-rw-r--r--testset/2/Palette22.cdr.raw116
-rw-r--r--testset/2/Palette22.cdr.xhtml58
-rw-r--r--testset/2/TextColours12.cdrbin0 -> 94926 bytes
-rw-r--r--testset/2/TextColours12.cdr.odg107
-rw-r--r--testset/2/TextColours12.cdr.raw78
-rw-r--r--testset/2/TextColours12.cdr.xhtml60
-rw-r--r--testset/2/TextColours2.cdrbin0 -> 3297 bytes
-rw-r--r--testset/2/TextColours2.cdr.odg33
-rw-r--r--testset/2/TextColours2.cdr.raw4
-rw-r--r--testset/2/TextColours2.cdr.xhtml12
-rw-r--r--testset/2/TextColours22.cdrbin0 -> 1931958 bytes
-rw-r--r--testset/2/TextColours22.cdr.odg102
-rw-r--r--testset/2/TextColours22.cdr.raw74
-rw-r--r--testset/2/TextColours22.cdr.xhtml58
-rw-r--r--testset/2/regression.in9
-rw-r--r--testset/20/3TextColours20.cdrbin0 -> 1938281 bytes
-rw-r--r--testset/20/3TextColours20.cdr.odg150
-rw-r--r--testset/20/3TextColours20.cdr.raw210
-rw-r--r--testset/20/3TextColours20.cdr.xhtml146
-rw-r--r--testset/20/Palette20.cdrbin0 -> 1826289 bytes
-rw-r--r--testset/20/Palette20.cdr.odg177
-rw-r--r--testset/20/Palette20.cdr.raw116
-rw-r--r--testset/20/Palette20.cdr.xhtml58
-rw-r--r--testset/20/TextColours20.cdrbin0 -> 1930110 bytes
-rw-r--r--testset/20/TextColours20.cdr.odg102
-rw-r--r--testset/20/TextColours20.cdr.raw74
-rw-r--r--testset/20/TextColours20.cdr.xhtml58
-rw-r--r--testset/20/regression.in3
-rw-r--r--testset/21/3TextColours21.cdrbin0 -> 1936241 bytes
-rw-r--r--testset/21/3TextColours21.cdr.odg150
-rw-r--r--testset/21/3TextColours21.cdr.raw210
-rw-r--r--testset/21/3TextColours21.cdr.xhtml146
-rw-r--r--testset/21/Palette21.cdrbin0 -> 1826139 bytes
-rw-r--r--testset/21/Palette21.cdr.odg177
-rw-r--r--testset/21/Palette21.cdr.raw116
-rw-r--r--testset/21/Palette21.cdr.xhtml58
-rw-r--r--testset/21/TextColours21.cdrbin0 -> 1931935 bytes
-rw-r--r--testset/21/TextColours21.cdr.odg102
-rw-r--r--testset/21/TextColours21.cdr.raw74
-rw-r--r--testset/21/TextColours21.cdr.xhtml58
-rw-r--r--testset/21/regression.in3
-rw-r--r--testset/22/3TextColours22.cdrbin0 -> 1938295 bytes
-rw-r--r--testset/22/3TextColours22.cdr.odg150
-rw-r--r--testset/22/3TextColours22.cdr.raw210
-rw-r--r--testset/22/3TextColours22.cdr.xhtml146
-rw-r--r--testset/22/Palette22.cdrbin0 -> 1937560 bytes
-rw-r--r--testset/22/Palette22.cdr.odg177
-rw-r--r--testset/22/Palette22.cdr.raw116
-rw-r--r--testset/22/Palette22.cdr.xhtml58
-rw-r--r--testset/22/TextColours22.cdrbin0 -> 1931958 bytes
-rw-r--r--testset/22/TextColours22.cdr.odg102
-rw-r--r--testset/22/TextColours22.cdr.raw74
-rw-r--r--testset/22/TextColours22.cdr.xhtml58
-rw-r--r--testset/22/regression.in3
-rw-r--r--testset/23/3TextColours23.cdrbin0 -> 1938271 bytes
-rw-r--r--testset/23/3TextColours23.cdr.odg150
-rw-r--r--testset/23/3TextColours23.cdr.raw210
-rw-r--r--testset/23/3TextColours23.cdr.xhtml146
-rw-r--r--testset/23/Palette23.cdrbin0 -> 1937578 bytes
-rw-r--r--testset/23/Palette23.cdr.odg177
-rw-r--r--testset/23/Palette23.cdr.raw116
-rw-r--r--testset/23/Palette23.cdr.xhtml58
-rw-r--r--testset/23/TextColours23.cdrbin0 -> 1931951 bytes
-rw-r--r--testset/23/TextColours23.cdr.odg102
-rw-r--r--testset/23/TextColours23.cdr.raw74
-rw-r--r--testset/23/TextColours23.cdr.xhtml58
-rw-r--r--testset/23/regression.in3
-rw-r--r--testset/3/3TextColours13.cdrbin0 -> 95282 bytes
-rw-r--r--testset/3/3TextColours13.cdr.odg155
-rw-r--r--testset/3/3TextColours13.cdr.raw214
-rw-r--r--testset/3/3TextColours13.cdr.xhtml148
-rw-r--r--testset/3/3TextColours23.cdrbin0 -> 1938271 bytes
-rw-r--r--testset/3/3TextColours23.cdr.odg150
-rw-r--r--testset/3/3TextColours23.cdr.raw210
-rw-r--r--testset/3/3TextColours23.cdr.xhtml146
-rw-r--r--testset/3/3TextColours3.cdrbin0 -> 11384 bytes
-rw-r--r--testset/3/3TextColours3.cdr.odg33
-rw-r--r--testset/3/3TextColours3.cdr.raw4
-rw-r--r--testset/3/3TextColours3.cdr.xhtml12
-rw-r--r--testset/3/Palette13.cdrbin0 -> 80392 bytes
-rw-r--r--testset/3/Palette13.cdr.odg168
-rw-r--r--testset/3/Palette13.cdr.raw116
-rw-r--r--testset/3/Palette13.cdr.xhtml58
-rw-r--r--testset/3/Palette23.cdrbin0 -> 1937578 bytes
-rw-r--r--testset/3/Palette23.cdr.odg177
-rw-r--r--testset/3/Palette23.cdr.raw116
-rw-r--r--testset/3/Palette23.cdr.xhtml58
-rw-r--r--testset/3/Palette3.cdrbin0 -> 11716 bytes
-rw-r--r--testset/3/Palette3.cdr.odg33
-rw-r--r--testset/3/Palette3.cdr.raw4
-rw-r--r--testset/3/Palette3.cdr.xhtml12
-rw-r--r--testset/3/TextColours13.cdrbin0 -> 95080 bytes
-rw-r--r--testset/3/TextColours13.cdr.odg107
-rw-r--r--testset/3/TextColours13.cdr.raw78
-rw-r--r--testset/3/TextColours13.cdr.xhtml60
-rw-r--r--testset/3/TextColours23.cdrbin0 -> 1931951 bytes
-rw-r--r--testset/3/TextColours23.cdr.odg102
-rw-r--r--testset/3/TextColours23.cdr.raw74
-rw-r--r--testset/3/TextColours23.cdr.xhtml58
-rw-r--r--testset/3/TextColours3.cdrbin0 -> 10568 bytes
-rw-r--r--testset/3/TextColours3.cdr.odg33
-rw-r--r--testset/3/TextColours3.cdr.raw4
-rw-r--r--testset/3/TextColours3.cdr.xhtml12
-rw-r--r--testset/3/regression.in9
-rw-r--r--testset/4/3TextColours14.cdrbin0 -> 20450 bytes
-rw-r--r--testset/4/3TextColours14.cdr.odg155
-rw-r--r--testset/4/3TextColours14.cdr.raw214
-rw-r--r--testset/4/3TextColours14.cdr.xhtml148
-rw-r--r--testset/4/3TextColours4.cdrbin0 -> 16704 bytes
-rw-r--r--testset/4/3TextColours4.cdr.odg33
-rw-r--r--testset/4/3TextColours4.cdr.raw4
-rw-r--r--testset/4/3TextColours4.cdr.xhtml12
-rw-r--r--testset/4/Palette14.cdrbin0 -> 18863 bytes
-rw-r--r--testset/4/Palette14.cdr.odg168
-rw-r--r--testset/4/Palette14.cdr.raw116
-rw-r--r--testset/4/Palette14.cdr.xhtml58
-rw-r--r--testset/4/Palette4.cdrbin0 -> 18336 bytes
-rw-r--r--testset/4/Palette4.cdr.odg33
-rw-r--r--testset/4/Palette4.cdr.raw4
-rw-r--r--testset/4/Palette4.cdr.xhtml12
-rw-r--r--testset/4/TextColours14.cdrbin0 -> 15391 bytes
-rw-r--r--testset/4/TextColours14.cdr.odg107
-rw-r--r--testset/4/TextColours14.cdr.raw78
-rw-r--r--testset/4/TextColours14.cdr.xhtml60
-rw-r--r--testset/4/TextColours4.cdrbin0 -> 14948 bytes
-rw-r--r--testset/4/TextColours4.cdr.odg33
-rw-r--r--testset/4/TextColours4.cdr.raw4
-rw-r--r--testset/4/TextColours4.cdr.xhtml12
-rw-r--r--testset/4/regression.in6
-rw-r--r--testset/5/3TextColours15.cdrbin0 -> 1389635 bytes
-rw-r--r--testset/5/3TextColours15.cdr.odg155
-rw-r--r--testset/5/3TextColours15.cdr.raw214
-rw-r--r--testset/5/3TextColours15.cdr.xhtml148
-rw-r--r--testset/5/3TextColours5.cdrbin0 -> 13338 bytes
-rw-r--r--testset/5/3TextColours5.cdr.odg150
-rw-r--r--testset/5/3TextColours5.cdr.raw210
-rw-r--r--testset/5/3TextColours5.cdr.xhtml146
-rw-r--r--testset/5/Palette15.cdrbin0 -> 1388125 bytes
-rw-r--r--testset/5/Palette15.cdr.odg168
-rw-r--r--testset/5/Palette15.cdr.raw116
-rw-r--r--testset/5/Palette15.cdr.xhtml58
-rw-r--r--testset/5/Palette5.cdrbin0 -> 21948 bytes
-rw-r--r--testset/5/Palette5.cdr.odg174
-rw-r--r--testset/5/Palette5.cdr.raw116
-rw-r--r--testset/5/Palette5.cdr.xhtml58
-rw-r--r--testset/5/TextColours15.cdrbin0 -> 1384682 bytes
-rw-r--r--testset/5/TextColours15.cdr.odg107
-rw-r--r--testset/5/TextColours15.cdr.raw78
-rw-r--r--testset/5/TextColours15.cdr.xhtml60
-rw-r--r--testset/5/TextColours5.cdrbin0 -> 11030 bytes
-rw-r--r--testset/5/TextColours5.cdr.odg102
-rw-r--r--testset/5/TextColours5.cdr.raw74
-rw-r--r--testset/5/TextColours5.cdr.xhtml58
-rw-r--r--testset/5/regression.in6
-rw-r--r--testset/6/3TextColours16.cdrbin0 -> 1399327 bytes
-rw-r--r--testset/6/3TextColours16.cdr.odg150
-rw-r--r--testset/6/3TextColours16.cdr.raw210
-rw-r--r--testset/6/3TextColours16.cdr.xhtml146
-rw-r--r--testset/6/3TextColours6.cdrbin0 -> 27602 bytes
-rw-r--r--testset/6/3TextColours6.cdr.odg150
-rw-r--r--testset/6/3TextColours6.cdr.raw210
-rw-r--r--testset/6/3TextColours6.cdr.xhtml146
-rw-r--r--testset/6/Palette16.cdrbin0 -> 1397082 bytes
-rw-r--r--testset/6/Palette16.cdr.odg177
-rw-r--r--testset/6/Palette16.cdr.raw116
-rw-r--r--testset/6/Palette16.cdr.xhtml58
-rw-r--r--testset/6/Palette6.cdrbin0 -> 52326 bytes
-rw-r--r--testset/6/Palette6.cdr.odg174
-rw-r--r--testset/6/Palette6.cdr.raw116
-rw-r--r--testset/6/Palette6.cdr.xhtml58
-rw-r--r--testset/6/TextColours16.cdrbin0 -> 1390904 bytes
-rw-r--r--testset/6/TextColours16.cdr.odg102
-rw-r--r--testset/6/TextColours16.cdr.raw74
-rw-r--r--testset/6/TextColours16.cdr.xhtml58
-rw-r--r--testset/6/TextColours6.cdrbin0 -> 22574 bytes
-rw-r--r--testset/6/TextColours6.cdr.odg102
-rw-r--r--testset/6/TextColours6.cdr.raw74
-rw-r--r--testset/6/TextColours6.cdr.xhtml58
-rw-r--r--testset/6/regression.in6
-rw-r--r--testset/7/3TextColours17.cdrbin0 -> 1938286 bytes
-rw-r--r--testset/7/3TextColours17.cdr.odg150
-rw-r--r--testset/7/3TextColours17.cdr.raw210
-rw-r--r--testset/7/3TextColours17.cdr.xhtml146
-rw-r--r--testset/7/3TextColours7.cdrbin0 -> 13856 bytes
-rw-r--r--testset/7/3TextColours7.cdr.odg155
-rw-r--r--testset/7/3TextColours7.cdr.raw214
-rw-r--r--testset/7/3TextColours7.cdr.xhtml148
-rw-r--r--testset/7/Palette17.cdrbin0 -> 1826242 bytes
-rw-r--r--testset/7/Palette17.cdr.odg177
-rw-r--r--testset/7/Palette17.cdr.raw116
-rw-r--r--testset/7/Palette17.cdr.xhtml58
-rw-r--r--testset/7/Palette7.cdrbin0 -> 14524 bytes
-rw-r--r--testset/7/Palette7.cdr.odg174
-rw-r--r--testset/7/Palette7.cdr.raw116
-rw-r--r--testset/7/Palette7.cdr.xhtml58
-rw-r--r--testset/7/TextColours17.cdrbin0 -> 1930110 bytes
-rw-r--r--testset/7/TextColours17.cdr.odg102
-rw-r--r--testset/7/TextColours17.cdr.raw74
-rw-r--r--testset/7/TextColours17.cdr.xhtml58
-rw-r--r--testset/7/TextColours7.cdrbin0 -> 13788 bytes
-rw-r--r--testset/7/TextColours7.cdr.odg107
-rw-r--r--testset/7/TextColours7.cdr.raw78
-rw-r--r--testset/7/TextColours7.cdr.xhtml60
-rw-r--r--testset/7/regression.in6
-rw-r--r--testset/8/3TextColours18.cdrbin0 -> 1938295 bytes
-rw-r--r--testset/8/3TextColours18.cdr.odg150
-rw-r--r--testset/8/3TextColours18.cdr.raw210
-rw-r--r--testset/8/3TextColours18.cdr.xhtml146
-rw-r--r--testset/8/3TextColours8.cdrbin0 -> 13900 bytes
-rw-r--r--testset/8/3TextColours8.cdr.odg155
-rw-r--r--testset/8/3TextColours8.cdr.raw214
-rw-r--r--testset/8/3TextColours8.cdr.xhtml148
-rw-r--r--testset/8/Palette18.cdrbin0 -> 1826245 bytes
-rw-r--r--testset/8/Palette18.cdr.odg177
-rw-r--r--testset/8/Palette18.cdr.raw116
-rw-r--r--testset/8/Palette18.cdr.xhtml58
-rw-r--r--testset/8/Palette8.cdrbin0 -> 14544 bytes
-rw-r--r--testset/8/Palette8.cdr.odg174
-rw-r--r--testset/8/Palette8.cdr.raw116
-rw-r--r--testset/8/Palette8.cdr.xhtml58
-rw-r--r--testset/8/TextColours18.cdrbin0 -> 1930107 bytes
-rw-r--r--testset/8/TextColours18.cdr.odg102
-rw-r--r--testset/8/TextColours18.cdr.raw74
-rw-r--r--testset/8/TextColours18.cdr.xhtml58
-rw-r--r--testset/8/TextColours8.cdrbin0 -> 13808 bytes
-rw-r--r--testset/8/TextColours8.cdr.odg107
-rw-r--r--testset/8/TextColours8.cdr.raw78
-rw-r--r--testset/8/TextColours8.cdr.xhtml60
-rw-r--r--testset/8/regression.in6
-rw-r--r--testset/8b/3TextColours8bidi.cdrbin0 -> 13850 bytes
-rw-r--r--testset/8b/3TextColours8bidi.cdr.odg155
-rw-r--r--testset/8b/3TextColours8bidi.cdr.raw214
-rw-r--r--testset/8b/3TextColours8bidi.cdr.xhtml148
-rw-r--r--testset/8b/Palette8bidi.cdrbin0 -> 14522 bytes
-rw-r--r--testset/8b/Palette8bidi.cdr.odg174
-rw-r--r--testset/8b/Palette8bidi.cdr.raw116
-rw-r--r--testset/8b/Palette8bidi.cdr.xhtml58
-rw-r--r--testset/8b/TextColours8bidi.cdrbin0 -> 13776 bytes
-rw-r--r--testset/8b/TextColours8bidi.cdr.odg107
-rw-r--r--testset/8b/TextColours8bidi.cdr.raw78
-rw-r--r--testset/8b/TextColours8bidi.cdr.xhtml60
-rw-r--r--testset/8b/regression.in3
-rw-r--r--testset/9/3TextColours19.cdrbin0 -> 1938284 bytes
-rw-r--r--testset/9/3TextColours19.cdr.odg150
-rw-r--r--testset/9/3TextColours19.cdr.raw210
-rw-r--r--testset/9/3TextColours19.cdr.xhtml146
-rw-r--r--testset/9/3TextColours9.cdrbin0 -> 14012 bytes
-rw-r--r--testset/9/3TextColours9.cdr.odg155
-rw-r--r--testset/9/3TextColours9.cdr.raw214
-rw-r--r--testset/9/3TextColours9.cdr.xhtml148
-rw-r--r--testset/9/Palette19.cdrbin0 -> 1826245 bytes
-rw-r--r--testset/9/Palette19.cdr.odg177
-rw-r--r--testset/9/Palette19.cdr.raw116
-rw-r--r--testset/9/Palette19.cdr.xhtml58
-rw-r--r--testset/9/Palette9.cdrbin0 -> 14706 bytes
-rw-r--r--testset/9/Palette9.cdr.odg174
-rw-r--r--testset/9/Palette9.cdr.raw116
-rw-r--r--testset/9/Palette9.cdr.xhtml58
-rw-r--r--testset/9/TextColours19.cdrbin0 -> 1930123 bytes
-rw-r--r--testset/9/TextColours19.cdr.odg102
-rw-r--r--testset/9/TextColours19.cdr.raw74
-rw-r--r--testset/9/TextColours19.cdr.xhtml58
-rw-r--r--testset/9/TextColours9.cdrbin0 -> 13938 bytes
-rw-r--r--testset/9/TextColours9.cdr.odg107
-rw-r--r--testset/9/TextColours9.cdr.raw78
-rw-r--r--testset/9/TextColours9.cdr.xhtml60
-rw-r--r--testset/9/regression.in6
456 files changed, 35851 insertions, 0 deletions
diff --git a/testset/1/3TextColours1.cdr b/testset/1/3TextColours1.cdr
new file mode 100644
index 0000000..e892155
--- /dev/null
+++ b/testset/1/3TextColours1.cdr
Binary files differ
diff --git a/testset/1/3TextColours1.cdr.odg b/testset/1/3TextColours1.cdr.odg
new file mode 100644
index 0000000..823133f
--- /dev/null
+++ b/testset/1/3TextColours1.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20995</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2660in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/1/3TextColours1.cdr.raw b/testset/1/3TextColours1.cdr.raw
new file mode 100644
index 0000000..9471360
--- /dev/null
+++ b/testset/1/3TextColours1.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2660in)
+ endPage
+endDocument
diff --git a/testset/1/3TextColours1.cdr.xhtml b/testset/1/3TextColours1.cdr.xhtml
new file mode 100644
index 0000000..b93f2ae
--- /dev/null
+++ b/testset/1/3TextColours1.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.1520">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/1/3TextColours11.cdr b/testset/1/3TextColours11.cdr
new file mode 100644
index 0000000..6649a4e
--- /dev/null
+++ b/testset/1/3TextColours11.cdr
Binary files differ
diff --git a/testset/1/3TextColours11.cdr.odg b/testset/1/3TextColours11.cdr.odg
new file mode 100644
index 0000000..ee743a4
--- /dev/null
+++ b/testset/1/3TextColours11.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/1/3TextColours11.cdr.raw b/testset/1/3TextColours11.cdr.raw
new file mode 100644
index 0000000..45fe941
--- /dev/null
+++ b/testset/1/3TextColours11.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/1/3TextColours11.cdr.xhtml b/testset/1/3TextColours11.cdr.xhtml
new file mode 100644
index 0000000..6a20442
--- /dev/null
+++ b/testset/1/3TextColours11.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/1/3TextColours21.cdr b/testset/1/3TextColours21.cdr
new file mode 100644
index 0000000..11b4686
--- /dev/null
+++ b/testset/1/3TextColours21.cdr
Binary files differ
diff --git a/testset/1/3TextColours21.cdr.odg b/testset/1/3TextColours21.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/1/3TextColours21.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/1/3TextColours21.cdr.raw b/testset/1/3TextColours21.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/1/3TextColours21.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/1/3TextColours21.cdr.xhtml b/testset/1/3TextColours21.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/1/3TextColours21.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/1/Palette1.cdr b/testset/1/Palette1.cdr
new file mode 100644
index 0000000..c42d3d5
--- /dev/null
+++ b/testset/1/Palette1.cdr
Binary files differ
diff --git a/testset/1/Palette1.cdr.odg b/testset/1/Palette1.cdr.odg
new file mode 100644
index 0000000..823133f
--- /dev/null
+++ b/testset/1/Palette1.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20995</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2660in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/1/Palette1.cdr.raw b/testset/1/Palette1.cdr.raw
new file mode 100644
index 0000000..9471360
--- /dev/null
+++ b/testset/1/Palette1.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2660in)
+ endPage
+endDocument
diff --git a/testset/1/Palette1.cdr.xhtml b/testset/1/Palette1.cdr.xhtml
new file mode 100644
index 0000000..b93f2ae
--- /dev/null
+++ b/testset/1/Palette1.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.1520">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/1/Palette11.cdr b/testset/1/Palette11.cdr
new file mode 100644
index 0000000..e0452f5
--- /dev/null
+++ b/testset/1/Palette11.cdr
Binary files differ
diff --git a/testset/1/Palette11.cdr.odg b/testset/1/Palette11.cdr.odg
new file mode 100644
index 0000000..6917d94
--- /dev/null
+++ b/testset/1/Palette11.cdr.odg
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#100003" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000200" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#200800" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#010704" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0b1300" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/1/Palette11.cdr.raw b/testset/1/Palette11.cdr.raw
new file mode 100644
index 0000000..51fee2c
--- /dev/null
+++ b/testset/1/Palette11.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #010704, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0b1300, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #100003, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #200800, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #01ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/1/Palette11.cdr.xhtml b/testset/1/Palette11.cdr.xhtml
new file mode 100644
index 0000000..2f66722
--- /dev/null
+++ b/testset/1/Palette11.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#010704" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#0b1300" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#100003" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#200800" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#01ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/1/Palette21.cdr b/testset/1/Palette21.cdr
new file mode 100644
index 0000000..ce5fd5d
--- /dev/null
+++ b/testset/1/Palette21.cdr
Binary files differ
diff --git a/testset/1/Palette21.cdr.odg b/testset/1/Palette21.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/1/Palette21.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/1/Palette21.cdr.raw b/testset/1/Palette21.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/1/Palette21.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/1/Palette21.cdr.xhtml b/testset/1/Palette21.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/1/Palette21.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/1/TextColours1.cdr b/testset/1/TextColours1.cdr
new file mode 100644
index 0000000..a90311c
--- /dev/null
+++ b/testset/1/TextColours1.cdr
Binary files differ
diff --git a/testset/1/TextColours1.cdr.odg b/testset/1/TextColours1.cdr.odg
new file mode 100644
index 0000000..823133f
--- /dev/null
+++ b/testset/1/TextColours1.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20995</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2660in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/1/TextColours1.cdr.raw b/testset/1/TextColours1.cdr.raw
new file mode 100644
index 0000000..9471360
--- /dev/null
+++ b/testset/1/TextColours1.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2660in)
+ endPage
+endDocument
diff --git a/testset/1/TextColours1.cdr.xhtml b/testset/1/TextColours1.cdr.xhtml
new file mode 100644
index 0000000..b93f2ae
--- /dev/null
+++ b/testset/1/TextColours1.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.1520">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/1/TextColours11.cdr b/testset/1/TextColours11.cdr
new file mode 100644
index 0000000..0c585dc
--- /dev/null
+++ b/testset/1/TextColours11.cdr
Binary files differ
diff --git a/testset/1/TextColours11.cdr.odg b/testset/1/TextColours11.cdr.odg
new file mode 100644
index 0000000..5d2c36f
--- /dev/null
+++ b/testset/1/TextColours11.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/1/TextColours11.cdr.raw b/testset/1/TextColours11.cdr.raw
new file mode 100644
index 0000000..482ad79
--- /dev/null
+++ b/testset/1/TextColours11.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/1/TextColours11.cdr.xhtml b/testset/1/TextColours11.cdr.xhtml
new file mode 100644
index 0000000..ff3f8a0
--- /dev/null
+++ b/testset/1/TextColours11.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/1/TextColours21.cdr b/testset/1/TextColours21.cdr
new file mode 100644
index 0000000..4107341
--- /dev/null
+++ b/testset/1/TextColours21.cdr
Binary files differ
diff --git a/testset/1/TextColours21.cdr.odg b/testset/1/TextColours21.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/1/TextColours21.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/1/TextColours21.cdr.raw b/testset/1/TextColours21.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/1/TextColours21.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/1/TextColours21.cdr.xhtml b/testset/1/TextColours21.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/1/TextColours21.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/1/regression.in b/testset/1/regression.in
index 06cda57..01f8ff4 100644
--- a/testset/1/regression.in
+++ b/testset/1/regression.in
@@ -1,8 +1,14 @@
+3TextColours11.cdr
+3TextColours1.cdr
+3TextColours21.cdr
fill1.cdr
lines_and_arrows_v1.cdr
moved1.cdr
norm1.cdr
outl1.cdr
+Palette11.cdr
+Palette1.cdr
+Palette21.cdr
posit1.cdr
rectangles_with_fill_v1.cdr
rot1.cdr
@@ -10,3 +16,6 @@ sample1.cdr
shapes_v1.cdr
strike1.cdr
style1.cdr
+TextColours11.cdr
+TextColours1.cdr
+TextColours21.cdr
diff --git a/testset/10/3TextColours10.cdr b/testset/10/3TextColours10.cdr
new file mode 100644
index 0000000..d68d7f1
--- /dev/null
+++ b/testset/10/3TextColours10.cdr
Binary files differ
diff --git a/testset/10/3TextColours10.cdr.odg b/testset/10/3TextColours10.cdr.odg
new file mode 100644
index 0000000..4684cb2
--- /dev/null
+++ b/testset/10/3TextColours10.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/10/3TextColours10.cdr.raw b/testset/10/3TextColours10.cdr.raw
new file mode 100644
index 0000000..2283c01
--- /dev/null
+++ b/testset/10/3TextColours10.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/10/3TextColours10.cdr.xhtml b/testset/10/3TextColours10.cdr.xhtml
new file mode 100644
index 0000000..356f9b1
--- /dev/null
+++ b/testset/10/3TextColours10.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/10/Palette10.cdr b/testset/10/Palette10.cdr
new file mode 100644
index 0000000..814e8f2
--- /dev/null
+++ b/testset/10/Palette10.cdr
Binary files differ
diff --git a/testset/10/Palette10.cdr.odg b/testset/10/Palette10.cdr.odg
new file mode 100644
index 0000000..6011e6a
--- /dev/null
+++ b/testset/10/Palette10.cdr.odg
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#100003" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000200" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#200800" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#010704" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0b1300" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/10/Palette10.cdr.raw b/testset/10/Palette10.cdr.raw
new file mode 100644
index 0000000..a05ea3d
--- /dev/null
+++ b/testset/10/Palette10.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #010704, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0b1300, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #100003, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #200800, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/10/Palette10.cdr.xhtml b/testset/10/Palette10.cdr.xhtml
new file mode 100644
index 0000000..b32c104
--- /dev/null
+++ b/testset/10/Palette10.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#010704" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#0b1300" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#100003" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#200800" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/10/TextColours10.cdr b/testset/10/TextColours10.cdr
new file mode 100644
index 0000000..0e15f91
--- /dev/null
+++ b/testset/10/TextColours10.cdr
Binary files differ
diff --git a/testset/10/TextColours10.cdr.odg b/testset/10/TextColours10.cdr.odg
new file mode 100644
index 0000000..67dc8f2
--- /dev/null
+++ b/testset/10/TextColours10.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/10/TextColours10.cdr.raw b/testset/10/TextColours10.cdr.raw
new file mode 100644
index 0000000..b8b7880
--- /dev/null
+++ b/testset/10/TextColours10.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/10/TextColours10.cdr.xhtml b/testset/10/TextColours10.cdr.xhtml
new file mode 100644
index 0000000..2de670b
--- /dev/null
+++ b/testset/10/TextColours10.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/10/regression.in b/testset/10/regression.in
index 6603a77..6efd538 100644
--- a/testset/10/regression.in
+++ b/testset/10/regression.in
@@ -1,3 +1,4 @@
+3TextColours10.cdr
align_none_left_center_right_full_force-full_cdr10.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr10.cdr
bmp_0-0_25-25_8bit_cdr10.cdr
@@ -34,6 +35,7 @@ outl_corner_cdr10.cdr
outl_line_caps_cdr10.cdr
outl_scale_with_cdr10.cdr
outl_width_cdr10.cdr
+Palette10.cdr
rectangles_with_fill_v10.cdr
rgb_eeddcc-cdr10.cdr
rogan_logo_cdr10.cdr
@@ -42,6 +44,7 @@ shapes_v10.cdr
simple_circle_cdr10.cdr
subscript_superscript_position_cdr10.cdr
text_1-2-3-4_lines_cdr10.cdr
+TextColours10.cdr
text_norm_b_i_bi_u_cdr10.cdr
text_rgb_fill_cdr10.cdr
text_rgb_outl_cdr10.cdr
diff --git a/testset/11/3TextColours11.cdr b/testset/11/3TextColours11.cdr
new file mode 100644
index 0000000..6649a4e
--- /dev/null
+++ b/testset/11/3TextColours11.cdr
Binary files differ
diff --git a/testset/11/3TextColours11.cdr.odg b/testset/11/3TextColours11.cdr.odg
new file mode 100644
index 0000000..ee743a4
--- /dev/null
+++ b/testset/11/3TextColours11.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/11/3TextColours11.cdr.raw b/testset/11/3TextColours11.cdr.raw
new file mode 100644
index 0000000..45fe941
--- /dev/null
+++ b/testset/11/3TextColours11.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/11/3TextColours11.cdr.xhtml b/testset/11/3TextColours11.cdr.xhtml
new file mode 100644
index 0000000..6a20442
--- /dev/null
+++ b/testset/11/3TextColours11.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/11/Palette11.cdr b/testset/11/Palette11.cdr
new file mode 100644
index 0000000..e0452f5
--- /dev/null
+++ b/testset/11/Palette11.cdr
Binary files differ
diff --git a/testset/11/Palette11.cdr.odg b/testset/11/Palette11.cdr.odg
new file mode 100644
index 0000000..6917d94
--- /dev/null
+++ b/testset/11/Palette11.cdr.odg
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#100003" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000200" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#200800" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#010704" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0b1300" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/11/Palette11.cdr.raw b/testset/11/Palette11.cdr.raw
new file mode 100644
index 0000000..51fee2c
--- /dev/null
+++ b/testset/11/Palette11.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #010704, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0b1300, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #100003, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #200800, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #01ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/11/Palette11.cdr.xhtml b/testset/11/Palette11.cdr.xhtml
new file mode 100644
index 0000000..2f66722
--- /dev/null
+++ b/testset/11/Palette11.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#010704" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#0b1300" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#100003" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#200800" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#01ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/11/TextColours11.cdr b/testset/11/TextColours11.cdr
new file mode 100644
index 0000000..0c585dc
--- /dev/null
+++ b/testset/11/TextColours11.cdr
Binary files differ
diff --git a/testset/11/TextColours11.cdr.odg b/testset/11/TextColours11.cdr.odg
new file mode 100644
index 0000000..5d2c36f
--- /dev/null
+++ b/testset/11/TextColours11.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/11/TextColours11.cdr.raw b/testset/11/TextColours11.cdr.raw
new file mode 100644
index 0000000..482ad79
--- /dev/null
+++ b/testset/11/TextColours11.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/11/TextColours11.cdr.xhtml b/testset/11/TextColours11.cdr.xhtml
new file mode 100644
index 0000000..ff3f8a0
--- /dev/null
+++ b/testset/11/TextColours11.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/11/regression.in b/testset/11/regression.in
index 0e8b8e1..e89e515 100644
--- a/testset/11/regression.in
+++ b/testset/11/regression.in
@@ -1,3 +1,4 @@
+3TextColours11.cdr
align_none_left_center_right_full_force-full_cdr11.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr11.cdr
Biline_cdr11.cdr
@@ -50,6 +51,7 @@ outl_corner_cdr11.cdr
outl_line_caps_cdr11.cdr
outl_scale_with_cdr11.cdr
outl_width_cdr11.cdr
+Palette11.cdr
pattern_fill_cdr11.cdr
people_02_cdr11.cdr
rectangles_with_fill_cdr11.cdr
@@ -60,6 +62,7 @@ simple_circle_cdr11.cdr
subscript_superscript_position_cdr11.cdr
text_1-2-3-4_lines_cdr11.cdr
text1_cdr11.cdr
+TextColours11.cdr
text_rgb_fill_cdr11.cdr
text_rgb_outl_cdr11.cdr
text_rotated_characters_cdr11.cdr
diff --git a/testset/12/3TextColours12.cdr b/testset/12/3TextColours12.cdr
new file mode 100644
index 0000000..0f967d7
--- /dev/null
+++ b/testset/12/3TextColours12.cdr
Binary files differ
diff --git a/testset/12/3TextColours12.cdr.odg b/testset/12/3TextColours12.cdr.odg
new file mode 100644
index 0000000..ee743a4
--- /dev/null
+++ b/testset/12/3TextColours12.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/12/3TextColours12.cdr.raw b/testset/12/3TextColours12.cdr.raw
new file mode 100644
index 0000000..45fe941
--- /dev/null
+++ b/testset/12/3TextColours12.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/12/3TextColours12.cdr.xhtml b/testset/12/3TextColours12.cdr.xhtml
new file mode 100644
index 0000000..6a20442
--- /dev/null
+++ b/testset/12/3TextColours12.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/12/Palette12.cdr b/testset/12/Palette12.cdr
new file mode 100644
index 0000000..e0eae0e
--- /dev/null
+++ b/testset/12/Palette12.cdr
Binary files differ
diff --git a/testset/12/Palette12.cdr.odg b/testset/12/Palette12.cdr.odg
new file mode 100644
index 0000000..6917d94
--- /dev/null
+++ b/testset/12/Palette12.cdr.odg
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#100003" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000200" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#200800" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#010704" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0b1300" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/12/Palette12.cdr.raw b/testset/12/Palette12.cdr.raw
new file mode 100644
index 0000000..51fee2c
--- /dev/null
+++ b/testset/12/Palette12.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #010704, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0b1300, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #100003, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #200800, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #01ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/12/Palette12.cdr.xhtml b/testset/12/Palette12.cdr.xhtml
new file mode 100644
index 0000000..2f66722
--- /dev/null
+++ b/testset/12/Palette12.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#010704" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#0b1300" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#100003" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#200800" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#01ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/12/TextColours12.cdr b/testset/12/TextColours12.cdr
new file mode 100644
index 0000000..2904dd9
--- /dev/null
+++ b/testset/12/TextColours12.cdr
Binary files differ
diff --git a/testset/12/TextColours12.cdr.odg b/testset/12/TextColours12.cdr.odg
new file mode 100644
index 0000000..5d2c36f
--- /dev/null
+++ b/testset/12/TextColours12.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/12/TextColours12.cdr.raw b/testset/12/TextColours12.cdr.raw
new file mode 100644
index 0000000..482ad79
--- /dev/null
+++ b/testset/12/TextColours12.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/12/TextColours12.cdr.xhtml b/testset/12/TextColours12.cdr.xhtml
new file mode 100644
index 0000000..ff3f8a0
--- /dev/null
+++ b/testset/12/TextColours12.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/12/regression.in b/testset/12/regression.in
index 49e2d28..ec4a4de 100644
--- a/testset/12/regression.in
+++ b/testset/12/regression.in
@@ -1,3 +1,4 @@
+3TextColours12.cdr
align_none_left_center_right_full_force-full_cdr12.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr12.cdr
Biline_cdr12.cdr
@@ -54,6 +55,7 @@ outl_line_caps_cdr12.cdr
outl_mitter_limit_cdr12.cdr
outl_scale_with_cdr12.cdr
outl_width_cdr12.cdr
+Palette12.cdr
pattern_fill_cdr12.cdr
people_02_cdr12.cdr
postscript_fill_cdr12.cdr
@@ -66,6 +68,7 @@ subscript_superscript_position_cdr12.cdr
terra_cdr12.cdr
text_1-2-3-4_lines_cdr12.cdr
text1_cdr12.cdr
+TextColours12.cdr
text_norm_b_i_bi_u_cdr12.cdr
text_rgb_fill_cdr12.cdr
text_rgb_outl-blue_fill-red_cdr12.cdr
diff --git a/testset/13/3TextColours13.cdr b/testset/13/3TextColours13.cdr
new file mode 100644
index 0000000..835ce8f
--- /dev/null
+++ b/testset/13/3TextColours13.cdr
Binary files differ
diff --git a/testset/13/3TextColours13.cdr.odg b/testset/13/3TextColours13.cdr.odg
new file mode 100644
index 0000000..ee743a4
--- /dev/null
+++ b/testset/13/3TextColours13.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/13/3TextColours13.cdr.raw b/testset/13/3TextColours13.cdr.raw
new file mode 100644
index 0000000..45fe941
--- /dev/null
+++ b/testset/13/3TextColours13.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/13/3TextColours13.cdr.xhtml b/testset/13/3TextColours13.cdr.xhtml
new file mode 100644
index 0000000..6a20442
--- /dev/null
+++ b/testset/13/3TextColours13.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/13/Palette13.cdr b/testset/13/Palette13.cdr
new file mode 100644
index 0000000..916bd21
--- /dev/null
+++ b/testset/13/Palette13.cdr
Binary files differ
diff --git a/testset/13/Palette13.cdr.odg b/testset/13/Palette13.cdr.odg
new file mode 100644
index 0000000..af78bfc
--- /dev/null
+++ b/testset/13/Palette13.cdr.odg
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#007700" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c1c2c4" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/13/Palette13.cdr.raw b/testset/13/Palette13.cdr.raw
new file mode 100644
index 0000000..a545057
--- /dev/null
+++ b/testset/13/Palette13.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c1c2c4, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #007700, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #01ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/13/Palette13.cdr.xhtml b/testset/13/Palette13.cdr.xhtml
new file mode 100644
index 0000000..8eb5553
--- /dev/null
+++ b/testset/13/Palette13.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#c1c2c4" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#007700" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#01ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/13/TextColours13.cdr b/testset/13/TextColours13.cdr
new file mode 100644
index 0000000..68c3dd1
--- /dev/null
+++ b/testset/13/TextColours13.cdr
Binary files differ
diff --git a/testset/13/TextColours13.cdr.odg b/testset/13/TextColours13.cdr.odg
new file mode 100644
index 0000000..5d2c36f
--- /dev/null
+++ b/testset/13/TextColours13.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/13/TextColours13.cdr.raw b/testset/13/TextColours13.cdr.raw
new file mode 100644
index 0000000..482ad79
--- /dev/null
+++ b/testset/13/TextColours13.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/13/TextColours13.cdr.xhtml b/testset/13/TextColours13.cdr.xhtml
new file mode 100644
index 0000000..ff3f8a0
--- /dev/null
+++ b/testset/13/TextColours13.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/13/regression.in b/testset/13/regression.in
index ab8a491..0acbb39 100644
--- a/testset/13/regression.in
+++ b/testset/13/regression.in
@@ -1,3 +1,4 @@
+3TextColours13.cdr
align_none_left_center_right_full_force-full_13.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr13.cdr
Biline_v13.cdr
@@ -61,6 +62,7 @@ outl_line_caps_cdr13.cdr
outl_mitter_limit_cdr13.cdr
outl_scale_with_cdr13.cdr
outl_width_cdr13.cdr
+Palette13.cdr
pattern_fill_cdr13.cdr
people_02_v13.cdr
postscript_fill_changed_values_cdr13.cdr
@@ -74,6 +76,7 @@ subscript_superscript_position_cdr13.cdr
terra_v13.cdr
text_1-2-3-4_lines_cdr13.cdr
text1_v13.cdr
+TextColours13.cdr
text_norm_b_i_bi_u_cdr13.cdr
text_rgb_fill_cdr13.cdr
text_rgb_outl_cdr13.cdr
diff --git a/testset/14/3TextColours14.cdr b/testset/14/3TextColours14.cdr
new file mode 100644
index 0000000..dedc20e
--- /dev/null
+++ b/testset/14/3TextColours14.cdr
Binary files differ
diff --git a/testset/14/3TextColours14.cdr.odg b/testset/14/3TextColours14.cdr.odg
new file mode 100644
index 0000000..ee743a4
--- /dev/null
+++ b/testset/14/3TextColours14.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/14/3TextColours14.cdr.raw b/testset/14/3TextColours14.cdr.raw
new file mode 100644
index 0000000..45fe941
--- /dev/null
+++ b/testset/14/3TextColours14.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/14/3TextColours14.cdr.xhtml b/testset/14/3TextColours14.cdr.xhtml
new file mode 100644
index 0000000..6a20442
--- /dev/null
+++ b/testset/14/3TextColours14.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/14/Palette14.cdr b/testset/14/Palette14.cdr
new file mode 100644
index 0000000..ce72903
--- /dev/null
+++ b/testset/14/Palette14.cdr
Binary files differ
diff --git a/testset/14/Palette14.cdr.odg b/testset/14/Palette14.cdr.odg
new file mode 100644
index 0000000..af78bfc
--- /dev/null
+++ b/testset/14/Palette14.cdr.odg
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#007700" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c1c2c4" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/14/Palette14.cdr.raw b/testset/14/Palette14.cdr.raw
new file mode 100644
index 0000000..a545057
--- /dev/null
+++ b/testset/14/Palette14.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c1c2c4, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #007700, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #01ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/14/Palette14.cdr.xhtml b/testset/14/Palette14.cdr.xhtml
new file mode 100644
index 0000000..8eb5553
--- /dev/null
+++ b/testset/14/Palette14.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#c1c2c4" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#007700" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#01ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/14/TextColours14.cdr b/testset/14/TextColours14.cdr
new file mode 100644
index 0000000..e3d0b28
--- /dev/null
+++ b/testset/14/TextColours14.cdr
Binary files differ
diff --git a/testset/14/TextColours14.cdr.odg b/testset/14/TextColours14.cdr.odg
new file mode 100644
index 0000000..5d2c36f
--- /dev/null
+++ b/testset/14/TextColours14.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/14/TextColours14.cdr.raw b/testset/14/TextColours14.cdr.raw
new file mode 100644
index 0000000..482ad79
--- /dev/null
+++ b/testset/14/TextColours14.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/14/TextColours14.cdr.xhtml b/testset/14/TextColours14.cdr.xhtml
new file mode 100644
index 0000000..ff3f8a0
--- /dev/null
+++ b/testset/14/TextColours14.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/14/regression.in b/testset/14/regression.in
index f091370..3996404 100644
--- a/testset/14/regression.in
+++ b/testset/14/regression.in
@@ -1,3 +1,4 @@
+3TextColours14.cdr
align_none_left_center_right_full_force-full_cdr14.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr14.cdr
Biline_cdr14.cdr
@@ -31,6 +32,7 @@ multifonts_sample_cdr14.cdr
nonfirst_strikethru_cdr14.cdr
nonlatin_multiline_cdr14.cdr
ord_xpar_cdr14.cdr
+Palette14.cdr
pattern_fill_cdr14.cdr
people_02_cdr14.cdr
rectangles_with_fill_cdr14.cdr
@@ -41,6 +43,7 @@ subscript_superscript_position_cdr14.cdr
terra_cdr14.cdr
text_1-2-3-4_lines_cdr14.cdr
text1_cdr14.cdr
+TextColours14.cdr
text_norm_b_i_bi_u_cdr14.cdr
text_rgb_fill_cdr14.cdr
text_rgb_outl_cdr14.cdr
diff --git a/testset/15/3TextColours15.cdr b/testset/15/3TextColours15.cdr
new file mode 100644
index 0000000..9dc25e4
--- /dev/null
+++ b/testset/15/3TextColours15.cdr
Binary files differ
diff --git a/testset/15/3TextColours15.cdr.odg b/testset/15/3TextColours15.cdr.odg
new file mode 100644
index 0000000..4684cb2
--- /dev/null
+++ b/testset/15/3TextColours15.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/15/3TextColours15.cdr.raw b/testset/15/3TextColours15.cdr.raw
new file mode 100644
index 0000000..2283c01
--- /dev/null
+++ b/testset/15/3TextColours15.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/15/3TextColours15.cdr.xhtml b/testset/15/3TextColours15.cdr.xhtml
new file mode 100644
index 0000000..356f9b1
--- /dev/null
+++ b/testset/15/3TextColours15.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/15/Palette15.cdr b/testset/15/Palette15.cdr
new file mode 100644
index 0000000..5e0c6cb
--- /dev/null
+++ b/testset/15/Palette15.cdr
Binary files differ
diff --git a/testset/15/Palette15.cdr.odg b/testset/15/Palette15.cdr.odg
new file mode 100644
index 0000000..2706385
--- /dev/null
+++ b/testset/15/Palette15.cdr.odg
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#007700" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c1c2c4" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/15/Palette15.cdr.raw b/testset/15/Palette15.cdr.raw
new file mode 100644
index 0000000..bb003fb
--- /dev/null
+++ b/testset/15/Palette15.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c1c2c4, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #007700, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/15/Palette15.cdr.xhtml b/testset/15/Palette15.cdr.xhtml
new file mode 100644
index 0000000..d6f9fe1
--- /dev/null
+++ b/testset/15/Palette15.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#c1c2c4" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#007700" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/15/TextColours15.cdr b/testset/15/TextColours15.cdr
new file mode 100644
index 0000000..c83b18d
--- /dev/null
+++ b/testset/15/TextColours15.cdr
Binary files differ
diff --git a/testset/15/TextColours15.cdr.odg b/testset/15/TextColours15.cdr.odg
new file mode 100644
index 0000000..67dc8f2
--- /dev/null
+++ b/testset/15/TextColours15.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/15/TextColours15.cdr.raw b/testset/15/TextColours15.cdr.raw
new file mode 100644
index 0000000..b8b7880
--- /dev/null
+++ b/testset/15/TextColours15.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/15/TextColours15.cdr.xhtml b/testset/15/TextColours15.cdr.xhtml
new file mode 100644
index 0000000..2de670b
--- /dev/null
+++ b/testset/15/TextColours15.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/15/regression.in b/testset/15/regression.in
index dfd52dc..36dd788 100644
--- a/testset/15/regression.in
+++ b/testset/15/regression.in
@@ -1,3 +1,4 @@
+3TextColours15.cdr
align_none_left_center_right_full_force-full_cdr15.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr15.cdr
Biline_cdr15.cdr
@@ -31,6 +32,7 @@ multifonts_sample_cdr15.cdr
nonfirst_strikethru_cdr15.cdr
nonlatin_multiline_cdr15.cdr
ord_xpar_cdr15.cdr
+Palette15.cdr
pallets1_cdr15.cdr
pallets2_cdr15.cdr
pattern_fill_cdr15.cdr
@@ -43,6 +45,7 @@ subscript_superscript_position_cdr15.cdr
terra_cdr15.cdr
text_1-2-3-4_lines_cdr15.cdr
text1_cdr15.cdr
+TextColours15.cdr
text_norm_b_i_bi_u_cdr15.cdr
text_rgb_fill_cdr15.cdr
text_rgb_outl_cdr15.cdr
diff --git a/testset/16/3TextColours16.cdr b/testset/16/3TextColours16.cdr
new file mode 100644
index 0000000..d3f1909
--- /dev/null
+++ b/testset/16/3TextColours16.cdr
Binary files differ
diff --git a/testset/16/3TextColours16.cdr.odg b/testset/16/3TextColours16.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/16/3TextColours16.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/16/3TextColours16.cdr.raw b/testset/16/3TextColours16.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/16/3TextColours16.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/16/3TextColours16.cdr.xhtml b/testset/16/3TextColours16.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/16/3TextColours16.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/16/Palette16.cdr b/testset/16/Palette16.cdr
new file mode 100644
index 0000000..38c902c
--- /dev/null
+++ b/testset/16/Palette16.cdr
Binary files differ
diff --git a/testset/16/Palette16.cdr.odg b/testset/16/Palette16.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/16/Palette16.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/16/Palette16.cdr.raw b/testset/16/Palette16.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/16/Palette16.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/16/Palette16.cdr.xhtml b/testset/16/Palette16.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/16/Palette16.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/16/TextColours16.cdr b/testset/16/TextColours16.cdr
new file mode 100644
index 0000000..e79fc29
--- /dev/null
+++ b/testset/16/TextColours16.cdr
Binary files differ
diff --git a/testset/16/TextColours16.cdr.odg b/testset/16/TextColours16.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/16/TextColours16.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/16/TextColours16.cdr.raw b/testset/16/TextColours16.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/16/TextColours16.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/16/TextColours16.cdr.xhtml b/testset/16/TextColours16.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/16/TextColours16.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/16/regression.in b/testset/16/regression.in
index 12ac517..49877ff 100644
--- a/testset/16/regression.in
+++ b/testset/16/regression.in
@@ -1,3 +1,4 @@
+3TextColours16.cdr
align_none_left_center_right_full_force-full_cdr16.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr16.cdr
Biline_cdr16.cdr
@@ -31,6 +32,7 @@ multifonts_sample_cdr16.cdr
nonfirst_strikethru_cdr16.cdr
nonlatin_multiline_cdr16.cdr
ord_xpar_cdr16.cdr
+Palette16.cdr
pallets1_cdr16.cdr
pallets2_cdr16.cdr
pattern_fill_cdr16.cdr
@@ -43,6 +45,7 @@ subscript_superscript_position_cdr16.cdr
terra_cdr16.cdr
text_1-2-3-4_lines_cdr16.cdr
text1_cdr16.cdr
+TextColours16.cdr
text_norm_b_i_bi_u_cdr16.cdr
text_rgb_fill_cdr16.cdr
text_rgb_outl_cdr16.cdr
diff --git a/testset/17/3TextColours17.cdr b/testset/17/3TextColours17.cdr
new file mode 100644
index 0000000..1e0abea
--- /dev/null
+++ b/testset/17/3TextColours17.cdr
Binary files differ
diff --git a/testset/17/3TextColours17.cdr.odg b/testset/17/3TextColours17.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/17/3TextColours17.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/17/3TextColours17.cdr.raw b/testset/17/3TextColours17.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/17/3TextColours17.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/17/3TextColours17.cdr.xhtml b/testset/17/3TextColours17.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/17/3TextColours17.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/17/Palette17.cdr b/testset/17/Palette17.cdr
new file mode 100644
index 0000000..83b738d
--- /dev/null
+++ b/testset/17/Palette17.cdr
Binary files differ
diff --git a/testset/17/Palette17.cdr.odg b/testset/17/Palette17.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/17/Palette17.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/17/Palette17.cdr.raw b/testset/17/Palette17.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/17/Palette17.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/17/Palette17.cdr.xhtml b/testset/17/Palette17.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/17/Palette17.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/17/TextColours17.cdr b/testset/17/TextColours17.cdr
new file mode 100644
index 0000000..f4089b1
--- /dev/null
+++ b/testset/17/TextColours17.cdr
Binary files differ
diff --git a/testset/17/TextColours17.cdr.odg b/testset/17/TextColours17.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/17/TextColours17.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/17/TextColours17.cdr.raw b/testset/17/TextColours17.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/17/TextColours17.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/17/TextColours17.cdr.xhtml b/testset/17/TextColours17.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/17/TextColours17.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/17/regression.in b/testset/17/regression.in
index b96de9b..bbf71a8 100644
--- a/testset/17/regression.in
+++ b/testset/17/regression.in
@@ -1,3 +1,4 @@
+3TextColours17.cdr
align_none_left_center_right_full_force-full_cdr17.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr17.cdr
Biline_cdr17.cdr
@@ -30,6 +31,7 @@ multifonts_sample_cdr17.cdr
nonfirst_strikethru_cdr17.cdr
nonlatin_multiline_cdr17.cdr
ord_xpar_cdr17.cdr
+Palette17.cdr
pallets1_cdr17.cdr
pallets2_cdr17.cdr
pattern_fill_cdr17.cdr
@@ -41,6 +43,7 @@ subscript_superscript_position_cdr17.cdr
terra_cdr17.cdr
text_1-2-3-4_lines_cdr17.cdr
text1_cdr17.cdr
+TextColours17.cdr
text_norm_b_i_bi_u_cdr17.cdr
text_rgb_fill_cdr17.cdr
text_rgb_outl_cdr17.cdr
diff --git a/testset/18/3TextColours18.cdr b/testset/18/3TextColours18.cdr
new file mode 100644
index 0000000..a91b20c
--- /dev/null
+++ b/testset/18/3TextColours18.cdr
Binary files differ
diff --git a/testset/18/3TextColours18.cdr.odg b/testset/18/3TextColours18.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/18/3TextColours18.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/18/3TextColours18.cdr.raw b/testset/18/3TextColours18.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/18/3TextColours18.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/18/3TextColours18.cdr.xhtml b/testset/18/3TextColours18.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/18/3TextColours18.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/18/Palette18.cdr b/testset/18/Palette18.cdr
new file mode 100644
index 0000000..6291c04
--- /dev/null
+++ b/testset/18/Palette18.cdr
Binary files differ
diff --git a/testset/18/Palette18.cdr.odg b/testset/18/Palette18.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/18/Palette18.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/18/Palette18.cdr.raw b/testset/18/Palette18.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/18/Palette18.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/18/Palette18.cdr.xhtml b/testset/18/Palette18.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/18/Palette18.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/18/TextColours18.cdr b/testset/18/TextColours18.cdr
new file mode 100644
index 0000000..e4b8eee
--- /dev/null
+++ b/testset/18/TextColours18.cdr
Binary files differ
diff --git a/testset/18/TextColours18.cdr.odg b/testset/18/TextColours18.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/18/TextColours18.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/18/TextColours18.cdr.raw b/testset/18/TextColours18.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/18/TextColours18.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/18/TextColours18.cdr.xhtml b/testset/18/TextColours18.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/18/TextColours18.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/18/regression.in b/testset/18/regression.in
index 853bd15..0005f0f 100644
--- a/testset/18/regression.in
+++ b/testset/18/regression.in
@@ -1,3 +1,4 @@
+3TextColours18.cdr
align_none_left_center_right_full_force-full_cdr18.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr18.cdr
Biline_cdr18.cdr
@@ -30,6 +31,7 @@ multifonts_sample_cdr18.cdr
nonfirst_strikethru_cdr18.cdr
nonlatin_multiline_cdr18.cdr
ord_xpar_cdr18.cdr
+Palette18.cdr
pattern_fill_cdr18.cdr
people_02_cdr18.cdr
rogan_logo_cdr18.cdr
@@ -39,6 +41,7 @@ subscript_superscript_position_cdr18.cdr
terra_cdr18.cdr
text_1-2-3-4_lines_cdr18.cdr
text1_cdr18.cdr
+TextColours18.cdr
text_norm_b_i_bi_u_cdr18.cdr
text_rgb_fill_cdr18.cdr
text_rgb_outl_cdr18.cdr
diff --git a/testset/19/3TextColours19.cdr b/testset/19/3TextColours19.cdr
new file mode 100644
index 0000000..676d94d
--- /dev/null
+++ b/testset/19/3TextColours19.cdr
Binary files differ
diff --git a/testset/19/3TextColours19.cdr.odg b/testset/19/3TextColours19.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/19/3TextColours19.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/19/3TextColours19.cdr.raw b/testset/19/3TextColours19.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/19/3TextColours19.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/19/3TextColours19.cdr.xhtml b/testset/19/3TextColours19.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/19/3TextColours19.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/19/Palette19.cdr b/testset/19/Palette19.cdr
new file mode 100644
index 0000000..503f5f1
--- /dev/null
+++ b/testset/19/Palette19.cdr
Binary files differ
diff --git a/testset/19/Palette19.cdr.odg b/testset/19/Palette19.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/19/Palette19.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/19/Palette19.cdr.raw b/testset/19/Palette19.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/19/Palette19.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/19/Palette19.cdr.xhtml b/testset/19/Palette19.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/19/Palette19.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/19/TextColours19.cdr b/testset/19/TextColours19.cdr
new file mode 100644
index 0000000..fac58a4
--- /dev/null
+++ b/testset/19/TextColours19.cdr
Binary files differ
diff --git a/testset/19/TextColours19.cdr.odg b/testset/19/TextColours19.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/19/TextColours19.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/19/TextColours19.cdr.raw b/testset/19/TextColours19.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/19/TextColours19.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/19/TextColours19.cdr.xhtml b/testset/19/TextColours19.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/19/TextColours19.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/19/regression.in b/testset/19/regression.in
index 237a206..003ba71 100644
--- a/testset/19/regression.in
+++ b/testset/19/regression.in
@@ -1,3 +1,4 @@
+3TextColours19.cdr
align_none_left_center_right_full_force-full_cdr19.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr19.cdr
Biline_cdr19.cdr
@@ -30,6 +31,7 @@ multifonts_sample_cdr19.cdr
nonfirst_strikethru_cdr19.cdr
nonlatin_multiline_cdr19.cdr
ord_xpar_cdr19.cdr
+Palette19.cdr
pattern_fill_cdr19.cdr
people_02_cdr19.cdr
rogan_logo_cdr19.cdr
@@ -39,6 +41,7 @@ subscript_superscript_position_cdr19.cdr
terra_cdr19.cdr
text_1-2-3-4_lines_cdr19.cdr
text1_cdr19.cdr
+TextColours19.cdr
text_norm_b_i_bi_u_cdr19.cdr
text_rgb_fill_cdr19.cdr
text_rgb_outl_cdr19.cdr
diff --git a/testset/2/3TextColours12.cdr b/testset/2/3TextColours12.cdr
new file mode 100644
index 0000000..0f967d7
--- /dev/null
+++ b/testset/2/3TextColours12.cdr
Binary files differ
diff --git a/testset/2/3TextColours12.cdr.odg b/testset/2/3TextColours12.cdr.odg
new file mode 100644
index 0000000..ee743a4
--- /dev/null
+++ b/testset/2/3TextColours12.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/2/3TextColours12.cdr.raw b/testset/2/3TextColours12.cdr.raw
new file mode 100644
index 0000000..45fe941
--- /dev/null
+++ b/testset/2/3TextColours12.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/2/3TextColours12.cdr.xhtml b/testset/2/3TextColours12.cdr.xhtml
new file mode 100644
index 0000000..6a20442
--- /dev/null
+++ b/testset/2/3TextColours12.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/2/3TextColours2.cdr b/testset/2/3TextColours2.cdr
new file mode 100644
index 0000000..5169ef4
--- /dev/null
+++ b/testset/2/3TextColours2.cdr
Binary files differ
diff --git a/testset/2/3TextColours2.cdr.odg b/testset/2/3TextColours2.cdr.odg
new file mode 100644
index 0000000..823133f
--- /dev/null
+++ b/testset/2/3TextColours2.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20995</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2660in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/2/3TextColours2.cdr.raw b/testset/2/3TextColours2.cdr.raw
new file mode 100644
index 0000000..9471360
--- /dev/null
+++ b/testset/2/3TextColours2.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2660in)
+ endPage
+endDocument
diff --git a/testset/2/3TextColours2.cdr.xhtml b/testset/2/3TextColours2.cdr.xhtml
new file mode 100644
index 0000000..b93f2ae
--- /dev/null
+++ b/testset/2/3TextColours2.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.1520">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/2/3TextColours22.cdr b/testset/2/3TextColours22.cdr
new file mode 100644
index 0000000..b3a36e2
--- /dev/null
+++ b/testset/2/3TextColours22.cdr
Binary files differ
diff --git a/testset/2/3TextColours22.cdr.odg b/testset/2/3TextColours22.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/2/3TextColours22.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/2/3TextColours22.cdr.raw b/testset/2/3TextColours22.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/2/3TextColours22.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/2/3TextColours22.cdr.xhtml b/testset/2/3TextColours22.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/2/3TextColours22.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/2/Palette12.cdr b/testset/2/Palette12.cdr
new file mode 100644
index 0000000..e0eae0e
--- /dev/null
+++ b/testset/2/Palette12.cdr
Binary files differ
diff --git a/testset/2/Palette12.cdr.odg b/testset/2/Palette12.cdr.odg
new file mode 100644
index 0000000..6917d94
--- /dev/null
+++ b/testset/2/Palette12.cdr.odg
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#100003" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000200" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#200800" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#010704" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0b1300" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/2/Palette12.cdr.raw b/testset/2/Palette12.cdr.raw
new file mode 100644
index 0000000..51fee2c
--- /dev/null
+++ b/testset/2/Palette12.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #010704, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0b1300, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #100003, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #200800, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #01ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/2/Palette12.cdr.xhtml b/testset/2/Palette12.cdr.xhtml
new file mode 100644
index 0000000..2f66722
--- /dev/null
+++ b/testset/2/Palette12.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#010704" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#0b1300" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#100003" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#200800" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#01ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/2/Palette2.cdr b/testset/2/Palette2.cdr
new file mode 100644
index 0000000..a26e762
--- /dev/null
+++ b/testset/2/Palette2.cdr
Binary files differ
diff --git a/testset/2/Palette2.cdr.odg b/testset/2/Palette2.cdr.odg
new file mode 100644
index 0000000..823133f
--- /dev/null
+++ b/testset/2/Palette2.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20995</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2660in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/2/Palette2.cdr.raw b/testset/2/Palette2.cdr.raw
new file mode 100644
index 0000000..9471360
--- /dev/null
+++ b/testset/2/Palette2.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2660in)
+ endPage
+endDocument
diff --git a/testset/2/Palette2.cdr.xhtml b/testset/2/Palette2.cdr.xhtml
new file mode 100644
index 0000000..b93f2ae
--- /dev/null
+++ b/testset/2/Palette2.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.1520">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/2/Palette22.cdr b/testset/2/Palette22.cdr
new file mode 100644
index 0000000..c0a433e
--- /dev/null
+++ b/testset/2/Palette22.cdr
Binary files differ
diff --git a/testset/2/Palette22.cdr.odg b/testset/2/Palette22.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/2/Palette22.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/2/Palette22.cdr.raw b/testset/2/Palette22.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/2/Palette22.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/2/Palette22.cdr.xhtml b/testset/2/Palette22.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/2/Palette22.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/2/TextColours12.cdr b/testset/2/TextColours12.cdr
new file mode 100644
index 0000000..2904dd9
--- /dev/null
+++ b/testset/2/TextColours12.cdr
Binary files differ
diff --git a/testset/2/TextColours12.cdr.odg b/testset/2/TextColours12.cdr.odg
new file mode 100644
index 0000000..5d2c36f
--- /dev/null
+++ b/testset/2/TextColours12.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/2/TextColours12.cdr.raw b/testset/2/TextColours12.cdr.raw
new file mode 100644
index 0000000..482ad79
--- /dev/null
+++ b/testset/2/TextColours12.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/2/TextColours12.cdr.xhtml b/testset/2/TextColours12.cdr.xhtml
new file mode 100644
index 0000000..ff3f8a0
--- /dev/null
+++ b/testset/2/TextColours12.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/2/TextColours2.cdr b/testset/2/TextColours2.cdr
new file mode 100644
index 0000000..93efe07
--- /dev/null
+++ b/testset/2/TextColours2.cdr
Binary files differ
diff --git a/testset/2/TextColours2.cdr.odg b/testset/2/TextColours2.cdr.odg
new file mode 100644
index 0000000..823133f
--- /dev/null
+++ b/testset/2/TextColours2.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20995</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2660in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/2/TextColours2.cdr.raw b/testset/2/TextColours2.cdr.raw
new file mode 100644
index 0000000..9471360
--- /dev/null
+++ b/testset/2/TextColours2.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2660in)
+ endPage
+endDocument
diff --git a/testset/2/TextColours2.cdr.xhtml b/testset/2/TextColours2.cdr.xhtml
new file mode 100644
index 0000000..b93f2ae
--- /dev/null
+++ b/testset/2/TextColours2.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.1520">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/2/TextColours22.cdr b/testset/2/TextColours22.cdr
new file mode 100644
index 0000000..9fe085a
--- /dev/null
+++ b/testset/2/TextColours22.cdr
Binary files differ
diff --git a/testset/2/TextColours22.cdr.odg b/testset/2/TextColours22.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/2/TextColours22.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/2/TextColours22.cdr.raw b/testset/2/TextColours22.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/2/TextColours22.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/2/TextColours22.cdr.xhtml b/testset/2/TextColours22.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/2/TextColours22.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/2/regression.in b/testset/2/regression.in
index 9a61b42..4d08916 100644
--- a/testset/2/regression.in
+++ b/testset/2/regression.in
@@ -1,8 +1,14 @@
+3TextColours12.cdr
+3TextColours22.cdr
+3TextColours2.cdr
fill2.cdr
lines_and_arrows_v2.cdr
moved2.cdr
norm2.cdr
outl2.cdr
+Palette12.cdr
+Palette22.cdr
+Palette2.cdr
posit2.cdr
rectangles_with_fill_v2.cdr
rot2.cdr
@@ -10,3 +16,6 @@ sample2.cdr
shapes_v2.cdr
strike2.cdr
style2.cdr
+TextColours12.cdr
+TextColours22.cdr
+TextColours2.cdr
diff --git a/testset/20/3TextColours20.cdr b/testset/20/3TextColours20.cdr
new file mode 100644
index 0000000..9cba22d
--- /dev/null
+++ b/testset/20/3TextColours20.cdr
Binary files differ
diff --git a/testset/20/3TextColours20.cdr.odg b/testset/20/3TextColours20.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/20/3TextColours20.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/20/3TextColours20.cdr.raw b/testset/20/3TextColours20.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/20/3TextColours20.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/20/3TextColours20.cdr.xhtml b/testset/20/3TextColours20.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/20/3TextColours20.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/20/Palette20.cdr b/testset/20/Palette20.cdr
new file mode 100644
index 0000000..16c1cbc
--- /dev/null
+++ b/testset/20/Palette20.cdr
Binary files differ
diff --git a/testset/20/Palette20.cdr.odg b/testset/20/Palette20.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/20/Palette20.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/20/Palette20.cdr.raw b/testset/20/Palette20.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/20/Palette20.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/20/Palette20.cdr.xhtml b/testset/20/Palette20.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/20/Palette20.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/20/TextColours20.cdr b/testset/20/TextColours20.cdr
new file mode 100644
index 0000000..a03b28d
--- /dev/null
+++ b/testset/20/TextColours20.cdr
Binary files differ
diff --git a/testset/20/TextColours20.cdr.odg b/testset/20/TextColours20.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/20/TextColours20.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/20/TextColours20.cdr.raw b/testset/20/TextColours20.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/20/TextColours20.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/20/TextColours20.cdr.xhtml b/testset/20/TextColours20.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/20/TextColours20.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/20/regression.in b/testset/20/regression.in
index 9da7bed..a0da40c 100644
--- a/testset/20/regression.in
+++ b/testset/20/regression.in
@@ -1,3 +1,4 @@
+3TextColours20.cdr
align_none_left_center_right_full_force-full_cdr20.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr20.cdr
Biline_cdr20.cdr
@@ -30,6 +31,7 @@ multifonts_sample_cdr20.cdr
nonfirst_strikethru_cdr20.cdr
nonlatin_multiline_cdr20.cdr
ord_xpar_cdr20.cdr
+Palette20.cdr
pattern_fill_cdr20.cdr
people_02_cdr20.cdr
rogan_logo_cdr20.cdr
@@ -39,6 +41,7 @@ subscript_superscript_position_cdr20.cdr
terra_cdr20.cdr
text_1-2-3-4_lines_cdr20.cdr
text1_cdr20.cdr
+TextColours20.cdr
text_norm_b_i_bi_u_cdr20.cdr
text_rgb_fill_cdr20.cdr
text_rgb_outl_cdr20.cdr
diff --git a/testset/21/3TextColours21.cdr b/testset/21/3TextColours21.cdr
new file mode 100644
index 0000000..11b4686
--- /dev/null
+++ b/testset/21/3TextColours21.cdr
Binary files differ
diff --git a/testset/21/3TextColours21.cdr.odg b/testset/21/3TextColours21.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/21/3TextColours21.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/21/3TextColours21.cdr.raw b/testset/21/3TextColours21.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/21/3TextColours21.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/21/3TextColours21.cdr.xhtml b/testset/21/3TextColours21.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/21/3TextColours21.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/21/Palette21.cdr b/testset/21/Palette21.cdr
new file mode 100644
index 0000000..ce5fd5d
--- /dev/null
+++ b/testset/21/Palette21.cdr
Binary files differ
diff --git a/testset/21/Palette21.cdr.odg b/testset/21/Palette21.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/21/Palette21.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/21/Palette21.cdr.raw b/testset/21/Palette21.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/21/Palette21.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/21/Palette21.cdr.xhtml b/testset/21/Palette21.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/21/Palette21.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/21/TextColours21.cdr b/testset/21/TextColours21.cdr
new file mode 100644
index 0000000..4107341
--- /dev/null
+++ b/testset/21/TextColours21.cdr
Binary files differ
diff --git a/testset/21/TextColours21.cdr.odg b/testset/21/TextColours21.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/21/TextColours21.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/21/TextColours21.cdr.raw b/testset/21/TextColours21.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/21/TextColours21.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/21/TextColours21.cdr.xhtml b/testset/21/TextColours21.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/21/TextColours21.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/21/regression.in b/testset/21/regression.in
index bf00ce9..f8c71f9 100644
--- a/testset/21/regression.in
+++ b/testset/21/regression.in
@@ -1,3 +1,4 @@
+3TextColours21.cdr
align_none_left_center_right_full_force-full_cdr21.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr21.cdr
Biline_cdr21.cdr
@@ -30,6 +31,7 @@ multifonts_sample_cdr21.cdr
nonfirst_strikethru_cdr21.cdr
nonlatin_multiline_cdr21.cdr
ord_xpar_cdr21.cdr
+Palette21.cdr
pattern_fill_cdr21.cdr
people_02_cdr21.cdr
rogan_logo_cdr21.cdr
@@ -39,6 +41,7 @@ subscript_superscript_position_cdr21.cdr
terra_cdr21.cdr
text_1-2-3-4_lines_cdr21.cdr
text1_cdr21.cdr
+TextColours21.cdr
text_norm_b_i_bi_u_cdr21.cdr
text_rgb_fill_cdr21.cdr
text_rgb_outl_cdr21.cdr
diff --git a/testset/22/3TextColours22.cdr b/testset/22/3TextColours22.cdr
new file mode 100644
index 0000000..b3a36e2
--- /dev/null
+++ b/testset/22/3TextColours22.cdr
Binary files differ
diff --git a/testset/22/3TextColours22.cdr.odg b/testset/22/3TextColours22.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/22/3TextColours22.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/22/3TextColours22.cdr.raw b/testset/22/3TextColours22.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/22/3TextColours22.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/22/3TextColours22.cdr.xhtml b/testset/22/3TextColours22.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/22/3TextColours22.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/22/Palette22.cdr b/testset/22/Palette22.cdr
new file mode 100644
index 0000000..c0a433e
--- /dev/null
+++ b/testset/22/Palette22.cdr
Binary files differ
diff --git a/testset/22/Palette22.cdr.odg b/testset/22/Palette22.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/22/Palette22.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/22/Palette22.cdr.raw b/testset/22/Palette22.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/22/Palette22.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/22/Palette22.cdr.xhtml b/testset/22/Palette22.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/22/Palette22.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/22/TextColours22.cdr b/testset/22/TextColours22.cdr
new file mode 100644
index 0000000..9fe085a
--- /dev/null
+++ b/testset/22/TextColours22.cdr
Binary files differ
diff --git a/testset/22/TextColours22.cdr.odg b/testset/22/TextColours22.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/22/TextColours22.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/22/TextColours22.cdr.raw b/testset/22/TextColours22.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/22/TextColours22.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/22/TextColours22.cdr.xhtml b/testset/22/TextColours22.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/22/TextColours22.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/22/regression.in b/testset/22/regression.in
index 30e0009..2cf5b64 100644
--- a/testset/22/regression.in
+++ b/testset/22/regression.in
@@ -1,3 +1,4 @@
+3TextColours22.cdr
align_none_left_center_right_full_force-full_cdr22.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr22.cdr
Biline_cdr22.cdr
@@ -30,6 +31,7 @@ multifonts_sample_cdr22.cdr
nonfirst_strikethru_cdr22.cdr
nonlatin_multiline_cdr22.cdr
ord_xpar_cdr22.cdr
+Palette22.cdr
pattern_fill_cdr22.cdr
people_02_cdr22.cdr
rogan_logo_cdr22.cdr
@@ -39,6 +41,7 @@ subscript_superscript_position_cdr22.cdr
terra_cdr22.cdr
text_1-2-3-4_lines_cdr22.cdr
text1_cdr22.cdr
+TextColours22.cdr
text_norm_b_i_bi_u_cdr22.cdr
text_rgb_fill_cdr22.cdr
text_rgb_outl_cdr22.cdr
diff --git a/testset/23/3TextColours23.cdr b/testset/23/3TextColours23.cdr
new file mode 100644
index 0000000..17fd946
--- /dev/null
+++ b/testset/23/3TextColours23.cdr
Binary files differ
diff --git a/testset/23/3TextColours23.cdr.odg b/testset/23/3TextColours23.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/23/3TextColours23.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/23/3TextColours23.cdr.raw b/testset/23/3TextColours23.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/23/3TextColours23.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/23/3TextColours23.cdr.xhtml b/testset/23/3TextColours23.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/23/3TextColours23.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/23/Palette23.cdr b/testset/23/Palette23.cdr
new file mode 100644
index 0000000..6eab3ea
--- /dev/null
+++ b/testset/23/Palette23.cdr
Binary files differ
diff --git a/testset/23/Palette23.cdr.odg b/testset/23/Palette23.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/23/Palette23.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/23/Palette23.cdr.raw b/testset/23/Palette23.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/23/Palette23.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/23/Palette23.cdr.xhtml b/testset/23/Palette23.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/23/Palette23.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/23/TextColours23.cdr b/testset/23/TextColours23.cdr
new file mode 100644
index 0000000..f94a708
--- /dev/null
+++ b/testset/23/TextColours23.cdr
Binary files differ
diff --git a/testset/23/TextColours23.cdr.odg b/testset/23/TextColours23.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/23/TextColours23.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/23/TextColours23.cdr.raw b/testset/23/TextColours23.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/23/TextColours23.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/23/TextColours23.cdr.xhtml b/testset/23/TextColours23.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/23/TextColours23.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/23/regression.in b/testset/23/regression.in
index 4236f8e..2dd5dbe 100644
--- a/testset/23/regression.in
+++ b/testset/23/regression.in
@@ -1,3 +1,4 @@
+3TextColours23.cdr
align_none_left_center_right_full_force-full_cdr23.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr23.cdr
Biline_cdr23.cdr
@@ -30,6 +31,7 @@ multifonts_sample_cdr23.cdr
nonfirst_strikethru_cdr23.cdr
nonlatin_multiline_cdr23.cdr
ord_xpar_cdr23.cdr
+Palette23.cdr
pattern_fill_cdr23.cdr
people_02_cdr23.cdr
rogan_logo_cdr23.cdr
@@ -39,6 +41,7 @@ subscript_superscript_position_cdr23.cdr
terra_cdr23.cdr
text_1-2-3-4_lines_cdr23.cdr
text1_cdr23.cdr
+TextColours23.cdr
text_norm_b_i_bi_u_cdr23.cdr
text_rgb_fill_cdr23.cdr
text_rgb_outl_cdr23.cdr
diff --git a/testset/3/3TextColours13.cdr b/testset/3/3TextColours13.cdr
new file mode 100644
index 0000000..835ce8f
--- /dev/null
+++ b/testset/3/3TextColours13.cdr
Binary files differ
diff --git a/testset/3/3TextColours13.cdr.odg b/testset/3/3TextColours13.cdr.odg
new file mode 100644
index 0000000..ee743a4
--- /dev/null
+++ b/testset/3/3TextColours13.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/3/3TextColours13.cdr.raw b/testset/3/3TextColours13.cdr.raw
new file mode 100644
index 0000000..45fe941
--- /dev/null
+++ b/testset/3/3TextColours13.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/3/3TextColours13.cdr.xhtml b/testset/3/3TextColours13.cdr.xhtml
new file mode 100644
index 0000000..6a20442
--- /dev/null
+++ b/testset/3/3TextColours13.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/3/3TextColours23.cdr b/testset/3/3TextColours23.cdr
new file mode 100644
index 0000000..17fd946
--- /dev/null
+++ b/testset/3/3TextColours23.cdr
Binary files differ
diff --git a/testset/3/3TextColours23.cdr.odg b/testset/3/3TextColours23.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/3/3TextColours23.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/3/3TextColours23.cdr.raw b/testset/3/3TextColours23.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/3/3TextColours23.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/3/3TextColours23.cdr.xhtml b/testset/3/3TextColours23.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/3/3TextColours23.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/3/3TextColours3.cdr b/testset/3/3TextColours3.cdr
new file mode 100644
index 0000000..fe29978
--- /dev/null
+++ b/testset/3/3TextColours3.cdr
Binary files differ
diff --git a/testset/3/3TextColours3.cdr.odg b/testset/3/3TextColours3.cdr.odg
new file mode 100644
index 0000000..823133f
--- /dev/null
+++ b/testset/3/3TextColours3.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20995</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2660in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/3/3TextColours3.cdr.raw b/testset/3/3TextColours3.cdr.raw
new file mode 100644
index 0000000..9471360
--- /dev/null
+++ b/testset/3/3TextColours3.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2660in)
+ endPage
+endDocument
diff --git a/testset/3/3TextColours3.cdr.xhtml b/testset/3/3TextColours3.cdr.xhtml
new file mode 100644
index 0000000..b93f2ae
--- /dev/null
+++ b/testset/3/3TextColours3.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.1520">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/3/Palette13.cdr b/testset/3/Palette13.cdr
new file mode 100644
index 0000000..916bd21
--- /dev/null
+++ b/testset/3/Palette13.cdr
Binary files differ
diff --git a/testset/3/Palette13.cdr.odg b/testset/3/Palette13.cdr.odg
new file mode 100644
index 0000000..af78bfc
--- /dev/null
+++ b/testset/3/Palette13.cdr.odg
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#007700" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c1c2c4" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/3/Palette13.cdr.raw b/testset/3/Palette13.cdr.raw
new file mode 100644
index 0000000..a545057
--- /dev/null
+++ b/testset/3/Palette13.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c1c2c4, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #007700, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #01ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/3/Palette13.cdr.xhtml b/testset/3/Palette13.cdr.xhtml
new file mode 100644
index 0000000..8eb5553
--- /dev/null
+++ b/testset/3/Palette13.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#c1c2c4" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#007700" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#01ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/3/Palette23.cdr b/testset/3/Palette23.cdr
new file mode 100644
index 0000000..6eab3ea
--- /dev/null
+++ b/testset/3/Palette23.cdr
Binary files differ
diff --git a/testset/3/Palette23.cdr.odg b/testset/3/Palette23.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/3/Palette23.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/3/Palette23.cdr.raw b/testset/3/Palette23.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/3/Palette23.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/3/Palette23.cdr.xhtml b/testset/3/Palette23.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/3/Palette23.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/3/Palette3.cdr b/testset/3/Palette3.cdr
new file mode 100644
index 0000000..3b3f84f
--- /dev/null
+++ b/testset/3/Palette3.cdr
Binary files differ
diff --git a/testset/3/Palette3.cdr.odg b/testset/3/Palette3.cdr.odg
new file mode 100644
index 0000000..823133f
--- /dev/null
+++ b/testset/3/Palette3.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20995</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2660in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/3/Palette3.cdr.raw b/testset/3/Palette3.cdr.raw
new file mode 100644
index 0000000..9471360
--- /dev/null
+++ b/testset/3/Palette3.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2660in)
+ endPage
+endDocument
diff --git a/testset/3/Palette3.cdr.xhtml b/testset/3/Palette3.cdr.xhtml
new file mode 100644
index 0000000..b93f2ae
--- /dev/null
+++ b/testset/3/Palette3.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.1520">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/3/TextColours13.cdr b/testset/3/TextColours13.cdr
new file mode 100644
index 0000000..68c3dd1
--- /dev/null
+++ b/testset/3/TextColours13.cdr
Binary files differ
diff --git a/testset/3/TextColours13.cdr.odg b/testset/3/TextColours13.cdr.odg
new file mode 100644
index 0000000..5d2c36f
--- /dev/null
+++ b/testset/3/TextColours13.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/3/TextColours13.cdr.raw b/testset/3/TextColours13.cdr.raw
new file mode 100644
index 0000000..482ad79
--- /dev/null
+++ b/testset/3/TextColours13.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/3/TextColours13.cdr.xhtml b/testset/3/TextColours13.cdr.xhtml
new file mode 100644
index 0000000..ff3f8a0
--- /dev/null
+++ b/testset/3/TextColours13.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/3/TextColours23.cdr b/testset/3/TextColours23.cdr
new file mode 100644
index 0000000..f94a708
--- /dev/null
+++ b/testset/3/TextColours23.cdr
Binary files differ
diff --git a/testset/3/TextColours23.cdr.odg b/testset/3/TextColours23.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/3/TextColours23.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/3/TextColours23.cdr.raw b/testset/3/TextColours23.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/3/TextColours23.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/3/TextColours23.cdr.xhtml b/testset/3/TextColours23.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/3/TextColours23.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/3/TextColours3.cdr b/testset/3/TextColours3.cdr
new file mode 100644
index 0000000..47ba13d
--- /dev/null
+++ b/testset/3/TextColours3.cdr
Binary files differ
diff --git a/testset/3/TextColours3.cdr.odg b/testset/3/TextColours3.cdr.odg
new file mode 100644
index 0000000..823133f
--- /dev/null
+++ b/testset/3/TextColours3.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20995</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2660in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/3/TextColours3.cdr.raw b/testset/3/TextColours3.cdr.raw
new file mode 100644
index 0000000..9471360
--- /dev/null
+++ b/testset/3/TextColours3.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2660in)
+ endPage
+endDocument
diff --git a/testset/3/TextColours3.cdr.xhtml b/testset/3/TextColours3.cdr.xhtml
new file mode 100644
index 0000000..b93f2ae
--- /dev/null
+++ b/testset/3/TextColours3.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.1520">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/3/regression.in b/testset/3/regression.in
index 54484cc..97f5562 100644
--- a/testset/3/regression.in
+++ b/testset/3/regression.in
@@ -1,8 +1,14 @@
+3TextColours13.cdr
+3TextColours23.cdr
+3TextColours3.cdr
fill3.cdr
lines_and_arrows_v3.cdr
moved3.cdr
norm3.cdr
outl3.cdr
+Palette13.cdr
+Palette23.cdr
+Palette3.cdr
posit3.cdr
rectangles_with_fill_v3.cdr
rot3.cdr
@@ -10,3 +16,6 @@ sample3.cdr
shapes_v3.cdr
strike3.cdr
style3.cdr
+TextColours13.cdr
+TextColours23.cdr
+TextColours3.cdr
diff --git a/testset/4/3TextColours14.cdr b/testset/4/3TextColours14.cdr
new file mode 100644
index 0000000..dedc20e
--- /dev/null
+++ b/testset/4/3TextColours14.cdr
Binary files differ
diff --git a/testset/4/3TextColours14.cdr.odg b/testset/4/3TextColours14.cdr.odg
new file mode 100644
index 0000000..ee743a4
--- /dev/null
+++ b/testset/4/3TextColours14.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/4/3TextColours14.cdr.raw b/testset/4/3TextColours14.cdr.raw
new file mode 100644
index 0000000..45fe941
--- /dev/null
+++ b/testset/4/3TextColours14.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/4/3TextColours14.cdr.xhtml b/testset/4/3TextColours14.cdr.xhtml
new file mode 100644
index 0000000..6a20442
--- /dev/null
+++ b/testset/4/3TextColours14.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/4/3TextColours4.cdr b/testset/4/3TextColours4.cdr
new file mode 100644
index 0000000..1a27297
--- /dev/null
+++ b/testset/4/3TextColours4.cdr
Binary files differ
diff --git a/testset/4/3TextColours4.cdr.odg b/testset/4/3TextColours4.cdr.odg
new file mode 100644
index 0000000..aaab2a0
--- /dev/null
+++ b/testset/4/3TextColours4.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20998</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2670in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/4/3TextColours4.cdr.raw b/testset/4/3TextColours4.cdr.raw
new file mode 100644
index 0000000..830f95f
--- /dev/null
+++ b/testset/4/3TextColours4.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2670in)
+ endPage
+endDocument
diff --git a/testset/4/3TextColours4.cdr.xhtml b/testset/4/3TextColours4.cdr.xhtml
new file mode 100644
index 0000000..f9036f8
--- /dev/null
+++ b/testset/4/3TextColours4.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.2240">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/4/Palette14.cdr b/testset/4/Palette14.cdr
new file mode 100644
index 0000000..ce72903
--- /dev/null
+++ b/testset/4/Palette14.cdr
Binary files differ
diff --git a/testset/4/Palette14.cdr.odg b/testset/4/Palette14.cdr.odg
new file mode 100644
index 0000000..af78bfc
--- /dev/null
+++ b/testset/4/Palette14.cdr.odg
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#007700" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c1c2c4" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/4/Palette14.cdr.raw b/testset/4/Palette14.cdr.raw
new file mode 100644
index 0000000..a545057
--- /dev/null
+++ b/testset/4/Palette14.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c1c2c4, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #007700, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #01ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/4/Palette14.cdr.xhtml b/testset/4/Palette14.cdr.xhtml
new file mode 100644
index 0000000..8eb5553
--- /dev/null
+++ b/testset/4/Palette14.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#c1c2c4" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#007700" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#01ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/4/Palette4.cdr b/testset/4/Palette4.cdr
new file mode 100644
index 0000000..9c45756
--- /dev/null
+++ b/testset/4/Palette4.cdr
Binary files differ
diff --git a/testset/4/Palette4.cdr.odg b/testset/4/Palette4.cdr.odg
new file mode 100644
index 0000000..aaab2a0
--- /dev/null
+++ b/testset/4/Palette4.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20998</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2670in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/4/Palette4.cdr.raw b/testset/4/Palette4.cdr.raw
new file mode 100644
index 0000000..830f95f
--- /dev/null
+++ b/testset/4/Palette4.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2670in)
+ endPage
+endDocument
diff --git a/testset/4/Palette4.cdr.xhtml b/testset/4/Palette4.cdr.xhtml
new file mode 100644
index 0000000..f9036f8
--- /dev/null
+++ b/testset/4/Palette4.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.2240">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/4/TextColours14.cdr b/testset/4/TextColours14.cdr
new file mode 100644
index 0000000..e3d0b28
--- /dev/null
+++ b/testset/4/TextColours14.cdr
Binary files differ
diff --git a/testset/4/TextColours14.cdr.odg b/testset/4/TextColours14.cdr.odg
new file mode 100644
index 0000000..5d2c36f
--- /dev/null
+++ b/testset/4/TextColours14.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#01ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/4/TextColours14.cdr.raw b/testset/4/TextColours14.cdr.raw
new file mode 100644
index 0000000..482ad79
--- /dev/null
+++ b/testset/4/TextColours14.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #01ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/4/TextColours14.cdr.xhtml b/testset/4/TextColours14.cdr.xhtml
new file mode 100644
index 0000000..ff3f8a0
--- /dev/null
+++ b/testset/4/TextColours14.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#01ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/4/TextColours4.cdr b/testset/4/TextColours4.cdr
new file mode 100644
index 0000000..39d1cfb
--- /dev/null
+++ b/testset/4/TextColours4.cdr
Binary files differ
diff --git a/testset/4/TextColours4.cdr.odg b/testset/4/TextColours4.cdr.odg
new file mode 100644
index 0000000..aaab2a0
--- /dev/null
+++ b/testset/4/TextColours4.cdr.odg
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20998</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2670in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1"/>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/4/TextColours4.cdr.raw b/testset/4/TextColours4.cdr.raw
new file mode 100644
index 0000000..830f95f
--- /dev/null
+++ b/testset/4/TextColours4.cdr.raw
@@ -0,0 +1,4 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2670in)
+ endPage
+endDocument
diff --git a/testset/4/TextColours4.cdr.xhtml b/testset/4/TextColours4.cdr.xhtml
new file mode 100644
index 0000000..f9036f8
--- /dev/null
+++ b/testset/4/TextColours4.cdr.xhtml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.2240">
+</svg:svg>
+ </body>
+</html>
diff --git a/testset/4/regression.in b/testset/4/regression.in
index 7405217..d94cdfe 100644
--- a/testset/4/regression.in
+++ b/testset/4/regression.in
@@ -1,8 +1,12 @@
+3TextColours14.cdr
+3TextColours4.cdr
fill4.cdr
lines_and_arrows_v4.cdr
moved4.cdr
norm4.cdr
outl4.cdr
+Palette14.cdr
+Palette4.cdr
posit4.cdr
rectangles_with_fill_v4.cdr
rot4.cdr
@@ -10,3 +14,5 @@ sample4.cdr
shapes_v4.cdr
strike4.cdr
style4.cdr
+TextColours14.cdr
+TextColours4.cdr
diff --git a/testset/5/3TextColours15.cdr b/testset/5/3TextColours15.cdr
new file mode 100644
index 0000000..9dc25e4
--- /dev/null
+++ b/testset/5/3TextColours15.cdr
Binary files differ
diff --git a/testset/5/3TextColours15.cdr.odg b/testset/5/3TextColours15.cdr.odg
new file mode 100644
index 0000000..4684cb2
--- /dev/null
+++ b/testset/5/3TextColours15.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/5/3TextColours15.cdr.raw b/testset/5/3TextColours15.cdr.raw
new file mode 100644
index 0000000..2283c01
--- /dev/null
+++ b/testset/5/3TextColours15.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/5/3TextColours15.cdr.xhtml b/testset/5/3TextColours15.cdr.xhtml
new file mode 100644
index 0000000..356f9b1
--- /dev/null
+++ b/testset/5/3TextColours15.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/5/3TextColours5.cdr b/testset/5/3TextColours5.cdr
new file mode 100644
index 0000000..3ba2290
--- /dev/null
+++ b/testset/5/3TextColours5.cdr
Binary files differ
diff --git a/testset/5/3TextColours5.cdr.odg b/testset/5/3TextColours5.cdr.odg
new file mode 100644
index 0000000..9faa9d4
--- /dev/null
+++ b/testset/5/3TextColours5.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20998</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2670in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#4abebc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="0.0010in" svg:width="14.0348in" svg:x="0.3915in" svg:y="0.7690in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/5/3TextColours5.cdr.raw b/testset/5/3TextColours5.cdr.raw
new file mode 100644
index 0000000..48162c2
--- /dev/null
+++ b/testset/5/3TextColours5.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2670in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 0.0010in, svg:width: 14.0348in, svg:x: 0.3915in, svg:y: 0.7690in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #4abebc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #4abebc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #4abebc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/5/3TextColours5.cdr.xhtml b/testset/5/3TextColours5.cdr.xhtml
new file mode 100644
index 0000000..c1e4f1d
--- /dev/null
+++ b/testset/5/3TextColours5.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.2240">
+ <svg:text x="28.1880" y="55.4400">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#4abebc" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#4abebc" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#4abebc" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/5/Palette15.cdr b/testset/5/Palette15.cdr
new file mode 100644
index 0000000..5e0c6cb
--- /dev/null
+++ b/testset/5/Palette15.cdr
Binary files differ
diff --git a/testset/5/Palette15.cdr.odg b/testset/5/Palette15.cdr.odg
new file mode 100644
index 0000000..2706385
--- /dev/null
+++ b/testset/5/Palette15.cdr.odg
@@ -0,0 +1,168 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#007700" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c1c2c4" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/5/Palette15.cdr.raw b/testset/5/Palette15.cdr.raw
new file mode 100644
index 0000000..bb003fb
--- /dev/null
+++ b/testset/5/Palette15.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c1c2c4, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #007700, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/5/Palette15.cdr.xhtml b/testset/5/Palette15.cdr.xhtml
new file mode 100644
index 0000000..d6f9fe1
--- /dev/null
+++ b/testset/5/Palette15.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#c1c2c4" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#007700" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/5/Palette5.cdr b/testset/5/Palette5.cdr
new file mode 100644
index 0000000..16b6a97
--- /dev/null
+++ b/testset/5/Palette5.cdr
Binary files differ
diff --git a/testset/5/Palette5.cdr.odg b/testset/5/Palette5.cdr.odg
new file mode 100644
index 0000000..7172ec4
--- /dev/null
+++ b/testset/5/Palette5.cdr.odg
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20998</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2670in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#189dbc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#df3f75" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#100003" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000200" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#200800" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a4432d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#010704" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#009dcc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0b1300" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="0.0010in" svg:width="11.4920in" svg:x="0.0975in" svg:y="0.1000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/5/Palette5.cdr.raw b/testset/5/Palette5.cdr.raw
new file mode 100644
index 0000000..d8d0e21
--- /dev/null
+++ b/testset/5/Palette5.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2670in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 0.0010in, svg:width: 11.4920in, svg:x: 0.0975in, svg:y: 0.1000in)
+ openParagraph ()
+ openSpan(fo:color: #189dbc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #df3f75, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #010704, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #009dcc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0b1300, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #100003, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #200800, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a4432d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/5/Palette5.cdr.xhtml b/testset/5/Palette5.cdr.xhtml
new file mode 100644
index 0000000..22136ea
--- /dev/null
+++ b/testset/5/Palette5.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.2240">
+ <svg:text x="7.0200" y="7.2720">
+ <svg:tspan fill="#189dbc" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#df3f75" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#010704" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#009dcc" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#0b1300" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#100003" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#200800" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#a4432d" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/5/TextColours15.cdr b/testset/5/TextColours15.cdr
new file mode 100644
index 0000000..c83b18d
--- /dev/null
+++ b/testset/5/TextColours15.cdr
Binary files differ
diff --git a/testset/5/TextColours15.cdr.odg b/testset/5/TextColours15.cdr.odg
new file mode 100644
index 0000000..67dc8f2
--- /dev/null
+++ b/testset/5/TextColours15.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/5/TextColours15.cdr.raw b/testset/5/TextColours15.cdr.raw
new file mode 100644
index 0000000..b8b7880
--- /dev/null
+++ b/testset/5/TextColours15.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/5/TextColours15.cdr.xhtml b/testset/5/TextColours15.cdr.xhtml
new file mode 100644
index 0000000..2de670b
--- /dev/null
+++ b/testset/5/TextColours15.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/5/TextColours5.cdr b/testset/5/TextColours5.cdr
new file mode 100644
index 0000000..43effc4
--- /dev/null
+++ b/testset/5/TextColours5.cdr
Binary files differ
diff --git a/testset/5/TextColours5.cdr.odg b/testset/5/TextColours5.cdr.odg
new file mode 100644
index 0000000..d9a545d
--- /dev/null
+++ b/testset/5/TextColours5.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">20998</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29697</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6920in" fo:page-width="8.2670in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#4abebc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="0.0010in" svg:width="14.0348in" svg:x="0.3915in" svg:y="0.7690in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/5/TextColours5.cdr.raw b/testset/5/TextColours5.cdr.raw
new file mode 100644
index 0000000..48caf68
--- /dev/null
+++ b/testset/5/TextColours5.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6920in, svg:width: 8.2670in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 0.0010in, svg:width: 14.0348in, svg:x: 0.3915in, svg:y: 0.7690in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #4abebc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/5/TextColours5.cdr.xhtml b/testset/5/TextColours5.cdr.xhtml
new file mode 100644
index 0000000..7bff537
--- /dev/null
+++ b/testset/5/TextColours5.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8240" version="1.1" width="595.2240">
+ <svg:text x="28.1880" y="55.4400">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#4abebc" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/5/regression.in b/testset/5/regression.in
index 681ce54..c64ac78 100644
--- a/testset/5/regression.in
+++ b/testset/5/regression.in
@@ -1,8 +1,12 @@
+3TextColours15.cdr
+3TextColours5.cdr
fill5.cdr
lines_and_arrows_v5.cdr
moved5.cdr
norm5.cdr
outl5.cdr
+Palette15.cdr
+Palette5.cdr
posit5.cdr
rectangles_with_fill_v5.cdr
rot5.cdr
@@ -10,3 +14,5 @@ sample5.cdr
shapes_v5.cdr
strike5.cdr
style5.cdr
+TextColours15.cdr
+TextColours5.cdr
diff --git a/testset/6/3TextColours16.cdr b/testset/6/3TextColours16.cdr
new file mode 100644
index 0000000..d3f1909
--- /dev/null
+++ b/testset/6/3TextColours16.cdr
Binary files differ
diff --git a/testset/6/3TextColours16.cdr.odg b/testset/6/3TextColours16.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/6/3TextColours16.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/6/3TextColours16.cdr.raw b/testset/6/3TextColours16.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/6/3TextColours16.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/6/3TextColours16.cdr.xhtml b/testset/6/3TextColours16.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/6/3TextColours16.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/6/3TextColours6.cdr b/testset/6/3TextColours6.cdr
new file mode 100644
index 0000000..8c09472
--- /dev/null
+++ b/testset/6/3TextColours6.cdr
Binary files differ
diff --git a/testset/6/3TextColours6.cdr.odg b/testset/6/3TextColours6.cdr.odg
new file mode 100644
index 0000000..9fe1572
--- /dev/null
+++ b/testset/6/3TextColours6.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/6/3TextColours6.cdr.raw b/testset/6/3TextColours6.cdr.raw
new file mode 100644
index 0000000..4e6d8e5
--- /dev/null
+++ b/testset/6/3TextColours6.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/6/3TextColours6.cdr.xhtml b/testset/6/3TextColours6.cdr.xhtml
new file mode 100644
index 0000000..04ebf75
--- /dev/null
+++ b/testset/6/3TextColours6.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/6/Palette16.cdr b/testset/6/Palette16.cdr
new file mode 100644
index 0000000..38c902c
--- /dev/null
+++ b/testset/6/Palette16.cdr
Binary files differ
diff --git a/testset/6/Palette16.cdr.odg b/testset/6/Palette16.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/6/Palette16.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/6/Palette16.cdr.raw b/testset/6/Palette16.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/6/Palette16.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/6/Palette16.cdr.xhtml b/testset/6/Palette16.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/6/Palette16.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/6/Palette6.cdr b/testset/6/Palette6.cdr
new file mode 100644
index 0000000..3ebe798
--- /dev/null
+++ b/testset/6/Palette6.cdr
Binary files differ
diff --git a/testset/6/Palette6.cdr.odg b/testset/6/Palette6.cdr.odg
new file mode 100644
index 0000000..51617e8
--- /dev/null
+++ b/testset/6/Palette6.cdr.odg
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#189dbc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#df3f75" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#100003" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000200" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#200800" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a4432d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#010704" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#009dcc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0b1300" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/6/Palette6.cdr.raw b/testset/6/Palette6.cdr.raw
new file mode 100644
index 0000000..5793e12
--- /dev/null
+++ b/testset/6/Palette6.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #189dbc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #df3f75, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #010704, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #009dcc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0b1300, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #100003, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #200800, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a4432d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/6/Palette6.cdr.xhtml b/testset/6/Palette6.cdr.xhtml
new file mode 100644
index 0000000..2e3c43f
--- /dev/null
+++ b/testset/6/Palette6.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#189dbc" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#df3f75" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#010704" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#009dcc" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#0b1300" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#100003" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#200800" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#a4432d" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/6/TextColours16.cdr b/testset/6/TextColours16.cdr
new file mode 100644
index 0000000..e79fc29
--- /dev/null
+++ b/testset/6/TextColours16.cdr
Binary files differ
diff --git a/testset/6/TextColours16.cdr.odg b/testset/6/TextColours16.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/6/TextColours16.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/6/TextColours16.cdr.raw b/testset/6/TextColours16.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/6/TextColours16.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/6/TextColours16.cdr.xhtml b/testset/6/TextColours16.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/6/TextColours16.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/6/TextColours6.cdr b/testset/6/TextColours6.cdr
new file mode 100644
index 0000000..4acc288
--- /dev/null
+++ b/testset/6/TextColours6.cdr
Binary files differ
diff --git a/testset/6/TextColours6.cdr.odg b/testset/6/TextColours6.cdr.odg
new file mode 100644
index 0000000..d1e181b
--- /dev/null
+++ b/testset/6/TextColours6.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/6/TextColours6.cdr.raw b/testset/6/TextColours6.cdr.raw
new file mode 100644
index 0000000..9f4a0da
--- /dev/null
+++ b/testset/6/TextColours6.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/6/TextColours6.cdr.xhtml b/testset/6/TextColours6.cdr.xhtml
new file mode 100644
index 0000000..681080f
--- /dev/null
+++ b/testset/6/TextColours6.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/6/regression.in b/testset/6/regression.in
index d7d060b..3d7bb27 100644
--- a/testset/6/regression.in
+++ b/testset/6/regression.in
@@ -1,7 +1,13 @@
+3TextColours16.cdr
+3TextColours6.cdr
align_none_left_center_right_full_force-full_6.cdr
Arial_Tachoma_Verdana_TimesNewRoman_6.cdr
fancytext_6.cdr
lines_and_arrows_v6.cdr
+Palette16.cdr
+Palette6.cdr
rectangles_with_fill_v6.cdr
shapes_v6.cdr
+TextColours16.cdr
+TextColours6.cdr
text_rotated_characters_6.cdr
diff --git a/testset/7/3TextColours17.cdr b/testset/7/3TextColours17.cdr
new file mode 100644
index 0000000..1e0abea
--- /dev/null
+++ b/testset/7/3TextColours17.cdr
Binary files differ
diff --git a/testset/7/3TextColours17.cdr.odg b/testset/7/3TextColours17.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/7/3TextColours17.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/7/3TextColours17.cdr.raw b/testset/7/3TextColours17.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/7/3TextColours17.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/7/3TextColours17.cdr.xhtml b/testset/7/3TextColours17.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/7/3TextColours17.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/7/3TextColours7.cdr b/testset/7/3TextColours7.cdr
new file mode 100644
index 0000000..01bae21
--- /dev/null
+++ b/testset/7/3TextColours7.cdr
Binary files differ
diff --git a/testset/7/3TextColours7.cdr.odg b/testset/7/3TextColours7.cdr.odg
new file mode 100644
index 0000000..4684cb2
--- /dev/null
+++ b/testset/7/3TextColours7.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/7/3TextColours7.cdr.raw b/testset/7/3TextColours7.cdr.raw
new file mode 100644
index 0000000..2283c01
--- /dev/null
+++ b/testset/7/3TextColours7.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/7/3TextColours7.cdr.xhtml b/testset/7/3TextColours7.cdr.xhtml
new file mode 100644
index 0000000..356f9b1
--- /dev/null
+++ b/testset/7/3TextColours7.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/7/Palette17.cdr b/testset/7/Palette17.cdr
new file mode 100644
index 0000000..83b738d
--- /dev/null
+++ b/testset/7/Palette17.cdr
Binary files differ
diff --git a/testset/7/Palette17.cdr.odg b/testset/7/Palette17.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/7/Palette17.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/7/Palette17.cdr.raw b/testset/7/Palette17.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/7/Palette17.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/7/Palette17.cdr.xhtml b/testset/7/Palette17.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/7/Palette17.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/7/Palette7.cdr b/testset/7/Palette7.cdr
new file mode 100644
index 0000000..b48ea38
--- /dev/null
+++ b/testset/7/Palette7.cdr
Binary files differ
diff --git a/testset/7/Palette7.cdr.odg b/testset/7/Palette7.cdr.odg
new file mode 100644
index 0000000..31cb2e0
--- /dev/null
+++ b/testset/7/Palette7.cdr.odg
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#189dbc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#df3f75" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#100003" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000200" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#200800" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#010704" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#009dcc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0b1300" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/7/Palette7.cdr.raw b/testset/7/Palette7.cdr.raw
new file mode 100644
index 0000000..2511b81
--- /dev/null
+++ b/testset/7/Palette7.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #189dbc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #df3f75, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #010704, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #009dcc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0b1300, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #100003, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #200800, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/7/Palette7.cdr.xhtml b/testset/7/Palette7.cdr.xhtml
new file mode 100644
index 0000000..b0f2b08
--- /dev/null
+++ b/testset/7/Palette7.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#189dbc" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#df3f75" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#010704" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#009dcc" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#0b1300" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#100003" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#200800" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/7/TextColours17.cdr b/testset/7/TextColours17.cdr
new file mode 100644
index 0000000..f4089b1
--- /dev/null
+++ b/testset/7/TextColours17.cdr
Binary files differ
diff --git a/testset/7/TextColours17.cdr.odg b/testset/7/TextColours17.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/7/TextColours17.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/7/TextColours17.cdr.raw b/testset/7/TextColours17.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/7/TextColours17.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/7/TextColours17.cdr.xhtml b/testset/7/TextColours17.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/7/TextColours17.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/7/TextColours7.cdr b/testset/7/TextColours7.cdr
new file mode 100644
index 0000000..0ddb402
--- /dev/null
+++ b/testset/7/TextColours7.cdr
Binary files differ
diff --git a/testset/7/TextColours7.cdr.odg b/testset/7/TextColours7.cdr.odg
new file mode 100644
index 0000000..67dc8f2
--- /dev/null
+++ b/testset/7/TextColours7.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/7/TextColours7.cdr.raw b/testset/7/TextColours7.cdr.raw
new file mode 100644
index 0000000..b8b7880
--- /dev/null
+++ b/testset/7/TextColours7.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/7/TextColours7.cdr.xhtml b/testset/7/TextColours7.cdr.xhtml
new file mode 100644
index 0000000..2de670b
--- /dev/null
+++ b/testset/7/TextColours7.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/7/regression.in b/testset/7/regression.in
index 4195eaf..569e006 100644
--- a/testset/7/regression.in
+++ b/testset/7/regression.in
@@ -1,3 +1,5 @@
+3TextColours17.cdr
+3TextColours7.cdr
align_none_left_center_right_full_force-full_cdr7.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr7.cdr
bitmap_imort_1bit_bmp_cdr7.cdr
@@ -43,6 +45,8 @@ outl_corner_cdr7.cdr
outl_line_caps_cdr7.cdr
outl_scale_with_cdr7.cdr
outl_width_cdr7.cdr
+Palette17.cdr
+Palette7.cdr
rectangles_with_fill_v7.cdr
rgb_eeddcc-cdr7.cdr
rogan_logo_cdr7.cdr
@@ -51,6 +55,8 @@ shapes_v7.cdr
simple_circle_cdr7.cdr
subscript_superscript_position_cdr7.cdr
text_1-2-3-4_lines_cdr7.cdr
+TextColours17.cdr
+TextColours7.cdr
text_norm_b_i_bi_u_cdr7.cdr
text_rgb_fill_cdr7.cdr
text_rgb_outl_cdr7.cdr
diff --git a/testset/8/3TextColours18.cdr b/testset/8/3TextColours18.cdr
new file mode 100644
index 0000000..a91b20c
--- /dev/null
+++ b/testset/8/3TextColours18.cdr
Binary files differ
diff --git a/testset/8/3TextColours18.cdr.odg b/testset/8/3TextColours18.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/8/3TextColours18.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/8/3TextColours18.cdr.raw b/testset/8/3TextColours18.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/8/3TextColours18.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/8/3TextColours18.cdr.xhtml b/testset/8/3TextColours18.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/8/3TextColours18.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/8/3TextColours8.cdr b/testset/8/3TextColours8.cdr
new file mode 100644
index 0000000..a839bfe
--- /dev/null
+++ b/testset/8/3TextColours8.cdr
Binary files differ
diff --git a/testset/8/3TextColours8.cdr.odg b/testset/8/3TextColours8.cdr.odg
new file mode 100644
index 0000000..4684cb2
--- /dev/null
+++ b/testset/8/3TextColours8.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/8/3TextColours8.cdr.raw b/testset/8/3TextColours8.cdr.raw
new file mode 100644
index 0000000..2283c01
--- /dev/null
+++ b/testset/8/3TextColours8.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/8/3TextColours8.cdr.xhtml b/testset/8/3TextColours8.cdr.xhtml
new file mode 100644
index 0000000..356f9b1
--- /dev/null
+++ b/testset/8/3TextColours8.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/8/Palette18.cdr b/testset/8/Palette18.cdr
new file mode 100644
index 0000000..6291c04
--- /dev/null
+++ b/testset/8/Palette18.cdr
Binary files differ
diff --git a/testset/8/Palette18.cdr.odg b/testset/8/Palette18.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/8/Palette18.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/8/Palette18.cdr.raw b/testset/8/Palette18.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/8/Palette18.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/8/Palette18.cdr.xhtml b/testset/8/Palette18.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/8/Palette18.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/8/Palette8.cdr b/testset/8/Palette8.cdr
new file mode 100644
index 0000000..c8f5394
--- /dev/null
+++ b/testset/8/Palette8.cdr
Binary files differ
diff --git a/testset/8/Palette8.cdr.odg b/testset/8/Palette8.cdr.odg
new file mode 100644
index 0000000..31cb2e0
--- /dev/null
+++ b/testset/8/Palette8.cdr.odg
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#189dbc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#df3f75" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#100003" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000200" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#200800" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#010704" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#009dcc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0b1300" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/8/Palette8.cdr.raw b/testset/8/Palette8.cdr.raw
new file mode 100644
index 0000000..2511b81
--- /dev/null
+++ b/testset/8/Palette8.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #189dbc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #df3f75, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #010704, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #009dcc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0b1300, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #100003, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #200800, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/8/Palette8.cdr.xhtml b/testset/8/Palette8.cdr.xhtml
new file mode 100644
index 0000000..b0f2b08
--- /dev/null
+++ b/testset/8/Palette8.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#189dbc" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#df3f75" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#010704" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#009dcc" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#0b1300" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#100003" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#200800" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/8/TextColours18.cdr b/testset/8/TextColours18.cdr
new file mode 100644
index 0000000..e4b8eee
--- /dev/null
+++ b/testset/8/TextColours18.cdr
Binary files differ
diff --git a/testset/8/TextColours18.cdr.odg b/testset/8/TextColours18.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/8/TextColours18.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/8/TextColours18.cdr.raw b/testset/8/TextColours18.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/8/TextColours18.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/8/TextColours18.cdr.xhtml b/testset/8/TextColours18.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/8/TextColours18.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/8/TextColours8.cdr b/testset/8/TextColours8.cdr
new file mode 100644
index 0000000..ff858e2
--- /dev/null
+++ b/testset/8/TextColours8.cdr
Binary files differ
diff --git a/testset/8/TextColours8.cdr.odg b/testset/8/TextColours8.cdr.odg
new file mode 100644
index 0000000..67dc8f2
--- /dev/null
+++ b/testset/8/TextColours8.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/8/TextColours8.cdr.raw b/testset/8/TextColours8.cdr.raw
new file mode 100644
index 0000000..b8b7880
--- /dev/null
+++ b/testset/8/TextColours8.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/8/TextColours8.cdr.xhtml b/testset/8/TextColours8.cdr.xhtml
new file mode 100644
index 0000000..2de670b
--- /dev/null
+++ b/testset/8/TextColours8.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/8/regression.in b/testset/8/regression.in
index 8936f7e..8c2f08f 100644
--- a/testset/8/regression.in
+++ b/testset/8/regression.in
@@ -1,3 +1,5 @@
+3TextColours18.cdr
+3TextColours8.cdr
align_none_left_center_right_full_force-full_cdr8.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr8.cdr
bmp_0-0_25-25_8bit_cdr8.cdr
@@ -35,6 +37,8 @@ outl_corner_cdr8.cdr
outl_line_caps_cdr8.cdr
outl_scale_with_cdr8.cdr
outl_width_cdr8.cdr
+Palette18.cdr
+Palette8.cdr
rectangles_with_fill_v8.cdr
rgb_eeddcc-cdr8.cdr
rogan_logo_cdr8.cdr
@@ -43,6 +47,8 @@ shapes_v8.cdr
simple_circle_cdr8.cdr
subscript_superscript_position_cdr8.cdr
text_1-2-3-4_lines_cdr8.cdr
+TextColours18.cdr
+TextColours8.cdr
text_norm_b_i_bi_u_cdr8.cdr
text_rgb_fill_cdr8.cdr
text_rgb_outl_cdr8.cdr
diff --git a/testset/8b/3TextColours8bidi.cdr b/testset/8b/3TextColours8bidi.cdr
new file mode 100644
index 0000000..c127742
--- /dev/null
+++ b/testset/8b/3TextColours8bidi.cdr
Binary files differ
diff --git a/testset/8b/3TextColours8bidi.cdr.odg b/testset/8b/3TextColours8bidi.cdr.odg
new file mode 100644
index 0000000..4684cb2
--- /dev/null
+++ b/testset/8b/3TextColours8bidi.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/8b/3TextColours8bidi.cdr.raw b/testset/8b/3TextColours8bidi.cdr.raw
new file mode 100644
index 0000000..2283c01
--- /dev/null
+++ b/testset/8b/3TextColours8bidi.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/8b/3TextColours8bidi.cdr.xhtml b/testset/8b/3TextColours8bidi.cdr.xhtml
new file mode 100644
index 0000000..356f9b1
--- /dev/null
+++ b/testset/8b/3TextColours8bidi.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/8b/Palette8bidi.cdr b/testset/8b/Palette8bidi.cdr
new file mode 100644
index 0000000..059111e
--- /dev/null
+++ b/testset/8b/Palette8bidi.cdr
Binary files differ
diff --git a/testset/8b/Palette8bidi.cdr.odg b/testset/8b/Palette8bidi.cdr.odg
new file mode 100644
index 0000000..31cb2e0
--- /dev/null
+++ b/testset/8b/Palette8bidi.cdr.odg
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#189dbc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#df3f75" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#100003" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000200" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#200800" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#010704" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#009dcc" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0b1300" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/8b/Palette8bidi.cdr.raw b/testset/8b/Palette8bidi.cdr.raw
new file mode 100644
index 0000000..2511b81
--- /dev/null
+++ b/testset/8b/Palette8bidi.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #189dbc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #df3f75, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #010704, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #009dcc, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0b1300, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #100003, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #200800, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/8b/Palette8bidi.cdr.xhtml b/testset/8b/Palette8bidi.cdr.xhtml
new file mode 100644
index 0000000..b0f2b08
--- /dev/null
+++ b/testset/8b/Palette8bidi.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#189dbc" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#df3f75" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#010704" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#009dcc" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#0b1300" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#100003" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#200800" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/8b/TextColours8bidi.cdr b/testset/8b/TextColours8bidi.cdr
new file mode 100644
index 0000000..62ca884
--- /dev/null
+++ b/testset/8b/TextColours8bidi.cdr
Binary files differ
diff --git a/testset/8b/TextColours8bidi.cdr.odg b/testset/8b/TextColours8bidi.cdr.odg
new file mode 100644
index 0000000..67dc8f2
--- /dev/null
+++ b/testset/8b/TextColours8bidi.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/8b/TextColours8bidi.cdr.raw b/testset/8b/TextColours8bidi.cdr.raw
new file mode 100644
index 0000000..b8b7880
--- /dev/null
+++ b/testset/8b/TextColours8bidi.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/8b/TextColours8bidi.cdr.xhtml b/testset/8b/TextColours8bidi.cdr.xhtml
new file mode 100644
index 0000000..2de670b
--- /dev/null
+++ b/testset/8b/TextColours8bidi.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/8b/regression.in b/testset/8b/regression.in
index 5af22a4..4dad3b5 100644
--- a/testset/8b/regression.in
+++ b/testset/8b/regression.in
@@ -1,3 +1,4 @@
+3TextColours8bidi.cdr
align_none_left_center_right_full_force-full_cdr8bidi.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr8bidi.cdr
bmp_0-0_25-25_8bit_cdr8bidi.cdr
@@ -34,12 +35,14 @@ outl_corner_cdr8bidi.cdr
outl_line_caps_cdr8bidi.cdr
outl_scale_with_cdr8bidi.cdr
outl_width_cdr8bidi.cdr
+Palette8bidi.cdr
rgb_eeddcc-cdr8bidi.cdr
rogan_logo_cdr8bidi.cdr
shapes_cdr8bidi.cdr
simple_circle_cdr8bidi.cdr
subscript_superscript_position_cdr8bidi.cdr
text_1-2-3-4_lines_cdr8bidi.cdr
+TextColours8bidi.cdr
text_norm_b_i_bi_u_cdr8bidi.cdr
text_rgb_fill_cdr8bidi.cdr
text_rgb_outl_cdr8bidi.cdr
diff --git a/testset/9/3TextColours19.cdr b/testset/9/3TextColours19.cdr
new file mode 100644
index 0000000..676d94d
--- /dev/null
+++ b/testset/9/3TextColours19.cdr
Binary files differ
diff --git a/testset/9/3TextColours19.cdr.odg b/testset/9/3TextColours19.cdr.odg
new file mode 100644
index 0000000..98722d6
--- /dev/null
+++ b/testset/9/3TextColours19.cdr.odg
@@ -0,0 +1,150 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/9/3TextColours19.cdr.raw b/testset/9/3TextColours19.cdr.raw
new file mode 100644
index 0000000..1feaaa6
--- /dev/null
+++ b/testset/9/3TextColours19.cdr.raw
@@ -0,0 +1,210 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/9/3TextColours19.cdr.xhtml b/testset/9/3TextColours19.cdr.xhtml
new file mode 100644
index 0000000..2e0d5d7
--- /dev/null
+++ b/testset/9/3TextColours19.cdr.xhtml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/9/3TextColours9.cdr b/testset/9/3TextColours9.cdr
new file mode 100644
index 0000000..9273439
--- /dev/null
+++ b/testset/9/3TextColours9.cdr
Binary files differ
diff --git a/testset/9/3TextColours9.cdr.odg b/testset/9/3TextColours9.cdr.odg
new file mode 100644
index 0000000..4684cb2
--- /dev/null
+++ b/testset/9/3TextColours9.cdr.odg
@@ -0,0 +1,155 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/9/3TextColours9.cdr.raw b/testset/9/3TextColours9.cdr.raw
new file mode 100644
index 0000000..2283c01
--- /dev/null
+++ b/testset/9/3TextColours9.cdr.raw
@@ -0,0 +1,214 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/9/3TextColours9.cdr.xhtml b/testset/9/3TextColours9.cdr.xhtml
new file mode 100644
index 0000000..356f9b1
--- /dev/null
+++ b/testset/9/3TextColours9.cdr.xhtml
@@ -0,0 +1,148 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/9/Palette19.cdr b/testset/9/Palette19.cdr
new file mode 100644
index 0000000..503f5f1
--- /dev/null
+++ b/testset/9/Palette19.cdr
Binary files differ
diff --git a/testset/9/Palette19.cdr.odg b/testset/9/Palette19.cdr.odg
new file mode 100644
index 0000000..60d60c3
--- /dev/null
+++ b/testset/9/Palette19.cdr.odg
@@ -0,0 +1,177 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0092b5" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00932c" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#a29b98" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ffec00" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#74d1ea" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#32b48e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span21">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#378661" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4620f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d40030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30016" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span21">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/9/Palette19.cdr.raw b/testset/9/Palette19.cdr.raw
new file mode 100644
index 0000000..6ddc599
--- /dev/null
+++ b/testset/9/Palette19.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #0092b5, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #32b48e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #378661, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4620f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d40030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e30016, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00932c, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #a29b98, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #ffec00, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #74d1ea, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/9/Palette19.cdr.xhtml b/testset/9/Palette19.cdr.xhtml
new file mode 100644
index 0000000..3d3b362
--- /dev/null
+++ b/testset/9/Palette19.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#0092b5" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#32b48e" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#378661" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4620f" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d40030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#e30016" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#00932c" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#a29b98" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#ffec00" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#74d1ea" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/9/Palette9.cdr b/testset/9/Palette9.cdr
new file mode 100644
index 0000000..6c6e844
--- /dev/null
+++ b/testset/9/Palette9.cdr
Binary files differ
diff --git a/testset/9/Palette9.cdr.odg b/testset/9/Palette9.cdr.odg
new file mode 100644
index 0000000..6011e6a
--- /dev/null
+++ b/testset/9/Palette9.cdr.odg
@@ -0,0 +1,174 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#229ebe" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c8266d" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#100003" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span11">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000200" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span12">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#200800" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span13">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b22222" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span14">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#af0035" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span15">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ff33" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span16">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#102a83" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span17">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e84512" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span18">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#008d53" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span19">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#883c29" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#33b48f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span20">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0087b3" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#010704" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#c4630e" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#42764b" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d50030" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00bbe2" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#b99b5f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#0b1300" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="11.4929in" svg:width="8.0677in" svg:x="0.0972in" svg:y="0.1002in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">TOYO 0684pc</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span1">SpectraMaster&#xAE; Rs318</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span2">DIC 64p*</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span3">PANTONE 18-6022 TCX</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span4">HKS 78 E</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span5">HKS 58 K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span6">HKS 16 N</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span7">HKS 50 Z</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span8">HKS 57K 050% - K 30%</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span9">RVW-PR43K</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span10">RVW-MT-05O</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">RDG_WHITE</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span12">PANTONE Yellow XGC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span11">PANTONE Blue 0821 C</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span13">firebrick</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span14">TRUMATCH 2-A5</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span15">100%G 20%B</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span16">Blue</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span17">PANTONE 3516 CP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span18">PANTONE 3536 UP</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span19">PANTONE H 635-5 CVC</text:span>
+ </text:p>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span20">PANTONE DE 241-3 C</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/9/Palette9.cdr.raw b/testset/9/Palette9.cdr.raw
new file mode 100644
index 0000000..a05ea3d
--- /dev/null
+++ b/testset/9/Palette9.cdr.raw
@@ -0,0 +1,116 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 11.4929in, svg:width: 8.0677in, svg:x: 0.0972in, svg:y: 0.1002in)
+ openParagraph ()
+ openSpan(fo:color: #229ebe, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TOYO 0684pc)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c8266d, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (SpectraMaster® Rs318)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #33b48f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (DIC 64p*)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #010704, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 18-6022 TCX)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #c4630e, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 78 E)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #42764b, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 58 K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #d50030, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 16 N)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00bbe2, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 50 Z)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b99b5f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (HKS 57K 050% - K 30%)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0b1300, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-PR43K)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #100003, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RVW-MT-05O)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (RDG_WHITE)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #200800, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Yellow XGC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #000200, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE Blue 0821 C)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #b22222, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (firebrick)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #af0035, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (TRUMATCH 2-A5)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #00ff33, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (100%G 20%B)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #102a83, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (Blue)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #e84512, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3516 CP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #008d53, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE 3536 UP)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #883c29, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE H 635-5 CVC)
+ closeSpan
+ closeParagraph
+ openParagraph ()
+ openSpan(fo:color: #0087b3, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (PANTONE DE 241-3 C)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/9/Palette9.cdr.xhtml b/testset/9/Palette9.cdr.xhtml
new file mode 100644
index 0000000..b32c104
--- /dev/null
+++ b/testset/9/Palette9.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="6.9979" y="834.7048">
+ <svg:tspan fill="#229ebe" font-family="Arial" font-size="12.0000">
+TOYO 0684pc</svg:tspan>
+ <svg:tspan fill="#c8266d" font-family="Arial" font-size="12.0000">
+SpectraMaster&#xAE; Rs318</svg:tspan>
+ <svg:tspan fill="#33b48f" font-family="Arial" font-size="12.0000">
+DIC 64p*</svg:tspan>
+ <svg:tspan fill="#010704" font-family="Arial" font-size="12.0000">
+PANTONE 18-6022 TCX</svg:tspan>
+ <svg:tspan fill="#c4630e" font-family="Arial" font-size="12.0000">
+HKS 78 E</svg:tspan>
+ <svg:tspan fill="#42764b" font-family="Arial" font-size="12.0000">
+HKS 58 K</svg:tspan>
+ <svg:tspan fill="#d50030" font-family="Arial" font-size="12.0000">
+HKS 16 N</svg:tspan>
+ <svg:tspan fill="#00bbe2" font-family="Arial" font-size="12.0000">
+HKS 50 Z</svg:tspan>
+ <svg:tspan fill="#b99b5f" font-family="Arial" font-size="12.0000">
+HKS 57K 050% - K 30%</svg:tspan>
+ <svg:tspan fill="#0b1300" font-family="Arial" font-size="12.0000">
+RVW-PR43K</svg:tspan>
+ <svg:tspan fill="#100003" font-family="Arial" font-size="12.0000">
+RVW-MT-05O</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+RDG_WHITE</svg:tspan>
+ <svg:tspan fill="#200800" font-family="Arial" font-size="12.0000">
+PANTONE Yellow XGC</svg:tspan>
+ <svg:tspan fill="#000200" font-family="Arial" font-size="12.0000">
+PANTONE Blue 0821 C</svg:tspan>
+ <svg:tspan fill="#b22222" font-family="Arial" font-size="12.0000">
+firebrick</svg:tspan>
+ <svg:tspan fill="#af0035" font-family="Arial" font-size="12.0000">
+TRUMATCH 2-A5</svg:tspan>
+ <svg:tspan fill="#00ff33" font-family="Arial" font-size="12.0000">
+100%G 20%B</svg:tspan>
+ <svg:tspan fill="#102a83" font-family="Arial" font-size="12.0000">
+Blue</svg:tspan>
+ <svg:tspan fill="#e84512" font-family="Arial" font-size="12.0000">
+PANTONE 3516 CP</svg:tspan>
+ <svg:tspan fill="#008d53" font-family="Arial" font-size="12.0000">
+PANTONE 3536 UP</svg:tspan>
+ <svg:tspan fill="#883c29" font-family="Arial" font-size="12.0000">
+PANTONE H 635-5 CVC</svg:tspan>
+ <svg:tspan fill="#0087b3" font-family="Arial" font-size="12.0000">
+PANTONE DE 241-3 C</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/9/TextColours19.cdr b/testset/9/TextColours19.cdr
new file mode 100644
index 0000000..fac58a4
--- /dev/null
+++ b/testset/9/TextColours19.cdr
Binary files differ
diff --git a/testset/9/TextColours19.cdr.odg b/testset/9/TextColours19.cdr.odg
new file mode 100644
index 0000000..cda5cf6
--- /dev/null
+++ b/testset/9/TextColours19.cdr.odg
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#919191" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c781" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/9/TextColours19.cdr.raw b/testset/9/TextColours19.cdr.raw
new file mode 100644
index 0000000..7373e85
--- /dev/null
+++ b/testset/9/TextColours19.cdr.raw
@@ -0,0 +1,74 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #919191, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c781, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/9/TextColours19.cdr.xhtml b/testset/9/TextColours19.cdr.xhtml
new file mode 100644
index 0000000..86258a7
--- /dev/null
+++ b/testset/9/TextColours19.cdr.xhtml
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#919191" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c781" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/9/TextColours9.cdr b/testset/9/TextColours9.cdr
new file mode 100644
index 0000000..e1e70ab
--- /dev/null
+++ b/testset/9/TextColours9.cdr
Binary files differ
diff --git a/testset/9/TextColours9.cdr.odg b/testset/9/TextColours9.cdr.odg
new file mode 100644
index 0000000..67dc8f2
--- /dev/null
+++ b/testset/9/TextColours9.cdr.odg
@@ -0,0 +1,107 @@
+<?xml version="1.0"?>
+<office:document xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" office:mimetype="application/vnd.oasis.opendocument.graphics" office:version="1.0">
+ <office:settings>
+ <config:config-item-set config:name="ooo:view-settings">
+ <config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item>
+ <config:config-item config:name="VisibleAreaWidth" config:type="int">21000</config:config-item>
+ <config:config-item config:name="VisibleAreaHeight" config:type="int">29700</config:config-item>
+ </config:config-item-set>
+ </office:settings>
+ <office:font-face-decls>
+ <style:font-face style:name="Arial" svg:font-family="Arial"/>
+ <style:font-face style:font-charset="x-symbol" style:name="StarSymbol" svg:font-family="StarSymbol"/>
+ </office:font-face-decls>
+ <office:styles/>
+ <office:automatic-styles>
+ <style:page-layout style:name="PL0">
+ <style:page-layout-properties style:footnote-max-height="0.0000in" style:print-orientation="portrait" style:writing-mode="lr-tb" fo:page-height="11.6929in" fo:page-width="8.2677in">
+ <style:footnote-sep/>
+ </style:page-layout-properties>
+ </style:page-layout>
+ <style:style style:family="drawing-page" style:name="DP1">
+ <style:drawing-page-properties draw:fill="none"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span0">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#1b1918" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span1">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#96704a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span10">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#00ffff" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span2">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#cc1414" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span3">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#25c9ca" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span4">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#ac706a" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span5">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#8f8f8f" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span6">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#000000" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span7">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1c881" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span8">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#d1cde6" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="text" style:name="Span9">
+ <style:text-properties style:font-name="Arial" style:font-name-asian="Arial" style:font-name-complex="Arial" style:font-size-asian="12.0000pt" style:font-size-complex="12.0000pt" fo:color="#e30079" fo:font-size="12.0000pt"/>
+ </style:style>
+ <style:style style:family="paragraph" style:name="S0" style:parent-style-name="Standard">
+ <style:paragraph-properties style:justify-single-word="false"/>
+ </style:style>
+ <style:style style:family="graphic" style:name="gr_0" style:parent-style-name="standard">
+ <style:graphic-properties draw:fill="none" draw:stroke="none" fo:min-width="1.0000in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in"/>
+ </style:style>
+ </office:automatic-styles>
+ <office:master-styles>
+ <style:master-page draw:style-name="DP1" style:name="PM0" style:page-layout-name="PL0"/>
+ </office:master-styles>
+ <office:body>
+ <office:drawing>
+ <draw:page draw:master-page-name="PM0" draw:name="page1" draw:style-name="DP1">
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.0121in" svg:width="4.5204in" svg:x="0.3912in" svg:y="0.7688in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0">
+ <text:span text:style-name="Span0">T</text:span>
+ <text:span text:style-name="Span1">hi</text:span>
+ <text:span text:style-name="Span0">s </text:span>
+ <text:span text:style-name="Span2">is</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span3">a</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span4">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span5">wi</text:span>
+ <text:span text:style-name="Span0">th </text:span>
+ <text:span text:style-name="Span6">ma</text:span>
+ <text:span text:style-name="Span0">ny </text:span>
+ <text:span text:style-name="Span1">te</text:span>
+ <text:span text:style-name="Span0">xt </text:span>
+ <text:span text:style-name="Span7">co</text:span>
+ <text:span text:style-name="Span0">lo</text:span>
+ <text:span text:style-name="Span8">ur</text:span>
+ <text:span text:style-name="Span0"> </text:span>
+ <text:span text:style-name="Span9">mo</text:span>
+ <text:span text:style-name="Span10">de</text:span>
+ <text:span text:style-name="Span0">ls</text:span>
+ </text:p>
+ </draw:text-box>
+ </draw:frame>
+ <draw:frame draw:layer="layout" draw:style-name="gr_0" svg:height="1.4109in" svg:width="3.1396in" svg:x="0.3855in" svg:y="1.9408in" fo:padding-bottom="0.0000in" fo:padding-left="0.0000in" fo:padding-right="0.0000in" fo:padding-top="0.0000in">
+ <draw:text-box>
+ <text:p text:style-name="S0"/>
+ </draw:text-box>
+ </draw:frame>
+ </draw:page>
+ </office:drawing>
+ </office:body>
+</office:document>
diff --git a/testset/9/TextColours9.cdr.raw b/testset/9/TextColours9.cdr.raw
new file mode 100644
index 0000000..b8b7880
--- /dev/null
+++ b/testset/9/TextColours9.cdr.raw
@@ -0,0 +1,78 @@
+startDocument()
+ startPage(svg:height: 11.6929in, svg:width: 8.2677in)
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.0121in, svg:width: 4.5204in, svg:x: 0.3912in, svg:y: 0.7688in)
+ openParagraph ()
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (T)
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (hi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (s )
+ closeSpan
+ openSpan(fo:color: #cc1414, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (is)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #25c9ca, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (a)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #ac706a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #8f8f8f, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (wi)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (th )
+ closeSpan
+ openSpan(fo:color: #000000, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ma)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ny )
+ closeSpan
+ openSpan(fo:color: #96704a, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (te)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (xt )
+ closeSpan
+ openSpan(fo:color: #d1c881, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (co)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (lo)
+ closeSpan
+ openSpan(fo:color: #d1cde6, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ur)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText ( )
+ closeSpan
+ openSpan(fo:color: #e30079, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (mo)
+ closeSpan
+ openSpan(fo:color: #00ffff, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (de)
+ closeSpan
+ openSpan(fo:color: #1b1918, fo:font-size: 12.0000pt, style:font-name: Arial)
+ insertText (ls)
+ closeSpan
+ closeParagraph
+ endTextObject
+ startTextObject (fo:padding-bottom: 0.0000in, fo:padding-left: 0.0000in, fo:padding-right: 0.0000in, fo:padding-top: 0.0000in, svg:height: 1.4109in, svg:width: 3.1396in, svg:x: 0.3855in, svg:y: 1.9408in)
+ openParagraph ()
+ closeParagraph
+ endTextObject
+ endPage
+endDocument
diff --git a/testset/9/TextColours9.cdr.xhtml b/testset/9/TextColours9.cdr.xhtml
new file mode 100644
index 0000000..2de670b
--- /dev/null
+++ b/testset/9/TextColours9.cdr.xhtml
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:svg="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <body>
+ <?import namespace="svg" urn="http://www.w3.org/2000/svg"?>
+ <!--
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+ -->
+ <svg:svg height="841.8898" version="1.1" width="595.2756">
+ <svg:text x="28.1690" y="128.2252">
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+T</svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+hi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+s </svg:tspan>
+ <svg:tspan fill="#cc1414" font-family="Arial" font-size="12.0000">
+is</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#25c9ca" font-family="Arial" font-size="12.0000">
+a</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#ac706a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#8f8f8f" font-family="Arial" font-size="12.0000">
+wi</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+th </svg:tspan>
+ <svg:tspan fill="#000000" font-family="Arial" font-size="12.0000">
+ma</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ny </svg:tspan>
+ <svg:tspan fill="#96704a" font-family="Arial" font-size="12.0000">
+te</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+xt </svg:tspan>
+ <svg:tspan fill="#d1c881" font-family="Arial" font-size="12.0000">
+co</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+lo</svg:tspan>
+ <svg:tspan fill="#d1cde6" font-family="Arial" font-size="12.0000">
+ur</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ </svg:tspan>
+ <svg:tspan fill="#e30079" font-family="Arial" font-size="12.0000">
+mo</svg:tspan>
+ <svg:tspan fill="#00ffff" font-family="Arial" font-size="12.0000">
+de</svg:tspan>
+ <svg:tspan fill="#1b1918" font-family="Arial" font-size="12.0000">
+ls</svg:tspan>
+ </svg:text>
+ <svg:text x="27.7583" y="241.3213">
+</svg:text>
+ </svg:svg>
+ </body>
+</html>
diff --git a/testset/9/regression.in b/testset/9/regression.in
index 82b7335..5dba9c1 100644
--- a/testset/9/regression.in
+++ b/testset/9/regression.in
@@ -1,3 +1,5 @@
+3TextColours19.cdr
+3TextColours9.cdr
align_none_left_center_right_full_force-full_cdr9.cdr
Arial_Tachoma_Verdana_TimesNewRoman_cdr9.cdr
bmp_0-0_25-25_8bit_cdr9.cdr
@@ -34,6 +36,8 @@ outl_corner_cdr9.cdr
outl_line_caps_cdr9.cdr
outl_scale_with_cdr9.cdr
outl_width_cdr9.cdr
+Palette19.cdr
+Palette9.cdr
rectangles_with_fill_v9.cdr
rgb_eeddcc-cdr9.cdr
rogan_logo_cdr9.cdr
@@ -42,6 +46,8 @@ shapes_v9.cdr
simple_circle_cdr9.cdr
subscript_superscript_position_cdr9.cdr
text_1-2-3-4_lines_cdr9.cdr
+TextColours19.cdr
+TextColours9.cdr
text_norm_b_i_bi_u_cdr9.cdr
text_rgb_fill_cdr9.cdr
text_rgb_outl_cdr9.cdr