From: Fletcher T. Penney Date: Wed, 29 Mar 2017 23:19:45 +0000 (-0400) Subject: FIXED: Don't separate out 'à' X-Git-Tag: 6.0.3^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=213b96e81d5e64e40c1a95c317b4f4ec56a8c441;p=multimarkdown FIXED: Don't separate out 'à' --- diff --git a/Sources/libMultiMarkdown/lexer.c b/Sources/libMultiMarkdown/lexer.c index 9e0dce9..c4122ef 100644 --- a/Sources/libMultiMarkdown/lexer.c +++ b/Sources/libMultiMarkdown/lexer.c @@ -1,4 +1,4 @@ -/* Generated by re2c 0.14.3 on Wed Mar 29 18:33:51 2017 */ +/* Generated by re2c 0.14.3 on Wed Mar 29 19:16:39 2017 */ /** MultiMarkdown 6 -- Lightweight markup processor to produce HTML, LaTeX, and more. @@ -168,25 +168,25 @@ int scan(Scanner * s, const char * stop) { case 'x': case 'y': case 'z': - case 0x7F: goto yy67; - case '\t': goto yy47; - case '\n': goto yy56; - case '\r': goto yy58; - case ' ': goto yy49; - case '!': goto yy20; - case '"': goto yy30; - case '#': goto yy51; - case '$': goto yy43; - case '%': goto yy53; - case '&': goto yy37; - case '\'': goto yy32; - case '(': goto yy22; - case ')': goto yy24; - case '*': goto yy59; - case '+': goto yy6; - case '-': goto yy8; - case '.': goto yy34; - case '/': goto yy39; + case 0x7F: goto yy66; + case '\t': goto yy46; + case '\n': goto yy55; + case '\r': goto yy57; + case ' ': goto yy48; + case '!': goto yy19; + case '"': goto yy29; + case '#': goto yy50; + case '$': goto yy42; + case '%': goto yy52; + case '&': goto yy36; + case '\'': goto yy31; + case '(': goto yy21; + case ')': goto yy23; + case '*': goto yy58; + case '+': goto yy5; + case '-': goto yy7; + case '.': goto yy33; + case '/': goto yy38; case '0': case '1': case '2': @@ -196,23 +196,23 @@ int scan(Scanner * s, const char * stop) { case '6': case '7': case '8': - case '9': goto yy55; - case ':': goto yy35; - case '<': goto yy10; - case '=': goto yy14; - case '>': goto yy26; - case '[': goto yy16; - case '\\': goto yy41; - case ']': goto yy18; - case '^': goto yy45; - case '_': goto yy61; - case '`': goto yy63; - case '{': goto yy4; - case '|': goto yy65; - case '}': goto yy28; - case '~': goto yy12; - case 0xC2: goto yy50; - case 0xC3: goto yy3; + case '9': goto yy54; + case ':': goto yy34; + case '<': goto yy9; + case '=': goto yy13; + case '>': goto yy25; + case '[': goto yy15; + case '\\': goto yy40; + case ']': goto yy17; + case '^': goto yy44; + case '_': goto yy60; + case '`': goto yy62; + case '{': goto yy3; + case '|': goto yy64; + case '}': goto yy27; + case '~': goto yy11; + case 0xC2: goto yy49; + case 0xC3: case 0xC4: case 0xC5: case 0xC6: @@ -240,8 +240,8 @@ int scan(Scanner * s, const char * stop) { case 0xDC: case 0xDD: case 0xDE: - case 0xDF: goto yy68; - case 0xE0: goto yy69; + case 0xDF: goto yy67; + case 0xE0: goto yy68; case 0xE1: case 0xE2: case 0xE3: @@ -256,308 +256,239 @@ int scan(Scanner * s, const char * stop) { case 0xEC: case 0xED: case 0xEE: - case 0xEF: goto yy70; - case 0xF0: goto yy71; + case 0xEF: goto yy69; + case 0xF0: goto yy70; case 0xF1: case 0xF2: - case 0xF3: goto yy72; - case 0xF4: goto yy73; + case 0xF3: goto yy71; + case 0xF4: goto yy72; default: goto yy2; } yy2: YYCURSOR = YYMARKER; switch (yyaccept) { - case 0: goto yy5; - case 1: goto yy7; - case 2: goto yy11; - case 3: goto yy13; - case 4: goto yy15; - case 5: goto yy21; - case 6: goto yy38; - case 7: goto yy52; - case 8: goto yy82; - case 9: goto yy90; - case 10: goto yy97; - case 11: goto yy106; - case 12: goto yy113; - case 13: goto yy122; - case 14: goto yy129; - case 15: goto yy136; - case 16: goto yy146; - default: goto yy281; + case 0: goto yy4; + case 1: goto yy6; + case 2: goto yy10; + case 3: goto yy12; + case 4: goto yy14; + case 5: goto yy20; + case 6: goto yy37; + case 7: goto yy51; + case 8: goto yy81; + case 9: goto yy89; + case 10: goto yy96; + case 11: goto yy105; + case 12: goto yy112; + case 13: goto yy121; + case 14: goto yy128; + case 15: goto yy135; + case 16: goto yy145; + default: goto yy280; } yy3: - yych = *++YYCURSOR; - switch (yych) { - case 0x80: - case 0x81: - case 0x82: - case 0x84: - case 0x85: - case 0x86: - case 0x87: - case 0x88: - case 0x89: - case 0x8A: - case 0x8B: - case 0x8C: - case 0x8D: - case 0x8E: - case 0x8F: - case 0x90: - case 0x91: - case 0x92: - case 0x93: - case 0x94: - case 0x95: - case 0x96: - case 0x97: - case 0x98: - case 0x99: - case 0x9A: - case 0x9B: - case 0x9C: - case 0x9D: - case 0x9E: - case 0x9F: - case 0xA0: - case 0xA1: - case 0xA2: - case 0xA3: - case 0xA4: - case 0xA5: - case 0xA6: - case 0xA7: - case 0xA8: - case 0xA9: - case 0xAA: - case 0xAB: - case 0xAC: - case 0xAD: - case 0xAE: - case 0xAF: - case 0xB0: - case 0xB1: - case 0xB2: - case 0xB3: - case 0xB4: - case 0xB5: - case 0xB6: - case 0xB7: - case 0xB8: - case 0xB9: - case 0xBA: - case 0xBB: - case 0xBC: - case 0xBD: - case 0xBE: - case 0xBF: goto yy67; - case 0x83: goto yy303; - default: goto yy2; - } -yy4: yyaccept = 0; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '+': goto yy286; - case '-': goto yy285; - case '=': goto yy282; - case '>': goto yy284; - case '{': goto yy280; - case '~': goto yy283; - default: goto yy5; + case '+': goto yy285; + case '-': goto yy284; + case '=': goto yy281; + case '>': goto yy283; + case '{': goto yy279; + case '~': goto yy282; + default: goto yy4; } -yy5: +yy4: { return TEXT_BRACE_LEFT; } -yy6: +yy5: yyaccept = 1; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '+': goto yy277; - default: goto yy7; + case '+': goto yy276; + default: goto yy6; } -yy7: +yy6: { return PLUS; } -yy8: +yy7: ++YYCURSOR; switch ((yych = *YYCURSOR)) { - case '-': goto yy271; - default: goto yy9; + case '-': goto yy270; + default: goto yy8; } -yy9: +yy8: { return DASH_N; } -yy10: +yy9: yyaccept = 2; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '<': goto yy268; - default: goto yy11; + case '<': goto yy267; + default: goto yy10; } -yy11: +yy10: { return ANGLE_LEFT; } -yy12: +yy11: yyaccept = 3; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '>': goto yy264; - case '~': goto yy263; - default: goto yy13; + case '>': goto yy263; + case '~': goto yy262; + default: goto yy12; } -yy13: +yy12: { return SUBSCRIPT; } -yy14: +yy13: yyaccept = 4; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '=': goto yy260; - default: goto yy15; + case '=': goto yy259; + default: goto yy14; } -yy15: +yy14: { return EQUAL; } -yy16: +yy15: ++YYCURSOR; switch ((yych = *YYCURSOR)) { - case '#': goto yy256; - case '%': goto yy250; - case '>': goto yy258; - case '?': goto yy252; - case '^': goto yy254; - default: goto yy17; + case '#': goto yy255; + case '%': goto yy249; + case '>': goto yy257; + case '?': goto yy251; + case '^': goto yy253; + default: goto yy16; } -yy17: +yy16: { return BRACKET_LEFT; } -yy18: +yy17: ++YYCURSOR; { return BRACKET_RIGHT; } -yy20: +yy19: ++YYCURSOR; switch ((yych = *YYCURSOR)) { - case '[': goto yy248; - default: goto yy21; + case '[': goto yy247; + default: goto yy20; } -yy21: +yy20: { goto scan; } -yy22: +yy21: ++YYCURSOR; { return PAREN_LEFT; } -yy24: +yy23: ++YYCURSOR; { return PAREN_RIGHT; } -yy26: +yy25: ++YYCURSOR; { return ANGLE_RIGHT; } -yy28: +yy27: ++YYCURSOR; switch ((yych = *YYCURSOR)) { - case '}': goto yy246; - default: goto yy29; + case '}': goto yy245; + default: goto yy28; } -yy29: +yy28: { return TEXT_BRACE_RIGHT; } -yy30: +yy29: ++YYCURSOR; { return QUOTE_DOUBLE; } -yy32: +yy31: ++YYCURSOR; switch ((yych = *YYCURSOR)) { - case '\'': goto yy244; - default: goto yy33; + case '\'': goto yy243; + default: goto yy32; } -yy33: +yy32: { return QUOTE_SINGLE; } -yy34: +yy33: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case ' ': goto yy236; - case '.': goto yy237; - default: goto yy21; + case ' ': goto yy235; + case '.': goto yy236; + default: goto yy20; } -yy35: +yy34: ++YYCURSOR; { return COLON; } -yy37: +yy36: yyaccept = 6; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { case 'A': - case 'a': goto yy231; - default: goto yy38; + case 'a': goto yy230; + default: goto yy37; } -yy38: +yy37: { return AMPERSAND; } -yy39: +yy38: ++YYCURSOR; { return SLASH; } -yy41: +yy40: ++YYCURSOR; switch ((yych = *YYCURSOR)) { - case '\n': goto yy154; - case '\r': goto yy156; - case ' ': goto yy159; - case '!': goto yy219; - case '"': goto yy209; - case '#': goto yy189; - case '$': goto yy187; - case '%': goto yy185; - case '&': goto yy173; - case '\'': goto yy207; - case '(': goto yy201; - case ')': goto yy199; - case '*': goto yy165; - case '+': goto yy183; - case ',': goto yy215; - case '-': goto yy181; - case '.': goto yy221; - case '/': goto yy169; - case ':': goto yy211; - case ';': goto yy213; - case '<': goto yy177; - case '=': goto yy179; - case '>': goto yy175; - case '?': goto yy217; - case '@': goto yy171; - case '[': goto yy193; - case '\\': goto yy157; - case ']': goto yy191; - case '^': goto yy167; - case '_': goto yy163; - case '`': goto yy205; - case '{': goto yy197; - case '|': goto yy161; - case '}': goto yy195; - case '~': goto yy203; - default: goto yy42; + case '\n': goto yy153; + case '\r': goto yy155; + case ' ': goto yy158; + case '!': goto yy218; + case '"': goto yy208; + case '#': goto yy188; + case '$': goto yy186; + case '%': goto yy184; + case '&': goto yy172; + case '\'': goto yy206; + case '(': goto yy200; + case ')': goto yy198; + case '*': goto yy164; + case '+': goto yy182; + case ',': goto yy214; + case '-': goto yy180; + case '.': goto yy220; + case '/': goto yy168; + case ':': goto yy210; + case ';': goto yy212; + case '<': goto yy176; + case '=': goto yy178; + case '>': goto yy174; + case '?': goto yy216; + case '@': goto yy170; + case '[': goto yy192; + case '\\': goto yy156; + case ']': goto yy190; + case '^': goto yy166; + case '_': goto yy162; + case '`': goto yy204; + case '{': goto yy196; + case '|': goto yy160; + case '}': goto yy194; + case '~': goto yy202; + default: goto yy41; } -yy42: +yy41: { return TEXT_BACKSLASH; } -yy43: +yy42: ++YYCURSOR; switch ((yych = *YYCURSOR)) { - case '$': goto yy152; - default: goto yy44; + case '$': goto yy151; + default: goto yy43; } -yy44: +yy43: { return MATH_DOLLAR_SINGLE; } -yy45: +yy44: ++YYCURSOR; { return SUPERSCRIPT; } -yy47: +yy46: ++YYCURSOR; { return INDENT_TAB; } -yy49: +yy48: YYCTXMARKER = YYCURSOR + 1; yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '\t': goto yy138; - case '\n': goto yy56; - case '\r': goto yy151; - case ' ': goto yy135; - case 0xC2: goto yy137; - default: goto yy21; + case '\t': goto yy137; + case '\n': goto yy55; + case '\r': goto yy150; + case ' ': goto yy134; + case 0xC2: goto yy136; + default: goto yy20; } -yy50: +yy49: yych = *++YYCURSOR; switch (yych) { case 0x80: @@ -622,11 +553,11 @@ yy50: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy67; - case 0xA0: goto yy134; + case 0xBF: goto yy66; + case 0xA0: goto yy133; default: goto yy2; } -yy51: +yy50: YYCTXMARKER = YYCURSOR + 1; yyaccept = 7; yych = *(YYMARKER = ++YYCURSOR); @@ -635,20 +566,20 @@ yy51: case '\n': case '\r': case ' ': - case 0xC2: goto yy89; - case '#': goto yy87; - default: goto yy52; + case 0xC2: goto yy88; + case '#': goto yy86; + default: goto yy51; } -yy52: +yy51: { return TEXT_HASH; } -yy53: +yy52: ++YYCURSOR; { return TEXT_PERCENT; } -yy55: +yy54: yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '.': goto yy78; + case '.': goto yy77; case '0': case '1': case '2': @@ -658,41 +589,41 @@ yy55: case '6': case '7': case '8': - case '9': goto yy79; - default: goto yy21; + case '9': goto yy78; + default: goto yy20; } -yy56: +yy55: ++YYCURSOR; -yy57: +yy56: { return TEXT_NL; } -yy58: +yy57: yych = *++YYCURSOR; switch (yych) { - case '\n': goto yy56; - default: goto yy57; + case '\n': goto yy55; + default: goto yy56; } -yy59: +yy58: ++YYCURSOR; { return STAR; } -yy61: +yy60: ++YYCURSOR; { return UL; } -yy63: +yy62: ++YYCURSOR; yych = *YYCURSOR; - goto yy77; -yy64: + goto yy76; +yy63: { return BACKTICK; } -yy65: +yy64: ++YYCURSOR; yych = *YYCURSOR; - goto yy75; -yy66: + goto yy74; +yy65: { return PIPE; } -yy67: +yy66: yych = *++YYCURSOR; - goto yy21; -yy68: + goto yy20; +yy67: yych = *++YYCURSOR; switch (yych) { case 0x80: @@ -758,10 +689,10 @@ yy68: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy67; + case 0xBF: goto yy66; default: goto yy2; } -yy69: +yy68: yych = *++YYCURSOR; switch (yych) { case 0xA0: @@ -795,10 +726,10 @@ yy69: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy68; + case 0xBF: goto yy67; default: goto yy2; } -yy70: +yy69: yych = *++YYCURSOR; switch (yych) { case 0x80: @@ -864,10 +795,10 @@ yy70: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy68; + case 0xBF: goto yy67; default: goto yy2; } -yy71: +yy70: yych = *++YYCURSOR; switch (yych) { case 0x90: @@ -917,10 +848,10 @@ yy71: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy70; + case 0xBF: goto yy69; default: goto yy2; } -yy72: +yy71: yych = *++YYCURSOR; switch (yych) { case 0x80: @@ -986,10 +917,10 @@ yy72: case 0xBC: case 0xBD: case 0xBE: - case 0xBF: goto yy70; + case 0xBF: goto yy69; default: goto yy2; } -yy73: +yy72: yych = *++YYCURSOR; switch (yych) { case 0x80: @@ -1007,41 +938,41 @@ yy73: case 0x8C: case 0x8D: case 0x8E: - case 0x8F: goto yy70; + case 0x8F: goto yy69; default: goto yy2; } -yy74: +yy73: ++YYCURSOR; yych = *YYCURSOR; -yy75: +yy74: switch (yych) { - case '|': goto yy74; - default: goto yy66; + case '|': goto yy73; + default: goto yy65; } -yy76: +yy75: ++YYCURSOR; yych = *YYCURSOR; -yy77: +yy76: switch (yych) { - case '`': goto yy76; - default: goto yy64; + case '`': goto yy75; + default: goto yy63; } -yy78: +yy77: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { case '\t': - case ' ': goto yy84; - case '\n': goto yy81; - case '\r': goto yy83; - case 0xC2: goto yy86; + case ' ': goto yy83; + case '\n': goto yy80; + case '\r': goto yy82; + case 0xC2: goto yy85; default: goto yy2; } -yy79: +yy78: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case '.': goto yy78; + case '.': goto yy77; case '0': case '1': case '2': @@ -1051,38 +982,38 @@ yy79: case '6': case '7': case '8': - case '9': goto yy79; + case '9': goto yy78; default: goto yy2; } -yy81: +yy80: ++YYCURSOR; -yy82: +yy81: YYCURSOR = YYCTXMARKER; { return TEXT_NUMBER_POSS_LIST; } -yy83: +yy82: yych = *++YYCURSOR; switch (yych) { - case '\n': goto yy81; - default: goto yy82; + case '\n': goto yy80; + default: goto yy81; } -yy84: +yy83: yyaccept = 8; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; switch (yych) { case '\t': - case ' ': goto yy84; - case 0xC2: goto yy86; - default: goto yy82; + case ' ': goto yy83; + case 0xC2: goto yy85; + default: goto yy81; } -yy86: +yy85: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case 0xA0: goto yy84; + case 0xA0: goto yy83; default: goto yy2; } -yy87: +yy86: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -1090,77 +1021,77 @@ yy87: case '\n': case '\r': case ' ': - case 0xC2: goto yy96; - case '#': goto yy102; + case 0xC2: goto yy95; + case '#': goto yy101; default: goto yy2; } -yy88: +yy87: yyaccept = 9; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; -yy89: +yy88: switch (yych) { case '\t': - case ' ': goto yy88; - case '\n': goto yy92; - case '\r': goto yy94; - case 0xC2: goto yy91; - default: goto yy90; + case ' ': goto yy87; + case '\n': goto yy91; + case '\r': goto yy93; + case 0xC2: goto yy90; + default: goto yy89; } -yy90: +yy89: { return HASH1; } -yy91: +yy90: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case 0xA0: goto yy88; + case 0xA0: goto yy87; default: goto yy2; } -yy92: +yy91: ++YYCURSOR; -yy93: +yy92: YYCURSOR = YYCTXMARKER; { return HASH1; } -yy94: +yy93: yych = *++YYCURSOR; switch (yych) { - case '\n': goto yy92; - default: goto yy93; + case '\n': goto yy91; + default: goto yy92; } -yy95: +yy94: yyaccept = 10; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; -yy96: +yy95: switch (yych) { case '\t': - case ' ': goto yy95; - case '\n': goto yy99; - case '\r': goto yy101; - case 0xC2: goto yy98; - default: goto yy97; + case ' ': goto yy94; + case '\n': goto yy98; + case '\r': goto yy100; + case 0xC2: goto yy97; + default: goto yy96; } -yy97: +yy96: { return HASH2; } -yy98: +yy97: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case 0xA0: goto yy95; + case 0xA0: goto yy94; default: goto yy2; } -yy99: +yy98: ++YYCURSOR; -yy100: +yy99: YYCURSOR = YYCTXMARKER; { return HASH2; } -yy101: +yy100: yych = *++YYCURSOR; switch (yych) { - case '\n': goto yy99; - default: goto yy100; + case '\n': goto yy98; + default: goto yy99; } -yy102: +yy101: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -1168,11 +1099,11 @@ yy102: case '\n': case '\r': case ' ': - case 0xC2: goto yy105; - case '#': goto yy103; + case 0xC2: goto yy104; + case '#': goto yy102; default: goto yy2; } -yy103: +yy102: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -1180,77 +1111,77 @@ yy103: case '\n': case '\r': case ' ': - case 0xC2: goto yy112; - case '#': goto yy118; + case 0xC2: goto yy111; + case '#': goto yy117; default: goto yy2; } -yy104: +yy103: yyaccept = 11; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; -yy105: +yy104: switch (yych) { case '\t': - case ' ': goto yy104; - case '\n': goto yy108; - case '\r': goto yy110; - case 0xC2: goto yy107; - default: goto yy106; + case ' ': goto yy103; + case '\n': goto yy107; + case '\r': goto yy109; + case 0xC2: goto yy106; + default: goto yy105; } -yy106: +yy105: { return HASH3; } -yy107: +yy106: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case 0xA0: goto yy104; + case 0xA0: goto yy103; default: goto yy2; } -yy108: +yy107: ++YYCURSOR; -yy109: +yy108: YYCURSOR = YYCTXMARKER; { return HASH3; } -yy110: +yy109: yych = *++YYCURSOR; switch (yych) { - case '\n': goto yy108; - default: goto yy109; + case '\n': goto yy107; + default: goto yy108; } -yy111: +yy110: yyaccept = 12; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; -yy112: +yy111: switch (yych) { case '\t': - case ' ': goto yy111; - case '\n': goto yy115; - case '\r': goto yy117; - case 0xC2: goto yy114; - default: goto yy113; + case ' ': goto yy110; + case '\n': goto yy114; + case '\r': goto yy116; + case 0xC2: goto yy113; + default: goto yy112; } -yy113: +yy112: { return HASH4; } -yy114: +yy113: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case 0xA0: goto yy111; + case 0xA0: goto yy110; default: goto yy2; } -yy115: +yy114: ++YYCURSOR; -yy116: +yy115: YYCURSOR = YYCTXMARKER; { return HASH4; } -yy117: +yy116: yych = *++YYCURSOR; switch (yych) { - case '\n': goto yy115; - default: goto yy116; + case '\n': goto yy114; + default: goto yy115; } -yy118: +yy117: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -1258,11 +1189,11 @@ yy118: case '\n': case '\r': case ' ': - case 0xC2: goto yy121; - case '#': goto yy119; + case 0xC2: goto yy120; + case '#': goto yy118; default: goto yy2; } -yy119: +yy118: YYCTXMARKER = YYCURSOR + 1; yych = *++YYCURSOR; switch (yych) { @@ -1270,501 +1201,507 @@ yy119: case '\n': case '\r': case ' ': - case 0xC2: goto yy128; + case 0xC2: goto yy127; default: goto yy2; } -yy120: +yy119: yyaccept = 13; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; -yy121: +yy120: switch (yych) { case '\t': - case ' ': goto yy120; - case '\n': goto yy124; - case '\r': goto yy126; - case 0xC2: goto yy123; - default: goto yy122; + case ' ': goto yy119; + case '\n': goto yy123; + case '\r': goto yy125; + case 0xC2: goto yy122; + default: goto yy121; } -yy122: +yy121: { return HASH5; } -yy123: +yy122: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case 0xA0: goto yy120; + case 0xA0: goto yy119; default: goto yy2; } -yy124: +yy123: ++YYCURSOR; -yy125: +yy124: YYCURSOR = YYCTXMARKER; { return HASH5; } -yy126: +yy125: yych = *++YYCURSOR; switch (yych) { - case '\n': goto yy124; - default: goto yy125; + case '\n': goto yy123; + default: goto yy124; } -yy127: +yy126: yyaccept = 14; YYMARKER = ++YYCURSOR; yych = *YYCURSOR; -yy128: +yy127: switch (yych) { case '\t': - case ' ': goto yy127; - case '\n': goto yy131; - case '\r': goto yy133; - case 0xC2: goto yy130; - default: goto yy129; + case ' ': goto yy126; + case '\n': goto yy130; + case '\r': goto yy132; + case 0xC2: goto yy129; + default: goto yy128; } -yy129: +yy128: { return HASH6; } -yy130: +yy129: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case 0xA0: goto yy127; + case 0xA0: goto yy126; default: goto yy2; } -yy131: +yy130: ++YYCURSOR; -yy132: +yy131: YYCURSOR = YYCTXMARKER; { return HASH6; } -yy133: +yy132: yych = *++YYCURSOR; switch (yych) { - case '\n': goto yy131; - default: goto yy132; + case '\n': goto yy130; + default: goto yy131; } -yy134: +yy133: YYCTXMARKER = YYCURSOR + 1; yyaccept = 5; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '\t': goto yy138; - case ' ': goto yy135; - case 0xC2: goto yy137; - default: goto yy21; + case '\t': goto yy137; + case ' ': goto yy134; + case 0xC2: goto yy136; + default: goto yy20; } -yy135: +yy134: yyaccept = 15; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '\n': goto yy142; - case '\r': goto yy144; - case ' ': goto yy140; - case 0xC2: goto yy141; - default: goto yy136; + case '\n': goto yy141; + case '\r': goto yy143; + case ' ': goto yy139; + case 0xC2: goto yy140; + default: goto yy135; } -yy136: +yy135: { return NON_INDENT_SPACE; } -yy137: +yy136: yych = *++YYCURSOR; switch (yych) { - case 0xA0: goto yy135; + case 0xA0: goto yy134; default: goto yy2; } -yy138: +yy137: ++YYCURSOR; YYCURSOR = YYCTXMARKER; { return NON_INDENT_SPACE; } -yy140: +yy139: yyaccept = 15; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '\n': goto yy142; - case '\r': goto yy144; - case ' ': goto yy145; - case 0xC2: goto yy147; - default: goto yy136; + case '\n': goto yy141; + case '\r': goto yy143; + case ' ': goto yy144; + case 0xC2: goto yy146; + default: goto yy135; } -yy141: +yy140: yych = *++YYCURSOR; switch (yych) { - case 0xA0: goto yy140; + case 0xA0: goto yy139; default: goto yy2; } -yy142: +yy141: ++YYCURSOR; -yy143: +yy142: { return TEXT_LINEBREAK; } -yy144: +yy143: yych = *++YYCURSOR; switch (yych) { - case '\n': goto yy142; - default: goto yy143; + case '\n': goto yy141; + default: goto yy142; } -yy145: +yy144: yyaccept = 16; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case '\n': goto yy142; - case '\r': goto yy144; - case ' ': goto yy148; - case 0xC2: goto yy150; - default: goto yy146; + case '\n': goto yy141; + case '\r': goto yy143; + case ' ': goto yy147; + case 0xC2: goto yy149; + default: goto yy145; } -yy146: +yy145: { return INDENT_SPACE; } -yy147: +yy146: yych = *++YYCURSOR; switch (yych) { - case 0xA0: goto yy145; + case 0xA0: goto yy144; default: goto yy2; } -yy148: +yy147: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case '\n': goto yy142; - case '\r': goto yy144; - case ' ': goto yy148; - case 0xC2: goto yy150; + case '\n': goto yy141; + case '\r': goto yy143; + case ' ': goto yy147; + case 0xC2: goto yy149; default: goto yy2; } -yy150: +yy149: ++YYCURSOR; yych = *YYCURSOR; switch (yych) { - case 0xA0: goto yy148; + case 0xA0: goto yy147; default: goto yy2; } -yy151: +yy150: yych = *++YYCURSOR; switch (yych) { - case '\n': goto yy56; - default: goto yy57; + case '\n': goto yy55; + default: goto yy56; } -yy152: +yy151: ++YYCURSOR; { return MATH_DOLLAR_DOUBLE; } -yy154: +yy153: ++YYCURSOR; -yy155: +yy154: { return TEXT_LINEBREAK; } -yy156: +yy155: yych = *++YYCURSOR; switch (yych) { - case '\n': goto yy154; - default: goto yy155; + case '\n': goto yy153; + default: goto yy154; } -yy157: +yy156: ++YYCURSOR; switch ((yych = *YYCURSOR)) { - case '(': goto yy223; - case ')': goto yy225; - case '[': goto yy227; - case ']': goto yy229; - default: goto yy158; + case '(': goto yy222; + case ')': goto yy224; + case '[': goto yy226; + case ']': goto yy228; + default: goto yy157; } -yy158: +yy157: { return ESCAPED_CHARACTER; } -yy159: +yy158: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy161: +yy160: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy163: +yy162: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy165: +yy164: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy167: +yy166: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy169: +yy168: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy171: +yy170: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy173: +yy172: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy175: +yy174: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy177: +yy176: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy179: +yy178: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy181: +yy180: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy183: +yy182: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy185: +yy184: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy187: +yy186: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy189: +yy188: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy191: +yy190: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy193: +yy192: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy195: +yy194: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy197: +yy196: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy199: +yy198: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy201: +yy200: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy203: +yy202: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy205: +yy204: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy207: +yy206: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy209: +yy208: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy211: +yy210: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy213: +yy212: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy215: +yy214: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy217: +yy216: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy219: +yy218: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy221: +yy220: ++YYCURSOR; { return ESCAPED_CHARACTER; } -yy223: +yy222: ++YYCURSOR; { return MATH_PAREN_OPEN; } -yy225: +yy224: ++YYCURSOR; { return MATH_PAREN_CLOSE; } -yy227: +yy226: ++YYCURSOR; { return MATH_BRACKET_OPEN; } -yy229: +yy228: ++YYCURSOR; { return MATH_BRACKET_CLOSE; } -yy231: +yy230: yych = *++YYCURSOR; switch (yych) { case 'M': - case 'm': goto yy232; + case 'm': goto yy231; default: goto yy2; } -yy232: +yy231: yych = *++YYCURSOR; switch (yych) { case 'P': - case 'p': goto yy233; + case 'p': goto yy232; default: goto yy2; } -yy233: +yy232: yych = *++YYCURSOR; switch (yych) { - case ';': goto yy234; + case ';': goto yy233; default: goto yy2; } -yy234: +yy233: ++YYCURSOR; { return AMPERSAND_LONG; } -yy236: +yy235: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy240; + case '.': goto yy239; default: goto yy2; } -yy237: +yy236: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy238; + case '.': goto yy237; default: goto yy2; } -yy238: +yy237: ++YYCURSOR; { return ELLIPSIS; } -yy240: +yy239: yych = *++YYCURSOR; switch (yych) { - case ' ': goto yy241; + case ' ': goto yy240; default: goto yy2; } -yy241: +yy240: yych = *++YYCURSOR; switch (yych) { - case '.': goto yy242; + case '.': goto yy241; default: goto yy2; } -yy242: +yy241: ++YYCURSOR; { return ELLIPSIS; } -yy244: +yy243: ++YYCURSOR; { return QUOTE_RIGHT_ALT; } -yy246: +yy245: ++YYCURSOR; { return BRACE_DOUBLE_RIGHT; } -yy248: +yy247: ++YYCURSOR; { return BRACKET_IMAGE_LEFT; } -yy250: +yy249: ++YYCURSOR; { return BRACKET_VARIABLE_LEFT; } -yy252: +yy251: ++YYCURSOR; { return BRACKET_GLOSSARY_LEFT; } -yy254: +yy253: ++YYCURSOR; { return BRACKET_FOOTNOTE_LEFT; } -yy256: +yy255: ++YYCURSOR; { return BRACKET_CITATION_LEFT; } -yy258: +yy257: ++YYCURSOR; { return BRACKET_ABBREVIATION_LEFT; } -yy260: +yy259: yych = *++YYCURSOR; switch (yych) { - case '}': goto yy261; + case '}': goto yy260; default: goto yy2; } -yy261: +yy260: ++YYCURSOR; { return CRITIC_HI_CLOSE; } -yy263: +yy262: yych = *++YYCURSOR; switch (yych) { - case '}': goto yy266; + case '}': goto yy265; default: goto yy2; } -yy264: +yy263: ++YYCURSOR; { return CRITIC_SUB_DIV; } -yy266: +yy265: ++YYCURSOR; { return CRITIC_SUB_CLOSE; } -yy268: +yy267: yych = *++YYCURSOR; switch (yych) { - case '}': goto yy269; + case '}': goto yy268; default: goto yy2; } -yy269: +yy268: ++YYCURSOR; { return CRITIC_COM_CLOSE; } -yy271: +yy270: ++YYCURSOR; switch ((yych = *YYCURSOR)) { - case '-': goto yy275; - case '}': goto yy273; - default: goto yy272; + case '-': goto yy274; + case '}': goto yy272; + default: goto yy271; } -yy272: +yy271: { return DASH_N; } -yy273: +yy272: ++YYCURSOR; { return CRITIC_DEL_CLOSE; } -yy275: +yy274: ++YYCURSOR; { return DASH_M; } -yy277: +yy276: yych = *++YYCURSOR; switch (yych) { - case '}': goto yy278; + case '}': goto yy277; default: goto yy2; } -yy278: +yy277: ++YYCURSOR; { return CRITIC_ADD_CLOSE; } -yy280: +yy279: yyaccept = 17; yych = *(YYMARKER = ++YYCURSOR); switch (yych) { - case 'T': goto yy297; - default: goto yy281; + case 'T': goto yy296; + default: goto yy280; } -yy281: +yy280: { return BRACE_DOUBLE_LEFT; } +yy281: + yych = *++YYCURSOR; + switch (yych) { + case '=': goto yy294; + default: goto yy2; + } yy282: yych = *++YYCURSOR; switch (yych) { - case '=': goto yy295; + case '~': goto yy292; default: goto yy2; } yy283: yych = *++YYCURSOR; switch (yych) { - case '~': goto yy293; + case '>': goto yy290; default: goto yy2; } yy284: yych = *++YYCURSOR; switch (yych) { - case '>': goto yy291; + case '-': goto yy288; default: goto yy2; } yy285: yych = *++YYCURSOR; switch (yych) { - case '-': goto yy289; + case '+': goto yy286; default: goto yy2; } yy286: - yych = *++YYCURSOR; - switch (yych) { - case '+': goto yy287; - default: goto yy2; - } -yy287: ++YYCURSOR; { return CRITIC_ADD_OPEN; } -yy289: +yy288: ++YYCURSOR; { return CRITIC_DEL_OPEN; } -yy291: +yy290: ++YYCURSOR; { return CRITIC_COM_OPEN; } -yy293: +yy292: ++YYCURSOR; { return CRITIC_SUB_OPEN; } -yy295: +yy294: ++YYCURSOR; { return CRITIC_HI_OPEN; } +yy296: + yych = *++YYCURSOR; + switch (yych) { + case 'O': goto yy297; + default: goto yy2; + } yy297: yych = *++YYCURSOR; switch (yych) { - case 'O': goto yy298; + case 'C': goto yy298; default: goto yy2; } yy298: yych = *++YYCURSOR; switch (yych) { - case 'C': goto yy299; + case '}': goto yy299; default: goto yy2; } yy299: @@ -1774,30 +1711,8 @@ yy299: default: goto yy2; } yy300: - yych = *++YYCURSOR; - switch (yych) { - case '}': goto yy301; - default: goto yy2; - } -yy301: ++YYCURSOR; { return TOC; } -yy303: - yyaccept = 5; - yych = *(YYMARKER = ++YYCURSOR); - switch (yych) { - case 0xC2: goto yy304; - default: goto yy21; - } -yy304: - yych = *++YYCURSOR; - switch (yych) { - case 0xA0: goto yy305; - default: goto yy2; - } -yy305: - ++YYCURSOR; - { return TEXT_PLAIN; } } } diff --git a/Sources/libMultiMarkdown/lexer.re b/Sources/libMultiMarkdown/lexer.re index 44fd265..b8c3101 100644 --- a/Sources/libMultiMarkdown/lexer.re +++ b/Sources/libMultiMarkdown/lexer.re @@ -93,7 +93,7 @@ int scan(Scanner * s, const char * stop) { // The order of these seems to matter // Don't split `à` character - '\303' '\240' { return TEXT_PLAIN; } + //'\303' '\240' { return TEXT_PLAIN; } "{{TOC}}" { return TOC; }