From 08f17475050263aaad3f39de5be08d8fca8c14e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Mon, 19 Nov 2012 19:11:04 +0100
Subject: [PATCH] Invert <dyn:code> and <pre> tags

---
 generators/index.py                               | 15 ++++++---------
 .../plugins/dynastiecolor/jscripts/embed.js       |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/generators/index.py b/generators/index.py
index 1d18bd6..76977eb 100644
--- a/generators/index.py
+++ b/generators/index.py
@@ -239,24 +239,21 @@ class Index(DynastieGenerator):
         formatter.encoding = 'utf-8'
         
         writer = StrictUTF8Writer()
-        node.writexml(writer)
+        node.firstChild.writexml(writer)
         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.fdopen(r,'r',0), os.fdopen(w,'w',0)
-        highlight(code[start+5:end], lexer, formatter, w)
+        highlight(code, lexer, formatter, w)
         w.close()
         
         code = r.read()
         r.close()
 
+        # Remove <pre> after <div class="highlight">
+        code = code[28:-13]
+        code = '<div class="highlight">' + code + '</div>'
+
         return code
 
     def generate(self, blog, src, output):
diff --git a/static/js/tinymce/jscripts/tiny_mce/plugins/dynastiecolor/jscripts/embed.js b/static/js/tinymce/jscripts/tiny_mce/plugins/dynastiecolor/jscripts/embed.js
index 61b4598..e98adaf 100644
--- a/static/js/tinymce/jscripts/tiny_mce/plugins/dynastiecolor/jscripts/embed.js
+++ b/static/js/tinymce/jscripts/tiny_mce/plugins/dynastiecolor/jscripts/embed.js
@@ -9,7 +9,7 @@ var DynastieColorDialog = {
 	{
 	    language = document.forms[0].language.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.close();