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

Fix graphdoc to properly escape characters in ids for Graphviz (#1111)

Browse Source 
Fixes #11741
This commit is contained in:
Paul Culley 2020-09-14 11:10:20 -05:00 committed by GitHub
parent b38f77f2aa
commit c0d622c16a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,6 +113,10 @@ else:
_GS_CMD = where_is("gs") _GS_CMD = where_is("gs")
def esc(id_txt):
return id_txt.replace('"', '\\"')
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# #
# GVOptions # GVOptions
@ -575,7 +579,7 @@ class GVDocBase(BaseDoc, GVDoc):
text += ' URL="%s"' % url text += ' URL="%s"' % url
text += " ]" text += " ]"
self.write(' "%s" %s;\n' % (node_id, text)) self.write(' "%s" %s;\n' % (esc(node_id), text))
def add_link(self, id1, id2, style="", head="", tail="", comment=""): def add_link(self, id1, id2, style="", head="", tail="", comment=""):
""" """
@ -583,7 +587,7 @@ class GVDocBase(BaseDoc, GVDoc):
Implements GVDocBase.add_link(). Implements GVDocBase.add_link().
""" """
self.write(' "%s" -> "%s"' % (id1, id2)) self.write(' "%s" -> "%s"' % (esc(id1), esc(id2)))
if style or head or tail: if style or head or tail:
self.write(' [') self.write(' [')
@ -635,7 +639,7 @@ class GVDocBase(BaseDoc, GVDoc):
Implements GVDocBase.add_samerank(). Implements GVDocBase.add_samerank().
""" """
self.write(' {rank=same "%s" "%s"}\n' % (id1, id2)) self.write(' {rank=same "%s" "%s"}\n' % (esc(id1), esc(id2)))
def rewrite_label(self, id, label): def rewrite_label(self, id, label):
""" """
@ -643,7 +647,7 @@ class GVDocBase(BaseDoc, GVDoc):
Implements GVDocBase.rewrite_label(). Implements GVDocBase.rewrite_label().
""" """
self.write(' "%s" [label = "%s"]\n' % (id, label)) self.write(' "%s" [label = "%s"]\n' % (esc(id), label))
def start_subgraph(self, graph_id): def start_subgraph(self, graph_id):
""" Implement GVDocBase.start_subgraph() """ """ Implement GVDocBase.start_subgraph() """