Commit: 5f2dafea1cf41da06d4e952903a6bf7b0cbfa759 - tlexi (git)

generic text markup tools

Commit MetaInfo

• Revisão: 5f2dafea1cf41da06d4e952903a6bf7b0cbfa759 (tree)
• Hora: 2013-04-01 19:59:57
• Autor: hylom <hylom@hylo...>
• Commiter: hylom

Mensagem de Log

writing 'call' action....

Mudança Sumário

• modified: jarkup.json
• modified: test/test.txt
• modified: textparser.py
• modified: tlexi.py

Diff

--- a/jarkup.json
+++ b/jarkup.json
@@ -119,6 +119,7 @@
           "priority": 101, 
           "regexp": "^<(.*)>$", 
           "continue": false, 
+          "call": ["getImageGeom", "${image_dir}/\\1"],
           "replace": "<a href=\"${image_dir}/\\1\" target=\"_blank\"><img src=\"${image_dir}/\\1\" alt=\"図$ref $caption\" width=\"480\"></a><span class=\"caption\">図$ref $caption</span>"
         }, 
         "caption": {

--- a/test/test.txt
+++ b/test/test.txt
@@ -17,7 +17,7 @@
 　jareでは*[http://example.com/]のようにリンクを埋め込めます。*[http://hylom.net/ このように]リンクを埋めることも可能です。
 
 ☆図1 図のキャプション
-<imagefile.png>
+<network.png>
 
 　また、*図1のようにして参照を埋め込めます。*[http://example.com/]のようにリンクも埋め込めます。*[http://hylom.net/ このように]リンクを埋めることも可能です。
 

--- a/textparser.py
+++ b/textparser.py
@@ -15,6 +15,9 @@ class Parser(object):
         self.mode_stack = ["global", ]
         self.mode_stores = {}
         self._global_stores = {}
+        self.functions = {
+#            "getImageGeom": getImageGeom,
+            }
 
     def currentMode(self):
         try:
@@ -123,9 +126,6 @@ class Parser(object):
                 text = self._do_action(mode, text, new_actions, rex, match)
                 return text
 
-        if 'replace' in actions:
-            text = rex.sub(actions['replace'], text)
-            text = self._expand_variable(mode, text)
         if 'store' in actions:
             arg = actions['store']
             if isinstance(arg, list):
@@ -139,6 +139,17 @@ class Parser(object):
         if 'set' in actions:
             arg = actions['set']
             self._store(mode, arg[0], arg[1]) 
+        if 'call' in actions:
+            (func, newarg) = actions['call']
+            if func in self.functions:
+                arg = match.group(1)
+                context = self.mode_stores.get(mode, {})
+                results = self.functions[func](context, arg)
+                for (k, v) in results:
+                    self._store(mode, k, v)
+        if 'replace' in actions:
+            text = rex.sub(actions['replace'], text)
+            text = self._expand_variable(mode, text)
         return text
 
     def _apply_rules(self, mode, text):
@@ -183,3 +194,7 @@ class Parser(object):
                         break
 
         return text
+
+
+def getImageGeom(context, filename):
+    return [('width', str(128)), ('height', str(256))]

--- a/tlexi.py
+++ b/tlexi.py
@@ -9,7 +9,6 @@ from optparse import OptionParser
 from lexi import Lexi
 from textparser import Parser
 
-
 def parse_arguments():
     "Generate option parser and parse arguments"
     usage = "usage: %prog [options] <source_file> <output_file>"
@@ -33,7 +32,6 @@ def parse_arguments():
     options.output_file = args[1]
     return options
 
-
 def main():
     opts = parse_arguments()
     lexi = Lexi(opts.rule_file)
@@ -48,12 +46,10 @@ def main():
     else:
         output = codecs.open(opts.output_file, 'w', 'utf8')
 
-
     # do markup
     parser = Parser(lexi)
     parser.markup(source, output)
 
-
 if __name__ == '__main__':
     main()