diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-21 18:48:57 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-21 18:48:57 +0000 |
| commit | 28563e8b1322e33a43107bfedaae99f669b303f5 (patch) | |
| tree | b300f70aa463098de18a62ffa1bd93f9b6e3c6dd /share | |
| parent | correcting previous revision (diff) | |
| parent | ensure backwards compatibility with old hpgl exports (diff) | |
| download | inkscape-28563e8b1322e33a43107bfedaae99f669b303f5.tar.gz inkscape-28563e8b1322e33a43107bfedaae99f669b303f5.zip | |
Update to trunk
(bzr r13090.1.66)
Diffstat (limited to 'share')
| -rwxr-xr-x | share/extensions/dxf_input.py | 4 | ||||
| -rw-r--r-- | share/extensions/hpgl_decoder.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/share/extensions/dxf_input.py b/share/extensions/dxf_input.py index da81ff78c..235b9ae8f 100755 --- a/share/extensions/dxf_input.py +++ b/share/extensions/dxf_input.py @@ -279,14 +279,14 @@ def export_INSERT(): if vals[groups['2']] and vals[groups['10']] and vals[groups['20']]: x = vals[groups['10']][0] + scale*xmin y = vals[groups['20']][0] - scale*ymin - height - attribs = {'x': '%f' % x, 'y': '%f' % y, inkex.addNS('href','xlink'): '#' + quote(vals[groups['2']][0].encode("utf-8"))} + attribs = {'x': '%f' % x, 'y': '%f' % y, inkex.addNS('href','xlink'): '#' + quote(vals[groups['2']][0].replace(" ", "_").encode("utf-8"))} inkex.etree.SubElement(layer, 'use', attribs) def export_BLOCK(): # mandatory group codes : (2) (block name) if vals[groups['2']]: global block - block = inkex.etree.SubElement(defs, 'symbol', {'id': vals[groups['2']][0]}) + block = inkex.etree.SubElement(defs, 'symbol', {'id': vals[groups['2']][0].replace(" ", "_")}) def export_ENDBLK(): global block diff --git a/share/extensions/hpgl_decoder.py b/share/extensions/hpgl_decoder.py index c195b21e3..06cf566a3 100644 --- a/share/extensions/hpgl_decoder.py +++ b/share/extensions/hpgl_decoder.py @@ -112,7 +112,7 @@ class hpglDecoder: def getParameters(self, parameterString): # process coordinates if parameterString.strip() == '': - return [] + parameterString = '0,0;' # remove command delimiter parameterString = parameterString.replace(';', '').strip() # split parameter |
