[Gzz-commits] navidoc doc/syntax.rst navidoc/mp/__init__.py n...

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Branch:         
Changes by:     Asko Soukka <address@hidden>    03/07/28 10:44:35

Modified files:
        doc            : syntax.rst 
        navidoc/mp     : __init__.py uml.mp uml.py 

Log message:
        fixes

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/doc/syntax.rst.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.mp.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.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.12 navidoc/doc/syntax.rst:1.13
--- navidoc/doc/syntax.rst:1.12 Fri Jun 27 06:07:01 2003
+++ navidoc/doc/syntax.rst      Mon Jul 28 10:44:34 2003
@@ -4,7 +4,7 @@
 
 Defining UML diagram begins like any directive definition in reStructuredText::
 
-  ..UML:: foobar
+   .. UML:: foobar
 
 After the definition follows an indented content. The content should
 contain definition part and usually also layout part.
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.43 navidoc/navidoc/mp/__init__.py:1.44
--- navidoc/navidoc/mp/__init__.py:1.43 Mon Jun 30 09:56:10 2003
+++ navidoc/navidoc/mp/__init__.py      Mon Jul 28 10:44:35 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.43 2003/06/30 13:56:10 humppake Exp $
+# $Id: __init__.py,v 1.44 2003/07/28 14:44:35 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -360,7 +360,7 @@
         if self.target == '' and diagram and context:
             self.target = "javascript:setImg('"+diagram+"_img', 
'"+slashify(relative_path(config.working_directory, 
config.mp_directory))+diagram+context+config.midfix+".png', 
'#"+diagram+id_postfix+"_map')"
 
-        if not self.target.startswith('javascript'): diagram = '#'+diagram
+        if not self.target.startswith('javascript') and self.target.find('#') 
== -1: diagram = '#'+diagram
         else: diagram = ''
 
         return """<area href="%s%s" shape="rect" coords="%s" target="%s" 
title="%s" alt="%s" />""" \
Index: navidoc/navidoc/mp/uml.mp
diff -u navidoc/navidoc/mp/uml.mp:1.15 navidoc/navidoc/mp/uml.mp:1.16
--- navidoc/navidoc/mp/uml.mp:1.15      Mon Jun 16 14:00:48 2003
+++ navidoc/navidoc/mp/uml.mp   Mon Jul 28 10:44:35 2003
@@ -19,7 +19,7 @@
 % MA  02111-1307  USA
 % 
 
-% $Id: uml.mp,v 1.15 2003/06/16 18:00:48 humppake Exp $
+% $Id: uml.mp,v 1.16 2003/07/28 14:44:35 humppake Exp $
 
 %
 % Written by Tuomas Lukka
@@ -74,6 +74,7 @@
     fixmeasuredpic(a);
     (a.n--a.ne--a.e--a.se--a.s--a.sw--a.w--a.nw--cycle)
 enddef;
+
 
 %%%%%%%%%%%%%%%%%%%
 %
Index: navidoc/navidoc/mp/uml.py
diff -u navidoc/navidoc/mp/uml.py:1.22 navidoc/navidoc/mp/uml.py:1.23
--- navidoc/navidoc/mp/uml.py:1.22      Mon Jun 30 09:56:10 2003
+++ navidoc/navidoc/mp/uml.py   Mon Jul 28 10:44:35 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: uml.py,v 1.22 2003/06/30 13:56:10 humppake Exp $
+# $Id: uml.py,v 1.23 2003/07/28 14:44:35 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -365,50 +365,60 @@
         self.elements = []
        self.var = var or toks[0]
        self.name = toks[0]
-       self.do_contents(list)
+
+        self.link = None
+
+        for element in list:
+            try: # try to make contained element work on it's own
+                element = config.element_list.parse_element(element)
+                if len(config.element_list.extras) > 0 and \
+                       isinstance(config.element_list.extras[0], 
navidoc.link.Link):
+                    
config.element_list.list.append(config.element_list.extras.pop(0))
+                config.element_list.list.append(element)
+                if hasattr(element, 'var') and element.var:
+                    self.elements.append(element.var)
+            except IndexError, e: # didn't work, add it as contained (usually 
links)
+                config.element_list.add_contained_element(self, element)
 
         if self.link != None:
-            self.link.bbox = ('bboxmeasuredpic(%s)' % (self.var))
-    def handle_contained(self, element):
-        element = config.element_list.parse_element(element)
-        config.element_list.list.append(element)
-        if hasattr(element, 'var') and element.var:
-            self.elements.append(element.var)
+            self.link.bbox = ('bboxmeasuredpic(%s.titl)' % (self.var))
+
     def setup_code(self):
-        titlebox = """
-           addto %%.titl.pict doublepath 
(urcorner(%%.titl.pict)--lrcorner(%%.titl.pict)) withpen currentpen;
-           addto %%.titl.pict doublepath 
(ulcorner(%%.titl.pict)--llcorner(%%.titl.pict)) withpen currentpen;
-           addto %%.titl.pict doublepath 
(ulcorner(%%.titl.pict)--urcorner(%%.titl.pict)) withpen currentpen;
-            """
-       s = """
-           picture %%.titl.pict;
-           %%.titl.pict = classTitle("%name%");
-            setbounds %%.titl.pict to bbox %%.titl.pict;
-            """
-        if not self.elements: s = s + titlebox
-        s = s + """
-           unknownpicmeasurements(%%);
-           picmeasurements(%%.titl);
-           %%.titl.sw = %%.nw;
-           """
-        if self.elements: s = s + titlebox
-       return self.repl(s)
+        s = """
+        picture %%.titl.pict;
+        %%.titl.pict = classTitle("%name%");
+        setbounds %%.titl.pict to bbox %%.titl.pict;
+
+        addto %%.titl.pict doublepath 
(urcorner(%%.titl.pict)--lrcorner(%%.titl.pict)) withpen currentpen;
+       addto %%.titl.pict doublepath 
(ulcorner(%%.titl.pict)--llcorner(%%.titl.pict)) withpen currentpen;
+       addto %%.titl.pict doublepath 
(ulcorner(%%.titl.pict)--urcorner(%%.titl.pict)) withpen currentpen;
+
+        unknownpicmeasurements(%%);
+        picmeasurements(%%.titl);
+       %%.titl.sw = %%.nw;
+       """
+        return self.repl(s)
     def draw_code(self):
-        s = ''
         if self.elements:
             elements_sw_x = 'xpart ' + '.sw, xpart '.join(self.elements) + 
'.sw'
             elements_sw_y = 'ypart ' + '.sw, ypart '.join(self.elements) + 
'.sw'
             elements_ne_x = 'xpart ' + '.ne, xpart '.join(self.elements) + 
'.ne'
             elements_ne_y = 'ypart ' + '.ne, ypart '.join(self.elements) + 
'.ne'
-            
-            s = """
-            %%.sw = (min("""+elements_sw_x+"""), min("""+elements_sw_y+""")) - 
(10,10);
-            %%.ne = (max("""+elements_ne_x+"""), max("""+elements_ne_y+""")) + 
(10,10);
-            """
-        s = s + """
-            draw bboxmeasuredpic(%%);
-            drawmeasuredpic(%%.titl);
+        
+        s = ''
+        if self.elements:
+            s += """
+        %%.sw = (min("""+elements_sw_x+"""), min("""+elements_sw_y+""")) - 
(10,10);
+        %%.ne = (max("""+elements_ne_x+"""), max("""+elements_ne_y+""")) + 
(10,10);
+
             """
+        s += """
+        picmeasurements(%%.titl);
+        %%.titl.sw = %%.nw;
+
+        draw bboxmeasuredpic(%%);
+        drawmeasuredpic(%%.titl);
+        """
        return self.repl(s)
 
 class mpqual(navidoc.mp.MetapostElement):