Merge branch 'dev' into next

This commit is contained in:
Yann Esposito (Yogsototh) 2010-10-26 15:03:33 +02:00
commit 03fcb72333
3 changed files with 40 additions and 1 deletions

1
Rules
View file

@ -60,6 +60,7 @@ compile '/html/*' do
filter :ultraviolet # must be before kramdown
filter :graph
filter :description
filter :falacy
if ext == 'erb'
filter :erb

View file

@ -85,4 +85,4 @@ translations:
fr: "s'abonner"
enableJavascriptToComment:
en: "You must enable javascript to comment."
en: "Vous devez activer javascript pour commenter."
fr: "Vous devez activer javascript pour commenter."

View file

@ -1,3 +1,40 @@
# usage:
# <%
# $macros={}
# $macros[:test]="passed test"
# %>
# ...
# Here is a %test.
#
class Macros < Nanoc3::Filter
identifier :falacy
attr_accessor :macro
def initialize(arg)
super
@macro={}
@macro[:tlal] = %{<span class="sc"><abbr title="Trop long à lire">tlàl</abbr> : </span>}
@macro[:tldr] = %{<span class="sc"><abbr title="Too long; don't read">tl;dr</abbr>: </span>}
if not $macros.nil?
@macro.merge!( $macros )
end
end
def macro_value_for(macro_name)
if macro_name.nil? or macro_name=="" or @macro[macro_name.intern].nil?
return %{%#{macro_name}}
end
return @macro[macro_name.intern]
end
def run(content, params={})
content.gsub(/%(\w*)/) do |m|
if m != '%'
macro_value_for($1)
else
m
end
end
end
end
def tldr
%{<span class="sc"><abbr title="Too long; don't read">tl;dr</abbr>: </span>}
end
@ -5,3 +42,4 @@ end
def tlal
%{<span class="sc"><abbr title="Trop long à lire">tlàl</abbr> : </span>}
end