fix convert underline to html style

adam187 · fabpot · commit 2ff3a9c7b05c · 2013-10-18T10:02:24.000+02:00
diff --git a/SensioLabs/AnsiConverter/AnsiToHtmlConverter.php b/SensioLabs/AnsiConverter/AnsiToHtmlConverter.php
@@ -87,6 +87,7 @@ protected function convertAnsiToColor($ansi)
     {
         $bg = 0;
         $fg = 7;
+        $as = '';
         if ('0' != $ansi && '' != $ansi) {
             $options = explode(';', $ansi);
 
@@ -109,7 +110,7 @@ protected function convertAnsiToColor($ansi)
             }
 
             if (in_array(4, $options)) {
-                $text = sprintf('<u>%s</u>', $text);
+                $as = '; text-decoration: underline';
             }
 
             if (in_array(7, $options)) {
@@ -118,7 +119,7 @@ protected function convertAnsiToColor($ansi)
         }
 
         if ($this->inlineStyles) {
-            return sprintf('</span><span style="background-color: %s; color: %s">', $this->inlineColors[$this->colorNames[$bg]], $this->inlineColors[$this->colorNames[$fg]]);
+            return sprintf('</span><span style="background-color: %s; color: %s%s">', $this->inlineColors[$this->colorNames[$bg]], $this->inlineColors[$this->colorNames[$fg]], $as);
         } else {
             return sprintf('</span><span class="ansi_color_bg_%s ansi_color_fg_%s">', $this->colorNames[$bg], $this->colorNames[$fg]);
         }
diff --git a/SensioLabs/AnsiConverter/Tests/AnsiToHtmlConverterTest.php b/SensioLabs/AnsiConverter/Tests/AnsiToHtmlConverterTest.php
@@ -48,6 +48,9 @@ public function getConvertData()
 
             // carriage returns
             array("<span style=\"background-color: black; color: white\">foobar</span>", "foo\rbar\rfoobar"),
+
+            // underline
+            array("<span style=\"background-color: black; color: white; text-decoration: underline\">foo</span>", "\e[4mfoo\e[0m"),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ protected function convertAnsiToColor($ansi)`
`87`	`87`	`{`
`88`	`88`	`$bg = 0;`
`89`	`89`	`$fg = 7;`
	`90`	`+ $as = '';`
`90`	`91`	`if ('0' != $ansi && '' != $ansi) {`
`91`	`92`	`$options = explode(';', $ansi);`
`92`	`93`
`@@ -109,7 +110,7 @@ protected function convertAnsiToColor($ansi)`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`if (in_array(4, $options)) {`
`112`		`- $text = sprintf('<u>%s</u>', $text);`
	`113`	`+ $as = '; text-decoration: underline';`
`113`	`114`	`}`
`114`	`115`
`115`	`116`	`if (in_array(7, $options)) {`
`@@ -118,7 +119,7 @@ protected function convertAnsiToColor($ansi)`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`if ($this->inlineStyles) {`
`121`		`- return sprintf('</span><span style="background-color: %s; color: %s">', $this->inlineColors[$this->colorNames[$bg]], $this->inlineColors[$this->colorNames[$fg]]);`
	`122`	`+ return sprintf('</span><span style="background-color: %s; color: %s%s">', $this->inlineColors[$this->colorNames[$bg]], $this->inlineColors[$this->colorNames[$fg]], $as);`
`122`	`123`	`} else {`
`123`	`124`	`return sprintf('</span><span class="ansi_color_bg_%s ansi_color_fg_%s">', $this->colorNames[$bg], $this->colorNames[$fg]);`
`124`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,9 @@ public function getConvertData()`
`48`	`48`
`49`	`49`	`// carriage returns`
`50`	`50`	`array("<span style=\"background-color: black; color: white\">foobar</span>", "foo\rbar\rfoobar"),`
	`51`	`+`
	`52`	`+ // underline`
	`53`	`+ array("<span style=\"background-color: black; color: white; text-decoration: underline\">foo</span>", "\e[4mfoo\e[0m"),`
`51`	`54`	`);`
`52`	`55`	`}`
`53`	`56`	`}`