Support for IE+MathPlayer.

Sync with latest Maruku.
This commit is contained in:
Jacques Distler 2007-01-24 10:53:10 -06:00
parent 1c05a94d1b
commit 488dd334f7
9 changed files with 74 additions and 28 deletions

View file

@ -205,8 +205,9 @@ class CharSourceStrscan
include SpanLevelParser
include MaRuKu::Strings
def initialize(s)
def initialize(s, parent=nil)
@s = StringScanner.new(s)
@parent = parent
end
# Return current char as a FixNum (or nil).
@ -273,9 +274,9 @@ end
class CharSourceDebug
def initialize(s)
@a = CharSourceManual.new(s)
@b = CharSourceStrscan.new(s)
def initialize(s, parent)
@a = CharSourceManual.new(s, parent)
@b = CharSourceStrscan.new(s, parent)
end
def method_missing(methodname, *args)

View file

@ -127,6 +127,7 @@ Disabled by default because of security concerns.
result[:unresolved_references] << " #{v}"
end
# $stderr.puts "Unresolved reference #{v.inspect} (avail: #{self.ald.keys.inspect})"
result[v.to_sym] = true
end
else

View file

@ -278,10 +278,10 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
end
def extension_meta(src, con, break_on_chars)
if m = src.read_regexp(/(\w)+\:/)
if m = src.read_regexp(/([^:]+):/)
name = m[1]
content = m[2]
al = read_attribute_list(src, con, break_on_chars)
# puts "#{name}=#{al.inspect}"
self.doc.ald[name] = al
con.push md_ald(name, al)
else
@ -624,6 +624,11 @@ module MaRuKu; module In; module Markdown; module SpanLevelParser
con.push_element md_im_image(alt_text, url, title)
when ?[ # link ref
ref_id = read_ref_id(src,con)
if ref_id.size == 0
ref_id = alt_text.to_s.downcase.gsub(' ','_')
else
ref_id = ref_id.downcase
end
con.push_element md_image(alt_text, ref_id)
else # no stuff
con.push_elements children