From 19d648a891b3cb9c7d573911f83d3a9fafe2b434 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 25 Nov 2016 18:19:24 -0500 Subject: housekeeping --- org/ao_defaults.org | 54 ++++++++++++++++------------------------------------- 1 file changed, 16 insertions(+), 38 deletions(-) (limited to 'org/ao_defaults.org') diff --git a/org/ao_defaults.org b/org/ao_defaults.org index 20952fb..8dde679 100644 --- a/org/ao_defaults.org +++ b/org/ao_defaults.org @@ -437,42 +437,17 @@ template InternalMarkup() { auto en_b_o = "〖"; auto en_b_c = "〗"; // endnote en_b_o: '~['; en_b_c: ']~'; auto lnk_o = "┥"; auto lnk_c = "┝"; auto url_o = "┤"; auto url_c = "├"; - string _indent_spaces =""; + auto nbsp = "░"; + auto br_line = "┘"; + auto br_nl = "┙"; + auto br_paragraph = "┚"; + auto br_obj = "break_obj"; + auto br_page_line = "┼"; + auto br_page = "┿"; + auto br_page_new = "╂"; string indent_by_spaces_provided(int indent) { - switch (indent) { - case 0: - _indent_spaces = ""; - break; - case 1: - _indent_spaces = " "; - break; - case 2: - _indent_spaces = " "; - break; - case 3: - _indent_spaces = " "; - break; - case 4: - _indent_spaces = " "; - break; - case 5: - _indent_spaces = " "; - break; - case 6: - _indent_spaces = " "; - break; - case 7: - _indent_spaces = " "; - break; - case 8: - _indent_spaces = " "; - break; - case 9: - _indent_spaces = " "; - break; - default: - break; - } + auto _indent_spaces ="░░"; // auto nbsp = "░"; + _indent_spaces = replicate(_indent_spaces, indent); return _indent_spaces; } } @@ -687,14 +662,17 @@ static note_ref = ctRegex!(`^\S+?noteref_( /+ inline markup footnotes endnotes +/ static inline_notes_al = ctRegex!(`【(?:[*+]\s+|\s*)(.+?)】`, "mg"); static inline_notes_al_gen = ctRegex!(`【.+?】`, "m"); -static inline_al_delimiter_open_regular = ctRegex!(`【`, "m"); +static inline_al_delimiter_open_regular = ctRegex!(`【\s`, "m"); +static inline_al_delimiter_open_symbol_star = ctRegex!(`【[*]\s`, "m"); +static inline_al_delimiter_open_symbol_plus = ctRegex!(`【[+]\s`, "m"); static inline_al_delimiter_close_regular = ctRegex!(`】`, "m"); static inline_al_delimiter_open_and_close_regular = ctRegex!(`【|】`, "m"); -static inline_notes_delimiter_al_regular = ctRegex!(`【(.+?)】`, "m"); -static inline_notes_delimiter_al_regular_number_note = ctRegex!(`【(\d+)\s+(.+?)】`, "m"); +static inline_notes_delimiter_al_regular = ctRegex!(`【(.+?)】`, "mg"); +static inline_notes_delimiter_al_regular_number_note = ctRegex!(`【(\d+)\s+(.+?)】`, "mg"); static inline_al_delimiter_open_asterisk = ctRegex!(`【\*`, "m"); static inline_al_delimiter_open_plus = ctRegex!(`【\+`, "m"); static inline_text_and_note_al = ctRegex!(`(?P.+?)【(?:[*+ ]*)(?P.+?)】`, "mg"); +static inline_text_and_note_al_ = ctRegex!(`(.+?(?:【[*+ ]*.+?】|$))`, "mg"); #+END_SRC ** links/ urls :inline:footnote: -- cgit v1.2.3