提交: 53662205ab30b86aaad5ec3e64797e3ba7e7f032 - tlexi (git)

generic text markup tools

Commit MetaInfo

• 修訂: 53662205ab30b86aaad5ec3e64797e3ba7e7f032 (tree)
• 時間: 2013-04-18 19:50:25
• 作者: hylom <hylom@hylo...>
• Commiter: hylom

Log Message

update jarkup

Change Summary

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

差異

--- a/jarkup.json
+++ b/jarkup.json
@@ -22,7 +22,7 @@
       "red1": {
         "priority": 102, 
         "regexp": "\\*g\\[(.*?)]", 
-        "replace": "<strong class=\"red-text\">\\1</strong>"
+        "replace": "<strong class=\"color-red\">\\1</strong>"
       }, 
       "bold2": {
         "priority": 103, 
@@ -32,7 +32,7 @@
       "red2": {
         "priority": 104, 
         "regexp": "\\*g\\{(.*?)}", 
-        "replace": "<strong class=\"red-text\">\\1</strong>"
+        "replace": "<strong class=\"color-red\">\\1</strong>"
       }, 
       "bold1": {
         "priority": 105, 
@@ -246,7 +246,7 @@
   }, 
   "blockDevider": "\n", 
   "globalVariables": [
-    "image_dir", 
-    "."
+    "image_dir", ".",
+    "defaultFigureWidth", "480"
   ]
 }

--- a/textparser.py
+++ b/textparser.py
@@ -134,38 +134,42 @@ class ModeStack(object):
             return None
 
 class Store(dict):
-    def __init__(self):
+    def __init__(self, mode_stack):
         self.mode_stores = {}
         self.global_store = {}
+        self._mode_stack = mode_stack;
+
+    def _mode(self):
+        return self._mode_stack.current()
 
     def save_global(self, key, value):
         self.global_store[key] = value
 
-    def save(self, mode, key, value):
-        modekey = mode.name
-        if not modekey in self.mode_stores:
-            self.mode_stores[modekey] = {}
-        self.mode_stores[modekey][key] = value
+    def save(self, key, value):
+        mode = self._mode()
+        if not mode in self.mode_stores:
+            self.mode_stores[mode] = {}
+        self.mode_stores[mode][key] = value
 
-    def load(self, mode, key, default=None):
-        modekey = mode.name
-        if (modekey in self.mode_stores) and (key in self.mode_stores[modekey]):
-            return self.mode_stores[modekey][key]
+    def load(self, key, default=None):
+        mode = self._mode()
+        if (mode in self.mode_stores) and (key in self.mode_stores[mode]):
+            return self.mode_stores[mode][key]
         else:
             return self.global_store.get(key, default)
 
-    def delete(self, mode, key):
-        modekey = mode.name
-        if not modekey in self.mode_stores:
+    def delete(self, key):
+        mode = self._mode()
+        if not mode in self.mode_stores:
             return 
-        if not key in self.mode_stores[modekey]:
+        if not key in self.mode_stores[mode]:
             return
-        del self.mode_stores[modekey][key]
+        del self.mode_stores[mode][key]
 
-    def clear(self, mode):
-        modekey = mode.name
-        if modekey in self.mode_stores:
-            del self.mode_stores[modekey]
+    def clear(self):
+        mode = self._mode()
+        if mode in self.mode_stores:
+            del self.mode_stores[mode]
 
 
 class Parser(object):
@@ -180,7 +184,7 @@ class Parser(object):
         self.mode_stack = ModeStack()
         self.mode_stack.push("global")
 
-        self.store = Store()
+        self.store = Store(self.mode_stack)
         self.functions = {
             "getImageGeometry": getImageGeometry,
             }
@@ -212,7 +216,6 @@ class Parser(object):
         self.stream_out.write(text)
         
     def _expand_variable(self, text, match=None):
-        mode = self.current_mode()
         if text.find(u'$') < 0:
             return text
         # expand $[0-9]+
@@ -225,7 +228,7 @@ class Parser(object):
         # expand vars
         rex = re.compile('\${?([A-Za-z0-9_]+)}?')
         m = rex.search(text)
-        sub_func = lambda x:self.store.load(mode, x.group(1), '')
+        sub_func = lambda x:self.store.load(x.group(1), '')
         text = rex.sub(sub_func, text)
         return text
 
@@ -242,6 +245,7 @@ class Parser(object):
         #_debug_print(mode.name)
         if mode.test("end", text):
             text = mode.on_exit(self, text)
+            self.store.clear()
             self.mode_stack.pop()
             next_mode = self.current_mode()
             if next_mode:
@@ -275,7 +279,7 @@ class Parser(object):
                 args = [self._expand_variable(x, match) for x in args]
                 results = self.functions[func](context, args)
                 for (k, v) in results:
-                    self.store.save(self.current_mode(), k, v)
+                    self.store.save(k, v)
 
             
         if 'apply' in rule:
@@ -285,7 +289,7 @@ class Parser(object):
 
         if 'switch' in rule:
             for key in rule['switch'].keys():
-                value = self.store.load(self.current_mode(), key)
+                value = self.store.load(key)
                 if value == None:
                     continue
                 if value not in rule['switch'][key]:
@@ -297,17 +301,17 @@ class Parser(object):
             arg = rule['store']
             if isinstance(arg, list):
                 for index in range(len(arg)):
-                    self.store.save(self.current_mode(), arg[index], match.group(index+1))
+                    self.store.save(arg[index], match.group(index+1))
             else:
-                self.store.save(self.current_mode(), arg, match.group(1))
+                self.store.save(arg, match.group(1))
 
         if 'unset' in rule:
             key = rule['unset']
-            self.store.delete(self.current_mode(), key) 
+            self.store.delete(key) 
 
         if 'set' in rule:
             arg = rule['set']
-            self.store.save(self.current_mode(), arg[0], arg[1]) 
+            self.store.save(arg[0], arg[1]) 
 
         if 'replace' in rule:
             text = rex.sub(rule['replace'], text)
@@ -338,4 +342,7 @@ def getImageGeometry(context, args):
     data = f.read()
     f.close()
     (w, h) = imagesize.get_image_size(data)
-    return [('width', str(w)), ('height', str(h))]
+    return [
+        ('width', str(w)),
+        ('height', str(h))
+        ]