From f95b596818a9ade81f9010b25923d0804a0c4469 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <matthias@gamezock.de>
Date: Tue, 11 May 2010 21:38:45 +0200
Subject: Improved module handler; improved mensa formatting

---
 modules/mensa.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'modules/mensa.py')

diff --git a/modules/mensa.py b/modules/mensa.py
index 96f2275..9ff4bcb 100644
--- a/modules/mensa.py
+++ b/modules/mensa.py
@@ -100,8 +100,10 @@ class Module(ModuleBase):
                 s = s.replace('&lt;', '<')
                 s = s.replace('&gt;', '>')
                 s = s.replace('&quot;', '"')
-                s = s.replace('<br />', ' ‒ ')
-                s = re.sub('\s+', ' ', s)
+                s = s.replace('<br />', ' ')
+                s = re.sub(r'-\s+', '-', s)
+                s = re.sub(r'\s+', ' ', s)
+                s = re.sub(r'([a-zäöüß])-([a-zäöüß])', r'\1\2', s)
                 s = re.sub(r'<span[^>]*>(.+?)</span>', r'\1', s)
                 return s
             
-- 
cgit v1.2.3