From 1c7c51a015a40ef0aea839e74010a06c0e88cff0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20Wobst?= Date: Fri, 17 Jan 2003 12:59:51 +0000 Subject: [PATCH] Makefile; various minor adaptations git-svn-id: https://pyx.svn.sourceforge.net/svnroot/pyx/trunk/pyx@617 069f4177-920e-0410-937b-c2a4a81bcd90 --- manual/color.py | 2 +- manual/colorname.py | 2 +- manual/gradientname.py | 10 +++++----- manual/{graph.dat => graph1.dat} | 0 manual/graph1.py | 13 +++++++++++++ manual/{graph.py => graph2.py} | 11 ++--------- manual/manual.tex | 4 +++- manual/pathstyles.py | 2 +- manual/tex1.py | 14 ++++++++++++++ manual/{tex.py => tex2.py} | 12 +----------- 10 files changed, 41 insertions(+), 29 deletions(-) rename manual/{graph.dat => graph1.dat} (100%) create mode 100755 manual/graph1.py rename manual/{graph.py => graph2.py} (87%) create mode 100755 manual/tex1.py rename manual/{tex.py => tex2.py} (86%) diff --git a/manual/color.py b/manual/color.py index 15f57d26..d717e861 100755 --- a/manual/color.py +++ b/manual/color.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import sys -sys.path.append("..") +sys.path[:0] = [".."] from pyx import * c = canvas.canvas() diff --git a/manual/colorname.py b/manual/colorname.py index 8394bdf8..6cfd807e 100755 --- a/manual/colorname.py +++ b/manual/colorname.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import sys, imp, re -sys.path.append("..") +sys.path[:0] = [".."] import pyx from pyx import * diff --git a/manual/gradientname.py b/manual/gradientname.py index 23e28463..f0c08ce0 100755 --- a/manual/gradientname.py +++ b/manual/gradientname.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import sys, imp, re -sys.path.append("..") +sys.path[:0] = [".."] import pyx from pyx import * @@ -27,10 +27,10 @@ for line in lines: # we yet don't use a file iterator painter=graph.axispainter(innerticklengths=None, labelattrs=None)) g = c.insert(graph.graphxy(t, ypos=y, width=10, height=0.5, x=xaxis, x2=graph.linkaxis(xaxis, - painter=graph.linkaxispainter(skipticklevel=skiplevel, - skiplabellevel=skiplevel, - innerticklengths=None, - outerticklengths=graph.axispainter.defaultticklengths)), + skipticklevel=skiplevel, + skiplabellevel=skiplevel, + painter=graph.axispainter(innerticklengths=None, + outerticklengths=graph.axispainter.defaultticklengths)), y=graph.linaxis(datavmin=0, datavmax=1, part=graph.manualpart(ticks=None)))) g.plot(pf, graph.rect(pyx.color.gradient.__dict__[m.group("name")])) g.dodata() diff --git a/manual/graph.dat b/manual/graph1.dat similarity index 100% rename from manual/graph.dat rename to manual/graph1.dat diff --git a/manual/graph1.py b/manual/graph1.py new file mode 100755 index 00000000..45dd4db4 --- /dev/null +++ b/manual/graph1.py @@ -0,0 +1,13 @@ +#!/usr/bin/env python +import sys +sys.path[:0] = [".."] + +from pyx import * +from pyx.graph import * + +c = canvas.canvas() +t = c.insert(tex.tex()) +g = c.insert(graphxy(t, width=10)) +g.plot(data("graph1.dat", x=1, y=2)) +g.finish() +c.writetofile("graph1") diff --git a/manual/graph.py b/manual/graph2.py similarity index 87% rename from manual/graph.py rename to manual/graph2.py index be0e7b3c..32f85354 100755 --- a/manual/graph.py +++ b/manual/graph2.py @@ -1,18 +1,11 @@ #!/usr/bin/env python import sys -sys.path.append("..") +sys.path[:0] = [".."] + from pyx import * from pyx.graph import * c = canvas.canvas() -t = c.insert(tex.tex()) -g = c.insert(graphxy(t, width=10)) -g.plot(data("graph.dat", x=1, y=2)) -g.finish() -c.writetofile("graph1") - - -c = canvas.canvas() t = tex.tex() a, b = 2, 9 diff --git a/manual/manual.tex b/manual/manual.tex index d1cbec31..113e69a1 100644 --- a/manual/manual.tex +++ b/manual/manual.tex @@ -4,7 +4,9 @@ \setlength{\parindent}{0pt} \begin{document} \subject{\texttt{http://pyx.sourceforge.net/}} -\title{\PyX{} 0.1\\User Manual} +\title{\PyX{} +\input pyxversion.tex +\\User Manual} \author{J\"org Lehmann \texttt{}\and Andr\'e Wobst \texttt{}} \maketitle diff --git a/manual/pathstyles.py b/manual/pathstyles.py index f01ea2c1..c92bbc9d 100755 --- a/manual/pathstyles.py +++ b/manual/pathstyles.py @@ -1,6 +1,6 @@ #!/usr/bin/env python import sys -sys.path.append("..") +sys.path[:0] = [".."] from pyx import * c = canvas.canvas() diff --git a/manual/tex1.py b/manual/tex1.py new file mode 100755 index 00000000..27c39416 --- /dev/null +++ b/manual/tex1.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python +import sys +sys.path[:0] = [".."] +from pyx import * + + +c = canvas.canvas() +t = c.insert(tex.tex()) +t.text(0, 0, "Hello, world!") +print "width:", t.textwd("Hello, world!") +print "height:", t.textht("Hello, world!") +print "depth:", t.textdp("Hello, world!") +c.writetofile("tex1") + diff --git a/manual/tex.py b/manual/tex2.py similarity index 86% rename from manual/tex.py rename to manual/tex2.py index 82a8b9a1..0c7019e4 100755 --- a/manual/tex.py +++ b/manual/tex2.py @@ -1,18 +1,8 @@ #!/usr/bin/env python import sys -sys.path.append("..") +sys.path[:0] = [".."] from pyx import * - -c = canvas.canvas() -t = c.insert(tex.tex()) -t.text(0, 0, "Hello, world!") -print "width:", t.textwd("Hello, world!") -print "height:", t.textht("Hello, world!") -print "depth:", t.textdp("Hello, world!") -c.writetofile("tex1") - - c = canvas.canvas() t = c.insert(tex.tex()) t.text(0, 0, "Hello, world!") -- 2.11.4.GIT