From 5f14bb2cc490c3d307ee8db70e84282a988521e4 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andr=C3=A9=20Wobst?= <wobsta@users.sourceforge.net>
Date: Wed, 17 May 2006 14:37:16 +0000
Subject: [PATCH] some minor additions: allow hrefs (using [] like in many
 wikis), skip python markup for indentation < 4; skip more ... when no further
 description is available

git-svn-id: https://pyx.svn.sourceforge.net/svnroot/pyx/trunk/pyx@2679 069f4177-920e-0410-937b-c2a4a81bcd90
---
 www/examples.pt | 7 +++++--
 www/pt2html.py  | 8 +++++++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/www/examples.pt b/www/examples.pt
index 3543369d..28bd5a7d 100644
--- a/www/examples.pt
+++ b/www/examples.pt
@@ -23,9 +23,12 @@
       </div>
       <a tal:attributes="href example/html"><h3 tal:content="example/title">title</h3></a>
       <tal:block content="structure example/shorttext"/>
-      <a tal:attributes="href example/html" tal:condition="example/shorttext">more&nbsp;...</a>
-      <tal:block content="structure string:</p>" condition="example/shorttext"/>
+      <tal:block condition="python: example.shorttext != example.text">
+        <a tal:attributes="href example/html" tal:condition="example/shorttext">more&nbsp;...</a>
+        <tal:block content="structure string:</p>" condition="example/shorttext"/>
+      </tal:block>
     </span>
+    <div style="clear: both;"></div>
 
   </div>
 
diff --git a/www/pt2html.py b/www/pt2html.py
index 6a23d204..abc20359 100755
--- a/www/pt2html.py
+++ b/www/pt2html.py
@@ -74,6 +74,7 @@ class MakeHtml:
     parmakeinline = re.compile(r"`(.*?)`")
     parmakeitalic = re.compile(r"''(.*?)''")
     parmakebold = re.compile(r"'''(.*?)'''")
+    parmakeref = re.compile(r"\[([^]]*)\s([^\s]*)\]")
     codepattern = re.compile(r"([ \t]*\n)*(?P<data>(([ \t]+[^\n]*)?\n)+)")
     indentpattern = re.compile(r"([ \t]*\n)*(?P<indent>[ \t]+)")
 
@@ -95,6 +96,7 @@ class MakeHtml:
                 par = self.parmakeinline.subn(r"<code>\1</code>", par)[0]
                 par = self.parmakeitalic.subn(r"<em>\1</em>", par)[0]
                 par = self.parmakebold.subn(r"<strong>\1</strong>", par)[0]
+                par = self.parmakeref.subn(r'<a href="\2">\1</a>', par)[0]
                 if not title:
                     title = par
                 else:
@@ -114,7 +116,11 @@ class MakeHtml:
                 code = code.group("data")
                 indent = self.indentpattern.match(code).group("indent")
                 code = re.subn(r"\s*[\r\n]%s" % indent, "\n", code.strip())[0]
-                output.write("<div class=\"codeindent\">%s</div>\n" % self.fromPython(code + "\n"))
+                if len(indent.expandtabs()) >= 4:
+                    code = self.fromPython(code + "\n")
+                else:
+                    code = "<pre>%s</pre>" % code
+                output.write("<div class=\"codeindent\">%s</div>\n" % code)
         text = output.getvalue()
         shorttext = text.split("...")[0]
         text = text.replace("...", "", 1)
-- 
2.11.4.GIT