diff options
| author | Ralph Amissah <ralph@amissah.com> | 2014-07-01 00:33:49 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2014-07-01 00:33:52 -0400 |
| commit | 954419b5ae79efb032d28b145ee40d0b61c80c23 (patch) | |
| tree | 6076bfea3c7a0d93c387a9d4d3bfe1e479aac6d3 /lib/sisu/v5/ao_syntax.rb | |
| parent | sisu.org minor (diff) | |
v5: merge what was sisu_6.0.8 into v5
* ao,
* syntax, able optionally to indicate the language syntax of a code block
* syntax, introduce box text block/group
* syntax, introduce tics quotes markup (blockquote equivalent)
* docbook,
* ocn & footnote numbers (as xml comments)
* metadata header (docinfo)
* quotes (blockquote)
* tables
* images
* code block
* vim syntax, add
* code block, language syntax, optional
* box block
* quote block
Diffstat (limited to 'lib/sisu/v5/ao_syntax.rb')
| -rw-r--r-- | lib/sisu/v5/ao_syntax.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sisu/v5/ao_syntax.rb b/lib/sisu/v5/ao_syntax.rb index a75e2690..619c5ac0 100644 --- a/lib/sisu/v5/ao_syntax.rb +++ b/lib/sisu/v5/ao_syntax.rb @@ -91,7 +91,7 @@ module SiSU_AO_Syntax { o: Mx[:fa_underscore_o], c: Mx[:fa_underscore_c] } else p __LINE__.to_s + '::' + __FILE__ end - @http_m=%r{\{.+?\}https?://\S+|https?:\S+|:\S+|\.\.\/\S+|#\S+|\S+?\.png\b|[*]~\S+|^#{Mx[:meta_o]}.+|#{Mx[:gr_o]}(?:code|block|group|alt|verse)(?:-end)?#{Mx[:gr_c]}|#{Mx[:fa_o]}:br#{Mx[:fa_c]}} + @http_m=%r{\{.+?\}https?://\S+|https?:\S+|:\S+|\.\.\/\S+|#\S+|\S+?\.png\b|[*]~\S+|^#{Mx[:meta_o]}.+|#{Mx[:gr_o]}(?:code(?:\.[a-z][0-9a-z_]+)?|box(?:\.[a-z_]+)?|block|group|alt|verse)(?:-end)?#{Mx[:gr_c]}|#{Mx[:fa_o]}:br#{Mx[:fa_c]}} @manmkp_ital=emph_italics \ ? '[i/*]\\{.+?\\}[i/*]' : '[i/]\\{.+?\\}[i/]' @@ -163,6 +163,7 @@ module SiSU_AO_Syntax && dob.is !=:heading \ && dob.is !=:heading_insert \ && dob.is !=:code \ + && dob.is !=:layout \ && dob.is !=:comment word=dob.obj.scan(@line_scan_ital) word=word.flatten.compact |