[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] navidoc ./Makefile ./config.py ./rst2any.py nav...
|
From: |
Asko Soukka |
|
Subject: |
[Gzz-commits] navidoc ./Makefile ./config.py ./rst2any.py nav... |
|
Date: |
Tue, 01 Apr 2003 08:54:10 -0500 |
CVSROOT: /cvsroot/navidoc
Module name: navidoc
Changes by: Asko Soukka <address@hidden> 03/04/01 08:54:10
Modified files:
. : Makefile config.py rst2any.py
navidoc/directives: __init__.py mp.py pegboard.py
navidoc/link : __init__.py javadoc.py
navidoc/mp : __init__.py uml.mp uml.py
navidoc/utils : parser.py path.py
navidoc/writers: __init__.py
Log message:
UMLs to compile, though, needs that temp directory, currently set to
../diagrams
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/Makefile.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/rst2any.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/directives/__init__.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/directives/mp.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/directives/pegboard.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/__init__.py.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/javadoc.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.mp.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.py.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/utils/parser.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/utils/path.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/writers/__init__.py.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
Patches:
Index: navidoc/Makefile
diff -u navidoc/Makefile:1.7 navidoc/Makefile:1.8
--- navidoc/Makefile:1.7 Mon Mar 31 04:32:00 2003
+++ navidoc/Makefile Tue Apr 1 08:54:09 2003
@@ -1,4 +1,4 @@
-#$Id: Makefile,v 1.7 2003/03/31 09:32:00 humppake Exp $
+#$Id: Makefile,v 1.8 2003/04/01 13:54:09 humppake Exp $
##########################################################################
CLASSPATH =$(NAVIDOC_DEPENDS)/jython.jar:$(shell echo $$CLASSPATH)
@@ -39,6 +39,12 @@
html-loop:
$(JYTHON) rst2any.py --loop --html -d navidoc -d docutils $(DBG) $(RST)
+
+latex:
+ $(JYTHON) rst2any.py --latex -d navidoc -d docutils $(DBG) $(RST)
+
+latex-loop:
+ $(JYTHON) rst2any.py --loop --latex -d navidoc -d docutils $(DBG) $(RST)
# !!NOTE!! navidoc make html is recursive
doc:
Index: navidoc/config.py
diff -u navidoc/config.py:1.8 navidoc/config.py:1.9
--- navidoc/config.py:1.8 Fri Mar 28 08:08:57 2003
+++ navidoc/config.py Tue Apr 1 08:54:09 2003
@@ -19,16 +19,20 @@
# MA 02111-1307 USA
#
-# $Id: config.py,v 1.8 2003/03/28 13:08:57 humppake Exp $
+# $Id: config.py,v 1.9 2003/04/01 13:54:09 humppake Exp $
__docformat__ = 'reStructuredText'
dbg = None
-import navidoc.utils.debug
+import os, navidoc.utils.debug
+
+#Environmental variable MPINPUTS should be relative to tmpdir,
+#or be an absolute path.
+os.putenv("MPINPUTS", "../navidoc/navidoc/mp/")
# global settings needed all around
-mp_directory = '../mptemp'
+mp_directory = '../diagrams'
mp_eps_only = 0
# global settings needed all around, these
Index: navidoc/navidoc/directives/__init__.py
diff -u navidoc/navidoc/directives/__init__.py:1.5
navidoc/navidoc/directives/__init__.py:1.6
--- navidoc/navidoc/directives/__init__.py:1.5 Fri Mar 28 08:08:57 2003
+++ navidoc/navidoc/directives/__init__.py Tue Apr 1 08:54:09 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: __init__.py,v 1.5 2003/03/28 13:08:57 humppake Exp $
+# $Id: __init__.py,v 1.6 2003/04/01 13:54:09 humppake Exp $
#
# Written by Asko Soukka
@@ -30,14 +30,14 @@
from docutils.parsers.rst import directives
from pegboard import pegboard_directive
-#from latex import bibliography_directive
-#from mp import mp_directive, uml_directive, uml_refer_directive
+from latex import bibliography_directive
+from mp import mp_directive, uml_directive, uml_refer_directive
directives._directives['pegboard'] = pegboard_directive
-#directives._directives['mp'] = mp_directive
-#directives._directives['uml'] = uml_directive
-#directives._directives['uml-refer'] = uml_refer_directive
-#directives._directives['bibliography'] = bibliography_directive
+directives._directives['mp'] = mp_directive
+directives._directives['uml'] = uml_directive
+directives._directives['uml-refer'] = uml_refer_directive
+directives._directives['bibliography'] = bibliography_directive
# some additional options and changes for latex writer
from docutils.parsers.rst.directives import images
Index: navidoc/navidoc/directives/mp.py
diff -u navidoc/navidoc/directives/mp.py:1.2
navidoc/navidoc/directives/mp.py:1.3
--- navidoc/navidoc/directives/mp.py:1.2 Fri Mar 28 08:08:57 2003
+++ navidoc/navidoc/directives/mp.py Tue Apr 1 08:54:09 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: mp.py,v 1.2 2003/03/28 13:08:57 humppake Exp $
+# $Id: mp.py,v 1.3 2003/04/01 13:54:09 humppake Exp $
#
# Written by Asko Soukka, Benja Fallenstein
@@ -134,7 +134,7 @@
mp.write(files[1])
mp.close()
- if not eps_only: create_uml(diagram)
+ create_uml(diagram)
add_refer(attributes['name'], 1)
@@ -180,7 +180,7 @@
"""
Add reference information for a spesific diagram.
"""
- refers_filepath = slashify(config.working_directory)+diagram+".gen.refers"
+ refers_filepath = slashify(config.mp_directory)+diagram+".gen.refers"
if (os.path.isfile(refers_filepath)):
old_refers = open(refers_filepath, "r").read()
if old_refers.find(config.output_filename) == -1:
Index: navidoc/navidoc/directives/pegboard.py
diff -u navidoc/navidoc/directives/pegboard.py:1.12
navidoc/navidoc/directives/pegboard.py:1.13
--- navidoc/navidoc/directives/pegboard.py:1.12 Tue Apr 1 04:30:28 2003
+++ navidoc/navidoc/directives/pegboard.py Tue Apr 1 08:54:09 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: pegboard.py,v 1.12 2003/04/01 09:30:28 humppake Exp $
+# $Id: pegboard.py,v 1.13 2003/04/01 13:54:09 humppake Exp $
#
# Written by Benja Fallensten, Vesa Kaihlavirta, Asko Soukka
@@ -136,6 +136,7 @@
rstfiles = [f for f in peg['files'] if f.endswith('.rst')]
config.dbg.mute('docutils')
+ config.mp_eps_only = 1
for rstfile in rstfiles:
config.input_filename = rstfile
config.output_filename = ''
@@ -178,6 +179,7 @@
dbg_fail('PEG %s: Docutil raised an exception while converting
%s. ' % (pegdir, rstfile))
dbg_fail('Conversion failed and HTML not created.\n')
config.dbg.enable('docutils')
+ config.mp_eps_only = 0
if not peg['html']:
for file in peg['files']:
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.4
navidoc/navidoc/link/__init__.py:1.5
--- navidoc/navidoc/link/__init__.py:1.4 Tue Apr 1 04:30:28 2003
+++ navidoc/navidoc/link/__init__.py Tue Apr 1 08:54:09 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: __init__.py,v 1.4 2003/04/01 09:30:28 humppake Exp $
+#$Id: __init__.py,v 1.5 2003/04/01 13:54:09 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -36,14 +36,19 @@
dbg = config.dbg.shorthand('link')
class Link (navidoc.Element):
-# target, title, bbox, focus=0, rough_edge=1, error=0
key = 'link'
def __init__(self, var, s, list):
dbg(self.key+" VAR: %s, S: %s, LIST: %s" % (var, s, list))
+ self.title = ''
+ self.bbox = ''
+ self.focus = 0
+ self.rough_edge = 1
+ self.error = 0
+ self.target = ''
# def __init__(self, var, s, list):
-# self.seqobjs = []
+# self.seqobjs = []d
# self.seqobjsdeletes = {}
# toks = s.split(" ");
# s = toks[0]
Index: navidoc/navidoc/link/javadoc.py
diff -u navidoc/navidoc/link/javadoc.py:1.1 navidoc/navidoc/link/javadoc.py:1.2
--- navidoc/navidoc/link/javadoc.py:1.1 Tue Apr 1 04:30:28 2003
+++ navidoc/navidoc/link/javadoc.py Tue Apr 1 08:54:09 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: javadoc.py,v 1.1 2003/04/01 09:30:28 humppake Exp $
+#$Id: javadoc.py,v 1.2 2003/04/01 13:54:09 humppake Exp $
#
# Written by Asko Soukka
@@ -35,7 +35,7 @@
dbg = config.dbg.shorthand('link')
-class JLinkPackage (navidoc.Element):
+class JLinkPackage(navidoc.Element):
key = "jlinkpackage"
def __init__(self, var, s, list):
@@ -45,3 +45,7 @@
def setup_code(self): return ''
def draw_code(self): return ''
+
+class JLink(navidoc.link.Link):
+ key = "jlink"
+
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.8 navidoc/navidoc/mp/__init__.py:1.9
--- navidoc/navidoc/mp/__init__.py:1.8 Tue Apr 1 04:30:28 2003
+++ navidoc/navidoc/mp/__init__.py Tue Apr 1 08:54:09 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: __init__.py,v 1.8 2003/04/01 09:30:28 humppake Exp $
+# $Id: __init__.py,v 1.9 2003/04/01 13:54:09 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -45,7 +45,7 @@
return 'showfocus("'+self.target+'", '+self.title+',
('+self.bbox+'));' \
+"\n"+'drawRoughEdge(('+bbox+'));'
else: return 'showfocus("'+self.target+'", '+self.title+',
('+self.box+'));'
-navidoc.link.Link.draw_code = link_draw_code
+#navidoc.link.Link.draw_code = link_draw_code
class MetapostElement(navidoc.NamedElement):
def repl(self, s):
@@ -66,6 +66,8 @@
self.var = var or s
self.name = s
self.do_contents(list)
+ if self.link != None:
+ self.link.bbox = ('bboxmeasuredpic(%s)' % (self.var))
def create_uml(diagram, extension='', scale=1.0):
"""
@@ -82,23 +84,27 @@
if len(extension) > 0: extension = '_'+extension
dir = slashify(config.mp_directory)
+ if config.mp_eps_only:
+ eps = open(dir+diagram+extension+'_gen.eps', 'w')
+ eps.write(m.setup_code()+'\n')
+ return
+
gen1 = open(dir+diagram+extension+'.gen.mp.1', 'w')
- gen1.write(m.setupCode()+'\n')
+ gen1.write(m.setup_code()+'\n')
gen1.close()
gen2 = open(dir+diagram+extension+'.gen.mp.2', 'w')
- gen2.write(m.drawCode()+"\n")
- gen2.write("showlinksize(\"bbox\", (bbox currentpicture));\n")
+ gen2.write(m.draw_code()+"\n")
+ gen2.write('showlinksize("bbox", "'+diagram+'", (bbox
currentpicture));'+"\n")
gen2.close()
gen3 = open(dir+diagram+extension+".gen.mp.3", "w")
gen3.write("""
prologues := 1;
- input general.mp
input uml.mp
beginfig(1)
- input %(diagram+extension)s.gen.mp.1
+ input %(diagram)s%(extension)s.gen.mp.1
input %(diagram)s.gen.mp
- input %(diagram+extension)s.gen.mp.2
+ input %(diagram)s%(extension)s.gen.mp.2
endfig
end
""" % locals())
@@ -118,7 +124,7 @@
dbg(syscmd)
os.system('cd '+config.mp_directory+';'+syscmd)
- log = open(slashify(config.mp_directory)+diagram+'.gen.log').read()
+ log = open(slashify(config.mp_directory)+diagram+'.gen.mp.log').read()
if log.find("\n"+'!') != -1:
dbg_fail('Error occurred while processing the diagram. The log is
shown below.')
dbg_fail(log)
@@ -132,10 +138,12 @@
# grep all linked areas from log file
for link in re.findall('LINKRECT\((.*?)\)', log):
+ dbg(link)
els = link.split(',')
if els[0] == '"bbox"':
bbox = els
else:
+ dbg(els)
links.append(MPLink(els))
dbg(bbox)
@@ -147,9 +155,10 @@
scaling = int(scaling / scale)
+ dbg("List: "+str(list))
syscmd = ('pstopnm '+' '.join(list)+'
<'+slashify(config.mp_directory)+diagram+'.gen' \
- +'.mp.1 2>/dev/null | pnmscale -reduce '+scaling+' 2>/dev/null |
' \
- +'pnmtopng >'+slashify(config.mp_directory)+diagram+'.gen.png
2>/dev/null')
+ +""".mp.1 2>/dev/null | pnmscale -reduce %s 2>/dev/null |
"""%scaling \
+ +'pnmtopng >'+slashify(config.mp_directory)+diagram+'.gen.png
2>/dev/null')#
dbg(syscmd)
os.system(syscmd)
Index: navidoc/navidoc/mp/uml.mp
diff -u navidoc/navidoc/mp/uml.mp:1.2 navidoc/navidoc/mp/uml.mp:1.3
--- navidoc/navidoc/mp/uml.mp:1.2 Thu Mar 27 04:33:48 2003
+++ navidoc/navidoc/mp/uml.mp Tue Apr 1 08:54:09 2003
@@ -19,7 +19,7 @@
% MA 02111-1307 USA
%
-% $Id: uml.mp,v 1.2 2003/03/27 09:33:48 humppake Exp $
+% $Id: uml.mp,v 1.3 2003/04/01 13:54:09 humppake Exp $
%
% Written by Tuomas Lukka
@@ -429,7 +429,7 @@
showlinksize(target, title, p);
enddef;
vardef showlinksize(expr target, title, p) =
- show "LINKRECT("& char(34) & name & char(34) & "," &
strpair((ulcorner(p))) &","& strpair((lrcorner(p))) & ")"
+ show "LINKRECT("& char(34) & target & char(34) & "," & char(34) & title &
char(34) & "," & strpair((ulcorner(p))) &","& strpair((lrcorner(p))) &")"
enddef;
vardef jitterpt(expr p, s) =
Index: navidoc/navidoc/mp/uml.py
diff -u navidoc/navidoc/mp/uml.py:1.5 navidoc/navidoc/mp/uml.py:1.6
--- navidoc/navidoc/mp/uml.py:1.5 Tue Apr 1 04:30:28 2003
+++ navidoc/navidoc/mp/uml.py Tue Apr 1 08:54:10 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: uml.py,v 1.5 2003/04/01 09:30:28 humppake Exp $
+# $Id: uml.py,v 1.6 2003/04/01 13:54:10 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -190,6 +190,8 @@
self.name = s
self.methods = self.fields = []
self.do_contents(list)
+ if self.link != None:
+ self.link.bbox('bboxmeasuredpic(%s)' %(self.var))
def handle_contained(self, el):
if el[0] == "methods":
self.methods = el[1:]
@@ -197,10 +199,6 @@
self.fields = el[1:]
else:
navidoc.mp.MetapostElement.handle_contained(self, el)
- def defaultlink(self):
- if self.linkpackage != None and "." not in self.name:
- return self.linkpackage + "." + self.name
- return self.name
def setup_code(self):
s = """
picture %%.cls, %%.pict, %%.meth, %%.sep, %%.fiel, %%.stereo;
@@ -236,7 +234,7 @@
"%%.stereo = nullpicture;")
return self.repl(s)
def draw_code(self):
- s = self.link.draw_code("bboxmeasuredpic(%%)") + """
+ s = """
drawmeasuredpic(%%);
draw bboxmeasuredpic(%%);
"""
@@ -249,6 +247,8 @@
self.var = var or s
self.name = s
self.do_contents(list)
+ if self.link != None:
+ self.link.bbox = ('bboxmeasuredpic(%s)' % (self.var))
def setup_code(self):
s = """
picture %%.pict;
@@ -257,7 +257,7 @@
"""
return self.repl(s)
def draw_code(self):
- s = self.link.draw_code("bboxmeasuredpic(%%)") + """
+ s = """
drawmeasuredpic(%%);
draw bboxmeasuredpic(%%);
draw (((0,0)--(15,0)--(15,5)--(0,5)--cycle) shifted %%.nw);
@@ -271,6 +271,9 @@
self.var = var or s
self.name = s
self.do_contents(l)
+ if self.link != None:
+ self.link.bbox = ('bboxmeasuredpic(%s)' % (self.var))
+ self.link.rough_edge = 0
def setup_code(self):
s = """
picture %%.pict;
@@ -279,7 +282,7 @@
"""
return self.repl(s)
def draw_code(self):
- s = self.link.draw_code("bboxmeasuredpic(%%)", 0) + """
+ s = """
drawmeasuredpic(%%);
"""
return self.repl(s)
@@ -342,7 +345,7 @@
%%.intlabel.nw = %%.se;
fi
drawmeasuredpic(%%.intlabel);
- """
+ """
return self.repl(s)
class mpnary(navidoc.mp.SimpleElement):
@@ -357,7 +360,7 @@
def draw_code(self):
s = """
drawmeasuredpic(%%);
- """
+ """
return self.repl(s)
class mpbigpackage(navidoc.mp.SimpleElement):
@@ -374,13 +377,13 @@
"""
return self.repl(s)
def draw_code(self):
- s = """bboxmeasuredpic(%%);
+ s = """
+ bboxmeasuredpic(%%);
fixmeasuredpic(%%);
draw bboxmeasuredpic(%%);
- """+\
- self.link.draw_code("bboxmeasuredpic(%%.titl)")+"""
- fixmeasuredpic(%%.titl);
- drawmeasuredpic(%%.titl);"""
+ fixmeasuredpic(%%.titl);
+ drawmeasuredpic(%%.titl);
+ """
return self.repl(s)
class mpqual(navidoc.mp.MetapostElement):
Index: navidoc/navidoc/utils/parser.py
diff -u navidoc/navidoc/utils/parser.py:1.2 navidoc/navidoc/utils/parser.py:1.3
--- navidoc/navidoc/utils/parser.py:1.2 Mon Mar 31 10:24:19 2003
+++ navidoc/navidoc/utils/parser.py Tue Apr 1 08:54:10 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: parser.py,v 1.2 2003/03/31 15:24:19 humppake Exp $
+# $Id: parser.py,v 1.3 2003/04/01 13:54:10 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -27,7 +27,7 @@
__docformat__ = 'reStructuredText'
-import re, random, string
+import re, random
import navidoc
def match_remove(p, s):
@@ -57,9 +57,10 @@
"""
Return a 20 random character string.
"""
- l = len(string.letters)
+ letters = "abcdeghijklmnopqrstuvxyzABCDEFGHIJKLMNOPQRSTUVXYZ"
+ l = len(letters)
return "".join([
- string.letters[random.randint(0, l-1)]
+ letters[random.randint(0, l-1)]
for k in range(20)])
def parse_indented(s):
Index: navidoc/navidoc/utils/path.py
diff -u navidoc/navidoc/utils/path.py:1.7 navidoc/navidoc/utils/path.py:1.8
--- navidoc/navidoc/utils/path.py:1.7 Fri Mar 28 08:08:57 2003
+++ navidoc/navidoc/utils/path.py Tue Apr 1 08:54:10 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-#$Id: path.py,v 1.7 2003/03/28 13:08:57 humppake Exp $
+#$Id: path.py,v 1.8 2003/04/01 13:54:10 humppake Exp $
#
# Written by Asko Soukka
@@ -55,6 +55,9 @@
"""
Returns a relative path from the source to the target.
"""
+ import config
+ dbg = config.dbg.shorthand('path')
+
if source == None or len(source) == 0: return target
## Condition removed because because of docutils sending
@@ -64,6 +67,11 @@
source = os.path.normpath(os.path.abspath(source))
target = os.path.normpath(os.path.abspath(target))
+ if os.path.isdir(source): source = slashify(source)
+ if os.path.isdir(target): target = slashify(target)
+
+ dbg('Source: %s, Target: %s' % (source, target))
+
depth = source.count('/')
source_parts = source.split('/')
target_parts = target.split('/')
@@ -80,4 +88,5 @@
+''.join([target_parts[i+parts]+'/' \
for i in range(len(target_parts)-parts)])
+ dbg('Relative path: '+relative[0:len(relative)-1])
return (relative[0:len(relative)-1])
Index: navidoc/navidoc/writers/__init__.py
diff -u navidoc/navidoc/writers/__init__.py:1.2
navidoc/navidoc/writers/__init__.py:1.3
--- navidoc/navidoc/writers/__init__.py:1.2 Wed Mar 26 10:36:17 2003
+++ navidoc/navidoc/writers/__init__.py Tue Apr 1 08:54:10 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: __init__.py,v 1.2 2003/03/26 15:36:17 humppake Exp $
+# $Id: __init__.py,v 1.3 2003/04/01 13:54:10 humppake Exp $
#
# Written by Asko Soukka
@@ -27,7 +27,24 @@
__docformat__ = 'reStructuredText'
+import docutils.writers
+
from navidoc.writers import latex2e
from docutils.writers import _writer_aliases
+_writer_modules = {}
_writer_aliases['latex'] = 'latex2e'
+_writer_modules['latex'] = 'navidoc.writers'
+
+def get_writer_class(writer_name):
+ """Return the Writer class from the `writer_name` module."""
+ writer_name = writer_name.lower()
+ if _writer_aliases.has_key(writer_name):
+ writer_name = _writer_aliases[writer_name]
+ if _writer_modules.has_key(writer_name):
+ writer_module = _writer_modules[writer_name]
+ else: writer_module = 'docutils.writers'
+ module = __import__(writer_name, globals(), locals(), writer_module)
+ return module.Writer
+
+docutils.writers.get_writer_class = get_writer_class
Index: navidoc/rst2any.py
diff -u navidoc/rst2any.py:1.17 navidoc/rst2any.py:1.18
--- navidoc/rst2any.py:1.17 Mon Mar 31 10:24:19 2003
+++ navidoc/rst2any.py Tue Apr 1 08:54:09 2003
@@ -21,7 +21,7 @@
# MA 02111-1307 USA
#
-#$Id: rst2any.py,v 1.17 2003/03/31 15:24:19 humppake Exp $
+#$Id: rst2any.py,v 1.18 2003/04/01 13:54:09 humppake Exp $
#
# Written by Asko Soukka
@@ -41,6 +41,7 @@
from navidoc.utils.path import *
import navidoc.mp.uml
+import navidoc.link.javadoc
"""
The main frontend for running Navidoc.
@@ -134,13 +135,18 @@
config.docutils = slashify(path) + 'docutils.conf'
for entry in dirlist:
run_docutils(slashify(path)+entry)
+
elif os.path.isfile(path):
config.working_directory = os.path.normpath(os.path.dirname(path))
+ if os.path.isfile(slashify(config.working_directory) +
'docutils.conf'):
+ config.docutils = slashify(config.working_directory) +
'docutils.conf'
config.input_filename = os.path.basename(path)
rst2any(path)
elif os.path.isfile(path+'.rst'):
config.working_directory = os.path.normpath(os.path.dirname(path))
+ if os.path.isfile(slashify(config.working_directory) +
'docutils.conf'):
+ config.docutils = slashify(config.working_directory) +
'docutils.conf'
config.input_filename = os.path.basename(path+'.rst')
rst2any(path+'.rst')
config.input_filename = ''
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] navidoc ./Makefile ./config.py ./rst2any.py nav...,
Asko Soukka <=