Commit: 18f5a22b3e7afc176d2ee7728b80e351060a9822 - tlexi (git)

generic text markup tools

Commit MetaInfo

• Revisión: 18f5a22b3e7afc176d2ee7728b80e351060a9822 (tree)
• Tiempo: 2013-09-01 22:26:08
• Autor: hylom <hylom@hylo...>
• Commiter: hylom

Log Message

update jarkup.json: enable textlink in table

Cambiar Resumen

• modified: jarkup.json
• modified: textparser.py

Diferencia incremental

--- a/jarkup.json
+++ b/jarkup.json
@@ -42,6 +42,23 @@
         "regexp": "\\*b\\[(.*?)]", 
         "replace": "<strong>\\1</strong>"
       }
+    },
+    "inline": {
+      "textLink": {
+        "priority": 100, 
+        "regexp": "\\*\\[(https?:/[^ ]*?)\\s+(.*?)]", 
+        "replace": "<a href=\"\\1\">\\2</a>"
+      }, 
+      "rawLink": {
+        "priority": 101, 
+        "regexp": "\\*\\[(https?:/[^ ]*?)]", 
+        "replace": "<a href=\"\\1\">\\1</a>"
+      }, 
+      "refference": {
+        "priority": 102, 
+        "regexp": "\\*(図|表|リスト|実行例)([0-9A-Za-z、]+)", 
+        "replace": "<strong>\\1\\2</strong>"
+      }
     }
   },
   "modes": {
@@ -72,6 +89,7 @@
       "transitions": [
         "figure", 
         "code", 
+        "langCode", 
         "table",
         "unOrderdList",
         "note",
@@ -98,7 +116,7 @@
       }
     }, 
     "table": {
-      "includeRule": ["fontDecoration", "toEntity"],
+      "includeRule": ["inline", "fontDecoration", "toEntity" ],
       "rules": {
         "tableRow": {
           "priority": 102, 
@@ -157,6 +175,19 @@
         "replace": ""
       }
     }, 
+    "langCode": {
+      "includeRule": ["fontDecoration", "toEntity"],
+      "begin": "^☆\\+---\\((.*)\\)\\s*$", 
+      "end": "^☆\\+---\\s*$", 
+      "onStart": {
+        "insert": "<pre>",
+        "replace": ""
+      },
+      "onFinished": {
+        "insert": "</pre>",
+        "replace": ""
+      }
+    }, 
     "codeList": {
       "includeRule": ["fontDecoration", "toEntity"],
       "begin": "^☆リスト.*$", 
@@ -219,6 +250,7 @@
       "transitions": [
         "figure", 
         "code", 
+        "langCode", 
         "table",
         "unOrderdList",
         "comment",

--- a/textparser.py
+++ b/textparser.py
@@ -237,13 +237,17 @@ class Parser(object):
         rex = re.compile('\$([0-9]+)')
         m = rex.search(text)
         if m and match:
-            sub_func = lambda x:match.group(int(x.group(1)))
-            text = rex.sub(sub_func, text)
+            def match_func(x):
+                ret = match.group(int(x.group(1)))
+                if ret == None:
+                    ret = x
+                return ret
+            text = rex.sub(match_func, text)
 
         # expand vars
         rex = re.compile('\${?([A-Za-z0-9_]+)}?')
         m = rex.search(text)
-        sub_func = lambda x:self.store.load(x.group(1), '')
+        sub_func = lambda x:self.store.load(x.group(1), x.string)
         text = rex.sub(sub_func, text)
         return text