From 6a8b06bbe0ed73dc61e8efde7b08478450d0005a Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 10 Jul 2019 10:45:21 -0400 Subject: xmls, special footnotes --- src/doc_reform/meta/metadoc_from_src.d | 35 +++++++++++++++++++++++++++++++--- src/doc_reform/meta/rgx.d | 1 + src/doc_reform/output/rgx.d | 1 + 3 files changed, 34 insertions(+), 3 deletions(-) (limited to 'src/doc_reform') diff --git a/src/doc_reform/meta/metadoc_from_src.d b/src/doc_reform/meta/metadoc_from_src.d index 7775f4c..1bfd183 100644 --- a/src/doc_reform/meta/metadoc_from_src.d +++ b/src/doc_reform/meta/metadoc_from_src.d @@ -1154,7 +1154,7 @@ template DocReformDocAbstraction() { foreach (i; previous_length .. the_document_body_section.length) { if (the_document_body_section[i].metainfo.is_a == "verse") { if ((the_document_body_section[i].text).match( - rgx.inline_notes_al_regular_number_note + rgx.inline_notes_al_all_note )) { note_section.gather_notes_for_endnote_section( the_document_body_section, @@ -1167,7 +1167,7 @@ template DocReformDocAbstraction() { } else { /+ scan object for endnotes +/ previous_length = the_document_body_section.length.to!int; if ((the_document_body_section[$-1].text).match( - rgx.inline_notes_al_regular_number_note + rgx.inline_notes_al_all_note )) { previous_count=(the_document_body_section.length -1).to!int; note_section.gather_notes_for_endnote_section( @@ -5387,12 +5387,41 @@ template DocReformDocAbstraction() { assert(cntr >= previous_count); assert( (contents_am[cntr].text).match( - rgx.inline_notes_al_regular_number_note) + rgx.inline_notes_al_all_note) ); mixin InternalMarkup; previous_count=cntr; static auto mkup = InlineMarkup(); static auto munge = ObjInlineMarkupMunge(); + foreach(m; + (contents_am[cntr].text).matchAll( + rgx.inline_notes_al_special_char_note) + ) { + debug(endnotes_build) { + writeln( + "{^", mkup.ff_o, m["char"], ".", mkup.ff_c, "^}" + ~ mkup.mark_internal_site_lnk, + tag_in_seg["seg_lv4"], + ".fnSuffix#noteref_\n ", m["char"], " ", + m["note"]); // sometimes need segment name (segmented html & epub) + } + // you need anchor for segments at this point -> + object_notes["anchor"] ~= "note_" ~ m["char"] ~ "』"; + object_notes["notes"] ~= (tag_in_seg["seg_lv4"].empty) + ? (links_and_images( + "{" ~ mkup.superscript ~ mkup.ff_o ~ m["char"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}#noteref_" + ~ m["char"]) ~ " " + ~ m["note"] ~ "』" + ) + : (links_and_images( + "{" ~ mkup.superscript ~ mkup.ff_o ~ m["char"] ~ "." ~ mkup.ff_c ~ mkup.superscript ~ "}" + ~ mkup.mark_internal_site_lnk + ~ tag_in_seg["seg_lv4"] + ~ ".fnSuffix#noteref_" + ~ m["char"]) ~ " " + ~ m["note"] ~ "』" + ); + } foreach(m; (contents_am[cntr].text).matchAll( rgx.inline_notes_al_regular_number_note) diff --git a/src/doc_reform/meta/rgx.d b/src/doc_reform/meta/rgx.d index 4f93c06..ddaf3f9 100644 --- a/src/doc_reform/meta/rgx.d +++ b/src/doc_reform/meta/rgx.d @@ -251,6 +251,7 @@ static template DocReformRgxInit() { static inline_notes_al_regular = ctRegex!(`【(.+?)】`, "mg"); static inline_notes_al_gen_text = ctRegex!(`【(?P.+?)】`, "m"); static inline_notes_al_gen_ref = ctRegex!(`【(?P[*+]\s+)\s*(?P.+?)】`, "mg"); + static inline_notes_al_all_note = ctRegex!(`【(?P\d+|(?:[*]|[+])+)\s+(?P.+?)\s*】`, "mg"); static inline_notes_al_regular_number_note = ctRegex!(`【(?P\d+)\s+(?P.+?)\s*】`, "mg"); static inline_notes_al_special_char_note = ctRegex!(`【(?P(?:[*]|[+])+)\s+(?P.+?)】`, "mg"); static inline_al_delimiter_open_regular = ctRegex!(`【\s`, "m"); diff --git a/src/doc_reform/output/rgx.d b/src/doc_reform/output/rgx.d index c0d8bf0..86cd48b 100644 --- a/src/doc_reform/output/rgx.d +++ b/src/doc_reform/output/rgx.d @@ -55,6 +55,7 @@ static template DocReformOutputRgxInit() { static inline_notes_al_regular = ctRegex!(`【(.+?)】`, "mg"); static inline_notes_al_gen_text = ctRegex!(`【(?P.+?)】`, "m"); static inline_notes_al_gen_ref = ctRegex!(`【(?P[*+]\s+)\s*(?P.+?)】`, "mg"); + static inline_notes_al_all_note = ctRegex!(`【(?P\d+|(?:[*]|[+])+)\s+(?P.+?)\s*】`, "mg"); static inline_notes_al_regular_number_note = ctRegex!(`【(?P\d+)\s+(?P.+?)\s*】`, "mg"); static inline_notes_al_special_char_note = ctRegex!(`【(?P(?:[*]|[+])+)\s+(?P.+?)】`, "mg"); static inline_al_delimiter_open_regular = ctRegex!(`【\s`, "m"); -- cgit v1.2.3