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

Add primary support for code highlightning

Browse Source
This commit is contained in:
Gregory Soutade 2012-11-13 18:33:38 +01:00
parent e14e184b1d
commit 44800ac42c
9 changed files with 285 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
generators/generator.py
View File

@ -21,6 +21,7 @@ class StrictUTF8Writer(codecs.StreamWriter):
object = object.replace('>', '>') object = object.replace('>', '>')
object = object.replace('"', '"') object = object.replace('"', '"')
object = object.replace(''', "'") object = object.replace(''', "'")
object = object.replace('&', "&")
if not type(object) == unicode: if not type(object) == unicode:
self.value = self.value + unicode(object, "utf-8") self.value = self.value + unicode(object, "utf-8")

83
generators/index.py
View File

@ -3,7 +3,7 @@ import datetime
import xml import xml
from xml.parsers.expat import * from xml.parsers.expat import *
from xml.dom.minidom import parse, parseString from xml.dom.minidom import parse, parseString
from dynastie.generators.generator import DynastieGenerator from dynastie.generators.generator import DynastieGenerator, StrictUTF8Writer
from django.db import models from django.db import models
class Index(DynastieGenerator): class Index(DynastieGenerator):
@ -83,6 +83,25 @@ class Index(DynastieGenerator):
post_content = f.read() post_content = f.read()
f.close() f.close()
while True:
start = post_content.find('<dyn:code')
end = post_content.find('</dyn:code>')
if start == -1: break
if end < start:
self.addError('Invalid <dyn:code> tags in ' + filename)
break
try:
dom2 = parseString(post_content[start:end+11])
except xml.dom.DOMException as e:
self.addError('Error parsing ' + filename)
break
res = self.createCode(dom2, dom2.firstChild)
post_content = post_content.replace(post_content[start:end+11], res)
self.simpleTransform(values, dom, post_elem, root) self.simpleTransform(values, dom, post_elem, root)
content_nodes = post_elem.getElementsByTagName('div') content_nodes = post_elem.getElementsByTagName('div')
@ -93,7 +112,6 @@ class Index(DynastieGenerator):
continue continue
new_node = dom.createTextNode(post_content) new_node = dom.createTextNode(post_content)
content_node.appendChild(new_node) content_node.appendChild(new_node)
def createPosts(self, posts, dom, root, node): def createPosts(self, posts, dom, root, node):
posts_elem = self.createElement(dom, 'posts') posts_elem = self.createElement(dom, 'posts')
@ -177,13 +195,68 @@ class Index(DynastieGenerator):
return tags_elem return tags_elem
def createCode(self, dom, node):
try:
from pygments import highlight
from pygments.util import ClassNotFound
from pygments.lexers import get_lexer_by_name
from pygments.formatters import get_formatter_by_name
except ImportError:
self.addError('Pygments package is missing, please install it in order to use <dyn:code>')
return
language = node.getAttribute('language')
if language is None:
self.addWarning('No language defined for <dyn:code> assuming C language')
language = "c"
else:
language = language.lower()
lexer_options = {}
try:
lexer = get_lexer_by_name(language, **lexer_options)
except ClassNotFound:
self.addWarning('Language ' + language + ' not supported by current version of pygments')
lexer = get_lexer_by_name('c', **lexer_options)
formatter_options = {'classprefix' : 'color_', 'style' : 'emacs'}
for k in node.attributes.keys():
attr = node.attributes[k]
if attr.prefix != '': continue
if attr.name == 'language': continue
name = attr.name
value = attr.value
if name == 'colouring': name = style
formatter_options[name] = value
formatter = get_formatter_by_name('html', **formatter_options)
lexer.encoding = 'utf-8'
formatter.encoding = 'utf-8'
writer = StrictUTF8Writer()
node.firstChild.firstChild.writexml(writer)
code = writer.getvalue().encode('utf-8')
r,w = os.pipe()
r,w=os.fdopen(r,'r',0), os.fdopen(w,'w',0)
highlight(code, lexer, formatter, w)
w.close()
code = r.read()
r.close()
return code
def generate(self, blog, src, output): def generate(self, blog, src, output):
from dynastie.models import Post, Blog from dynastie.models import Post, Blog
self.hooks = {'posts' : self.createPosts, self.hooks = {'posts' : self.createPosts,
'navigation' : self.createNavigation, 'navigation' : self.createNavigation,
'recents' : self.createRecents, 'recents' : self.createRecents,
'tags' : self.createTags} 'tags' : self.createTags}
if not os.path.exists(src + '/_index.html'): if not os.path.exists(src + '/_index.html'):
self.addError('No _index.html found, exiting') self.addError('No _index.html found, exiting')

64
sites/blog.soutade.fr/css/blog.css
View File

@ -378,4 +378,66 @@ ul li
#email #email
{ {
display:none; display:none;
} }
.color_hll { background-color: #ffffcc }
.color_c { color: #008800; font-style: italic } /* Comment */
.color_err { border: 1px solid #FF0000 } /* Error */
.color_k { color: #AA22FF; font-weight: bold } /* Keyword */
.color_o { color: #666666 } /* Operator */
.color_cm { color: #008800; font-style: italic } /* Comment.Multiline */
.color_cp { color: #008800 } /* Comment.Preproc */
.color_c1 { color: #008800; font-style: italic } /* Comment.Single */
.color_cs { color: #008800; font-weight: bold } /* Comment.Special */
.color_gd { color: #A00000 } /* Generic.Deleted */
.color_ge { font-style: italic } /* Generic.Emph */
.color_gr { color: #FF0000 } /* Generic.Error */
.color_gh { color: #000080; font-weight: bold } /* Generic.Heading */
.color_gi { color: #00A000 } /* Generic.Inserted */
.color_go { color: #808080 } /* Generic.Output */
.color_gp { color: #000080; font-weight: bold } /* Generic.Prompt */
.color_gs { font-weight: bold } /* Generic.Strong */
.color_gu { color: #800080; font-weight: bold } /* Generic.Subheading */
.color_gt { color: #0040D0 } /* Generic.Traceback */
.color_kc { color: #AA22FF; font-weight: bold } /* Keyword.Constant */
.color_kd { color: #AA22FF; font-weight: bold } /* Keyword.Declaration */
.color_kn { color: #AA22FF; font-weight: bold } /* Keyword.Namespace */
.color_kp { color: #AA22FF } /* Keyword.Pseudo */
.color_kr { color: #AA22FF; font-weight: bold } /* Keyword.Reserved */
.color_kt { color: #00BB00; font-weight: bold } /* Keyword.Type */
.color_m { color: #666666 } /* Literal.Number */
.color_s { color: #BB4444 } /* Literal.String */
.color_na { color: #BB4444 } /* Name.Attribute */
.color_nb { color: #AA22FF } /* Name.Builtin */
.color_nc { color: #0000FF } /* Name.Class */
.color_no { color: #880000 } /* Name.Constant */
.color_nd { color: #AA22FF } /* Name.Decorator */
.color_ni { color: #999999; font-weight: bold } /* Name.Entity */
.color_ne { color: #D2413A; font-weight: bold } /* Name.Exception */
.color_nf { color: #00A000 } /* Name.Function */
.color_nl { color: #A0A000 } /* Name.Label */
.color_nn { color: #0000FF; font-weight: bold } /* Name.Namespace */
.color_nt { color: #008000; font-weight: bold } /* Name.Tag */
.color_nv { color: #B8860B } /* Name.Variable */
.color_ow { color: #AA22FF; font-weight: bold } /* Operator.Word */
.color_w { color: #bbbbbb } /* Text.Whitespace */
.color_mf { color: #666666 } /* Literal.Number.Float */
.color_mh { color: #666666 } /* Literal.Number.Hex */
.color_mi { color: #666666 } /* Literal.Number.Integer */
.color_mo { color: #666666 } /* Literal.Number.Oct */
.color_sb { color: #BB4444 } /* Literal.String.Backtick */
.color_sc { color: #BB4444 } /* Literal.String.Char */
.color_sd { color: #BB4444; font-style: italic } /* Literal.String.Doc */
.color_s2 { color: #BB4444 } /* Literal.String.Double */
.color_se { color: #BB6622; font-weight: bold } /* Literal.String.Escape */
.color_sh { color: #BB4444 } /* Literal.String.Heredoc */
.color_si { color: #BB6688; font-weight: bold } /* Literal.String.Interpol */
.color_sx { color: #008000 } /* Literal.String.Other */
.color_sr { color: #BB6688 } /* Literal.String.Regex */
.color_s1 { color: #BB4444 } /* Literal.String.Single */
.color_ss { color: #B8860B } /* Literal.String.Symbol */
.color_bp { color: #AA22FF } /* Name.Builtin.Pseudo */
.color_vc { color: #B8860B } /* Name.Variable.Class */
.color_vg { color: #B8860B } /* Name.Variable.Global */
.color_vi { color: #B8860B } /* Name.Variable.Instance */
.color_il { color: #666666 } /* Literal.Number.Integer.Long */

6
static/js/dynastie.js
View File

@ -3,16 +3,18 @@ tinyMCE.init({
// General options // General options
mode : "textareas", mode : "textareas",
theme : "advanced", theme : "advanced",
plugins : "autolink,lists,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template", plugins : "autolink,lists,spellchecker,pagebreak,style,layer,table,save,advhr,advimage,advlink,emotions,iespell,inlinepopups,insertdatetime,preview,media,searchreplace,print,contextmenu,paste,directionality,fullscreen,noneditable,visualchars,nonbreaking,xhtmlxtras,template,dynastiecolor",
editor_selector : "mceAdvanced", editor_selector : "mceAdvanced",
encoding : "raw", encoding : "raw",
entities : "", entities : "",
entity_encoding : "raw", entity_encoding : "raw",
valid_elements : '*[*]',
preformatted : true,
// Theme options // Theme options
theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect", theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsizeselect",
theme_advanced_buttons2 : "bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor", theme_advanced_buttons2 : "bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,charmap,emotions,iespell,media,advhr", theme_advanced_buttons3 : "tablecontrols,|,hr,removeformat,visualaid,|,charmap,emotions,iespell,media,advhr,dynastiecolor",
// theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage", // theme_advanced_buttons4 : "insertlayer,moveforward,movebackward,absolute,|,styleprops,spellchecker,|,cite,abbr,acronym,del,ins,attribs,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage",
theme_advanced_toolbar_location : "top", theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left", theme_advanced_toolbar_align : "left",

70
static/js/tinymce/jscripts/tiny_mce/plugins/dynastiecolor/dynastiecolor.html vendored Normal file
View File

@ -0,0 +1,70 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
<script type="text/javascript" src="../../utils/validate.js"></script>
<script type="text/javascript" src="../../utils/form_utils.js"></script>
<script type="text/javascript" src="jscripts/embed.js"></script>
<title>Dynastie Code</title>
</head>
<body id="content">
<form onsubmit="DynastieColorDialog.insert();return false;" action="#">
<table role="presentation" border="0" cellpadding="4" cellspacing="0">
<tr id="linklistrow">
<td><label for="linklist">Language</label></td>
<td id="linklistcontainer">
<select id="language">
<option value="bash">Bash</option>
<option value="c">C</option>
<option value="cpp">C++</option>
<option value="css">CSS</option>
<option value="cmake">CMAKE</option>
<option value="html">HTML</option>
<option value="ini">INI</option>
<option value="java">Java</option>
<option value="js">JavaScript</option>
<option value="lua">Lua</option>
<option value="cl">LISP</option>
<option value="make">MAKE</option>
<option value="ocaml">OCaml</option>
<option value="perl">PERL</option>
<option value="php">PHP</option>
<option value="python">Python</option>
<option value="rb">Ruby</option>
<option value="rst">REST</option>
<option value="sql">SQL</option>
<option value="xml">XML</option>
</select></td>
<td><label for="linklist">Style</label></td>
<td id="linklistcontainer">
<select id="colouring">
<option value="default">Default</option>
<option value="emacs">EMACS</option>
<option value="vim">VIM</option>
<option value="native">VIM native</option>
<option value="fruity">VIM Fruity</option>
<option value="friendly">VIM Friendly</option>
<option value="perldoc">Perl Doc</option>
<option value="vs">Visual Studio</option>
<option value="borland">Borland</option>
<option value="trac">Trac</option>
<option value="autumn">Autumn</option>
<option value="bw">BW</option>
<option value="colorful">Colorful</option>
<option value="manni">Manni</option>
<option value="monokai">Monokai</option>
<option value="murphy">Murphy</option>
<option value="pastie">Pastie</option>
<option value="rrt">RRT</option>
<option value="tango">Tango</option>
</select></td>
</tr>
</table>
<textarea name="code" cols="90" rows="40"></textarea>
<div class="mceActionPanel">
<input type="button" id="insert" name="insert" value="{#insert}" onclick="DynastieColorDialog.insert();" />
<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />
</div>
</form>
</body>
</html>

1
static/js/tinymce/jscripts/tiny_mce/plugins/dynastiecolor/editor_plugin.js vendored Symbolic link
View File

@ -0,0 +1 @@
editor_plugin_src.js

50
static/js/tinymce/jscripts/tiny_mce/plugins/dynastiecolor/editor_plugin_src.js vendored Normal file
View File

@ -0,0 +1,50 @@
/**
* editor_plugin_src.js
*
* Copyright 2012, Grégory Soutadé
* Released under LGPL License.
*
*/
(function() {
tinymce.create('tinymce.plugins.DynastieColor', {
init : function(ed, url) {
var t = this, css = tinymce.explode(ed.settings.content_css);
t.editor = ed;
// Force absolute CSS urls
tinymce.each(css, function(u, k) {
css[k] = ed.documentBaseURI.toAbsolute(u);
});
ed.addCommand('mceDynastieColor', function() {
ed.windowManager.open({
file : ed.getParam("plugin_dynastiecolor_pageurl", url + "/dynastiecolor.html"),
width : parseInt(ed.getParam("plugin_dynastiecolor_width", "700")),
height : parseInt(ed.getParam("plugin_dynastiecolor_height", "800")),
resizable : "yes",
scrollbars : "yes",
popup_css : css ? css.join(',') : ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css"),
}, {
base : ed.documentBaseURI.getURI()
});
});
ed.addButton('dynastiecolor', {title : 'Insert code', cmd : 'mceDynastieColor'});
},
getInfo : function() {
return {
longname : 'DynastieColor',
author : 'Grégory Soutadé',
authorurl : 'http://soutade.fr',
infourl : 'http://indefero.soutade.fr/p/dynastie',
version : tinymce.majorVersion + "." + tinymce.minorVersion
};
}
});
// Register plugin
tinymce.PluginManager.add('dynastiecolor', tinymce.plugins.DynastieColor);
})();

17
static/js/tinymce/jscripts/tiny_mce/plugins/dynastiecolor/jscripts/embed.js vendored Normal file
View File

@ -0,0 +1,17 @@
tinyMCEPopup.requireLangPack();
var DynastieColorDialog = {
insert : function() {
// Insert the contents from the input into the document
val = document.forms[0].code.value;
if (val != '')
{
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>';
tinyMCEPopup.editor.execCommand('mceInsertContent', false, val);
}
tinyMCEPopup.close();
}
};

2
views.py
View File

@ -249,7 +249,7 @@ def edit_tag(request, tag_id):
form = TagForm(request.POST, instance=tag) # A form bound to the POST data form = TagForm(request.POST, instance=tag) # A form bound to the POST data
if form.is_valid(): # All validation rules pass if form.is_valid(): # All validation rules pass
if request.POST['name'] != name: if request.POST['name'] != name:
tag.remove() tag.remove(b)
form.save() form.save()
return HttpResponseRedirect('/blog/' + str(b.id)) return HttpResponseRedirect('/blog/' + str(b.id))
else: else: