[Gzz-commits] navidoc ./config.himalia ./config.py navidoc/li...

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/04/25 13:03:09

Modified files:
        .              : config.himalia config.py 
        navidoc/link   : __init__.py 
        navidoc/modules: imagemap.py 
        navidoc/mp     : __init__.py 

Log message:
        dumdedum

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.himalia.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/config.py.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/__init__.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/modules/imagemap.py.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.21&tr2=1.22&r1=text&r2=text

Patches:
Index: navidoc/config.himalia
diff -u navidoc/config.himalia:1.8 navidoc/config.himalia:1.9
--- navidoc/config.himalia:1.8  Fri Apr 25 07:59:20 2003
+++ navidoc/config.himalia      Fri Apr 25 13:03:09 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: config.himalia,v 1.8 2003/04/25 11:59:20 humppake Exp $
+# $Id: config.himalia,v 1.9 2003/04/25 17:03:09 humppake Exp $
 
 __docformat__ = 'reStructuredText'
 
@@ -42,11 +42,13 @@
 mp_generate = 1
 mp_eps_only = 0
 
-# global settings needed all around, these
-# should be automaticly re-set before compiling reST
+# initializing dynamic settings
+# should be kept up-to-date in code
+# always when compiling ReST or diagrams
 working_directory = '.'
 input_filename = ''
 output_filename = ''
+link_base_directory = None # if different than working_directory
 
 # settings for linking javadoc
 javadoc_directories = ['../ffdoc/libvob/javadoc',
Index: navidoc/config.py
diff -u navidoc/config.py:1.20 navidoc/config.py:1.21
--- navidoc/config.py:1.20      Fri Apr 25 07:25:12 2003
+++ navidoc/config.py   Fri Apr 25 13:03:09 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: config.py,v 1.20 2003/04/25 11:25:12 humppake Exp $
+# $Id: config.py,v 1.21 2003/04/25 17:03:09 humppake Exp $
 
 __docformat__ = 'reStructuredText'
 
@@ -53,10 +53,12 @@
 linkpackage = '' # dynamic
 
 # initializing dynamic settings
-# should be automaticly re-set before compiling reST
+# should be kept up-to-date in code
+# always when compiling ReST or diagrams
 working_directory = '.'
 input_filename = ''
 output_filename = ''
+link_base_directory = None # if different than working_directory
 
 # general debug filter
 dbg = navidoc.util.debug.DebugFilter()
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.11 
navidoc/navidoc/link/__init__.py:1.12
--- navidoc/navidoc/link/__init__.py:1.11       Fri Apr 25 09:36:41 2003
+++ navidoc/navidoc/link/__init__.py    Fri Apr 25 13:03:09 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: __init__.py,v 1.11 2003/04/25 13:36:41 humppake Exp $
+#$Id: __init__.py,v 1.12 2003/04/25 17:03:09 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -61,8 +61,13 @@
             for link in list:
                 if type(link) == type([]):
                     link = link[0]
-                if self.target == None or not os.path.isfile(self.target):
-                    self.target = 
os.path.normpath(slashify(config.working_directory) + link)
+                if self.target == None or \
+                       not os.path.isfile(self.target):
+                    if config.link_base_directory == None:
+                        self.target = 
os.path.normpath(slashify(config.working_directory) + link)
+                    else:
+                        self.target = 
os.path.normpath(slashify(config.link_base_directory) + link)
+
             """
             Final check and setting attributes.
             """
@@ -89,8 +94,7 @@
             strip = re.compile('[a-zA-ZåäöÅÄÖ ]*')
             title = title.findall(file.read())
             file.close()
-            if len(title) > 0:
-                self.title = strip.findall(title[0])[0]
+            if len(title) > 0: self.title = strip.findall(title[0])[0]
 
         if not self.error and os.path.abspath(path) \
            == 
os.path.abspath(slashify(config.working_directory)+config.output_filename):
Index: navidoc/navidoc/modules/imagemap.py
diff -u navidoc/navidoc/modules/imagemap.py:1.3 
navidoc/navidoc/modules/imagemap.py:1.4
--- navidoc/navidoc/modules/imagemap.py:1.3     Thu Apr 24 06:59:18 2003
+++ navidoc/navidoc/modules/imagemap.py Fri Apr 25 13:03:09 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: imagemap.py,v 1.3 2003/04/24 10:59:18 humppake Exp $
+#$Id: imagemap.py,v 1.4 2003/04/25 17:03:09 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -107,7 +107,7 @@
 def embed_implicit_diagram(filepath, diagram):
     dbg_navidoc('Embedding implicitly diagram %s into %s' % (diagram, 
filepath))
 
-    init_working_directory = config.working_directory
+    config.link_base_directory = config.working_directory
     init_input_filename = config.input_filename
     init_output_filename = config.output_filename
     
@@ -119,11 +119,18 @@
     html = htmlfile.read()
     htmlfile.close()
 
-    insert = html.find('<a id="'+diagram+'_small">')
+    insert = html.find('<a id="'+diagram+'_implficit">')
     if insert == -1:
+        """
+        Implicit imagemaps are embedded after the first header or after
+        the <body> tag.
+        """
         for index in range(6):
             insert = html.upper().find('</H%s>' % (str(index)))+5
             if insert != 4: break
+        if insert == 4:
+            insert = html.upper().find('<BODY')
+            insert = html.upper().find('>', insert)+1
         insert_left = insert
     else: insert_left = html.find('/>', html.find('<img', insert))+2
     
@@ -139,7 +146,7 @@
         out.write(html[0:insert]);
         create_uml(diagram, context, scale=0.5)
         dbg("Mapping diagram %s within %s" % (diagram, filepath))
-        imgmap = get_imagemap(diagram, context, scale=0.5, id_postfix="_small")
+        imgmap = get_imagemap(diagram, context, scale=0.5, 
id_postfix="_implicit")
         dbg("Diagram %s imagemap: %s" % (diagram, "\n"+str(imgmap)))
         out.write(imgmap)
 
@@ -147,9 +154,10 @@
         out.write(html)
         out.close()
 
-    config.working_directory = init_working_directory
+    config.working_directory = config.link_base_directory
     config.input_filename = init_input_filename
     config.output_filename = init_output_filename
+    config.link_base_directory = None
 
 def is_linked(diagram):
     log = open(slashify(config.mp_directory)+diagram+'.gen.mp.log').read()  
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.21 navidoc/navidoc/mp/__init__.py:1.22
--- navidoc/navidoc/mp/__init__.py:1.21 Fri Apr 25 09:36:41 2003
+++ navidoc/navidoc/mp/__init__.py      Fri Apr 25 13:03:09 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.21 2003/04/25 13:36:41 humppake Exp $
+# $Id: __init__.py,v 1.22 2003/04/25 17:03:09 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -125,10 +125,14 @@
             except IOError:
                 raise MetapostException("Referenced file %s defined in %s was 
not found." % (refers[id], filepath))
 
-            if len(title) > 0: title = title[0]
+            strip = re.compile('[a-zA-ZåäöÅÄÖ ]*')
+            if len(title) > 0: title = strip.findall(title[0])[0]
             else: title = refers[id].split("/")[-1].split(".")[0]
 
-            target = relative_path(config.working_directory, refers[id])
+            if config.link_base_directory == None:
+                target = relative_path(config.working_directory, refers[id])
+            else:
+                target = relative_path(config.link_base_directory, refers[id])
             refer_names[id] = random_var()
 
             element = mptitle(refer_names[id], title,