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 2011-08-15 10:20:14 -05:00
parent ecaf67dca9 3c650f2cf6
commit c1826775d2
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/unit/page_renderer_test.rb
View file

@ -466,7 +466,13 @@ END_THM
'</span></em></p>', '</span></em></p>',
'_should we go ThatWay or ThisWay _') '_should we go ThatWay or ThisWay _')
end end
def test_content_with_utf8_in_strong
assert_markup_parsed_as(
"<p>Can we handle <strong>\u221E-gerbe</strong></p>",
"Can we handle **\u221E-gerbe**")
end
def test_content_with_redirected_link def test_content_with_redirected_link
assert_markup_parsed_as( assert_markup_parsed_as(
"<p>This is a redirected link: <a class='existingWikiWord' href='../show/liquor'>" + "<p>This is a redirected link: <a class='existingWikiWord' href='../show/liquor'>" +

5
vendor/plugins/maruku/lib/maruku/input/charsource.rb vendored
View file

@ -33,8 +33,9 @@ class CharSourceDebug; end
# Choose! # Choose!
#CharSource = CharSourceManual # faster! 58ms vs. 65ms CharSource = CharSourceManual # faster! 58ms vs. 65ms
CharSource = CharSourceStrscan # Seems faster on LONG documents (where we care) #CharSource = CharSourceStrscan # Faster on LONG documents. But it's not multi-byte aware
# (at least in Ruby 1.9.2 and earlier), Hence unusable in Ruby 1.9.
#CharSource = CharSourceDebug #CharSource = CharSourceDebug