Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / plugins / rst

diff --git a/plugins/rst b/plugins/rst
index 06b36b80cca85b298ef79462abebd364629941cc..449dba415f69195177981459fc1ec0087464edb2 100755 (executable)
--- a/plugins/rst
+++ b/plugins/rst
@@ -18,21 +18,29 @@ __licence__ = 'GPLv2'
 from docutils.core import publish_parts;
 from proxy import IkiWikiProcedureProxy
 
 from docutils.core import publish_parts;
 from proxy import IkiWikiProcedureProxy
 

-def rst2html(*kwargs):
-    # FIXME arguments should be treated as a hash, the order could change
-    # at any time and break this.
-    parts = publish_parts(kwargs[3], writer_name='html',
+def rst2html(proxy, *args):
+    kwargs = _to_dict(args)
+    parts = publish_parts(kwargs["content"],
+                          writer_name="html",

                           settings_overrides = { 'halt_level': 6
                                                , 'file_insertion_enabled': 0
                                                , 'raw_enabled': 1
                                                })
     return '\n'.join(parts['html_body'].splitlines()[1:-1])
 
                           settings_overrides = { 'halt_level': 6
                                                , 'file_insertion_enabled': 0
                                                , 'raw_enabled': 1
                                                })
     return '\n'.join(parts['html_body'].splitlines()[1:-1])
 

+def _to_dict(args):
+    # args is a list paired by key, value, so we turn it into a dict
+    return dict((k, v) for k, v in zip(*[iter(args)]*2))
+
+def getsetup(proxy, *kwargs):
+    return 'plugin', { 'safe' : 1, 'rebuild' : 1 }
+

 import sys
 def debug(s):
 import sys
 def debug(s):

-    sys.stderr.write(__name__ + ':DEBUG:%s' % s)
+    sys.stderr.write(__name__ + ':DEBUG:%s\n' % s)

     sys.stderr.flush()
 
 proxy = IkiWikiProcedureProxy(__name__, debug_fn=None)
     sys.stderr.flush()
 
 proxy = IkiWikiProcedureProxy(__name__, debug_fn=None)

-proxy.register_hook('htmlize', rst2html)
+proxy.hook('getsetup', getsetup)
+proxy.hook('htmlize', rst2html)

 proxy.run()
 proxy.run()