[Gzz-commits] navidoc doc/syntax.rst navidoc/parser.py navido...

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/06/11 05:32:59

Modified files:
        doc            : syntax.rst 
        navidoc        : parser.py 
        navidoc/link   : __init__.py 

Log message:
        alternative link syntax

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/doc/syntax.rst.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/parser.py.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/__init__.py.diff?tr1=1.22&tr2=1.23&r1=text&r2=text

Patches:
Index: navidoc/doc/syntax.rst
diff -u navidoc/doc/syntax.rst:1.4 navidoc/doc/syntax.rst:1.5
--- navidoc/doc/syntax.rst:1.4  Wed Jun 11 03:49:34 2003
+++ navidoc/doc/syntax.rst      Wed Jun 11 05:32:59 2003
@@ -2,6 +2,7 @@
 UML Syntax
 ==========
 
+
 Testi
 =====
 
@@ -14,6 +15,8 @@
                bar
 
    class (bar) foo2
+
+   jlink bar
 
    ---
    vertically(50, hor_c, bar, foo);
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.22 
navidoc/navidoc/link/__init__.py:1.23
--- navidoc/navidoc/link/__init__.py:1.22       Wed Jun 11 03:49:34 2003
+++ navidoc/navidoc/link/__init__.py    Wed Jun 11 05:32:59 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: __init__.py,v 1.22 2003/06/11 07:49:34 humppake Exp $
+#$Id: __init__.py,v 1.23 2003/06/11 09:32:59 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -39,12 +39,12 @@
 class Link (navidoc.Element):
     key = 'link'
 
-    title = None
-    bbox = None
+    title = '' #None
+    bbox = '' #None
     focus = 0
     rough_edge = 1
     error = 0
-    target = None
+    target = '' #None
 
     def __init__(self, var, toks, list):
         """
@@ -52,12 +52,12 @@
         """
        dbg("link: %s %s %s" % (var, toks,list))
 
+        self.var = var or toks[0]
+        self.title = toks[0]
+
         if config.link_base_directory == None:
             redirection_path = config.working_directory
         else: redirection_path = config.link_base_directory
-            
-        if (len(toks) > 0):
-            self.title = toks[0]
 
         if (len(toks) > 1):
             """
Index: navidoc/navidoc/parser.py
diff -u navidoc/navidoc/parser.py:1.17 navidoc/navidoc/parser.py:1.18
--- navidoc/navidoc/parser.py:1.17      Wed Jun 11 03:49:34 2003
+++ navidoc/navidoc/parser.py   Wed Jun 11 05:32:59 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: parser.py,v 1.17 2003/06/11 07:49:34 humppake Exp $
+# $Id: parser.py,v 1.18 2003/06/11 09:32:59 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -156,7 +156,10 @@
 Please, use syntax "foo = class foo123" or "class (foo) foo123"
 and refer it later using "foo".'
 """ % (s))
-            
+
+        if isinstance(element, navidoc.link.Link):
+            element.bbox = 'bboxmeasuredpic(%s)' % (element.var)
+
         return element
 
     def setup_code(self):