[Gzz-commits] navidoc/navidoc modules/imagemap.py mp/__init__.py

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/04/24 06:26:14

Modified files:
        navidoc/modules: imagemap.py 
        navidoc/mp     : __init__.py 

Log message:
        another fix

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/modules/imagemap.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.16&tr2=1.17&r1=text&r2=text

Patches:
Index: navidoc/navidoc/modules/imagemap.py
diff -u navidoc/navidoc/modules/imagemap.py:1.1 
navidoc/navidoc/modules/imagemap.py:1.2
--- navidoc/navidoc/modules/imagemap.py:1.1     Thu Apr 24 03:48:04 2003
+++ navidoc/navidoc/modules/imagemap.py Thu Apr 24 06:26:14 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: imagemap.py,v 1.1 2003/04/24 07:48:04 humppake Exp $
+#$Id: imagemap.py,v 1.2 2003/04/24 10:26:14 humppake Exp $
 
 #
 # Written by Asko Soukka
@@ -150,7 +150,7 @@
     log = log.replace("\n",'') # MetaPost (mpost) splits lines awkwardly in 
the log.
     
     # Grep all linked areas from log file.
-    for link in re.findall('LINKRECT\((.*?)\)', log):
+    for link in re.findall('\"LINKRECT\((.*?)\)\"', log):
        els = link.split(',')
         if els[0] != '"bbox"': return 1
 
@@ -166,7 +166,7 @@
     bbox = None
 
     # Grep all linked areas from log file.
-    for link in re.findall('LINKRECT\((.*?)\)', log):
+    for link in re.findall('\"LINKRECT\((.*?)\)\"', log):
        els = link.split(',')
         if els[0] == '"bbox"': bbox = els[2:len(els)]
         else: links.append(MPLink(els))
@@ -199,7 +199,7 @@
     log = log.replace("\n",'') # MetaPost (mpost) splits lines awkwardly in 
the log.
 
     # Grep all linked areas from log file.
-    for link in re.findall('LINKRECT\((.*?)\)', log):
+    for link in re.findall('\"LINKRECT\((.*?)\)\"', log):
        els = link.split(',')
        if els[0] != '"bbox"': targets.append(MPLink(els).target)
 
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.16 navidoc/navidoc/mp/__init__.py:1.17
--- navidoc/navidoc/mp/__init__.py:1.16 Thu Apr 24 06:19:49 2003
+++ navidoc/navidoc/mp/__init__.py      Thu Apr 24 06:26:14 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.16 2003/04/24 10:19:49 humppake Exp $
+# $Id: __init__.py,v 1.17 2003/04/24 10:26:14 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -274,6 +274,7 @@
         Initilize MetaPost link. Parse link target, title and corners
         of linked area from elements read from MP log file.
         """
+        print elements
        self.target = re.match('^"(.*)"$', elements[0]).group(1)
        self.title = re.match('^"(.*)"$', elements[1]).group(1)
        self.corners = [float(element) for element in elements[2:]]