X-Git-Url: https://git.danieliu.xyz/?a=blobdiff_plain;f=src%2Fparser.c;h=f084667ad4888571ac79f977aae3941dcdd9fc0a;hb=221c74a4a0e73035645d8f6b13316347fa41cda6;hp=d81a2cb259b612b596ba8414cfba5eb6d323c54e;hpb=3e6d7001c4058b93281645e72ad1e223280b8589;p=smdp.git diff --git a/src/parser.c b/src/parser.c index d81a2cb..f084667 100644 --- a/src/parser.c +++ b/src/parser.c @@ -2,7 +2,7 @@ * Functions necessary to parse a file and transform its content into * a deck of slides containing lines. All based on markdown formating * rules. - * Copyright (C) 2015 Michael Goehler + * Copyright (C) 2016 Michael Goehler * * This file is part of mdp. * @@ -89,9 +89,11 @@ deck_t *markdown_load(FILE *input) { slide = next_slide(slide); sc++; - } else if(CHECK_BIT(bits, IS_TILDE_CODE) && CHECK_BIT(bits, IS_EMPTY)) { - // remove tilde code markers - (text->reset)(text); + } else if(CHECK_BIT(bits, IS_TILDE_CODE) && + CHECK_BIT(bits, IS_EMPTY)) { + // remove tilde code markers + (text->reset)(text); + } else { // if slide ! has line @@ -119,6 +121,10 @@ deck_t *markdown_load(FILE *input) { // calc offset line->offset = next_nonblank(text, 0); + // expand character entities if enabled + if(line->text->value) + expand_character_entities(line); + // adjust line length dynamicaly - excluding markup if(line->text->value) adjust_line_length(line); @@ -338,6 +344,11 @@ int markdown_analyse(cstring_t *text, int prev) { // return IS_EMPTY on null pointers if(!text || !text->value) { SET_BIT(bits, IS_EMPTY); + + // continue fenced code blocks across empty lines + if(num_tilde_characters > 0) + SET_BIT(bits, IS_CODE); + return bits; } @@ -346,23 +357,23 @@ int markdown_analyse(cstring_t *text, int prev) { // IS_TILDE_CODE if (wcsncmp(text->value, L"~~~", 3) == 0) { - int tildes_in_line = next_nontilde(text, 0); - if (tildes_in_line >= num_tilde_characters) { - if (num_tilde_characters > 0) { - num_tilde_characters = 0; - } else { - num_tilde_characters = tildes_in_line; - } - SET_BIT(bits, IS_EMPTY); - SET_BIT(bits, IS_TILDE_CODE); - return bits; - } + int tildes_in_line = next_nontilde(text, 0); + if (tildes_in_line >= num_tilde_characters) { + if (num_tilde_characters > 0) { + num_tilde_characters = 0; + } else { + num_tilde_characters = tildes_in_line; + } + SET_BIT(bits, IS_EMPTY); + SET_BIT(bits, IS_TILDE_CODE); + return bits; + } } if (num_tilde_characters > 0) { - SET_BIT(bits, IS_CODE); - SET_BIT(bits, IS_TILDE_CODE); - return bits; + SET_BIT(bits, IS_CODE); + SET_BIT(bits, IS_TILDE_CODE); + return bits; } // IS_STOP @@ -596,10 +607,162 @@ void markdown_debug(deck_t *deck, int debug) { } } +static int enable_character_entities = 0; +static struct named_character_entity { + wchar_t ucs; + const wchar_t *name; +} named_character_entities[] = { + { L'\x0022', L"quot" }, + { L'\x0026', L"amp" }, + { L'\x0027', L"apos" }, + { L'\x003C', L"lt" }, + { L'\x003E', L"gt" }, + { L'\x00A2', L"cent" }, + { L'\x00A3', L"pound" }, + { L'\x00A5', L"yen" }, + { L'\x00A7', L"sect" }, + { L'\x00A9', L"copy" }, + { L'\x00AA', L"laquo" }, + { L'\x00AE', L"reg" }, + { L'\x00B0', L"deg" }, + { L'\x00B1', L"plusmn" }, + { L'\x00B2', L"sup2" }, + { L'\x00B3', L"sup3" }, + { L'\x00B6', L"para" }, + { L'\x00B9', L"sup1" }, + { L'\x00BB', L"raquo" }, + { L'\x00BC', L"frac14" }, + { L'\x00BD', L"frac12" }, + { L'\x00BE', L"frac34" }, + { L'\x00D7', L"times" }, + { L'\x00F7', L"divide" }, + { L'\x2018', L"lsquo" }, + { L'\x2019', L"rsquo" }, + { L'\x201C', L"ldquo" }, + { L'\x201D', L"rdquo" }, + { L'\x2020', L"dagger" }, + { L'\x2021', L"Dagger" }, + { L'\x2022', L"bull" }, + { L'\x2026', L"hellip" }, + { L'\x2030', L"permil" }, + { L'\x2032', L"prime" }, + { L'\x2033', L"Prime" }, + { L'\x2039', L"lsaquo" }, + { L'\x203A', L"rsaquo" }, + { L'\x20AC', L"euro" }, + { L'\x2122', L"trade" }, + { L'\x2190', L"larr" }, + { L'\x2191', L"uarr" }, + { L'\x2192', L"rarr" }, + { L'\x2193', L"darr" }, + { L'\x2194', L"harr" }, + { L'\x21B5', L"crarr" }, + { L'\x21D0', L"lArr" }, + { L'\x21D1', L"uArr" }, + { L'\x21D2', L"rArr" }, + { L'\x21D3', L"dArr" }, + { L'\x21D4', L"hArr" }, + { L'\x221E', L"infin" }, + { L'\x2261', L"equiv" }, + { L'\x2308', L"lceil" }, + { L'\x2309', L"rceil" }, + { L'\x230A', L"lfloor" }, + { L'\x230B', L"rfloor" }, + { L'\x25CA', L"loz" }, + { L'\x2660', L"spades" }, + { L'\x2663', L"clubs" }, + { L'\x2665', L"hearts" }, + { L'\x2666', L"diams" }, + { L'\0', NULL }, +}; + +/* +export MDP_ENABLE_CHARENT=1 +*/ +void setup_character_entities(void) +{ + char *str = getenv("MDP_ENABLE_CHARENT"); + if (str == NULL) + enable_character_entities = 0; + else if (str[0] == '\0') + enable_character_entities = 1; + else + enable_character_entities = atoi(str); +} + +void expand_character_entities(line_t *line) +{ + wchar_t *ampersand; + wchar_t *prev, *curr; + + if (!enable_character_entities) + return; + + ampersand = NULL; + curr = &line->text->value[0]; + + // for each char in line + for(prev = NULL; *curr; prev = curr++) { + if (*curr == L'&' && (prev == NULL || *prev != L'\\')) { + ampersand = curr; + continue; + } + if (ampersand == NULL) { + continue; + } + if (*curr == L'#') { + if (prev == ampersand) + continue; + goto clean; + } + if (iswalpha(*curr) || iswxdigit(*curr)) { + continue; + } + if (*curr == L';') { + int cnt; + wchar_t ucs = L'\0'; + if (ampersand + 1 >= curr || ampersand + 16 < curr) // what is a good limit? + goto clean; + if (ampersand[1] == L'#') { // &#nnnn; or &#xhhhh; + if (ampersand + 2 >= curr) + goto clean; + if (ampersand[2] != L'x') { // &#nnnn; + cnt = wcsspn(&ersand[2], L"0123456789"); + if (ampersand + 2 + cnt != curr) + goto clean; + ucs = wcstoul(&ersand[2], NULL, 10); + } else { // &#xhhhh; + if (ampersand + 3 >= curr) + goto clean; + cnt = wcsspn(&ersand[3], L"0123456789abcdefABCDEF"); + if (ampersand + 3 + cnt != curr) + goto clean; + ucs = wcstoul(&ersand[3], NULL, 16); + } + } else { // &name; + for (cnt = 0; cnt < sizeof(named_character_entities)/sizeof(named_character_entities[0]); ++cnt) { + if (wcsncmp(named_character_entities[cnt].name, &ersand[1], curr - ampersand - 1)) + continue; + ucs = named_character_entities[cnt].ucs; + break; + } + if (ucs == L'\0') + goto clean; + } + *ampersand = ucs; + cstring_strip(line->text, ampersand + 1 - &line->text->value[0], curr - ampersand); + curr = ampersand; + continue; + } +clean: + ampersand = NULL; + } +} + void adjust_line_length(line_t *line) { int l = 0; const static wchar_t *special = L"\\*_`"; // list of interpreted chars - const wchar_t *c = &line->text->value[line->offset]; + const wchar_t *c = &line->text->value[0]; cstack_t *stack = cstack_init(); // for each char in line @@ -647,7 +810,6 @@ int next_nonblank(cstring_t *text, int i) { return i; } - int prev_blank(cstring_t *text, int i) { while ((i > 0) && !iswspace((text->value)[i])) i--;