From c7c6c121884feb55ae3964e6055ac8ca983458cd Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sat, 20 Aug 2016 08:57:12 -0400 Subject: step 0.6.3 includes fixes --- org/ao_defaults.org | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'org/ao_defaults.org') diff --git a/org/ao_defaults.org b/org/ao_defaults.org index a6baeb4..78b1de8 100644 --- a/org/ao_defaults.org +++ b/org/ao_defaults.org @@ -507,6 +507,10 @@ template InternalMarkup() { * regex ctRegex :regex: [[./sdp.org][sdp]] [[./][org/]] +http://dlang.org/phobos/std_regex.html +- Plain string, in which case it's compiled to bytecode before matching. +- Regex!char (wchar/dchar) that contains a pattern in the form of compiled bytecode. +- StaticRegex!char (wchar/dchar) that contains a pattern in the form of compiled native machine code. ** misc :misc: @@ -620,7 +624,7 @@ static para_attribs = ctRegex!(`^_(([0-9])(_([0-9]))?|_([1-9])?[*]) `); #+name: ao_rgx #+BEGIN_SRC d /+ blocked markup +/ -static block_open = ctRegex!("^((code|poem|group|block|quote|table)[{].*?$)|^`{3} (code|poem|group|block|quote|table)"); +static block_open = ctRegex!("^((code([.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)[{].*?$)|^`{3} (code([.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)"); // static block_open_less_code = ctRegex!("^(((poem|group|block|quote|table)[{].*?$)|`{3} (poem|group|block|quote|table))"); static block_poem_open = ctRegex!("^((poem[{].*?$)|`{3} poem)"); #+END_SRC @@ -630,9 +634,9 @@ static block_poem_open = ctRegex!("^((poem[{].*?$)|`{3} poem)"); #+name: ao_rgx #+BEGIN_SRC d /+ blocked markup tics +/ -static block_tic_open = ctRegex!("^`{3} (code|poem|group|block|quote|table)"); +static block_tic_open = ctRegex!("^`{3} (code([.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)"); // static block_tic_open_less_code = ctRegex!("^`{3} (poem|group|block|quote|table)"); -static block_tic_code_open = ctRegex!("^`{3} (code)"); +static block_tic_code_open = ctRegex!("^`{3} (code)([.][a-z][0-9a-z_]+)?"); static block_tic_poem_open = ctRegex!("^`{3} (poem)"); static block_tic_group_open = ctRegex!("^`{3} (group)"); static block_tic_block_open = ctRegex!("^`{3} (block)"); @@ -646,9 +650,9 @@ static block_tic_close = ctRegex!("^(`{3})$","m"); #+name: ao_rgx #+BEGIN_SRC d /+ blocked markup curly +/ -static block_curly_open = ctRegex!(`^((code|poem|group|block|quote|table)[{].*?$)`); +static block_curly_open = ctRegex!(`^((code([.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)[{].*?$)`); // static block_curly_open_less_code = ctRegex!(`^((poem|group|block|quote|table)[{].*?$)`); -static block_curly_code_open = ctRegex!(`^(code[{].*?$)`); +static block_curly_code_open = ctRegex!(`^(code([.][a-z][0-9a-z_]+)?[{].*?$)`); static block_curly_code_close = ctRegex!(`^([}]code)`); static block_curly_poem_open = ctRegex!(`^(poem[{].*?$)`); static block_curly_poem_close = ctRegex!(`^([}]poem)`); -- cgit v1.2.3