Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix graphviz 2.28.0 and multiple pages.

Browse Source 
svn: r20316
This commit is contained in:
Peter Landgren 2012-09-03 08:46:20 +00:00
parent 9a4fc8069a
commit 6ffdacc185
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gen/plug/docgen/graphdoc.py
View File

@ -638,16 +638,16 @@ class GVPsDoc(GVDocBase):
# multip pages, but the output is clipped, some margins have # multip pages, but the output is clipped, some margins have
# disappeared. I used 1 inch margins always. # disappeared. I used 1 inch margins always.
# See bug tracker issue 2815 # See bug tracker issue 2815
# :cairo does not work with Graphviz 2.26.3 See issue 4164 # :cairo does not work with Graphviz 2.26.3 and later See issue 4164
# Covert filename to str using file system encoding. # Covert filename to str using file system encoding.
fname = self._filename.encode(sys.getfilesystemencoding()) fname = self._filename.encode(sys.getfilesystemencoding())
command = 'dot -Tps:cairo -o"%s" "%s"' % (fname, tmp_dot) command = 'dot -Tps:cairo -o"%s" "%s"' % (fname, tmp_dot)
dotversion = Popen(['dot', '-V'], stderr=PIPE).communicate(input=None)[1] dotversion = Popen(['dot', '-V'], stderr=PIPE).communicate(input=None)[1]
# Problem with dot 2.26.3 and multiple pages, which gives "cairo: out of # Problem with dot 2.26.3 and later and multiple pages, which gives "cairo: out of
# memory" If the :cairo is skipped for these cases it gives acceptable # memory" If the :cairo is skipped for these cases it gives acceptable
# result. # result.
if dotversion.find('2.26.3') != -1 and (self.vpages * self.hpages) > 1: if (dotversion.find('2.26.3') or dotversion.find('2.28.0')) != -1 and (self.vpages * self.hpages) > 1:
command = command.replace(':cairo','') command = command.replace(':cairo','')
os.system(command) os.system(command)
# Delete the temporary dot file # Delete the temporary dot file
@ -912,14 +912,14 @@ class GVPdfGsDoc(GVDocBase):
# Generate PostScript using dot # Generate PostScript using dot
# Reason for using -Tps:cairo. Needed for Non Latin-1 letters # Reason for using -Tps:cairo. Needed for Non Latin-1 letters
# See bug tracker issue 2815 # See bug tracker issue 2815
# :cairo does not work with Graphviz 2.26.3 See issue 4164 # :cairo does not work with Graphviz 2.26.3 and later See issue 4164
command = 'dot -Tps:cairo -o"%s" "%s"' % ( tmp_ps, tmp_dot ) command = 'dot -Tps:cairo -o"%s" "%s"' % ( tmp_ps, tmp_dot )
dotversion = Popen(['dot', '-V'], stderr=PIPE).communicate(input=None)[1] dotversion = Popen(['dot', '-V'], stderr=PIPE).communicate(input=None)[1]
# Problem with dot 2.26.3 and multiple pages, which gives "cairo: out # Problem with dot 2.26.3 and later and multiple pages, which gives "cairo: out
# of memory". If the :cairo is skipped for these cases it gives # of memory". If the :cairo is skipped for these cases it gives
# acceptable result. # acceptable result.
if dotversion.find('2.26.3') != -1 and (self.vpages * self.hpages) > 1: if (dotversion.find('2.26.3') or dotversion.find('2.28.0')) != -1 and (self.vpages * self.hpages) > 1:
command = command.replace(':cairo','') command = command.replace(':cairo','')
os.system(command) os.system(command)