soutade/Dynastie
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity

Invert <dyn:code> and <pre> tags

Browse Source
This commit is contained in:
Grégory Soutadé 2012-11-19 19:11:04 +01:00
parent 16c2c73389
commit 08f1747505
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
generators/index.py
View File

@ -239,24 +239,21 @@ class Index(DynastieGenerator):
formatter.encoding = 'utf-8' formatter.encoding = 'utf-8'
writer = StrictUTF8Writer() writer = StrictUTF8Writer()
node.writexml(writer) node.firstChild.writexml(writer)
code = writer.getvalue().encode('utf-8') code = writer.getvalue().encode('utf-8')
start = code.find('<pre>');
end = code.rfind('</pre>');
if start == -1 or end == -1 or end < start:
self.addError('Error parsing <dyn:code>')
return ''
r,w = os.pipe() r,w = os.pipe()
r,w=os.fdopen(r,'r',0), os.fdopen(w,'w',0) r,w=os.fdopen(r,'r',0), os.fdopen(w,'w',0)
highlight(code[start+5:end], lexer, formatter, w) highlight(code, lexer, formatter, w)
w.close() w.close()
code = r.read() code = r.read()
r.close() r.close()
# Remove <pre> after <div class="highlight">
code = code[28:-13]
code = '<div class="highlight">' + code + '</div>'
return code return code
def generate(self, blog, src, output): def generate(self, blog, src, output):

2
static/js/tinymce/jscripts/tiny_mce/plugins/dynastiecolor/jscripts/embed.js vendored
View File

@ -9,7 +9,7 @@ var DynastieColorDialog = {
{ {
language = document.forms[0].language.value; language = document.forms[0].language.value;
colouring = document.forms[0].colouring.value; colouring = document.forms[0].colouring.value;
val = '<dyn:code language="' + language + '" colouring="' + colouring + '" xmlns:dyn="http://indefero.soutade.fr/p/dynastie"><pre>' + val + '</pre></dyn:code>'; val = '<pre><dyn:code language="' + language + '" colouring="' + colouring + '" xmlns:dyn="http://indefero.soutade.fr/p/dynastie">' + val + '</dyn:code></pre>';
tinyMCEPopup.editor.execCommand('mceInsertContent', false, val); tinyMCEPopup.editor.execCommand('mceInsertContent', false, val);
} }
tinyMCEPopup.close(); tinyMCEPopup.close();