Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
correct logic on error fallthrough
[git.ikiwiki.info.git]
/
plugins
/
rst
diff --git
a/plugins/rst
b/plugins/rst
index 797b686a5da681f4c9300eee2ed78482fe19ed19..8386675079bf6de787ad18731addf532cc142435 100755
(executable)
--- a/
plugins/rst
+++ b/
plugins/rst
@@
-1,11
+1,8
@@
-#!/usr/bin/python
+#!/usr/bin/
env
python
# -*- coding: utf-8 -*-
#
# rst — xml-rpc-based ikiwiki plugin to process RST files
#
# -*- coding: utf-8 -*-
#
# 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,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(
*kw
args):
- # 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, 'section' : 'format' }
+
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()