[Gzz-commits] navidoc navidoc/link/docxx.py navidoc/mp/uml.py...

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/06/06 08:17:07

Modified files:
        navidoc/link   : docxx.py 
        navidoc/mp     : uml.py 
Added files:
        doc            : syntax.rst 

Log message:
        syntax sketch and some fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/doc/syntax.rst?rev=1.1
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/docxx.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.py.diff?tr1=1.14&tr2=1.15&r1=text&r2=text

Patches:
Index: navidoc/navidoc/link/docxx.py
diff -u navidoc/navidoc/link/docxx.py:1.3 navidoc/navidoc/link/docxx.py:1.4
--- navidoc/navidoc/link/docxx.py:1.3   Thu Jun  5 03:42:45 2003
+++ navidoc/navidoc/link/docxx.py       Fri Jun  6 08:17:07 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: docxx.py,v 1.3 2003/06/05 07:42:45 humppake Exp $
+#$Id: docxx.py,v 1.4 2003/06/06 12:17:07 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -68,7 +68,10 @@
         navidoc.link.Link.__init__(self, var, s, list)
 
         if not self.target or self.error:
-            self.target = s.strip()
+            self.error = 0
+            if len(list) > 0 and len(list[0][0]) > 0:
+                self.target = list[0][0].strip()
+            else: self.target = s.strip()
             self.set_target()
             self.set_status()
             dbg(self.key+" Doc++ target: %s, error: %s" % (self.target, 
self.error))
Index: navidoc/navidoc/mp/uml.py
diff -u navidoc/navidoc/mp/uml.py:1.14 navidoc/navidoc/mp/uml.py:1.15
--- navidoc/navidoc/mp/uml.py:1.14      Wed May 28 05:42:57 2003
+++ navidoc/navidoc/mp/uml.py   Fri Jun  6 08:17:07 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: uml.py,v 1.14 2003/05/28 09:42:57 humppake Exp $
+# $Id: uml.py,v 1.15 2003/06/06 12:17:07 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -372,8 +372,8 @@
 class mpqual(navidoc.mp.MetapostElement):
     key = 'qual'
     def __init__(self, var, s, list):
-       self.var = var
-       self.name = "q"
+       self.var = var or s
+       self.name = s
        self.fields = []
        self.do_contents(list)
     def handle_contained(self, el):