コミット: 5649b28e2f691304c4faddbd26f6625dc3ea2dd6 - tlexi (git)

generic text markup tools

コミットメタ情報

• リビジョン: 5649b28e2f691304c4faddbd26f6625dc3ea2dd6 (tree)
• 日時: 2013-11-18 20:22:38
• 作者: hylom <hylom@hylo...>
• コミッター: hylom

ログメッセージ

add ctable plugin

変更サマリ

• modified: ctable.json
• add: plugins/ctable.py
• add: test/ctable.txt
• add: test/test_ctable.sh
• modified: textparser.py

差分

--- a/ctable.json
+++ b/ctable.json
@@ -1,12 +1,30 @@
 {
-  "rules": {
+  "usePlugins": [
+    "ctable"
+  ],
+  "modes": {
+    "global": {
+      "rules": {
+      },
+      "transitions": [
+        "figure", 
+        "code", 
+        "langCode", 
+        "ctable",
+        "unOrderdList",
+        "note",
+        "comment",
+        "codeList"
+      ]
+    },
     "ctable": {
       "extends": "table",
       "rules": {
         "tableRow": {
           "priority": 102, 
           "regexp": "^(.*)$", 
-          "call:" ["ctable.tableRow", "$1"]
+          "call": [ "ctable.tableRow", "$1" ],
+          "replace": ""
         }, 
         "tableHeaderRow": {
           "priority": 104, 
@@ -15,7 +33,8 @@
             "isHeader", 
             "yes"
           ], 
-          "call:" ["ctable.tableHeaderRow", "$1"]
+          "call": ["ctable.tableHeaderRow", "$1"],
+          "replace": ""
         }, 
         "tableCell": {
           "priority": 103, 
@@ -23,9 +42,11 @@
           "replace": "\\t"
         }
       },
+      "begin": "^☆表.*", 
+      "end": "^\\s*$", 
       "onFinished": {
-        "call:" ["ctable.getTable"],
-        "insert": "${table}"
+        "call": ["ctable.flushTable"],
+        "insert": "${ctable}\n</table></div>\n"
       }
     }
   }

--- /dev/null
+++ b/plugins/ctable.py
@@ -0,0 +1,31 @@
+# 
+# -*- codeing: utf-8 -*-
+'ctable.py'
+
+import re
+
+table_rows = []
+
+def tableRow(context, args):
+    line = args[0]
+    cells = line.split("\t")
+    table_rows.append(cells)
+    return []
+
+def tableHeaderRow(context, args):
+    return tableRow(context, args)
+
+def renderTable(context, args):
+    buf = ""
+    for row in table_rows:
+        buf += "<tr>\n  "
+        for cell in row:
+            buf += "<td>" + cell + "</td>"
+        buf += "\n</tr>"
+    return [('ctable', buf)]
+
+def flushTable(context, args):
+    ret = renderTable(context, args)
+    table_rows = []
+    return ret
+

--- /dev/null
+++ b/test/ctable.txt
@@ -0,0 +1,14 @@
+
+●ctableのテスト
+
+　ctableでは、空セルが自動的に上下のセルに連結されます。
+
+○実例
+
+☆表1 ctableの例
+〓見出し1	見出し2	見出し3	見出し4
+アイテム11	アイテム21	アイテム31	アイテム41
+	アイテム22	アイテム32	アイテム42
+アイテム13		アイテム33	アイテム43
+アイテム14		アイテム34	アイテム44
+

--- /dev/null
+++ b/test/test_ctable.sh
@@ -0,0 +1,3 @@
+python ../tlexi.py -r ../jarkup.json -a ../ctable.json ctable.txt out.txt
+cat out.txt
+

--- a/textparser.py
+++ b/textparser.py
@@ -109,6 +109,15 @@ class Mode(object):
         '''action when mode finished'''
         if self.has_attr("onFinished"):
             m = self.attr("onFinished")
+            if "call" in m:
+                param = m["call"]
+                (func, args) = param[0], param[1:]
+                if func in writer.functions:
+                    context = writer.store
+                    args = [writer._expand_variable(x, match) for x in args]
+                    results = writer.functions[func](context, args)
+                    for (k, v) in results:
+                        writer.store.save(k, v)
             if "insert" in m:
                 writer.write(m["insert"])
             if "replace" in m:
@@ -176,9 +185,14 @@ def embed_loader(parser, name):
     plugins = __import__(mod_name, globals(), locals(), [], -1)
     mod = plugins.__getattribute__(name)
     for elem in mod.__dict__:
+        if elem[0] == '_':
+            continue
+        func = mod.__getattribute__(elem)
+        if not hasattr(func, '__call__'):
+            continue
         func_name = name + "." + elem
-        parser.add_function(func_name, mod.__getattribute__(elem))
-        print func_name
+        parser.add_function(func_name, func)
+        print "load_function: " + func_name
 
 class Parser(object):
     """markupper class"""
@@ -227,8 +241,11 @@ class Parser(object):
         except StopIteration:
             return
 
-    def write(self, text):
+    def raw_write(self, text):
         self.stream_out.write(text)
+
+    def write(self, text):
+        self.raw_write(self._expand_variable(text))
         
     def _expand_variable(self, text, match=None):
         if text.find(u'$') < 0:
@@ -339,6 +356,7 @@ class Parser(object):
         if 'continue' in rule:
             if rule['continue'] == False:
                 return (True, text)
+
         return (False, text)