diff --git a/README.md b/README.md
old mode 100644
new mode 100755
diff --git a/doku.py b/doku.py
old mode 100644
new mode 100755
index a70abe5..ad94aa9
--- a/doku.py
+++ b/doku.py
@@ -29,5 +29,5 @@ class DokuWiki:
cmd = ['./doku.php', method ] + args
res = subprocess.Popen(cmd, stdin = None, stdout = subprocess.PIPE, stderr = sys.stderr, close_fds = True).communicate()
self.callcache[key] = unicode(res[0].decode('utf-8'))
- #print "%s->%s" % (cmd, self.callcache[key])
+ print "%s->%s" % (cmd, self.callcache[key])
return self.callcache[key]
diff --git a/doku.pyc b/doku.pyc
deleted file mode 100644
index 78db648..0000000
Binary files a/doku.pyc and /dev/null differ
diff --git a/moinformat.pyc b/moinformat.pyc
deleted file mode 100644
index bad5d0e..0000000
Binary files a/moinformat.pyc and /dev/null differ
diff --git a/output.txt b/output.txt
deleted file mode 100644
index 2ae8c98..0000000
--- a/output.txt
+++ /dev/null
@@ -1,238 +0,0 @@
-
-
-#pragma section-numbers off
-#acl All:admin,read,write,delete,revert
-#language en
-This page tries to use each supported markup element at least once.
-
-
-
-'''Index'''
-[[TableOfContents(2)]]
-**Index**
-
-[[:TableOfContents(2)|TableOfContents(2)]]
-
-
-
-====== Headers ======
-
-
-===== Header 2 =====
-
-
-==== Header 3 ====
-
-
-=== Header 4 ===
-
-
-== Header 5 ==
-
-
-====== Font styles ======
-
-
-Normal text, ''emphasized'', '''strong''', __underline__, ,,subscript,,, ^superscript^, `typewriter` and {{{typewriter
-.}}}
-
-Normal text, //emphasized//, **strong**, __underline__, subscript, superscript, ''typewriter'' and ''typewriter''.
-
-
-
-===== Syntax Highlighting =====
-
- *
-# python code
-print code.colorize("abc", 1 + 1)
-
-
-====== Hyperlinks ======
-
-
-===== Internal =====
-
-
- * MoinMoin
- * MoinMoin/TextFormatting
- * MoinMoin/InstallDocs
- * ../InstallDocs
- * /SubPage
- * Self:InterWiki
-
- * [[:MoinMoin|MoinMoin]]
- * [[:MoinMoin:TextFormatting|MoinMoin/TextFormatting]]
- * [[:MoinMoin:InstallDocs|MoinMoin/InstallDocs]]
- * [[:InstallDocs|../InstallDocs]]
- * [[:test:SubPage|/SubPage]]
- * [[:InterWiki|InterWiki]]
-
-
-[#anchorname Anchor Link]
-[#anchorname Anchor Link]
-
-
-
-===== External =====
-
-
- * http://moinmoin.wikiwikiweb.de/
- * [http://moinmoin.wikiwikiweb.de/]
- * [http://moinmoin.wikiwikiweb.de/ MoinMoin Wiki]
- * [http://moinmoin.wikiwikiweb.de/wiki/classic/img/moinmoin.png]
- * http://moinmoin.wikiwikiweb.de/wiki/classic/img/moinmoin.png
- * [http://moinmoin.wikiwikiweb.de/wiki/classic/img/moinmoin.png moinmoin.png]
- * MeatBall:InterWiki
- * wiki:MeatBall/InterWiki
- * [wiki:MeatBall/InterWiki]
- * [wiki:MeatBall/InterWiki InterWiki page on MeatBall]
- * [file://servername/full/path/to/file/filename%20with%20spaces.txt Click here to read filename with spaces.txt]
- * me@privacy.net
-
- * [[http://moinmoin.wikiwikiweb.de/|http://moinmoin.wikiwikiweb.de/]]
- * [[[http://moinmoin.wikiwikiweb.de/|http://moinmoin.wikiwikiweb.de/]]]
- * [[[http://moinmoin.wikiwikiweb.de/|http://moinmoin.wikiwikiweb.de/]] [[:MoinMoin|MoinMoin]] Wiki]
- * [[[http://moinmoin.wikiwikiweb.de/wiki/classic/img/moinmoin.png|http://moinmoin.wikiwikiweb.de/wiki/classic/img/moinmoin.png]]]
- * [[http://moinmoin.wikiwikiweb.de/wiki/classic/img/moinmoin.png|http://moinmoin.wikiwikiweb.de/wiki/classic/img/moinmoin.png]]
- * [[[http://moinmoin.wikiwikiweb.de/wiki/classic/img/moinmoin.png|http://moinmoin.wikiwikiweb.de/wiki/classic/img/moinmoin.png]] moinmoin.png]
- * [[MeatBall>InterWiki|InterWiki]]
- * wiki:[[:MeatBall:InterWiki|MeatBall/InterWiki]]
- * [wiki:[[:MeatBall:InterWiki|MeatBall/InterWiki]]]
- * [wiki:[[:MeatBall:InterWiki|MeatBall/InterWiki]] [[:InterWiki|InterWiki]] page on [[:MeatBall|MeatBall]]]
- * [[[file://servername/full/path/to/file/filename%20with%20spaces.txt|file://servername/full/path/to/file/filename%20with%20spaces.txt]] Click here to read filename with spaces.txt]
- * [[mailto:me@privacy.net|me@privacy.net]]
-
-
-===== Escaping WikiNames =====
-
-
-Wiki''''''Name
-Wiki``Name
-Wiki****Name Wiki''''Name
-
-
-
-====== Blockquote ======
-
-
- This is indented
- Even more
-
- * This is indented
- * Even more
-
-
-
-====== Bullet list ======
-
-
- * item 1
-
- * item 2, with gap
- * item 3
- * item 3.1
-
- * item 1
- * item 2, with gap
- * item 3
- * item 3.1
-
-
-
-====== Numbered list ======
-
-
- 1. item 1
- i. item 1
- i. item 2
-
- - item 1
- - item 1
- - item 2
-
-
-
- 1. item 2
- a. item 1
- a. item 2
-
- - item 2
- - item 1
- - item 2
-
-
-
-====== Descriptions + Definitions ======
-
-
- Term:: Description
- Label:: Definition
-- Description
- Definition
-
-====== Code display ======
-
- * line 1
- indented 4 characters
-
-
-
-====== Tables ======
-
-
-===== General table layout and HTML like options =====
-
-
- ||cell 1||cell2||cell 3||
-
- *
-|cell 1|cell2|cell 3|
-
-
-====== Rules ======
-
-
---- (not a rule)
-----
------
-------
--------
---------
----------
-----------
--------------------------------------------- (not thicker than 10)
---- (not a rule)
-
-
-
-
--
-
-
---
-
-
----
-
-
-----
-
-
-----
-
-
-----
-
-
-----
- (not thicker than 10)
-
-
-
-====== Macros ======
-
-
-[[Anchor(anchorname)]]
-'''[[PageCount]]''' pages
-[[:Anchor(anchorname)|Anchor(anchorname)]] **[[:PageCount|PageCount]]** pages
-
-
diff --git a/standalone.py b/standalone.py
deleted file mode 100644
index 413a450..0000000
--- a/standalone.py
+++ /dev/null
@@ -1,22 +0,0 @@
-from MoinMoin.server.standalone import StandaloneConfig, run
-
-import sys
-# Path of the directory where wikiconfig.py is located.
-# YOU NEED TO CHANGE THIS TO MATCH YOUR SETUP.
-sys.path.insert(0, 'home/caddy/wikifarm/var/wikifarm/config')
-
-# Path to MoinMoin package, needed if you installed with --prefix=PREFIX
-# or if you did not use setup.py.
-sys.path.insert(0, '/usr/local/lib/python2.4/site-packages')
-
-# Path of the directory where farmconfig.py is located (if different).
-sys.path.insert(0, '/home/caddy/wikifarm/var/wikifarm/config')
-
-class Config(StandaloneConfig):
- docs = '/home/caddy/wikifarm/var/wikifarm'
- user = 'http'
- group = 'http'
- port = 80
-
-run(Config)
-
\ No newline at end of file
diff --git a/syntaxreference.txt b/syntaxreference.txt
old mode 100644
new mode 100755
diff --git a/text_dokuwiki.py b/text_dokuwiki.py
old mode 100644
new mode 100755
index 99fd531..73df575
--- a/text_dokuwiki.py
+++ b/text_dokuwiki.py
@@ -82,7 +82,7 @@ class Formatter(FormatterBase):
def attachment_link(self, on, url=None, querystr=None, **kw):
if on:
- return '{{ %s | }}' % (self.randomID+url)
+ return '{{ %s | ' % (self.randomID+url)
else:
return ' }}'
@@ -138,6 +138,13 @@ class Formatter(FormatterBase):
return ['', '\n'][on]
+ # generic transclude/include:
+ def transclusion(self, on, **kw):
+ return ''
+
+ def transclusion_param(self, **kw):
+ return ''
+
def listitem(self, on, **kw):
# somewhy blockquote uses "listitem" call
return [(' ' * self.list_depth * 2) + self.list_type + ' ', '\n'][not on]
@@ -297,7 +304,10 @@ class Formatter(FormatterBase):
def showAttachedFiles(args):
args = args.split(',')
- return '{{ %s | %s }}' % (self.randomID+args[0].strip(), args[1].strip())
+ if len(args)>1:
+ return '{{ %s | %s }}' % (self.randomID+args[0].strip(), args[1].strip())
+ else:
+ return ''
# function which will just do what parent class would
def inherit(args):
diff --git a/text_dokuwiki.pyc b/text_dokuwiki.pyc
deleted file mode 100644
index cbff1eb..0000000
Binary files a/text_dokuwiki.pyc and /dev/null differ