deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

Browse source
This commit is contained in:
Jacques Distler 2009-03-27 09:27:00 -05:00
commit 72c4fb71df
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/chunks/literal.rb
View file

@ -32,7 +32,7 @@ module Literal
class Math < AbstractLiteral
MATH_START = '(\${1,2}|' + Regexp.escape('\[') + '|\\begin\{equation\})'
MATH_END = '(\${1,2}|' + Regexp.escape('\]') + '|\\end\{equation\})'
MATH_PATTERN = Regexp.new(MATH_START + '([^$]|\\\$)+' + MATH_END, Regexp::MULTILINE)
MATH_PATTERN = Regexp.new(MATH_START + '([^$]|\\\$)+?' + MATH_END, Regexp::MULTILINE)
def self.pattern() MATH_PATTERN end
end

4
vendor/plugins/maruku/lib/maruku/input/html_helper.rb vendored
View file

@ -28,12 +28,12 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
class HTMLHelper
include MaRuKu::Strings
Tag = %r{^<(/)?(\w+)\s*([^>]*)>}m
Tag = %r{^<(/)?(\w+)\s*([^>]*?)>}m
PartialTag = %r{^<.*}m
EverythingElse = %r{^[^<]+}m
CommentStart = %r{^<!--}x
CommentEnd = %r{^.*-->}
CommentEnd = %r{^.*?-->}
TO_SANITIZE = ['img','hr','br']
attr_reader :rest

4
vendor/plugins/maruku/lib/maruku/input/parse_block.rb vendored
View file

@ -177,7 +177,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
line = src.shift_line.strip
al = nil
# Check if there is an IAL
if new_meta_data? and line =~ /^(.*)\{(.*)\}\s*$/
if new_meta_data? and line =~ /^(.*?)\{(.*?)\}\s*$/
line = $1.strip
ial = $2
al = read_attribute_list(CharSource.new(ial,src), context=nil, break_on=[nil])
@ -193,7 +193,7 @@ module MaRuKu; module In; module Markdown; module BlockLevelParser
line = src.shift_line.strip
al = nil
# Check if there is an IAL
if new_meta_data? and line =~ /^(.*)\{(.*)\}\s*$/
if new_meta_data? and line =~ /^(.*?)\{(.*?)\}\s*$/
line = $1.strip
ial = $2
al = read_attribute_list(CharSource.new(ial,src), context=nil, break_on=[nil])

4
vendor/plugins/maruku/lib/maruku/input/parse_span_better.rb vendored
View file

@ -299,7 +299,7 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
end
def extension_meta(src, con, break_on_chars)
if m = src.read_regexp(/([^\s\:\"\']+):/)
if m = src.read_regexp(/([^\s\:\"\']+?):/)
name = m[1]
al = read_attribute_list(src, con, break_on_chars)
# puts "#{name}=#{al.inspect}"
@ -443,7 +443,7 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
# R_REF_ID = Regexp.compile(/([^\]\s]*)(\s*\])/)
# R_REF_ID = Regexp.compile(/([^\]\s]*)(\s*\])/)
R_REF_ID = Regexp.compile(/([^\]]*)\]/)
R_REF_ID = Regexp.compile(/([^\]]*?)\]/)
# Reads a bracketed id "[refid]". Consumes also both brackets.
def read_ref_id(src, con)

2
vendor/plugins/maruku/lib/maruku/input/type_detection.rb vendored
View file

@ -143,5 +143,5 @@ module MaRuKu; module Strings
TableSeparator = %r{^(\|?#{Sep}\|?)+?\s*$}
EMailAddress = /<([^:]+@[^:]+)>/
EMailAddress = /<([^:]+?@[^:]+?)>/
end end