Add more stylesheet hooks to the page template

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

diff --git a/plugins/rst b/plugins/rst
index 797b686a5da681f4c9300eee2ed78482fe19ed19..350b76dfa4c7a06aae2b0b75b6758111fae61d8b 100755 (executable)
--- a/plugins/rst
+++ b/plugins/rst
@@ -3,9 +3,6 @@
 #
 # rst — xml-rpc-based ikiwiki plugin to process RST files
 #
 #
 # rst — xml-rpc-based ikiwiki plugin to process RST files
 #

-# TODO: the top of this file should be converted to a python library for
-# ikiwiki plugins
-# 

 # based a little bit on rst.pm by Sergio Talens-Oliag, but only a little bit. :)
 #
 # Copyright © martin f. krafft <madduck@madduck.net>
 # based a little bit on rst.pm by Sergio Talens-Oliag, but only a little bit. :)
 #
 # Copyright © martin f. krafft <madduck@madduck.net>


@@ -13,7 +10,7 @@
 #
 __name__ = 'rst'
 __description__ = 'xml-rpc-based ikiwiki plugin to process RST files'
 #
 __name__ = 'rst'
 __description__ = 'xml-rpc-based ikiwiki plugin to process RST files'

-__version__ = '0.2'
+__version__ = '0.3'

 __author__ = 'martin f. krafft <madduck@madduck.net>'
 __copyright__ = 'Copyright © ' + __author__
 __licence__ = 'GPLv2'
 __author__ = 'martin f. krafft <madduck@madduck.net>'
 __copyright__ = 'Copyright © ' + __author__
 __licence__ = 'GPLv2'


@@ -21,7 +18,7 @@ __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):
+def rst2html(proxy, *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',
     # 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',


@@ -33,9 +30,9 @@ def rst2html(*kwargs):
 
 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('htmlize', rst2html)

 proxy.run()
 proxy.run()