diff options
| author | Ralph Amissah <ralph.amissah@gmail.com> | 2018-12-12 17:22:26 -0500 | 
|---|---|---|
| committer | Ralph Amissah <ralph.amissah@gmail.com> | 2019-05-17 16:59:38 -0400 | 
| commit | 422dff833551ef5f2eb9530edbd8ea710d59a0f3 (patch) | |
| tree | 0c58720dc5e56b25e824d47193537e3efca1a3e9 /org | |
| parent | 0.4.1 markup syntax extension for blocks, re: attributes (diff) | |
code block, number(ed), regex for keyword instruction, not implemented
- code(number){
  to number code block
  (hash symbol "#" used previously)
Diffstat (limited to 'org')
| -rw-r--r-- | org/default_regex.org | 20 | ||||
| -rw-r--r-- | org/meta_abstraction.org | 6 | 
2 files changed, 18 insertions, 8 deletions
| diff --git a/org/default_regex.org b/org/default_regex.org index ad8b9e5..6138eb5 100644 --- a/org/default_regex.org +++ b/org/default_regex.org @@ -174,8 +174,8 @@ static para_inline_link_anchor                        = ctRegex!(`\*[~](?P<ancho  #+name: meta_rgx  #+BEGIN_SRC d  /+ blocked markup +/ -static block_open                                     = ctRegex!("^((code(?:[.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)(?:[(][ a-zA-Z0-9;:,#]*[)])?[{][ ]*$)|^`{3} (code(?:[.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)(?:[(][ a-zA-Z0-9;:,#]*[)])?|^[{]table[(](?:h;)?(?P<columns>(?:[ ,]+[0-9]+)+)[)][}]"); -static block_poem_open                                = ctRegex!("^((poem(?:[(][ a-zA-Z0-9;:,#]*[)])?[{][ ]*$)|`{3} poem(?:[(][ a-zA-Z0-9;:,#]*[)])?)"); +static block_open                                     = ctRegex!("^((code(?:[.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)(?:[(][ a-zA-Z0-9;:,]*[)])?[{][ ]*$)|^`{3} (code(?:[.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)(?:[(][ a-zA-Z0-9;:,]*[)])?|^[{]table[(](?:h;)?(?P<columns>(?:[ ,]+[0-9]+)+)[)][}]"); +static block_poem_open                                = ctRegex!("^((poem(?:[(][ a-zA-Z0-9;:,]*[)])?[{][ ]*$)|`{3} poem(?:[(][ a-zA-Z0-9;:,]*[)])?)");  #+END_SRC  *** blocked markup tic                                          :block:tic: @@ -184,7 +184,7 @@ static block_poem_open                                = ctRegex!("^((poem(?:[(][  #+BEGIN_SRC d  /+ blocked markup tics +/  static block_tic_open                                 = ctRegex!("^`{3} (code(?:[.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)"); -static block_tic_code_open                            = ctRegex!("^`{3} (?:code)(?:[.](?P<syntax>[a-z][0-9a-z_]+))?(?:[(](?P<attrib>[ a-zA-Z0-9;:,#]*)[)])?"); +static block_tic_code_open                            = ctRegex!("^`{3} (?:code)(?:[.](?P<syntax>[a-z][0-9a-z_]+))?(?:[(](?P<attrib>[ a-zA-Z0-9;:,]*)[)])?");  static block_tic_poem_open                            = ctRegex!("^`{3} (poem)(?:[(](?P<attrib>[ a-zA-Z0-9;:,]*)[)])?");  static block_tic_group_open                           = ctRegex!("^`{3} (group)(?:[(](?P<attrib>[ a-zA-Z0-9;:,]*)[)])?");  static block_tic_block_open                           = ctRegex!("^`{3} (block)(?:[(](?P<attrib>[ a-zA-Z0-9;:,]*)[)])?"); @@ -198,8 +198,8 @@ static block_tic_close                                = ctRegex!("^(`{3})$","m")  #+name: meta_rgx  #+BEGIN_SRC d  /+ blocked markup curly +/ -static block_curly_open                               = ctRegex!(`^((?:code([.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)(?:[(][ a-zA-Z0-9;:,#]*[)])?[{][ ]*$)`); -static block_curly_code_open                          = ctRegex!(`^(?:code(?:[.](?P<syntax>[a-z][0-9a-z_]+))?(?:[(](?P<attrib>[ a-zA-Z0-9;:,#]*)[)])?[{][ ]*$)`); +static block_curly_open                               = ctRegex!(`^((?:code([.][a-z][0-9a-z_]+)?|poem|group|block|quote|table)(?:[(][ a-zA-Z0-9;:,]*[)])?[{][ ]*$)`); +static block_curly_code_open                          = ctRegex!(`^(?:code(?:[.](?P<syntax>[a-z][0-9a-z_]+))?(?:[(](?P<attrib>[ a-zA-Z0-9;:,]*)[)])?[{][ ]*$)`);  static block_curly_code_close                         = ctRegex!(`^([}]code)`);  static block_curly_poem_open                          = ctRegex!(`^(poem(?:[(](?P<attrib>[ a-zA-Z0-9;:,]*)[)])?[{][ ]*$)`);  static block_curly_poem_close                         = ctRegex!(`^([}]poem)`); @@ -214,7 +214,15 @@ static block_curly_table_close                        = ctRegex!(`^([}]table)`);  static block_curly_table_special_markup               = ctRegex!(`^[{]table[(](?P<attrib>(?:(h);)?(?P<columns>(?:[, ]+[0-9]+)+))[)][}]`, "mg");  #+END_SRC -*** block sub-matches                                         :block:curly: +*** block sub-matches                                               :block: +**** code + +#+name: meta_rgx +#+BEGIN_SRC d +static code_numbering                                 = ctRegex!(`(?P<number>\bnumber\b)`); +#+END_SRC + +**** table  #+name: meta_rgx  #+BEGIN_SRC d diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org index 51b089c..1a9c53c 100644 --- a/org/meta_abstraction.org +++ b/org/meta_abstraction.org @@ -3161,7 +3161,8 @@ void _start_block_(L,T,N)(    if (auto m = line.matchFirst(rgx.block_curly_code_open)) {      /+ curly code open +/      code_block_syntax = (m.captures[1]) ? m.captures[1].to!string : ""; -    code_block_numbered = (m.captures[2] == "#") ? true : false; +    code_block_numbered = (m.captures[2].matchFirst(rgx.code_numbering)) +      ? true : false;      debug(codecurly) {                              // code (curly) open        writefln(          "* [code curly] %s", @@ -3246,7 +3247,8 @@ void _start_block_(L,T,N)(    } else if (auto m = line.matchFirst(rgx.block_tic_code_open)) {      /+ tic code open +/      code_block_syntax = (m.captures[1]) ? m.captures[1].to!string : ""; -    code_block_numbered = (m.captures[2] == "#") ? true : false; +    code_block_numbered = (m.captures[2].matchFirst(rgx.code_numbering)) +      ? true : false;      debug(codetic) {                              // code (tic) open        writefln(          "* [code tic] %s", | 
