diff options
| author | Ralph Amissah <ralph@amissah.com> | 2007-09-04 22:17:10 +0100 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2007-09-04 22:17:10 +0100 |
| commit | 3c315f9fec6be9c8152840166c2d5900121bb11d (patch) | |
| tree | a495f9287535ff4ac62281d219e012d1b8dca784 | |
| parent | Merge branch 'upstream' into debian/sid (diff) | |
| parent | dal detail, code-block exception to header markup of bold and italics (diff) | |
Merge branch 'upstream' into debian/sid
| -rw-r--r-- | lib/sisu/v0/dal_syntax.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sisu/v0/dal_syntax.rb b/lib/sisu/v0/dal_syntax.rb index 14bed691..36ea3b04 100644 --- a/lib/sisu/v0/dal_syntax.rb +++ b/lib/sisu/v0/dal_syntax.rb @@ -106,7 +106,7 @@ module Syntax line=line.dup if (defined? @md.make_italic[:str] and @md.make_italic[:str]) \ or (defined? @vz.markup_make_italic[:str] and @vz.markup_make_italic[:str]) - line= if line !~/^(0~|%{1,4}\s)/ #!~/^(?:[0-6]~|!_|%+\s)/ + line= if line !~/^(?:0~|%{1,4}\s|<:code)/ #!~/^(?:[0-6]~|!_|%+\s)/ word=line.scan(@line_scan_ital) word.flatten! word.compact! #reinstated @@ -136,7 +136,7 @@ module Syntax def wordlist_bold(line) line=line.dup if (defined? @md.make_bold[:str] and @md.make_bold[:str]) or (defined? @vz.markup_make_bold[:str] and @vz.markup_make_bold[:str]) - line=if line !~/^(?:[0-9]~|%+\s)/ + line=if line !~/^(?:[0-9]~|%+\s|<:code)/ line_array=[] word=line.scan(@line_scan_bold) word.flatten! |