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

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/05/23 09:41:40

Modified files:
        .              : config.py 
        navidoc/directives: __init__.py 
        navidoc/link   : __init__.py 
        navidoc/modules: imagemap.py 
        navidoc/mp     : __init__.py uml.mp 
        navidoc/writers: xhtml11.py 

Log message:
        returned clipping

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/directives/__init__.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/__init__.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/modules/imagemap.py.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/uml.mp.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/writers/xhtml11.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: navidoc/config.py
diff -u navidoc/config.py:1.31 navidoc/config.py:1.32
--- navidoc/config.py:1.31      Fri May 23 04:48:36 2003
+++ navidoc/config.py   Fri May 23 09:41:40 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: config.py,v 1.31 2003/05/23 08:48:36 humppake Exp $
+# $Id: config.py,v 1.32 2003/05/23 13:41:40 humppake Exp $
 
 __docformat__ = 'reStructuredText'
 
@@ -29,21 +29,29 @@
 
 #Environmental variable MPINPUTS should be relative to tmpdir,
 #or be an absolute path.
-os.putenv("MPINPUTS", "../navidoc/mp/")
-
-# base_url
-base_rul = 'http://fenfire.org/'
+os.putenv("MPINPUTS", "../../navidoc/navidoc/mp/")
 
 # midfix for generated files
 # don't change this, if you don't know what you are doing :)
-midfix = ".gen"
+midfix = ''
+
+# base_url
+base_url = 'http://himalia.it.jyu.fi/2003/seminars/nörtti/'
+papers_directory = 'papers'
 
-# global settings needed all around
-mp_directory = 'diagrams'
+# settings for metapost
+mp_directory = '../nortti03/diagrams'
 mp_generate = 1
 mp_eps_only = 0
 mp_context_menu = 1
 
+# settings for linking javadoc
+# the search order is ascending, sudden death
+linkpackages = {} # holder of packagenames, will members will be cleaned after 
every diagram
+javadoc_directories = []
+link_redirection = {}
+docxx_directories = []
+
 # initializing dynamic settings
 # should be kept up-to-date in code
 # always when compiling ReST or diagrams
@@ -52,31 +60,6 @@
 output_filename = ''
 link_base_directory = None # if different than working_directory
 
-# settings for linking javadoc
-# the search order is ascending, sudden death
-linkpackages = {} # holder of packagenames, will members will be cleaned after 
every diagram
-javadoc_directories = ['../libvob/doc/javadoc',
-                       '../storm/doc/javadoc',
-                       '../ffdoc/alph/doc/javadoc',
-                       '../fenfire/docs/javadoc',
-                       '../loom/doc/javadoc',
-                       '../navidoc/doc/javadoc'
-                       ]
-link_redirection = {'navidoc': '../navidoc/doc',
-                    'libvob': '../libvob/doc',
-                    'storm': '../storm/doc',
-                    'alph': '../alph/doc',
-                    'fenfire': '../fenfire/docs',
-                    'loom': '../loom/doc',
-                    }
-docxx_directories = ['../libvob/doc/docxx',
-                     '../storm/doc/docxx',
-                     '../alph/doc/docxx',
-                     '../fenfire/docs/docxx',
-                     '../loom/doc/docxx',
-                     '../navidoc/doc/docxx',
-                     ]
-
 # general debug filter
 dbg = navidoc.util.debug.DebugFilter()
 
@@ -84,33 +67,10 @@
 docutils = "./docutils.conf"
 
 # pegs will be sorted after their priority
-pegboard_priorities = {'Current': 1,
-                       'Revising': 2,
-                       'Incomplete': 3,
-                       'Undefined': 4,
-                       'Accepted': 5,
-                       'Implemented': 6,
-                       'Rejected': 7,
-                       'Irrelevant': 8,
-                       }
+pegboard_priorities = {}
 
 # authors and stakeholders to replace with nicknames
-pegboard_authors = {'Tuomas Lukka': 'tjl',
-                    'Tuomas J. Lukka': 'tjl',
-                    'Benja Fallenstein': 'benja',
-                    'Benja': 'benja',
-                    'Asko Soukka': 'humppake',
-                    'Matti Katila': 'mudyc',
-                    'Anton Feldmann': 'anton',
-                    'Tero Mäyränen': 'deetsay',
-                    'Marc Schiereck': 'dreevich',
-                    'Hermanni Hyytiälä': 'hemppah',
-                    'Antti_Juhani Kaijanaho': 'ibid',
-                    'Janne V. Kujala': 'jvk',
-                    'Janne Kujala': 'jvk',
-                    'Tuukka Hastrup': 'tuukkah',
-                    'Vesa Kaihlavirta': 'vegai',
-                    }
+pegboard_authors = {}
 
 # status for pegs without rst or with failing rst
-pegboard_undefined = 'Undefined'
+pegboard_undefined = ''
Index: navidoc/navidoc/directives/__init__.py
diff -u navidoc/navidoc/directives/__init__.py:1.7 
navidoc/navidoc/directives/__init__.py:1.8
--- navidoc/navidoc/directives/__init__.py:1.7  Thu Apr 10 05:20:43 2003
+++ navidoc/navidoc/directives/__init__.py      Fri May 23 09:41:40 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.7 2003/04/10 09:20:43 humppake Exp $
+# $Id: __init__.py,v 1.8 2003/05/23 13:41:40 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -47,7 +47,9 @@
 # some additional options and changes for latex writer
 from docutils.parsers.rst.directives import images
 
-images.image.options['height'] = directives.unchanged;
-images.image.options['width'] = directives.unchanged;
-images.image.options['label'] = directives.unchanged;
-images.image.options['environment'] = directives.unchanged;
+images.image.options['height'] = directives.unchanged
+images.image.options['width'] = directives.unchanged
+images.image.options['label'] = directives.unchanged
+images.image.options['environment'] = directives.unchanged
+
+images.figure.options.update(images.image.options)
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.16 
navidoc/navidoc/link/__init__.py:1.17
--- navidoc/navidoc/link/__init__.py:1.16       Thu May 22 06:52:21 2003
+++ navidoc/navidoc/link/__init__.py    Fri May 23 09:41:40 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: __init__.py,v 1.16 2003/05/22 10:52:21 humppake Exp $
+#$Id: __init__.py,v 1.17 2003/05/23 13:41:40 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -80,7 +80,8 @@
                     link = link[0]
                 if self.target == None or \
                        not os.path.isfile(self.target):
-                    self.target = os.path.normpath(slashify(redirection_path) 
+ link)
+                    if link.startswith('http://'): self.target = link
+                    else: self.target = 
os.path.normpath(slashify(redirection_path) + link)
 
             """
             Final check and setting attributes.
@@ -95,6 +96,10 @@
         file is the current file. Could also parse
         <title> from the file and set it to title.
         """
+        if self.target.startswith('http://'):
+            self.error = 0
+            return
+
         path = self.target
 
         tmp = path.rfind("#")
Index: navidoc/navidoc/modules/imagemap.py
diff -u navidoc/navidoc/modules/imagemap.py:1.7 
navidoc/navidoc/modules/imagemap.py:1.8
--- navidoc/navidoc/modules/imagemap.py:1.7     Thu May 22 06:52:21 2003
+++ navidoc/navidoc/modules/imagemap.py Fri May 23 09:41:40 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: imagemap.py,v 1.7 2003/05/22 10:52:21 humppake Exp $
+#$Id: imagemap.py,v 1.8 2003/05/23 13:41:40 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -198,7 +198,8 @@
     if len(links) > 0:
         bbox = psbbox(bbox)
         for link in links:
-            link.target = relative_path(config.working_directory, link.target)
+            if not link.target.startswith('http://'):
+                link.target = relative_path(config.working_directory, 
link.target)
             link.map_corners(bbox.map_point)
 
         imgmap = '<a id="'+diagram+id_postfix+'"></a>' \
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.32 navidoc/navidoc/mp/__init__.py:1.33
--- navidoc/navidoc/mp/__init__.py:1.32 Fri May 23 04:48:36 2003
+++ navidoc/navidoc/mp/__init__.py      Fri May 23 09:41:40 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.32 2003/05/23 08:48:36 humppake Exp $
+# $Id: __init__.py,v 1.33 2003/05/23 13:41:40 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -201,7 +201,7 @@
     global rough_edges
     for rough_bbox in rough_edges:
         """Print stored roughEdges now, on top of everything else."""
-        gen2.write('drawRoughEdge(('+rough_bbox+'), ('+str(scale)+'));'+"\n")
+        gen2.write('drawRoughEdge(('+rough_bbox+'), (bbox currentpicture), 
('+str(scale)+'));'+"\n")
     gen2.write('showlinksize("bbox", "'+diagram+'", (bbox 
currentpicture));'+"\n")
     gen2.close()
     rough_edges = []
Index: navidoc/navidoc/mp/uml.mp
diff -u navidoc/navidoc/mp/uml.mp:1.8 navidoc/navidoc/mp/uml.mp:1.9
--- navidoc/navidoc/mp/uml.mp:1.8       Fri May 23 04:35:54 2003
+++ navidoc/navidoc/mp/uml.mp   Fri May 23 09:41:40 2003
@@ -19,7 +19,7 @@
 % MA  02111-1307  USA
 % 
 
-% $Id: uml.mp,v 1.8 2003/05/23 08:35:54 humppake Exp $
+% $Id: uml.mp,v 1.9 2003/05/23 13:41:40 humppake Exp $
 
 %
 % Written by Tuomas Lukka
@@ -445,7 +445,7 @@
     jitterpt(point length(p) of p, pta)
 enddef;
 
-vardef drawRoughEdge(expr p, scale) =
+vardef drawRoughEdge(expr p, q, scale) =
     save c, hor, ver, np, j, astart, athrough, aend, na;
     pair c;
     c = center(p);
@@ -474,7 +474,8 @@
     np := jitterpath(np, round(10+uniformdeviate(10)), .125 / scale * j);
     np := jitterpath(np, round(40+uniformdeviate(30)), .025 / scale * j);
 
-    draw np withpen pencircle scaled (4pt/scale) xscaled .4 rotated -37;;
+    draw np withpen pencircle scaled (4pt/scale) xscaled .4 rotated -37;
+    clip currentpicture to q;;
     
 enddef;
 
Index: navidoc/navidoc/writers/xhtml11.py
diff -u navidoc/navidoc/writers/xhtml11.py:1.1 
navidoc/navidoc/writers/xhtml11.py:1.2
--- navidoc/navidoc/writers/xhtml11.py:1.1      Thu Apr 10 05:59:50 2003
+++ navidoc/navidoc/writers/xhtml11.py  Fri May 23 09:41:40 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: xhtml11.py,v 1.1 2003/04/10 09:59:50 humppake Exp $
+# $Id: xhtml11.py,v 1.2 2003/05/23 13:41:40 humppake Exp $
 
 #
 # Modified by Asko Soukka
@@ -27,8 +27,8 @@
 
 # Author: David Goodger (hacked by Navidoc to create xhtml11)
 # Contact: address@hidden
-# Revision: $Revision: 1.1 $
-# Date: $Date: 2003/04/10 09:59:50 $
+# Revision: $Revision: 1.2 $
+# Date: $Date: 2003/05/23 13:41:40 $
 # Copyright: This module has been placed in the public domain.
 
 """
@@ -383,6 +383,8 @@
     def visit_citation_reference(self, node):
         href = ''
         if node.has_key('refid'):
+            if node['refid'].startswith('ref'):
+                node['refid'] = node['refid'][4:]
             href = '#' + node['refid']
         elif node.has_key('refname'):
             href = '#' + self.document.nameids[node['refname']]
@@ -730,6 +732,9 @@
         del atts['uri']
         if not atts.has_key('alt'):
             atts['alt'] = atts['src']
+        if atts.has_key('label'):
+            atts['id'] = atts['label']
+            del atts['label']
         if isinstance(node.parent, nodes.TextElement):
             self.context.append('')
         else: