diff options
| author | Ralph Amissah <ralph@amissah.com> | 2010-05-18 22:49:51 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2010-05-18 22:49:51 -0400 |
| commit | d59215ca524a8c349c38672e242ce4e960bb04e6 (patch) | |
| tree | 411c6163b6d9ab58e35129d1ebf065a6f30b6b53 /lib/sisu/v2/dal_doc_str.rb | |
| parent | debian/changelog (2.3.4-1) (diff) | |
| parent | update: changelog, version (2.3.5) (diff) | |
Merge branch 'upstream' into debian/sid
Diffstat (limited to 'lib/sisu/v2/dal_doc_str.rb')
| -rw-r--r-- | lib/sisu/v2/dal_doc_str.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/sisu/v2/dal_doc_str.rb b/lib/sisu/v2/dal_doc_str.rb index 46ae8d3c..a250175b 100644 --- a/lib/sisu/v2/dal_doc_str.rb +++ b/lib/sisu/v2/dal_doc_str.rb @@ -102,9 +102,9 @@ module SiSU_document_structure_extract tags=[] if str.nil? else - if str =~/(?:^|[ ])\*~([a-z0-9._-]+)(?:[ ]|$)/ - str.gsub!(/(^|[ ])\*~([a-z0-9._-]+)([ ]|$)/i, - "\\1#{Mx[:tag_o]}\\2#{Mx[:tag_c]}\\3") + if str =~/(?:^|[ ])\*~([a-z0-9._-]+)(?=[ #{Mx[:br_nl]}]|$)/ + str.gsub!(/(^|[ ])\*~([a-z0-9._-]+)(?=[ #{Mx[:br_nl]}]|$)/i, + "\\1#{Mx[:tag_o]}\\2#{Mx[:tag_c]}") str.gsub!(/ [ ]+/i,' ') tags=str.scan(/#{Mx[:tag_o]}(\S+?)#{Mx[:tag_c]}/).flatten str.gsub!(/[ ]?#{Mx[:tag_o]}\S+?#{Mx[:tag_c]}[ ]?/,' ') #may be issues with spaces would leave one, but "code" blocks? |