[Gzz-commits] navidoc ./config.py navidoc/__init__.py navidoc...

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/04/17 03:38:01

Modified files:
        .              : config.py 
        navidoc        : __init__.py parser.py 
        navidoc/link   : __init__.py 
        navidoc/mp     : __init__.py uml.py 

Log message:
        linkwork

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/__init__.py.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/parser.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/__init__.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.py.diff?tr1=1.9&tr2=1.10&r1=text&r2=text

Patches:
Index: navidoc/config.py
diff -u navidoc/config.py:1.15 navidoc/config.py:1.16
--- navidoc/config.py:1.15      Thu Apr 10 05:20:43 2003
+++ navidoc/config.py   Thu Apr 17 03:38:01 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: config.py,v 1.15 2003/04/10 09:20:43 humppake Exp $
+# $Id: config.py,v 1.16 2003/04/17 07:38:01 humppake Exp $
 
 __docformat__ = 'reStructuredText'
 
@@ -31,12 +31,16 @@
 #or be an absolute path.
 os.putenv("MPINPUTS", "../navidoc/mp/")
 
-# global settings needed all around
+# settings for metapost
 mp_directory = '../navidoc/diagrams'
 mp_generate = 1
 mp_eps_only = 0
 
-# global settings needed all around, these
+# settings for linking javadoc
+javadoc_directory = []
+linkpackage = '' # dynamic
+
+# initializing dynamic settings
 # should be automaticly re-set before compiling reST
 working_directory = '.'
 input_filename = ''
Index: navidoc/navidoc/__init__.py
diff -u navidoc/navidoc/__init__.py:1.12 navidoc/navidoc/__init__.py:1.13
--- navidoc/navidoc/__init__.py:1.12    Mon Apr  7 11:58:00 2003
+++ navidoc/navidoc/__init__.py Thu Apr 17 03:38:01 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: __init__.py,v 1.12 2003/04/07 15:58:00 humppake Exp $
+#$Id: __init__.py,v 1.13 2003/04/17 07:38:01 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -93,4 +93,4 @@
            self.handle_contained(element)
 
     def handle_contained(self, element):
-        config.element_list.add_contained_element(self.name, element)
+        config.element_list.add_contained_element(self, element)
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.6 
navidoc/navidoc/link/__init__.py:1.7
--- navidoc/navidoc/link/__init__.py:1.6        Mon Apr  7 11:58:00 2003
+++ navidoc/navidoc/link/__init__.py    Thu Apr 17 03:38:01 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: __init__.py,v 1.6 2003/04/07 15:58:00 humppake Exp $
+#$Id: __init__.py,v 1.7 2003/04/17 07:38:01 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -40,12 +40,12 @@
 
     def __init__(self, var, s, list):
         dbg(self.key+" VAR: %s, S: %s, LIST: %s" % (var, s, list))
-        self.title = ''
+        self.title = s.strip()
         self.bbox = ''
         self.focus = 0
         self.rough_edge = 1
         self.error = 0
-        self.target = ''
+        self.target = s.strip()
 
 #    def __init__(self, var, s, list):
 #      self.seqobjs = []d
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.11 navidoc/navidoc/mp/__init__.py:1.12
--- navidoc/navidoc/mp/__init__.py:1.11 Thu Apr 10 05:20:43 2003
+++ navidoc/navidoc/mp/__init__.py      Thu Apr 17 03:38:01 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.11 2003/04/10 09:20:43 humppake Exp $
+# $Id: __init__.py,v 1.12 2003/04/17 07:38:01 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -38,14 +38,14 @@
 dbg_fail = config.dbg.shorthand('mp.fail')
 
 def link_draw_code(self):
-    if self.error: return 'showlinkerror("'+self.target+'", '+self.title+',  
('+self.bbox+'));'
-    if not self.focus: return 'showlink("'+self.target+'", '+self.title+',  
('+self.bbox+'));'
+    if self.error: return 'showlinkerror("'+self.target+'", "'+self.title+'", 
('+self.bbox+'));'
+    if not self.focus: return 'showlink("'+self.target+'", "'+self.title+'", 
('+self.bbox+'));'
     else:
         if self.rough_edge:
-            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
+            return 'showfocus("'+self.target+'", "'+self.title+'", 
('+self.bbox+'));' \
+                   +"\n"+'drawRoughEdge(('+self.bbox+'));'
+        else: return 'showfocus("'+self.target+'", "'+self.title+'", 
('+self.bbox+'));'
+navidoc.link.Link.draw_code = link_draw_code
 
 class MetapostElement(navidoc.NamedElement):
     def repl(self, s):
Index: navidoc/navidoc/mp/uml.py
diff -u navidoc/navidoc/mp/uml.py:1.9 navidoc/navidoc/mp/uml.py:1.10
--- navidoc/navidoc/mp/uml.py:1.9       Mon Apr  7 11:58:00 2003
+++ navidoc/navidoc/mp/uml.py   Thu Apr 17 03:38:01 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: uml.py,v 1.9 2003/04/07 15:58:00 humppake Exp $
+# $Id: uml.py,v 1.10 2003/04/17 07:38:01 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -191,7 +191,7 @@
        self.methods = self.fields = []
        self.do_contents(list)
         if self.link != None:
-            self.link.bbox('bboxmeasuredpic(%s)' %(self.var))             
+            self.link.bbox = ('bboxmeasuredpic(%s)' %(self.var))             
     def handle_contained(self, el):
        if el[0] == "methods":
            self.methods = el[1:]
Index: navidoc/navidoc/parser.py
diff -u navidoc/navidoc/parser.py:1.9 navidoc/navidoc/parser.py:1.10
--- navidoc/navidoc/parser.py:1.9       Mon Apr  7 11:58:00 2003
+++ navidoc/navidoc/parser.py   Thu Apr 17 03:38:01 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: parser.py,v 1.9 2003/04/07 15:58:00 humppake Exp $
+# $Id: parser.py,v 1.10 2003/04/17 07:38:01 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -86,14 +86,18 @@
        self.list = [self.parse_element(element) for element in list]
        self.list.extend(self.extras)
 
-    def add_contained_element(self, super_name, element):
+    def add_contained_element(self, super, element):
         """
         Add a subelement.
         """
        s = element[0]
         (w,s) = match_remove("^\s*(\w+)\s*", s)
         key = w.group(1)
-        element = self.factor.create_new(key, None, super_name + " " + s, 
element[1:])
+        element = self.factor.create_new(key, None, super.name + " " + s, 
element[1:])
+
+        if isinstance(element, navidoc.link.Link):
+            super.link = element
+
         self.extras.append(element)
 
     def parse_element(self, element):