diff --git a/lib/LaTeXML/Common/Font.pm b/lib/LaTeXML/Common/Font.pm index 5352e1150..bf31f6fbb 100644 --- a/lib/LaTeXML/Common/Font.pm +++ b/lib/LaTeXML/Common/Font.pm @@ -20,8 +20,9 @@ use LaTeXML::Common::Number; use LaTeXML::Common::Dimension; use LaTeXML::Common::Font::Metric; use LaTeXML::Common::Font::StandardMetrics; +use LaTeXML::Common::Color; use List::Util qw(min max sum); -use base qw(LaTeXML::Common::Object); +use base qw(LaTeXML::Common::Object); # Note that this has evolved way beynond just "font", # but covers text properties (or even display properties) in general @@ -34,7 +35,7 @@ DebuggableFeature('size-detailed', "Show sizing of boxes in detail"); my $DEFFAMILY = 'serif'; # [CONSTANT] my $DEFSERIES = 'medium'; # [CONSTANT] my $DEFSHAPE = 'upright'; # [CONSTANT] -my $DEFCOLOR = 'black'; # [CONSTANT] +my $DEFCOLOR = Black; # [CONSTANT] my $DEFBACKGROUND = undef; # [CONSTANT] no color; transparent my $DEFOPACITY = '1'; # [CONSTANT] my $DEFENCODING = 'OT1'; # [CONSTANT] @@ -871,7 +872,7 @@ The attributes are size : TINY, Tiny, tiny, SMALL, Small, small, normal, Normal, large, Large, LARGE, huge, Huge, HUGE, gigantic, Gigantic, GIGANTIC - color : any named color, default is black + color : any named color, default is Black They are usually merged against the current font, attempting to mimic the, sometimes counter-intuitive, way that TeX does it, particularly for math diff --git a/lib/LaTeXML/Package.pm b/lib/LaTeXML/Package.pm index 8ea5c2956..8d36279b0 100644 --- a/lib/LaTeXML/Package.pm +++ b/lib/LaTeXML/Package.pm @@ -4647,7 +4647,7 @@ Likely values include (the values aren't required to be in this set): shape : upright, italic, slanted, smallcaps size : tiny, footnote, small, normal, large, Large, LARGE, huge, Huge - color : any named color, default is black + color : any color, default is Black Some families will only be used in math. This function returns nothing so it can be easily used in beforeDigest, afterDigest. diff --git a/lib/LaTeXML/Package/LaTeX.pool.ltxml b/lib/LaTeXML/Package/LaTeX.pool.ltxml index e4c0d1b5c..5b21235ab 100644 --- a/lib/LaTeXML/Package/LaTeX.pool.ltxml +++ b/lib/LaTeXML/Package/LaTeX.pool.ltxml @@ -4994,10 +4994,11 @@ sub picScale { sub picProperties { my (%props) = @_; - if (($props{stroke} || 'black') ne 'none') { + if (($props{stroke} || '') ne 'none') { $props{thick} = ptValue(LookupRegister('\@wholewidth')); } if (my $arrowlength = LookupValue('arrowlength')) { $props{arrowlength} = ptValue($arrowlength); } + $props{color} = Black unless defined $props{color}; return %props; } #---------------------------------------------------------------------- @@ -5061,11 +5062,11 @@ DefConstructor('\lx@pic@put Pair{}', mode => 'text'); DefConstructor('\line Pair:Number {Float}', - "", + "", alias => '\line', properties => sub { picProperties(points => '0,0 ' . slopeToPicCoord($_[1], $_[2])->pxValue()); }); DefConstructor('\vector Pair:Number {Float}', - "", alias => '\vector', properties => sub { picProperties(points => '0,0 ' . slopeToPicCoord($_[1], $_[2])->pxValue()); }); @@ -5075,11 +5076,11 @@ DefConstructor('\circle OptionalMatch:* {Float}', properties => sub { my ($stomach, $filled, $dia) = @_; picProperties(radius => picScale($dia)->multiply(0.5)->pxValue, - ($filled ? 'fill' : 'stroke') => 'black'); }); + ($filled ? 'fill' : 'stroke') => Black); }); DefConstructor('\oval [Float] Pair []', "", + . " stroke='#color' fill='none' part='#3' stroke-width='#thick'/>", alias => '\oval', properties => sub { my ($stomach, $r, $size, $part) = @_; @@ -5095,7 +5096,7 @@ DefConstructor('\oval [Float] Pair []', ); }); DefConstructor('\qbezier [Number] Pair Pair Pair', -"", +"", alias => '\qbezier', properties => sub { picProperties(pt => PairList(picScale($_[2]), picScale($_[3]), picScale($_[4]))); }); @@ -5110,7 +5111,7 @@ DefConstructor('\lx@pic@bezier {Number} Pair Pair Pair', # Generic boxing command (frames, dash, etc) DefConstructor('\pic@makebox@ Undigested RequiredKeyVals Pair []{}', "?#framed()()" + . " stroke='#color' stroke-width='#thick' fill='none' stroke-dasharray='#dash'/>)()" . "#box", reversion => '#1#3[#4]{#5}', diff --git a/lib/LaTeXML/Package/TeX.pool.ltxml b/lib/LaTeXML/Package/TeX.pool.ltxml index 5cb82ba60..c0fbe5a98 100644 --- a/lib/LaTeXML/Package/TeX.pool.ltxml +++ b/lib/LaTeXML/Package/TeX.pool.ltxml @@ -1947,7 +1947,7 @@ sub adjustBoxColor { my ($box) = @_; my $font = LookupValue('font'); if (my $color = $font && $font->getColor) { - if ($color ne 'black') { + if (!Black->equals($color)) { adjustBoxColor_rec($color, {}, $box); } } return; } @@ -2402,7 +2402,7 @@ DefConstructor('\vrule RuleSpecification', elsif ((defined $w) && ($w == 0)) { $whatsit->setProperty(invisible => 1); } if (my $color = LookupValue('font')->getColor) { - if ($color ne 'black') { + if (!Black->equals($color)) { $whatsit->setProperty(color => $color); } } return; }); @@ -2432,7 +2432,7 @@ DefConstructor('\hrule RuleSpecification', $alignment->addLine('t'); $whatsit->setProperty(isHorizontalRule => 1) } } # Marked as rule within alignment if (my $color = LookupValue('font')->getColor) { - if ($color ne 'black') { + if (!Black->equals($color)) { $whatsit->setProperty(color => $color); } } return; }); diff --git a/lib/LaTeXML/Package/diagbox.sty.ltxml b/lib/LaTeXML/Package/diagbox.sty.ltxml index f51d4a99e..c4874b128 100644 --- a/lib/LaTeXML/Package/diagbox.sty.ltxml +++ b/lib/LaTeXML/Package/diagbox.sty.ltxml @@ -145,7 +145,7 @@ DefConstructor('\lx@diagbox RequiredKeyVals:diagbox {}[]{}', M => $M, Mx => $Mx, My => $My, Mw => $Bw, Mh => $Mh, line1 => $line1, line2 => $line2, linewidth => ($kv && $kv->getValue('linewidth')) || '0.4', - linecolor => ($kv && $kv->getValue('linecolor')) || 'black'); } + linecolor => ($kv && $kv->getValue('linecolor')) || Black); } ); # slashbox compatibility diff --git a/lib/LaTeXML/Package/makecell.sty.ltxml b/lib/LaTeXML/Package/makecell.sty.ltxml index 990ac18b8..44ec624d1 100644 --- a/lib/LaTeXML/Package/makecell.sty.ltxml +++ b/lib/LaTeXML/Package/makecell.sty.ltxml @@ -56,7 +56,7 @@ DefMacro('\lx@diag@head{}{}', DefConstructor('\lx@diagheads {}{} {}{}{}', "" - . "" + . "" . "" . "#A" . "" @@ -84,9 +84,9 @@ DefConstructor('\lx@diagheads {}{} {}{}{}', my $pxppt = Dimension('1pt')->pxValue(10); $whatsit->setProperties( width => Dimension($w / $pxppt . 'pt'), height => Dimension($h / $pxppt . 'pt'), - A => $A, Ax => $Ax, Ay => $Ay, Aw => $Aw, Ah => $Ah, - B => $B, Bx => $Bx, By => $By, Bw => $Bw, Bh => $Bh, - line => $line); } + A => $A, Ax => $Ax, Ay => $Ay, Aw => $Aw, Ah => $Ah, + B => $B, Bx => $Bx, By => $By, Bw => $Bw, Bh => $Bh, + line => $line, color => Black); } ); #====================================================================== 1; diff --git a/lib/LaTeXML/Package/pgfsys-latexml.def.ltxml b/lib/LaTeXML/Package/pgfsys-latexml.def.ltxml index 8c98b7ed4..294dd0a82 100644 --- a/lib/LaTeXML/Package/pgfsys-latexml.def.ltxml +++ b/lib/LaTeXML/Package/pgfsys-latexml.def.ltxml @@ -445,7 +445,7 @@ AtBeginDocument('\def\XC@mcolor{\pgfsetcolor{.}}'); # Implementation DefMacro('\pgfsys@color@rgb{}{}{}', - '\pgfsys@color@rgb@stroke{#1}{#2}{#3}\pgfsys@color@rgb@fill{#1}{#2}{#3}'); + '\ifpgfpicture\pgfsys@color@rgb@stroke{#1}{#2}{#3}\pgfsys@color@rgb@fill{#1}{#2}{#3}\fi'); DefMacro('\lxSVG@RGB{}{}{}', sub { Explode(Color('rgb', $_[1], $_[2], $_[3])->toHex); }); DefMacro('\lxSVG@CMYK{}{}{}{}', sub { Explode(Color('cmyk', $_[1], $_[2], $_[3], $_[4])->toHex); }); diff --git a/lib/LaTeXML/Package/wasysym.sty.ltxml b/lib/LaTeXML/Package/wasysym.sty.ltxml index 2cda7983b..289548819 100644 --- a/lib/LaTeXML/Package/wasysym.sty.ltxml +++ b/lib/LaTeXML/Package/wasysym.sty.ltxml @@ -23,7 +23,7 @@ use LaTeXML::Package; #====================================================================== -DefPrimitiveI('\ataribox', undef, "\x{26CB}", font => { color => 'white', background => 'black' }, bounded => 1); +DefPrimitiveI('\ataribox', undef, "\x{26CB}", font => { color => White, background => Black }, bounded => 1); DefMathI('\Join', undef, "\x{2a1d}"); DefMathI('\Box', undef, "\x{25a1}"); DefMathI('\Diamond', undef, "\x{25c7}"); diff --git a/t/alignment/cells.xml b/t/alignment/cells.xml index 069ea2be2..8e4b4b06b 100644 --- a/t/alignment/cells.xml +++ b/t/alignment/cells.xml @@ -363,7 +363,7 @@ - + diff --git a/t/alignment/diagboxtest.xml b/t/alignment/diagboxtest.xml index ba87f34da..04fc36c0f 100644 --- a/t/alignment/diagboxtest.xml +++ b/t/alignment/diagboxtest.xml @@ -12,7 +12,7 @@ NW - + @@ -34,7 +34,7 @@ SE - + @@ -54,7 +54,7 @@ SW - + @@ -74,7 +74,7 @@ NE - + @@ -100,8 +100,8 @@ NW - - + + @@ -130,8 +130,8 @@ SE - - + + @@ -158,8 +158,8 @@ SW - - + + @@ -186,8 +186,8 @@ NE - - + + @@ -220,8 +220,8 @@ NW - - + + @@ -253,8 +253,8 @@ SE - - + + @@ -284,8 +284,8 @@ SW - - + + @@ -315,8 +315,8 @@ NE - - + + @@ -354,7 +354,7 @@ - + @@ -393,7 +393,7 @@ - + diff --git a/t/ams/mathtools.xml b/t/ams/mathtools.xml index fdfa931de..c6e35acf1 100644 --- a/t/ams/mathtools.xml +++ b/t/ams/mathtools.xml @@ -3158,12 +3158,12 @@ Then a switch of tag forms.

- first + first - last + last @@ -7303,10 +7303,10 @@ Then a switch of tag forms.

- Part 1 + Part 1 - Part 1 + Part 1 @@ -7317,7 +7317,7 @@ Then a switch of tag forms.

= - 2nd line + 2nd line @@ -7327,7 +7327,7 @@ Then a switch of tag forms.

= - 2nd line + 2nd line @@ -7338,7 +7338,7 @@ Then a switch of tag forms.

+ 19 - last part + last part @@ -7352,7 +7352,7 @@ Then a switch of tag forms.

+ - last part + last part @@ -7373,19 +7373,19 @@ Then a switch of tag forms.

= - 1 - 2 + 1 + 2 - 1 + 1 = - 2 + 2 @@ -7402,19 +7402,19 @@ Then a switch of tag forms.

= - 3 - 4 + 3 + 4 - 3 + 3 = - 4 + 4 diff --git a/t/fonts/cancels.xml b/t/fonts/cancels.xml index 9567c7fc2..833decf96 100644 --- a/t/fonts/cancels.xml +++ b/t/fonts/cancels.xml @@ -106,7 +106,7 @@ purple plain - stuff stuff stuff + stuff stuff stuff @@ -127,7 +127,7 @@
red back - stuff stuff stuff + stuff stuff stuff @@ -148,7 +148,7 @@
blue cross - stuff stuff stuff + stuff stuff stuff diff --git a/t/fonts/wasysym.xml b/t/fonts/wasysym.xml index 4a7940cdf..d83927758 100644 --- a/t/fonts/wasysym.xml +++ b/t/fonts/wasysym.xml @@ -57,7 +57,7 @@ -

♂♀¤☎⌕🕒↯⇨▶◀▲▼⌀⦰∢⌑✠☺☹☻☼✓⍾¢‰¦∴⋈℧∼≈≋〰〰➿➿➿□⌧☑⎔⬡⬠\octagon⚹⚹✡𝅘𝅥𝅮𝅘𝅥𝅗𝅥𝅝♫○●\Leftcircle\Rightcircle◗◐◑↺↻ðÐþÞɔǝ♈☊☋🌕🌑☾☽☉☿♀♁♂♃♄⛢♆♇♈♉♊♋♌♍♎♏♐♑♒♓☌☍⋆⍟⎕⍋⍒⍞⍝⌹⍐⍗⍇⍈⍀⌿m~ +

♂♀¤☎⌕🕒↯⇨▶◀▲▼⌀⦰∢⌑✠☺☹☻☼✓⍾¢‰¦∴⋈℧∼≈≋〰〰➿➿➿□⌧☑⎔⬡⬠\octagon⚹⚹✡𝅘𝅥𝅮𝅘𝅥𝅗𝅥𝅝♫○●\Leftcircle\Rightcircle◗◐◑↺↻ðÐþÞɔǝ♈☊☋🌕🌑☾☽☉☿♀♁♂♃♄⛢♆♇♈♉♊♋♌♍♎♏♐♑♒♓☌☍⋆⍟⎕⍋⍒⍞⍝⌹⍐⍗⍇⍈⍀⌿m~ m m -

diff --git a/t/graphics/colors.xml b/t/graphics/colors.xml index faa03a71d..eff0ad858 100644 --- a/t/graphics/colors.xml +++ b/t/graphics/colors.xml @@ -13,7 +13,7 @@ <tag close=" ">1</tag>Predefined colors -

Black vs. Black.

+

Black vs. Black.

White vs. White.

diff --git a/t/graphics/graphrot.xml b/t/graphics/graphrot.xml index 57187335a..5748a2ddb 100644 --- a/t/graphics/graphrot.xml +++ b/t/graphics/graphrot.xml @@ -247,19 +247,19 @@ End here

- +

Save the whales Save the whale Save the Kitty! Save the whale

- +

Save the whales Save the whale Save the Kitty! Save the whale

- +

Save the whales Save the whale Save the Kitty! Save the whale

@@ -290,19 +290,19 @@ the whales Save the whale Save the +

Save the whales Save the whale Save the Kitty! Save the whale

- +

Save the whales Save the whale Save the Kitty! Save the whale

- +

Save the whales Save the whale Save the Kitty! Save the whale

@@ -333,19 +333,19 @@ the whales Save the whale Save the +

Save the whales Save the whale Save the Kitty! Save the whale

- +

Save the whales Save the whale Save the Kitty! Save the whale

- +

Save the whales Save the whale Save the Kitty! Save the whale

diff --git a/t/graphics/picture.xml b/t/graphics/picture.xml index f8768a2e8..98ab7fe47 100644 --- a/t/graphics/picture.xml +++ b/t/graphics/picture.xml @@ -25,7 +25,7 @@ - +

@@ -53,48 +53,48 @@ - + - + - + - + - + - + - + - + - + - + - + - + @@ -110,13 +110,13 @@ - + - + - + @@ -135,25 +135,25 @@ A
- + A - + A - + A - +

A

@@ -164,7 +164,7 @@
- +

A

@@ -184,19 +184,19 @@
- + x - + x - + x @@ -266,46 +266,46 @@ vs. - + - + - + - + - + - + - + - + - + - + - + - + - + - + Xg @@ -514,15 +514,15 @@ vs. - - - + + + - + - + @@ -536,8 +536,8 @@ vs. 2.6Curves: - - + + @@ -588,36 +588,36 @@ vs. - + - + - + - + - + - + - + - + - + - + - + @@ -635,16 +635,16 @@ vs. - + - + - + - + O @@ -670,10 +670,10 @@ vs. - + - + @@ -732,22 +732,22 @@ vs. - + - + - + - + - + - + @@ -881,7 +881,7 @@ vs. - + @@ -896,7 +896,7 @@ vs. - + @@ -911,7 +911,7 @@ vs. - + @@ -949,7 +949,7 @@ vs. - + @@ -964,7 +964,7 @@ vs. - + @@ -979,7 +979,7 @@ vs. - + @@ -1017,7 +1017,7 @@ vs. - + @@ -1032,7 +1032,7 @@ vs. - + @@ -1047,7 +1047,7 @@ vs. - + @@ -1150,142 +1150,142 @@ square. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1414,139 +1414,139 @@ square. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1631,154 +1631,154 @@ square. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -1946,148 +1946,148 @@ square. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2255,163 +2255,163 @@ square. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2563,148 +2563,148 @@ square. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + @@ -2797,163 +2797,163 @@ square. - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/t/graphics/xcolors.xml b/t/graphics/xcolors.xml index 51179da56..24b92b134 100644 --- a/t/graphics/xcolors.xml +++ b/t/graphics/xcolors.xml @@ -332,307 +332,307 @@ A=100*13 = 1300pt;

red - XX 1 0 0 - XX 0 1 1 0 - XX 0 1 1 - XX FF0000 - XX 0.3 + XX 1 0 0 + XX 0 1 1 0 + XX 0 1 1 + XX FF0000 + XX 0.3
green - XX 0 1 0 - XX 1 0 1 0 - XX 0.3333 1 1 - XX 00FF00 - XX 0.59 + XX 0 1 0 + XX 1 0 1 0 + XX 0.3333 1 1 + XX 00FF00 + XX 0.59
blue - XX 0 0 1 - XX 1 1 0 0 - XX 0.6667 1 1 - XX 0000FF - XX 0.11 + XX 0 0 1 + XX 1 1 0 0 + XX 0.6667 1 1 + XX 0000FF + XX 0.11
cyan - XX 0 1 1 - XX 1 0 0 0 - XX 0.5 1 1 - XX 00FFFF - XX 0.7 + XX 0 1 1 + XX 1 0 0 0 + XX 0.5 1 1 + XX 00FFFF + XX 0.7
magenta - XX 1 0 1 - XX 0 1 0 0 - XX 0.8333 1 1 - XX FF00FF - XX 0.41 + XX 1 0 1 + XX 0 1 0 0 + XX 0.8333 1 1 + XX FF00FF + XX 0.41
yellow - XX 1 1 0 - XX 0 0 1 0 - XX 0.1667 1 1 - XX FFFF00 - XX 0.89 + XX 1 1 0 + XX 0 0 1 0 + XX 0.1667 1 1 + XX FFFF00 + XX 0.89
orange - XX 1 0.5 0 - XX 0 0.5 1 0 - XX 0.0833 1 1 - XX FF8000 - XX 0.595 + XX 1 0.5 0 + XX 0 0.5 1 0 + XX 0.0833 1 1 + XX FF8000 + XX 0.595
violet - XX 0.5 0 0.5 - XX 0 0.5 0 0.5 - XX 0.8333 1 0.5 - XX 800080 - XX 0.205 + XX 0.5 0 0.5 + XX 0 0.5 0 0.5 + XX 0.8333 1 0.5 + XX 800080 + XX 0.205
purple - XX 0.75 0 0.25 - XX 0 0.75 0.5 0.25 - XX 0.9444 1 0.75 - XX BF0040 - XX 0.2525 + XX 0.75 0 0.25 + XX 0 0.75 0.5 0.25 + XX 0.9444 1 0.75 + XX BF0040 + XX 0.2525
brown - XX 0.75 0.5 0.25 - XX 0 0.25 0.5 0.25 - XX 0.0833 0.6667 0.75 - XX BF8040 - XX 0.5475 + XX 0.75 0.5 0.25 + XX 0 0.25 0.5 0.25 + XX 0.0833 0.6667 0.75 + XX BF8040 + XX 0.5475
pink - XX 1 0.75 0.75 - XX 0 0.25 0.25 0 - XX 0 0.25 1 - XX FFBFBF - XX 0.825 + XX 1 0.75 0.75 + XX 0 0.25 0.25 0 + XX 0 0.25 1 + XX FFBFBF + XX 0.825
olive - XX 0.5 0.5 0 - XX 0 0 1 0.5 - XX 0.1667 1 0.5 - XX 808000 - XX 0.39 + XX 0.5 0.5 0 + XX 0 0 1 0.5 + XX 0.1667 1 0.5 + XX 808000 + XX 0.39
black - XX 0 0 0 - XX 0 0 0 1 - XX 0 0 0 - XX 000000 - XX 0 + XX 0 0 0 + XX 0 0 0 1 + XX 0 0 0 + XX 000000 + XX 0
darkgray - XX 0.25 0.25 0.25 - XX 0 0 0 0.75 - XX 0 0 0.25 - XX 404040 - XX 0.25 + XX 0.25 0.25 0.25 + XX 0 0 0 0.75 + XX 0 0 0.25 + XX 404040 + XX 0.25
gray - XX 0.5 0.5 0.5 - XX 0 0 0 0.5 - XX 0 0 0.5 - XX 808080 - XX 0.5 + XX 0.5 0.5 0.5 + XX 0 0 0 0.5 + XX 0 0 0.5 + XX 808080 + XX 0.5
lightgray - XX 0.75 0.75 0.75 - XX 0 0 0 0.25 - XX 0 0 0.75 - XX BFBFBF - XX 0.75 + XX 0.75 0.75 0.75 + XX 0 0 0 0.25 + XX 0 0 0.75 + XX BFBFBF + XX 0.75
white - XX 1 1 1 - XX 0 0 0 0 - XX 0 0 1 - XX FFFFFF - XX 1 + XX 1 1 1 + XX 0 0 0 0 + XX 0 0 1 + XX FFFFFF + XX 1
-red - XX 0 1 1 - XX 1 0 0 0 - XX 0.5 1 1 - XX 00FFFF - XX 0.7 + XX 0 1 1 + XX 1 0 0 0 + XX 0.5 1 1 + XX 00FFFF + XX 0.7
-green - XX 1 0 1 - XX 0 1 0 0 - XX 0.8333 1 1 - XX FF00FF - XX 0.41 + XX 1 0 1 + XX 0 1 0 0 + XX 0.8333 1 1 + XX FF00FF + XX 0.41
-blue - XX 1 1 0 - XX 0 0 1 0 - XX 0.1667 1 1 - XX FFFF00 - XX 0.89 + XX 1 1 0 + XX 0 0 1 0 + XX 0.1667 1 1 + XX FFFF00 + XX 0.89
-cyan - XX 1 0 0 - XX 0 1 1 0 - XX 0 1 1 - XX FF0000 - XX 0.3 + XX 1 0 0 + XX 0 1 1 0 + XX 0 1 1 + XX FF0000 + XX 0.3
-magenta - XX 0 1 0 - XX 1 0 1 0 - XX 0.3333 1 1 - XX 00FF00 - XX 0.59 + XX 0 1 0 + XX 1 0 1 0 + XX 0.3333 1 1 + XX 00FF00 + XX 0.59
-yellow - XX 0 0 1 - XX 1 1 0 0 - XX 0.6667 1 1 - XX 0000FF - XX 0.11 + XX 0 0 1 + XX 1 1 0 0 + XX 0.6667 1 1 + XX 0000FF + XX 0.11
-orange - XX 0 0.5 1 - XX 1 0.5 0 0 - XX 0.5833 1 1 - XX 0080FF - XX 0.405 + XX 0 0.5 1 + XX 1 0.5 0 0 + XX 0.5833 1 1 + XX 0080FF + XX 0.405
-violet - XX 0.5 1 0.5 - XX 0.5 0 0.5 0 - XX 0.3333 0.5 1 - XX 80FF80 - XX 0.795 + XX 0.5 1 0.5 + XX 0.5 0 0.5 0 + XX 0.3333 0.5 1 + XX 80FF80 + XX 0.795
-purple - XX 0.25 1 0.75 - XX 0.75 0 0.25 0 - XX 0.4444 0.75 1 - XX 40FFBF - XX 0.7475 + XX 0.25 1 0.75 + XX 0.75 0 0.25 0 + XX 0.4444 0.75 1 + XX 40FFBF + XX 0.7475
-brown - XX 0.25 0.5 0.75 - XX 0.5 0.25 0 0.25 - XX 0.5833 0.6667 0.75 - XX 4080BF - XX 0.4525 + XX 0.25 0.5 0.75 + XX 0.5 0.25 0 0.25 + XX 0.5833 0.6667 0.75 + XX 4080BF + XX 0.4525
-pink - XX 0 0.25 0.25 - XX 0.25 0 0 0.75 - XX 0.5 1 0.25 - XX 004040 - XX 0.175 + XX 0 0.25 0.25 + XX 0.25 0 0 0.75 + XX 0.5 1 0.25 + XX 004040 + XX 0.175
-olive - XX 0.5 0.5 1 - XX 0.5 0.5 0 0 - XX 0.6667 0.5 1 - XX 8080FF - XX 0.555 + XX 0.5 0.5 1 + XX 0.5 0.5 0 0 + XX 0.6667 0.5 1 + XX 8080FF + XX 0.555
-black - XX 1 1 1 - XX 0 0 0 0 - XX 0 0 1 - XX FFFFFF - XX 1 + XX 1 1 1 + XX 0 0 0 0 + XX 0 0 1 + XX FFFFFF + XX 1
-darkgray - XX 0.75 0.75 0.75 - XX 0 0 0 0.25 - XX 0 0 0.75 - XX BFBFBF - XX 0.75 + XX 0.75 0.75 0.75 + XX 0 0 0 0.25 + XX 0 0 0.75 + XX BFBFBF + XX 0.75
-gray - XX 0.5 0.5 0.5 - XX 0 0 0 0.5 - XX 0 0 0.5 - XX 808080 - XX 0.5 + XX 0.5 0.5 0.5 + XX 0 0 0 0.5 + XX 0 0 0.5 + XX 808080 + XX 0.5
-lightgray - XX 0.25 0.25 0.25 - XX 0 0 0 0.75 - XX 0 0 0.25 - XX 404040 - XX 0.25 + XX 0.25 0.25 0.25 + XX 0 0 0 0.75 + XX 0 0 0.25 + XX 404040 + XX 0.25
-white - XX 0 0 0 - XX 0 0 0 1 - XX 0 0 0 - XX 000000 - XX 0 + XX 0 0 0 + XX 0 0 0 1 + XX 0 0 0 + XX 000000 + XX 0
JungleGreen - XX 0.01 1 0.48 - XX 0.99 0 0.52 0 - XX 0.4125 0.99 1 - XX 03FF7A - XX 0.6458 + XX 0.01 1 0.48 + XX 0.99 0 0.52 0 + XX 0.4125 0.99 1 + XX 03FF7A + XX 0.6458
DarkOrchid - XX 0.6 0.2 0.8 - XX 0.4 0.8 0.2 0 - XX 0.7778 0.75 0.8 - XX 9933CC - XX 0.386 + XX 0.6 0.2 0.8 + XX 0.4 0.8 0.2 0 + XX 0.7778 0.75 0.8 + XX 9933CC + XX 0.386
-JungleGreen - XX 0.99 0 0.52 - XX 0 0.99 0.47 0.01 - XX 0.9125 1 0.99 - XX FC0085 - XX 0.3542 + XX 0.99 0 0.52 + XX 0 0.99 0.47 0.01 + XX 0.9125 1 0.99 + XX FC0085 + XX 0.3542
-DarkOrchid - XX 0.4 0.8 0.2 - XX 0.4 0 0.6 0.2 - XX 0.2778 0.75 0.8 - XX 66CC33 - XX 0.614 + XX 0.4 0.8 0.2 + XX 0.4 0 0.6 0.2 + XX 0.2778 0.75 0.8 + XX 66CC33 + XX 0.614
@@ -679,7 +679,7 @@ A=100*13 = 1300pt;

Sky blue

-

Black

+

Black

diff --git a/t/structure/enum.xml b/t/structure/enum.xml index c8fc8b268..6f57d0ffc 100644 --- a/t/structure/enum.xml +++ b/t/structure/enum.xml @@ -166,9 +166,9 @@ - 1 - 1 - item 1 + 1 + 1 + item 1

Line one

@@ -176,9 +176,9 @@
- 2 - 2 - item 2 + 2 + 2 + item 2

Line two