From: Bernie Innocenti <bernie@codewiz.org>
Date: Fri, 14 Aug 2009 23:15:27 +0000 (+0200)
Subject: Move cc-by-sa.png to sys/
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=74c6b88a6aee836a0aef40e5631130ecf9495bf3;p=geekigeeki.git

Move cc-by-sa.png to sys/
---

diff --git a/geekigeeki.py b/geekigeeki.py
index a0dc72c..5a401ab 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -344,7 +344,7 @@ def send_footer(mod_string=None):
 <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img class="license" alt="Creative Commons License" src="%s" /></a>
 <span class="benchmark">generated in %0.3fs</span> by <a href="http://www.codewiz.org/wiki/GeekiGeeki">GeekiGeeki</a> version %s
 </p>
-''' % (relative_url('cc-by-sa.png'), clock() - start_time, __version__))
+''' % (relative_url('sys/cc-by-sa.png'), clock() - start_time, __version__))
     if mod_string:
         print('<p class="modified">last modified %s</p>' % mod_string)
     print('</div></body></html>')
@@ -541,11 +541,11 @@ class WikiFormatter:
         scan_re = re.compile(r"""(?:
             # Styles and formatting ("--" must cling to a word to disambiguate it from the dash)
               (?P<b>     \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' | `` )
-            | (?P<glyph> --)
             | (?P<tit>   \={2,6})
             | (?P<br>    \\\\)
             | (?P<rule>  ^-{3,})
             | (?P<hi>    \b( FIXME | TODO | DONE )\b )
+            | (?P<glyph> --)
 
             # Links
             | (?P<macro> \<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>)