Merge pull request #56 from EvilJordan/master

New option "--fillonly"

Author: wader

README.md

@@ -24,6 +24,7 @@ Example usage:
 
 --charboxsize WxH    Character box size (use pixel units instead of font units)
 --colorscheme NAME   Color scheme
+--fillonly           Remove strokes from SVG output (use fills only)
 --fontfile PATH      Font file to use and embed
 --fontname NAME      Font name
 --fontref URL        External font URL to use
@@ -69,7 +70,7 @@ go build -o ansisvg .
 
 ## Fonts
 
-`ansisvg` can either use system-installed fonts (`-fontname`), link to a webfont on a HTTP server (`-fontref`) or embed a webfont from the local filesystem (`-fontfile`).
+`ansisvg` can either use system-installed fonts (`--fontname`), link to a webfont on a HTTP server (`-fontref`) or embed a webfont from the local filesystem (`--fontfile`).
 
 ### Compatibility issues
 
@@ -79,17 +80,17 @@ go build -o ansisvg .
 
 ### Variations of custom fonts (regular/bold/italic)
 
-* System wide fonts (`-fontname`) get correctly rendered with variations, but when using external fonts with `-fontref` or `-fontfile` the SVG viewer knows only the regular variant and will try to render italic/bold text 'extrapolated' from it which may look different than the actual font variation. To use the actual bold/italic font variants, different woff2 files have to be used for the respective text styles which needs additional CSS code (currently not supported by `ansisvg`).
+* System wide fonts (`-fontname`) get correctly rendered with variations, but when using external fonts with `--fontref` or `--fontfile` the SVG viewer knows only the regular variant and will try to render italic/bold text 'extrapolated' from it which may look different than the actual font variation. To use the actual bold/italic font variants, different woff2 files have to be used for the respective text styles which needs additional CSS code (currently not supported by `ansisvg`).
 
-* Bold style 'extrapolated' from the regular font may even break monospace alignment. Use `-grid` option to mitigate that.
+* Bold style 'extrapolated' from the regular font may even break monospace alignment. Use `--grid` option to mitigate that.
 
 ## Font-relative vs. pixel coordinates
 
-By default, `ansisvg` uses font-relative `ch`/`em` coordinates. This should make SVG dimensions and line/character spacing consistent with font family/size. When SVG dimensions and/or text coordinates are off, it is possible to force explicit pixel units for coordinates by specifying `-charboxsize` in X/Y pixel units, e.g. `8x16`.
+By default, `ansisvg` uses font-relative `ch`/`em` coordinates. This should make SVG dimensions and line/character spacing consistent with font family/size. When SVG dimensions and/or text coordinates are off, it is possible to force explicit pixel units for coordinates by specifying `--charboxsize` in X/Y pixel units, e.g. `8x16`.
 
 * Inkscape currently [cannot deal with SVG size expressed in font-relative units](https://gitlab.com/inkscape/inkscape/-/issues/4737), a quick workaround is Ctrl-Shift-R (resize page to content).
 
-* Some SVG processing tools like [asciidoctor](https://docs.asciidoctor.org/pdf-converter/latest/image-paths-and-formats/#image-formats) require the presence of the `viewBox` attribute. Use `-charboxsize` option to enable this attribute (it only works with pixel dimensions).
+* Some SVG processing tools like [asciidoctor](https://docs.asciidoctor.org/pdf-converter/latest/image-paths-and-formats/#image-formats) require the presence of the `viewBox` attribute. Use `--charboxsize` option to enable this attribute (it only works with pixel dimensions).
 
 ## Margin size
 
@@ -98,7 +99,11 @@ With `--marginsize` a margin can be defined, so there is a bit of empty space (o
 
 ## Consolidated text vs. grid mode
 
-By default, `ansisvg` consolidates text to `<tspan>` chunks, leaving the X positioning of characters to the SVG renderer. This usually works well for monospace fonts. However if not all glyphs involved are monospace (e.g. when exotic characters are used, making the SVG renderer fall back to a different font for those characters) then the alignment will be off; this can be worked around with `-grid` mode which will make `ansisvg` put each character to explicit positions, making the SVG bigger and less readable but ensuring proper positioning/alignment for all characters.
+By default, `ansisvg` consolidates text to `<tspan>` chunks, leaving the X positioning of characters to the SVG renderer. This usually works well for monospace fonts. However if not all glyphs involved are monospace (e.g. when exotic characters are used, making the SVG renderer fall back to a different font for those characters) then the alignment will be off; this can be worked around with `--grid` mode which will make `ansisvg` put each character to explicit positions, making the SVG bigger and less readable but ensuring proper positioning/alignment for all characters.
+
+## Illustrator Issues
+
+When handling ANSIs primarliy composed of block characters, e.g. █, ░, ▒, etc., a `stroke` is created by default in the output SVG that may cause overlapping of characters when viewed in Illustrator. The `--fillonly` mode is provided to remove `stroke` from the output SVG. This works especially well when combined with `--grid` and `--charboxsize`.
 
 ## Tricks
 

ansisvg

@@ -21,6 +21,7 @@ type Options struct {
 	ColorScheme   string
 	Transparent   bool
 	GridMode      bool
+	FillOnly      bool
 	LineHeight    float32
 }
 
@@ -31,6 +32,7 @@ var DefaultOptions = Options{
 	MarginSize:  xydim.XyDimFloat{X: 0, Y: 0},
 	ColorScheme: "Builtin Dark",
 	Transparent: false,
+	FillOnly:    false,
 	LineHeight:  1.0,
 }
 
@@ -143,6 +145,7 @@ func Convert(r io.Reader, w io.Writer, opts Options) error {
 		NrLines:          ad.MaxY + 1,
 		Lines:            lines,
 		GridMode:         opts.GridMode,
+		FillOnly:         opts.FillOnly,
 	}
 	return s.Render(w)
 }

ansitosvg/ansisvg.go

@@ -36,6 +36,7 @@ func Main(env Env) error {
 	var listColorSchemesFlag = fs.Bool("listcolorschemes", false, "List color schemes")
 	var transparentFlag = fs.Bool("transparent", ansitosvg.DefaultOptions.Transparent, "Transparent background")
 	var gridModeFlag = fs.Bool("grid", false, "Grid mode (sets position for each character)")
+	var fillOnlyFlag = fs.Bool("fillonly", ansitosvg.DefaultOptions.FillOnly, "Remove strokes from SVG output (use fills only)")
 	var helpFlag bool
 	fs.BoolVar(&helpFlag, "h", false, "")
 	fs.BoolVar(&helpFlag, "help", false, "Show help")
@@ -144,6 +145,7 @@ Example usage:
 			ColorScheme:   *colorSchemeFlag,
 			Transparent:   *transparentFlag,
 			GridMode:      *gridModeFlag,
+			FillOnly:      *fillOnlyFlag,
 		},
 	)
 }

cli/cli.go

@@ -0,0 +1,3 @@
+              
+    TEST!!    
+              

cli/testdata/fillonly.ansi

@@ -0,0 +1 @@
+--fillonly

cli/testdata/fillonly.args

@@ -6,6 +6,7 @@ Example usage:
 
 --charboxsize WxH    Character box size (use pixel units instead of font units)
 --colorscheme NAME   Color scheme
+--fillonly           Remove strokes from SVG output (use fills only)
 --fontfile PATH      Font file to use and embed
 --fontname NAME      Font name
 --fontref URL        External font URL to use

cli/testdata/fillonly.svg

@@ -6,6 +6,7 @@ Example usage:
 
 --charboxsize WxH    Character box size (use pixel units instead of font units)
 --colorscheme NAME   Color scheme
+--fillonly           Remove strokes from SVG output (use fills only)
 --fontfile PATH      Font file to use and embed
 --fontname NAME      Font name
 --fontref URL        External font URL to use

cli/testdata/help-short-flag.stdout

@@ -96,6 +96,7 @@ type Screen struct {
 	NrLines          int
 	Lines            []Line
 	GridMode         bool
+	FillOnly         bool
 	Dom              SvgDom
 }