[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gzz-commits] navidoc ./rst2any.py navidoc/parser.py navidoc/...
|
From: |
Asko Soukka |
|
Subject: |
[Gzz-commits] navidoc ./rst2any.py navidoc/parser.py navidoc/... |
|
Date: |
Thu, 27 Mar 2003 04:33:48 -0500 |
CVSROOT: /cvsroot/navidoc
Module name: navidoc
Changes by: Asko Soukka <address@hidden> 03/03/27 04:33:48
Modified files:
. : rst2any.py
navidoc : parser.py
navidoc/link : __init__.py
navidoc/mp : __init__.py uml.mp uml.py
Log message:
rst fix + unfinished
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/rst2any.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/parser.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/__init__.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.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.mp.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
Patches:
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.1
navidoc/navidoc/link/__init__.py:1.2
--- navidoc/navidoc/link/__init__.py:1.1 Tue Mar 18 09:32:53 2003
+++ navidoc/navidoc/link/__init__.py Thu Mar 27 04:33:48 2003
@@ -1 +1,131 @@
+#
+# Copyright (c) 2002, 2003 by Tuomas Lukka, Asko Soukka
+#
+# This file is part of Navidoc.
+#
+# Navidoc is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Navidoc is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+# Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General
+# Public License along with Navidoc; if not, write to the Free
+# Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+
+#$Id: __init__.py,v 1.2 2003/03/27 09:33:48 humppake Exp $
+
#
+# Written by Tuomas Lukka, Asko Soukka
+#
+
+__docformat__ = 'reStructuredText'
+
+from navidoc.parser import *
+
+import config
+
+from navidoc.utils.path import *
+
+dbg = config.dbg.shorthand('link')
+
+class Link:
+ key = 'link'
+
+ def __init__(self, target):
+ self.target = target
+ self.title = target
+
+ def draw_code(self, target, title, bbox):
+ """
+ This should be overwritten elsewhere.
+ """
+ dbg("Link.draw_code has no implementation.")
+ pass
+
+# if jlink != None:
+# #trimming jlink to comparable
+# name = jlink
+# if name.rfind("#") != -1:
+# name = name[0:name.rfind("#")]
+# if name.endswith(".html"): name = name[0:len(name)-5]
+# if name.endswith(".gen"): name = name[0:len(name)-4]
+# #Marking "Broken link" if file not found
+# if settings.has_key('path'):
+# slash = settings['path'].rfind("/")
+# if slash != -1:
+# path = (settings['path'][0:slash+1] +
target(jlink)).replace("//", "/")
+# else:
+# path = target(jlink).replace("//", "/")
+# if path.rfind("#") != -1:
+# path = path[0:path.rfind("#")]
+# if not os.path.isfile(path):
+# # print path
+# return 'showlinkerror("'+jlink+'", ('+box+'));'
+# else:
+# file = open(path)
+# title = re.compile('<title>([^<]*)</title>')
+# title = title.findall(file.read())
+# file.close()
+# if len(title) > 0: title = title[0]
+# else: title = jlink
+# titles[jlink] = title#
+
+# """ If focus is set and 'focus' matches, focus jlink. """
+# #comparing
+# if settings.has_key('focus') and (\
+# settings['focus'].find("_"+name.replace(".", "_")+".") != -1
or \
+# settings['focus'].find("_"+name.replace(".", "_")+"_package")
!= -1):
+# if RoughEdge: return 'showfocus("'+jlink+'",
('+box+'));'+"\n"+'drawRoughEdge(('+box+'));'
+# else: return 'showfocus("'+jlink+'", ('+box+'));'
+# return 'showjlink("'+jlink+'", ('+box+'));'
+# return ""
+
+# """Returns target file of the jlink with
+# path from the current directory."""
+# ts = jlink.split(".")
+# if re.search("html", ts[-1]):
+# settings2 = settings.copy()
+# if settings.has_key('path') and settings.has_key('tmpdir') \
+# and settings.has_key('name'):
+# if
(os.path.isfile(mputils._slashify(settings['tmpdir'])+settings['name']+".gen.refers")):
+# refer_file =
open(mputils._slashify(settings['tmpdir'])+settings['name']\
+# +".gen.refers", "r")
+# #print "NEEDLE:", ts[-3].split("/")[-1]
+# refers = refer_file.readlines()
+# if len(refers) > 0 and \
+# "".join([refer for refer in
refers]).find(ts[-3].split("/")[-1]) == -1:
+# tmp = mputils.transition_path(settings['path'],
refers[0].replace(".rst", ".gen.html"))
+# slash = tmp.rfind("/")
+# if slash != -1:
+# settings['to_context'] =
(tmp[0:slash+1]).replace("//", "/")
+# #print "REFERS:",refers
+# #print "PATH:", settings['path']
+# #print "JLINK:",jlink
+# #print "TO_CONTEXT:", settings['to_context']
+# refer_file.close()
+# if settings.has_key('to_context') and not \
+# jlink.startswith(settings['to_context']):
+# if settings['to_context'].endswith("/"):
+# target = settings['to_context']+jlink
+# else:
+# target = settings['to_context']+"/"+jlink
+# while target.startswith("/"):
+# target = target[1:len(target)]
+# else: target = jlink
+# settings.restore(settings2)
+# elif re.match("^[a-z]", ts[-1]):
+# target = (settings['to_javadoc']+"/"\
+# +"/".join(ts)
+# + "/package-summary.html#package_description")
+# else:
+# target = (settings['to_javadoc']+"/"\
+# +"/".join(ts)
+# + ".html")
+# return target
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.2 navidoc/navidoc/mp/__init__.py:1.3
--- navidoc/navidoc/mp/__init__.py:1.2 Wed Mar 26 10:36:17 2003
+++ navidoc/navidoc/mp/__init__.py Thu Mar 27 04:33:48 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/03/27 09:33:48 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -37,6 +37,15 @@
dbg = config.dbg.shorthand('mp')
dbg_fail = config.dbg.shorthand('mp.fail')
+
+def link_draw_code(self, target, title, bbox, focus=0, rough_edge=1, error=0):
+ if error: return 'showlinkerror("'target+'", '+title+', ('+box+'));'
+ if not focus: return 'showlink("'target+'", '+title+', ('+box+'));'
+ else:
+ if rough_edge: return 'showfocus("'+target+'", '+title+',
('+box+'));'+"\n"+'drawRoughEdge(('+box+'));'
+ else: return 'showfocus("'target+'", '+title+', ('+box+'));'
+navidoc.parser.Link.draw_code = link_draw_code
+
class NamedMPElement(NamedElement):
def repl(self, s):
s = s.replace("%%", self.var)
@@ -77,6 +86,7 @@
gen1.close()
gen2 = open(dir+diagram+extension+'.gen.mp.2', 'w')
gen2.write(m.drawCode()+"\n")
+ gen2.write("showlinksize(\"bbox\", (bbox currentpicture));\n")
gen2.close()
gen3 = open(dir+diagram+extension+".gen.mp.3", "w")
gen3.write("""
@@ -124,11 +134,13 @@
els = link.split(',')
if els[0] == '"bbox"':
bbox = els
+ else:
+ links.append(MPLink(els))
dbg(bbox)
# scales the bounding box and prepares it for pstopnm
if (bbox):
- bbox = psbbox(bbox[1:])
+ bbox = psbbox(bbox[2:])
list = bbox.pstopnm(scaling)
dbg(bbox)
@@ -160,6 +172,36 @@
"-urx", self.x[1]/dpi, "-ury", self.y[0]/dpi,
"-xsize", self.w * scale, "-ysize", self.h * scale,
"-xborder", 0, "-yborder", 0]]
+
+class MPLink:
+ def __init__(self, elements):
+ """
+ Initilize MetaPost link. Parse link target, title and corners
+ of linked area from elements read from MP log file.
+ """
+ self.target = re.match('^"(.*)"$', elements[0]).group(1)
+ self.title = re.match('^"(.*)"$', elements[1]).group(1)
+ self.corners = [float(element) for element in elements[2:]]
+ dbg("Link init: "+self.title)
+
+ def map_corners(self, mapper):
+ """
+ Map exact coordinates from corner elements using
+ provided mapper.
+ """
+ dbg("Unmapped corners: "+self.corners)
+ self.corners = [int(element) for element in (
+ mapper(self.corners[0], self.corners[1]) +
+ mapper(self.corners[2], self.corners[3])
+ )]
+ dbg("Mapped corners: "+self.corners)
+
+ def imgmapanchor(self, scale=1.0):
+ return """<area href="%s" shape="rect" coords="%s" target="_top"
title="%s" alt="%s" />\n""" \
+ % (self.target,
+ ",".join(["%s"%(int(c*scale)) for c in self.corners]),
+ self.title,
+ self.title)
class MetapostException(Exception):
def __init__(self, value):
Index: navidoc/navidoc/mp/uml.mp
diff -u navidoc/navidoc/mp/uml.mp:1.1 navidoc/navidoc/mp/uml.mp:1.2
--- navidoc/navidoc/mp/uml.mp:1.1 Wed Mar 26 10:36:17 2003
+++ navidoc/navidoc/mp/uml.mp Thu Mar 27 04:33:48 2003
@@ -19,7 +19,7 @@
% MA 02111-1307 USA
%
-% $Id: uml.mp,v 1.1 2003/03/26 15:36:17 humppake Exp $
+% $Id: uml.mp,v 1.2 2003/03/27 09:33:48 humppake Exp $
%
% Written by Tuomas Lukka
@@ -416,19 +416,19 @@
vardef strpair(expr p) =
(decimal((xpart(p))) & "," & decimal((ypart(p))) )
enddef;
-vardef showlink(expr name, p) =
+vardef showlink(expr target, title, p) =
fill p withcolor (0.8, 0.9, 1);
- showlinksize(name, p);
+ showlinksize(target, title, p);
enddef;
-vardef showlinkerror(expr name, p) =
- showlinksize(name, p);
+vardef showlinkerror(expr target, title, p) =
+ showlinksize(target, title, p);
draw classTitle("BROKEN LINK") shifted ulcorner(p) withcolor (1, 0, 0);
enddef;
-vardef showfocus(expr name, p) =
+vardef showfocus(expr target, title, p) =
fill p withcolor (9, 0.8, 0.7);
- showlinksize(name, p);
+ showlinksize(target, title, p);
enddef;
-vardef showlinksize(expr name, p) =
+vardef showlinksize(expr target, title, p) =
show "LINKRECT("& char(34) & name & char(34) & "," &
strpair((ulcorner(p))) &","& strpair((lrcorner(p))) & ")"
enddef;
Index: navidoc/navidoc/mp/uml.py
diff -u navidoc/navidoc/mp/uml.py:1.1 navidoc/navidoc/mp/uml.py:1.2
--- navidoc/navidoc/mp/uml.py:1.1 Wed Mar 26 10:36:17 2003
+++ navidoc/navidoc/mp/uml.py Thu Mar 27 04:33:48 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: uml.py,v 1.1 2003/03/26 15:36:17 humppake Exp $
+# $Id: uml.py,v 1.2 2003/03/27 09:33:48 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -230,7 +230,7 @@
"%%.stereo = nullpicture;")
return self.repl(s)
def draw_code(self):
- s = linkstr(self.link, "bboxmeasuredpic(%%)") + """
+ s = self.link.draw_code("bboxmeasuredpic(%%)") + """
drawmeasuredpic(%%);
draw bboxmeasuredpic(%%);
"""
@@ -251,7 +251,7 @@
"""
return self.repl(s)
def draw_code(self):
- s = linkstr(self.link, "bboxmeasuredpic(%%)") + """
+ s = self.link.draw_code("bboxmeasuredpic(%%)") + """
drawmeasuredpic(%%);
draw bboxmeasuredpic(%%);
draw (((0,0)--(15,0)--(15,5)--(0,5)--cycle) shifted %%.nw);
@@ -259,8 +259,9 @@
return self.repl(s)
class mptitle(NamedMPElement):
+ key = 'title'
def __init__(self, var, s, l = []):
- #print "mp:",s,l
+ dbg("mp: %s %s" % (s,l))
self.var = var or s
self.name = s
self.do_contents(l)
@@ -272,13 +273,14 @@
"""
return self.repl(s)
def draw_code(self):
- s = linkstr(self.link, "bboxmeasuredpic(%%)", 0) + """
+ s = self.link.draw_code("bboxmeasuredpic(%%)", 0) + """
drawmeasuredpic(%%);
"""
return self.repl(s)
# XXX underlining
class mpseqobject(SimpleElement):
+ key = 'seqobject'
def setup_code(self):
s = """
picture %%.titl, %%.pict;
@@ -302,6 +304,7 @@
return self.repl(s)
class mpcomponent(SimpleElement):
+ key = 'component'
def setup_code(self):
s = """
picture %%.titl, %%.pict;
@@ -314,6 +317,7 @@
return self.repl(s)
class mpinterface(SimpleElement):
+ key = 'interface'
def setup_code(self):
s = """
picture %%.titl, %%.pict, %%.intlabel.pict;
@@ -336,6 +340,7 @@
return self.repl(s)
class mpnary(SimpleElement):
+ key = 'naryassoc'
def setup_code(self):
s = """
picture %%.pict;
@@ -350,6 +355,7 @@
return self.repl(s)
class mpbigpackage(SimpleElement):
+ key = 'bigpackage'
def setup_code(self):
s = """
picture %%.titl.pict;
@@ -366,12 +372,13 @@
fixmeasuredpic(%%);
draw bboxmeasuredpic(%%);
"""+\
- linkstr(self.link, "bboxmeasuredpic(%%.titl)")+"""
+ self.link.draw_code("bboxmeasuredpic(%%.titl)")+"""
fixmeasuredpic(%%.titl);
drawmeasuredpic(%%.titl);"""
return self.repl(s)
class mpqual(NamedMPElement):
+ key = 'qual'
def __init__(self, var, s , list):
self.var = var
self.name = "q"
@@ -394,6 +401,7 @@
return self.repl(s)
class mpassoc(NamedMPElement):
+ key = 'assoc'
class end(NamedMPElement):
def __init__(self, var, list):
self.var = var
@@ -463,12 +471,14 @@
return self.repl(s).replace("START", self.a.obj).replace("END",
self.b.obj)
class mpvobtransform(mpassoc):
+ key = 'vobtransform'
def __init__(self, var, s , list):
mpassoc.__init__(self, var, s , list)
self.a.type = "vobtransformfrom"
self.b.type = "vobtransformto"
class mpvobtransformsub(mpassoc):
+ key = 'vobtransformsub'
def __init__(self, var, s , list):
mpassoc.__init__(self, var, s , list)
self.a.type = "vobtransformfromsub"
@@ -476,6 +486,7 @@
class mpvobin(mpassoc):
+ key = 'vobin'
def __init__(self, var, s , list):
mpassoc.__init__(self, var, s , list)
self.a.type = "vobinfrom"
@@ -509,22 +520,27 @@
return self.repl(s).replace("START", self.start).replace("END",
self.end)
class mpsupply(SimpleRelation):
+ key = 'supply'
def draw_code(self):
return self.pathCode() + self.repl(" draw %%.p; ")
class mpuse(SimpleRelation):
+ key = 'use'
def draw_code(self):
return self.pathCode() + self.repl(" drawarrow %%.p dashed evenly; ")
class mprealize(SimpleRelation):
+ key = 'realize'
def draw_code(self):
return self.pathCode() + self.repl(" realize(%%.p); ")
class mpinherit(SimpleRelation):
+ key = 'inherit'
def draw_code(self):
return self.pathCode() + self.repl(" inherit(%%.p); ")
class mpdep(SimpleRelation):
+ key = 'dep'
def __init__(self, var, s , list):
(m,s) = match_remove('^\s*"(.*?)"\s*', s)
self.stereo = m.group(1)
@@ -533,6 +549,7 @@
return self.pathCode() + self.repl(' dep(%%.p, "%stereo%"); ')
class mpvobsubmatch(SimpleRelation):
+ key = 'vobsubmatch'
def draw_code(self):
return self.pathCode() + self.repl(" vobsubmatch(%%.p); ")
@@ -545,21 +562,25 @@
return ""
class above(placement):
+ key = 'above'
def setup_code(self):
return self.repl(' vertically(%s, %s, %s, %s);' %
(self.length, self.var, self.start, self.end))
class under(placement):
+ key = 'under'
def setup_code(self):
return self.repl(' vertically(%s, %s, %s, %s);' %
(self.length, self.var, self.end, self.start))
class leftOf(placement):
+ key = 'left-of'
def setup_code(self):
return self.repl(' horizontally(%s, %s, %s, %s);' %
(self.length, self.var, self.start, self.end))
class leftOf(placement):
+ key = 'right-of'
def setup_code(self):
return self.repl(' horizontally(%s, %s, %s, %s);' %
(self.length, self.var, self.end, self.start))
Index: navidoc/navidoc/parser.py
diff -u navidoc/navidoc/parser.py:1.1 navidoc/navidoc/parser.py:1.2
--- navidoc/navidoc/parser.py:1.1 Wed Mar 26 10:36:17 2003
+++ navidoc/navidoc/parser.py Thu Mar 27 04:33:48 2003
@@ -19,7 +19,7 @@
# MA 02111-1307 USA
#
-# $Id: parser.py,v 1.1 2003/03/26 15:36:17 humppake Exp $
+# $Id: parser.py,v 1.2 2003/03/27 09:33:48 humppake Exp $
#
# Written by Tuomas Lukka, Asko Soukka
@@ -44,23 +44,29 @@
"""
Gather available elements and linktypes from modules.
"""
- element_types = keys4classes(navidoc.mp)
- link_types = keys4classes(navidoc.link)
+ #XXX: Fix key-name conflicts
+ element_types.update(keys4classes(navidoc.mp))
+ for module in dir(navidoc.mp):
+ module = getattr(root_module, module)
+ element_types.update(keys4classes(module))
+
+ link_types.update(keys4classes(navidoc.link))
+ for module in dir(navidoc.link):
+ module = getattr(root_module, module)
+ link_types.update(keys4classes(module))
-def keys4classes(root_module):
+def keys4classes(module):
"""
Gather a key -> class dictionary for all classes containing
'key' in sub modules under root module.
"""
d = {}
- for module in dir(root_module):
- module = getattr(root_module, module)
- for elements in dir(module):
- for element in elements:
- element = getattr(module, element)
- if hassattr(element, "key") \
- and type(element.key) == type(''):
- d[element.key] = element
+ for elements in dir(module):
+ for element in elements:
+ element = getattr(module, element)
+ if hassattr(element, "key") \
+ and type(element.key) == type(''):
+ d[element.key] = element
return d
class ParserException(Exception):
@@ -144,16 +150,16 @@
self.handle_contained(el)
dbg("Link: "+self.link)
def handle_contained(self, el):
- if el[0] == "link":
+ if link_types.has_key(el[0]):
link = el[1:]
if len(link):
- self.link = link[0][0]
+ self.link = link_types[el[0]](link[0][0])
else:
self.link = self.defaultlink()
else:
self.list.add_sub_element(self.name, el)
def defaultlink(self):
- return self.name
+ return = navidoc.link.Link(link[0][0])
class ElementList:
"""
@@ -214,123 +220,3 @@
code = "\n".join([element.draw_code() for element in self.list]) + "\n"
return code
-class Link:
- def __init__(self, elements):
- """
- Initilize Link. Parse link name and corners of linked area
- from elements.
- """
- self.name = re.match('^"(.*)"$', elements[0]).group(1)
- self.corners = [float(element) for element in elements[1:]]
- dbg("Link init: "+self.name)
- def map_corners(self, mapper):
- """
- Map exact coordinates from corner elements using
- provided mapper.
- """
- dbg("Unmapped corners: "+self.corners)
- self.corners = [int(element) for element in (
- mapper(self.corners[0], self.corners[1]) +
- mapper(self.corners[2], self.corners[3])
- )]
- dbg("Mapped corners: "+self.corners)
-
- def imgmapanchor(self, scale=1.0):
- pass
-# if titles.has_key(self.name):
-# return """<area href="%s" shape="rect" coords="%s" target="_top"
title="%s" alt="%s" />\n""" \
-# % (target(self.name),
-# ",".join(["%s"%(int(c*scale)) for c in self.corners]),
-# titles[self.name],
-# self.name)
-# else:
-# return """<area href="%s" shape="rect" coords="%s" target="_top"
title="%s" alt="%s" />\n""" \
-# % (target(self.name),
-# ",".join(["%s"%(int(c*scale)) for c in self.corners]),
-# self.name,
-# self.name)
-
- def jlinkstr(box, RoughEdge=1):
- pass
-# if jlink != None:
-# #trimming jlink to comparable
-# name = jlink
-# if name.rfind("#") != -1:
-# name = name[0:name.rfind("#")]
-# if name.endswith(".html"): name = name[0:len(name)-5]
-# if name.endswith(".gen"): name = name[0:len(name)-4]
-# #Marking "Broken link" if file not found
-# if settings.has_key('path'):
-# slash = settings['path'].rfind("/")
-# if slash != -1:
-# path = (settings['path'][0:slash+1] +
target(jlink)).replace("//", "/")
-# else:
-# path = target(jlink).replace("//", "/")
-# if path.rfind("#") != -1:
-# path = path[0:path.rfind("#")]
-# if not os.path.isfile(path):
-# # print path
-# return 'showlinkerror("'+jlink+'", ('+box+'));'
-# else:
-# file = open(path)
-# title = re.compile('<title>([^<]*)</title>')
-# title = title.findall(file.read())
-# file.close()
-# if len(title) > 0: title = title[0]
-# else: title = jlink
-# titles[jlink] = title#
-
-# """ If focus is set and 'focus' matches, focus jlink. """
-# #comparing
-# if settings.has_key('focus') and (\
-# settings['focus'].find("_"+name.replace(".", "_")+".") != -1
or \
-# settings['focus'].find("_"+name.replace(".", "_")+"_package")
!= -1):
-# if RoughEdge: return 'showfocus("'+jlink+'",
('+box+'));'+"\n"+'drawRoughEdge(('+box+'));'
-# else: return 'showfocus("'+jlink+'", ('+box+'));'
-# return 'showjlink("'+jlink+'", ('+box+'));'
-# return ""
-
- def target(jlink):
- pass
-# """Returns target file of the jlink with
-# path from the current directory."""
-# ts = jlink.split(".")
-# if re.search("html", ts[-1]):
-# settings2 = settings.copy()
-# if settings.has_key('path') and settings.has_key('tmpdir') \
-# and settings.has_key('name'):
-# if
(os.path.isfile(mputils._slashify(settings['tmpdir'])+settings['name']+".gen.refers")):
-# refer_file =
open(mputils._slashify(settings['tmpdir'])+settings['name']\
-# +".gen.refers", "r")
-# #print "NEEDLE:", ts[-3].split("/")[-1]
-# refers = refer_file.readlines()
-# if len(refers) > 0 and \
-# "".join([refer for refer in
refers]).find(ts[-3].split("/")[-1]) == -1:
-# tmp = mputils.transition_path(settings['path'],
refers[0].replace(".rst", ".gen.html"))
-# slash = tmp.rfind("/")
-# if slash != -1:
-# settings['to_context'] =
(tmp[0:slash+1]).replace("//", "/")
-# #print "REFERS:",refers
-# #print "PATH:", settings['path']
-# #print "JLINK:",jlink
-# #print "TO_CONTEXT:", settings['to_context']
-# refer_file.close()
-# if settings.has_key('to_context') and not \
-# jlink.startswith(settings['to_context']):
-# if settings['to_context'].endswith("/"):
-# target = settings['to_context']+jlink
-# else:
-# target = settings['to_context']+"/"+jlink
-# while target.startswith("/"):
-# target = target[1:len(target)]
-# else: target = jlink
-# settings.restore(settings2)
-# elif re.match("^[a-z]", ts[-1]):
-# target = (settings['to_javadoc']+"/"\
-# +"/".join(ts)
-# + "/package-summary.html#package_description")
-# else:
-# target = (settings['to_javadoc']+"/"\
-# +"/".join(ts)
-# + ".html")
-# return target
Index: navidoc/rst2any.py
diff -u navidoc/rst2any.py:1.13 navidoc/rst2any.py:1.14
--- navidoc/rst2any.py:1.13 Wed Mar 26 10:36:17 2003
+++ navidoc/rst2any.py Thu Mar 27 04:33:48 2003
@@ -71,7 +71,7 @@
"""
Runs docutils for a single file.
"""
- last_dot = input.rfind('.')
+ last_dot = input.replace("../", "__/").rfind('.')
if last_dot != -1: output = input[:last_dot]
else: output = input
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gzz-commits] navidoc ./rst2any.py navidoc/parser.py navidoc/...,
Asko Soukka <=