add wp_imgswap2.py for new OSDN Magazine

[otptools/otptools.git] / markupper.py

diff --git a/markupper.py b/markupper.py
index 779b2de..bfdcdc6 100644 (file)
--- a/markupper.py
+++ b/markupper.py
@@ -115,6 +115,12 @@ class Markupper(object):
             elif re.search(ur"^☆end-column", line):
                 self._end_column(line)
                 continue
+            elif re.search(ur"^☆begin-note:", line):
+                self._begin_note(line)
+                continue
+            elif re.search(ur"^☆end-note", line):
+                self._end_note(line)
+                continue
             elif re.search(ur"^☆space", line):
                 self._space(line)
                 continue
@@ -148,6 +154,9 @@ class Markupper(object):
             elif re.search(ur"^☆リスト", line):
                 self._list(line)
                 continue
+            elif re.search(ur"^☆実行例", line):
+                self._list(line)
+                continue
             elif re.search(ur"^☆flow", line):
                 self._flow(line)
                 continue
@@ -294,6 +303,7 @@ class Markupper(object):
         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)
@@ -329,7 +339,6 @@ class Markupper(object):
         print "</ol>\n"
 
 
-
     def _begin_column(self, line):
         """Proccess column"""
         try:
@@ -348,6 +357,25 @@ class Markupper(object):
 </div>
     """
 
+    def _begin_note(self, line):
+        """Proccess note"""
+        try:
+            str_title = re.search(ur"^☆begin-note:(.*)$", line).group(1)
+        except AttributeError:
+            str_title = ""
+
+        html = """
+<div class="column" style="background:#F0F8FF;border:1px solid gray; font-size:85%%;padding:8px 8px 4px;margin-bottom: 1em;"> 
+"""
+        if len(str_title.strip()) > 0:
+            html = html + "<strong>%s</strong>" % (str_title)
+        print html
+
+    def _end_note(self, line):
+        print """
+</div>
+    """
+
     def _list_start(self):
         return "<pre>"
 
@@ -356,7 +384,7 @@ class Markupper(object):
 
     def _list(self, line):
         try:
-            str_title = re.search(ur"^☆(リスト.*)$", line).group(1)
+            str_title = re.search(ur"^☆((リスト|実行例).*)$", line).group(1)
         except AttributeError:
             str_title = ""
         print "<p class='caption'><b>%s</b></p>" % (str_title)