fix bug in svg text color

skanaar · Oct 27, 2019 · 50917bb · 50917bb
1 parent 8571cab
commit 50917bb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/dist/nomnoml.js b/dist/nomnoml.js
@@ -855,10 +855,10 @@ var nomnoml;
                     return newElement('path', { d: '' });
                 },
                 fillText: function (text, x, y) {
-                    var attr = { x: tX(x), y: tY(y), style: '' };
+                    var attr = { x: tX(x), y: tY(y), style: 'fill: ' + last(states).fill + ';' };
                     var font = lastDefined('font');
                     if (font.indexOf('bold') === -1) {
-                        attr.style = 'font-weight:normal;';
+                        attr.style += 'font-weight:normal;';
                     }
                     if (font.indexOf('italic') > -1) {
                         attr.style += 'font-style:italic;';

diff --git a/src/skanaar.svg.ts b/src/skanaar.svg.ts
@@ -181,10 +181,10 @@ namespace nomnoml.skanaar {
 				return newElement('path', {d:''})
 			},
 			fillText: function (text, x, y){
-				var attr = { x: tX(x), y: tY(y), style: '' }
+				var attr = { x: tX(x), y: tY(y), style: 'fill: '+last(states).fill+';' }
 				var font = lastDefined('font')
 				if (font.indexOf('bold') === -1) {
-					attr.style = 'font-weight:normal;'
+					attr.style += 'font-weight:normal;'
 				}
 				if (font.indexOf('italic') > -1) {
 					attr.style += 'font-style:italic;'

diff --git a/test/box.style.nomnoml b/test/box.style.nomnoml
@@ -1 +1 @@
-#.box: fill=pink italic bold visual=rhomb
+#.box: fill=pink stroke=red italic bold visual=rhomb
diff --git a/test/index.html b/test/index.html
@@ -67,7 +67,7 @@ <h1>Svg</h1>
     <div nomnoml=svg>
       <script type="text/vnd.nomnoml">
 #font: Arial
-#.hello: underline
+#.hello: underline stroke=teal fill=#ffa
 [Pirate|
   eyeCount: Int|
   [a]--[b]
@@ -202,7 +202,7 @@ <h1>Label placement</h1>
   </div>
 
   <div class=testcase>
-    <h1>NodeJS render</h1>
+    <h1>CLI output</h1>
     <img src="output.node-test.svg">
   </div>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#.box: fill=pink italic bold visual=rhomb
		#.box: fill=pink stroke=red italic bold visual=rhomb