add otpuploader

[otptools/otptools.git] / markupper.py

diff --git a/markupper.py b/markupper.py
index 32716e0..dd3e4e9 100644 (file)
--- a/markupper.py
+++ b/markupper.py
@@ -272,11 +272,11 @@ class Markupper(object):
         # apply filter
         # line = tag_filter.apply(line)
 
-        line = re.sub(ur"[★*](表[0-9〜、]+)", ur"<b>\1</b>", line)
-        line = re.sub(ur"[★*](図[0-9〜、]+)", ur"<b>\1</b>", line)
-        line = re.sub(ur"[★*](写真[0-9〜、]+)", ur"<b>\1</b>", line)
-        line = re.sub(ur"[★*](リスト[0-9〜、]+)", ur"<b>\1</b>", line)
-        line = re.sub(ur"[★*](コラム[0-9〜、]+)", ur"<b>\1</b>", line)
+        line = re.sub(ur"[★*](表[0-9〜～、]+)", ur"<b>\1</b>", line)
+        line = re.sub(ur"[★*](図[0-9〜～、]+)", ur"<b>\1</b>", line)
+        line = re.sub(ur"[★*](写真[0-9〜～、]+)", ur"<b>\1</b>", line)
+        line = re.sub(ur"[★*](リスト[0-9～〜、]+)", ur"<b>\1</b>", line)
+        line = re.sub(ur"[★*](コラム[0-9〜～、]+)", ur"<b>\1</b>", line)
         line = re.sub(ur"[★*]b\[(.*?)\]", ur"<b>\1</b>", line)
         line = re.sub(ur"[★*]b\{(.*?)\}", ur"<b>\1</b>", line)
         line = re.sub(ur"[★*]g\[(.*?)]", ur"<span style='color:#F55;font-weight:bold;'>\1</span>", line)
@@ -319,7 +319,7 @@ class Markupper(object):
             str_title = ""
 
         html = """
-<div class="column" style="background:#DDDDDD;font-size:85%;padding:8px;"> 
+<div class="column" style="background:#DDDDDD;font-size:85%%;padding:8px;"> 
 <h4>%s</h4>
     """ % (str_title)
         print html