diff --git a/bwipjs b/bwipjs index 4b4698d8..7c9f6764 100755 --- a/bwipjs +++ b/bwipjs @@ -131,9 +131,9 @@ var optlist = [ 'non-data function characters can be specified by escaped combinations such\n' + 'as ^FNC1, ^FNC4 and ^SFT.' }, { name: 'height', type: 'float', - desc: 'Height of longest bar, in millimetermillimeters.' }, + desc: 'Height of longest bar, in millimetermillimeters. Default is 25.4.' }, { name: 'width', type: 'float', - desc: 'Stretch the symbol to precisely this width, in millimeters.' }, + desc: 'Stretch the symbol to precisely this width, in millimeters. Default is 0.' }, { name: 'inkspread', type: 'float', desc: 'Amount by which to reduce the bar widths to compensate for inkspread,\n' + 'in points.' }, diff --git a/src/drawing-svg.js b/src/drawing-svg.js index 7d94b494..c5acf58e 100644 --- a/src/drawing-svg.js +++ b/src/drawing-svg.js @@ -18,7 +18,7 @@ function DrawingSVG() { var opts; var svg = ''; - var path; + var path = ''; var clipid = ''; var clips = []; var lines = {}; @@ -138,9 +138,6 @@ function DrawingSVG() { // orthogonal shapes. // You will see a series of polygon() calls, followed by a fill(). polygon(pts) { - if (!path) { - path = '\n'; - path = null; + // Ignore `fill` "black" if BG is "transparent" + svg += '\n'; + path = ''; } }, // Currently only used by swissqrcode. The `polys` area is an array of @@ -255,7 +251,10 @@ function DrawingSVG() { x += glyph.advance + dx; } if (path) { - svg += '\n'; + // Ignore `fill` "black" if BG is "transparent" + svg += '\n'; } }, // Called after all drawing is complete. The return value from this method @@ -268,7 +267,7 @@ function DrawingSVG() { var bg = opts.backgroundcolor; return '\n' + (clips.length ? '' + clips.join('') + '' : '') + - (/^[0-9A-Fa-f]{6}$/.test(''+bg) + (/^[0-9a-fA-F]{6}$/.test(''+bg) ? '\n' : '') + linesvg + svg + '\n';