[Gzz-commits] navidoc/navidoc link/__init__.py mp/__init__.py

[Asko Soukka]

CVSROOT:        /cvsroot/navidoc
Module name:    navidoc
Changes by:     Asko Soukka <address@hidden>    03/05/23 11:00:52

Modified files:
        navidoc/link   : __init__.py 
        navidoc/mp     : __init__.py 

Log message:
        still fixing that title thing

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/link/__init__.py.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/navidoc/navidoc/navidoc/mp/__init__.py.diff?tr1=1.34&tr2=1.35&r1=text&r2=text

Patches:
Index: navidoc/navidoc/link/__init__.py
diff -u navidoc/navidoc/link/__init__.py:1.19 
navidoc/navidoc/link/__init__.py:1.20
--- navidoc/navidoc/link/__init__.py:1.19       Fri May 23 10:37:14 2003
+++ navidoc/navidoc/link/__init__.py    Fri May 23 11:00:52 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-#$Id: __init__.py,v 1.19 2003/05/23 14:37:14 humppake Exp $
+#$Id: __init__.py,v 1.20 2003/05/23 15:00:52 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -110,7 +110,7 @@
         if not self.error and set_title:
             file = open(path)                
             title = re.compile('<title>([^<]*)</title>')
-            strip = re.compile('[a-zA-ZåäöÅÄÖ ]*')
+            strip = re.compile('[a-zA-ZåäöÅÄÖ\- ]*')
             title = title.findall(file.read())
             file.close()
             if len(title) > 0: self.title = strip.findall(title[0])[0]
Index: navidoc/navidoc/mp/__init__.py
diff -u navidoc/navidoc/mp/__init__.py:1.34 navidoc/navidoc/mp/__init__.py:1.35
--- navidoc/navidoc/mp/__init__.py:1.34 Fri May 23 10:37:14 2003
+++ navidoc/navidoc/mp/__init__.py      Fri May 23 11:00:52 2003
@@ -19,7 +19,7 @@
 # MA  02111-1307  USA
 # 
 
-# $Id: __init__.py,v 1.34 2003/05/23 14:37:14 humppake Exp $
+# $Id: __init__.py,v 1.35 2003/05/23 15:00:52 humppake Exp $
 
 #
 # Written by Tuomas Lukka, Asko Soukka
@@ -139,7 +139,7 @@
             except IOError:
                 raise MetapostException("Referenced file %s defined in %s was 
not found." % (refers[id], filepath))
 
-            strip = re.compile('[a-zA-ZåäöÅÄÖ ]*')
+            strip = re.compile('[a-zA-ZåäöÅÄÖ\- ]*')
             if len(title) > 0: title = strip.findall(title[0])[0]
             else: title = refers[id].split("/")[-1].split(".")[0]