move defualt_markup_rules to each subrules.

[otptools/otptools.git] / markupper.py

diff --git a/markupper.py b/markupper.py
index fc4042c..3de80fe 100755 (executable)
--- a/markupper.py
+++ b/markupper.py
@@ -80,7 +80,7 @@ class Markupper(object):
 
         self._anchor = ""
         for line in self.input_iter:
-            line = self._default_markup_rule(line)
+            # line = self._default_markup_rule(line)
             # head-of-line rules
             if re.search(ur"^☆{{{$", line):
                 self._inline(line)
@@ -138,6 +138,7 @@ class Markupper(object):
                 self._paragraph(line)
                 continue
 
+
             if re.search(r"^\s*$", line):
                 line = ""
 
@@ -147,6 +148,7 @@ class Markupper(object):
         # end-of-loop
 
     def _head_l(self, line):
+        line = self._default_markup_rule(line)
         if self._anchor != "":
             line = re.sub(ur"^●(.*)$", ur'<h4 id="%s">\1</h4>' % self._anchor, line)
             self._anchor = ""
@@ -155,6 +157,7 @@ class Markupper(object):
         print line
 
     def _head_m(self, line):
+        line = self._default_markup_rule(line)
         if self._anchor != "":
             line = re.sub(ur"^○(.*)$", ur'<b id="%s">\1</b>' % self._anchor, line)
             self._anchor = ""
@@ -163,7 +166,7 @@ class Markupper(object):
         print line
 
     def _paragraph(self, line):
-        #line = self._escape(line)
+        line = self._default_markup_rule(line)
         line = "<p>" + line + "</p>"
         print line
 
@@ -236,7 +239,7 @@ class Markupper(object):
         @param line: string to apply markup
         @type line: string
         """
-        #line = self._escape(line)
+        line = self._escape(line)
 
         # apply filter
         # line = tag_filter.apply(line)
@@ -247,6 +250,7 @@ class Markupper(object):
         line = re.sub(ur"[★*]b\[(.*?)\]", ur"<b>\1</b>", line)
         line = re.sub(ur"[★*]b\{(.*?)\}", ur"<b>\1</b>", line)
         line = re.sub(ur"[★*]\[(\S*) (.*?)\]", r'<a href="\1">\2</a>', line)
+        line = re.sub(ur"[★*]\[(\S*)\]", r'<a href="\1">\1</a>', line)
 
         # comment
         if re.search(ur"^☆#", line):
@@ -259,6 +263,7 @@ class Markupper(object):
         """Proccess ul"""
         print "<ul>"
         while re.search(ur"^・", line):
+            line = self._default_markup_rule(line)
             print re.sub(ur"^・(.*)$", ur"<li>\1</li>", line.strip())
             line = self.input_iter.next()
         print "</ul>\n"
@@ -297,9 +302,7 @@ class Markupper(object):
 
         for line in self.input_iter:
             line = line.strip("\n\r")
-            line = line.replace("&", "&amp;")
-            line = line.replace("<", "&lt;")
-            line = line.replace(">", "&gt;")
+            line = self._escape(line)
             if re.search(ur"""^☆\+---""", line):
                 break
             print line
@@ -309,10 +312,7 @@ class Markupper(object):
         print self._list_start()
 
         for line in self.input_iter:
-            #        line = line.strip()
-            line = line.replace("&", "&amp;")
-            line = line.replace("<", "&lt;")
-            line = line.replace(">", "&gt;")
+            line = self._escape(line)
             line = line = re.sub(ur"[★*]b\[(.*?)]", ur"<b>\1</b>", line)
             line = line = re.sub(ur"[★*]b{(.*?)}", ur"<b>\1</b>", line)
 
@@ -321,7 +321,6 @@ class Markupper(object):
             print line,
         print self._list_end()
 
-
     def _inline(self, line):
         for line in self.input_iter:
             #        line = line.strip()
@@ -329,7 +328,6 @@ class Markupper(object):
                 break
             print line,
 
-
     def _comment(self, line):
         for line in self.input_iter:
             line = line.strip()
@@ -523,6 +521,7 @@ class Markupper(object):
         footnote = ""
         for line in self.input_iter:
             line = line.strip(" \n")
+            line = self._default_markup_rule(line)
             if re.search(ur"^\s*$", line):
                 break
             if re.search(ur"^※", line):