aboutsummaryrefslogtreecommitdiff
path: root/content/resources/rst_graphviz
diff options
context:
space:
mode:
authorSébastien Dailly <sebastien@chimrod.com>2014-05-05 21:36:19 +0200
committerSébastien Dailly <sebastien@chimrod.com>2014-05-05 21:36:19 +0200
commit2fba32dd916c20d5684d3aed8e3c5622c0a1cef4 (patch)
treef4e9b13d134b92671fb289af1b5d4a87542f7436 /content/resources/rst_graphviz
parent8490780c9367dc64e2ae4cb92b29a9e59694719e (diff)
Update post about graphviz
Diffstat (limited to 'content/resources/rst_graphviz')
-rwxr-xr-xcontent/resources/rst_graphviz/rst2html.py30
-rwxr-xr-xcontent/resources/rst_graphviz/rst2latex.py155
2 files changed, 165 insertions, 20 deletions
diff --git a/content/resources/rst_graphviz/rst2html.py b/content/resources/rst_graphviz/rst2html.py
index ab09012..953ee97 100755
--- a/content/resources/rst_graphviz/rst2html.py
+++ b/content/resources/rst_graphviz/rst2html.py
@@ -8,6 +8,10 @@
A minimal front end to the Docutils Publisher, producing HTML.
"""
+import sys
+reload(sys)
+sys.setdefaultencoding('utf-8')
+
try:
import locale
locale.setlocale(locale.LC_ALL, '')
@@ -28,8 +32,8 @@ description = ('Generates (X)HTML documents from standalone reStructuredText '
class Graphviz(Figure):
""" Generate a graphviz image
"""
- required_arguments = 0
- optional_arguments = 1
+ required_arguments = 1
+ optional_arguments = 0
final_argument_whitespace = True
has_content = True
@@ -38,22 +42,36 @@ class Graphviz(Figure):
def run(self):
- text = '\n'.join(self.content)
+ if self.content.count("..") == 0:
+ sep = -1
+ text = '\n'.join(self.content)
+ else:
+ sep = self.content.index("..")
+ text = '\n'.join(self.content[:sep])
extension = 'png'
imageFile = "tmp/%s.%s" % (hash(text), extension)
if not os.path.exists(imageFile):
- conversion = subprocess.Popen(['/usr/bin/dot',
+ conversion = subprocess.Popen(['dot',
'-T', 'png',
+ "-Gcharset=utf8",
'-o', imageFile,
],
stdin=subprocess.PIPE
)
- conversion.communicate(text)
+ try:
+ conversion.stdin.write("%s G { \n %s \n}" % (self.arguments[0],
+ text.encode("utf-8")))
+ except:
+ pass
+ conversion.stdin.close()
conversion.wait()
self.arguments = [imageFile]
self.options['scale'] = 50
- self.content = None
+ if sep == -1:
+ self.content = None
+ else:
+ self.content = self.content[sep+1:]
return Figure.run(self)
directives.register_directive('graphviz', Graphviz)
diff --git a/content/resources/rst_graphviz/rst2latex.py b/content/resources/rst_graphviz/rst2latex.py
index 9185405..615d2e5 100755
--- a/content/resources/rst_graphviz/rst2latex.py
+++ b/content/resources/rst_graphviz/rst2latex.py
@@ -8,6 +8,10 @@
A minimal front end to the Docutils Publisher, producing LaTeX.
"""
+import sys
+reload(sys)
+sys.setdefaultencoding('utf-8')
+
try:
import locale
locale.setlocale(locale.LC_ALL, '')
@@ -19,7 +23,7 @@ import os.path
from docutils.core import publish_cmdline
from docutils.parsers.rst import directives
-from docutils.parsers.rst.directives.images import Figure
+from docutils.parsers.rst.directives.images import Figure, Image
description = ('Generates LaTeX documents from standalone reStructuredText '
'sources. '
@@ -28,11 +32,103 @@ description = ('Generates LaTeX documents from standalone reStructuredText '
'<http://docutils.sourceforge.net/docs/user/latex.html> for '
'the full reference.')
+DOT2TEX = "dot2tex"
+
+def processContent(node):
+
+ if node.content.count("..") == 0:
+ sep = -1
+ text = '\n'.join(node.content)
+ else:
+ sep = node.content.index("..")
+ text = '\n'.join(node.content[:sep])
+ extension = 'pdf'
+ pdfFile = "tmp/%s.pdf" % (hash(text))
+
+
+ if not os.path.exists(pdfFile):
+ conversion = subprocess.Popen(['dot',
+ '-T', extension,
+ "-Gcharset=utf8",
+ ],
+ stdin=subprocess.PIPE,
+ stdout=subprocess.PIPE,
+ )
+
+ ps2pdf = subprocess.Popen(['ps2pdf',
+ "-",
+ pdfFile
+ ],
+ stdin = conversion.stdout
+ )
+ conversion.stdin.write("%s G {\n" %
+ node.arguments[0].encode("utf-8"))
+ conversion.stdin.write(text.encode("utf-8"))
+ conversion.stdin.write("\n}")
+ conversion.stdin.close()
+ conversion.stdout.close()
+
+ ps2pdf.wait()
+ conversion.wait()
+ if conversion.returncode != 0:
+ raise node.error(
+ 'Error in "%s" directive:\n' % node.name)
+
+ return (sep, pdfFile)
+
+class GraphvizImage(Image):
+ """ Generate a graphviz image
+ """
+ required_arguments = 1
+ optional_arguments = 0
+ final_argument_whitespace = True
+
+ has_content = True
+
+ option_spec = Image.option_spec.copy()
+
+ def run(self):
+
+
+ sep, arguments = processContent(self)
+ self.arguments = [arguments]
+ self.options['scale'] = 66
+ if sep == -1:
+ self.content = None
+ else:
+ self.content = self.content[sep+1:]
+
+ return Image.run(self)
+
class Graphviz(Figure):
""" Generate a graphviz image
"""
- required_arguments = 0
- optional_arguments = 1
+ required_arguments = 1
+ optional_arguments = 0
+ final_argument_whitespace = True
+
+ has_content = True
+
+ option_spec = Figure.option_spec.copy()
+
+ def run(self):
+
+ sep, arguments = processContent(self)
+ self.arguments = [arguments]
+ self.options['scale'] = 66
+ if sep == -1:
+ self.content = None
+ else:
+ self.content = self.content[sep+1:]
+
+ return Figure.run(self)
+
+
+class Dot2Tex(Figure):
+ """ Generate a graphviz image using dot2tex
+ """
+ required_arguments = 1
+ optional_arguments = 0
final_argument_whitespace = True
has_content = True
@@ -41,24 +137,55 @@ class Graphviz(Figure):
def run(self):
- text = '\n'.join(self.content)
- extension = 'png'
- imageFile = "tmp/%s.%s" % (hash(text), extension)
- if not os.path.exists(imageFile):
- conversion = subprocess.Popen(['/usr/bin/dot',
- '-T', 'png',
- '-o', imageFile,
+ if self.content.count("..") == 0:
+ sep = -1
+ text = '\n'.join(self.content)
+ else:
+ sep = self.content.index("..")
+ text = '\n'.join(self.content[:sep])
+ pdfFile = "tmp/%s.pdf" % (hash(text))
+ texFile = "tmp/%s.tex" % (hash(text))
+
+
+ if not os.path.exists(pdfFile):
+ conversion = subprocess.Popen([DOT2TEX,
+ '-c',
+ '-o', texFile,
],
stdin=subprocess.PIPE
)
- conversion.communicate(text)
+ conversion.communicate("%s G { \n %s \n}"
+ % (self.arguments[0], text))
conversion.wait()
- self.arguments = [imageFile]
- self.options['scale'] = 50
- self.content = None
+ ps2pdf = subprocess.Popen(['pdflatex',
+ '-output-directory', 'tmp',
+ texFile,
+ ],
+ )
+ ps2pdf.wait()
+ if conversion.returncode != 0:
+ raise self.error(
+ 'Error in "%s" directive:\n' % self.name)
+
+ self.arguments = [pdfFile]
+ self.options['scale'] = 66
+ if sep == -1:
+ self.content = None
+ else:
+ self.content = self.content[sep+1:]
+
return Figure.run(self)
+#try:
+# # Check if dot2tex exists and register the conversion with dot2tex and
+# # pdftex
+# subprocess.check_call([DOT2TEX, "-V"])
+# directives.register_directive('graphviz', Dot2Tex)
+# directives.register_directive('graphimg', GraphvizImage)
+#except:
+# # Otherwise use the old graphviz program
directives.register_directive('graphviz', Graphviz)
+directives.register_directive('graphimg', GraphvizImage)
publish_cmdline(writer_name='latex', description=description)