diff options
| -rw-r--r-- | org/meta_abstraction.org | 32 | ||||
| -rw-r--r-- | src/sdp/meta/metadoc_from_src.d | 32 |
2 files changed, 62 insertions, 2 deletions
diff --git a/org/meta_abstraction.org b/org/meta_abstraction.org index 0e379c7..5f058b7 100644 --- a/org/meta_abstraction.org +++ b/org/meta_abstraction.org @@ -767,6 +767,35 @@ if there is a blurb section you need to: "base_position" : 0, ]; bullet = false; + if (auto m = line.matchFirst(rgx.para_indent)) { + debug(paraindent) { // para indent + writeln(line); + } + indent["hang_position"] = (m.captures[1]).to!int; + indent["base_position"] = 0; + } else if (line.matchFirst(rgx.para_bullet)) { + debug(parabullet) { // para bullet + writeln(line); + } + bullet = true; + } else if (auto m = line.matchFirst(rgx.para_indent_hang)) { + debug(paraindenthang) { // para indent hang + writeln(line); + } + indent=[ + "hang_position" : (m.captures[1]).to!int, + "base_position" : (m.captures[2]).to!int, + ]; + } else if (auto m = line.matchFirst(rgx.para_bullet_indent)) { + debug(parabulletindent) { // para bullet indent + writeln(line); + } + indent=[ + "hang_position" : (m.captures[1]).to!int, + "base_position" : 0, + ]; + bullet = true; + } obj_type_status["para"] = State.on; line_occur["para"] = State.off; an_object_key="blurb_nugget"; @@ -836,13 +865,14 @@ if there is a blurb section you need to: comp_obj_para.of_section = "blurb"; comp_obj_para.is_of = "para"; comp_obj_para.is_a = "blurb"; - comp_obj_para.text = line.to!string.strip; + comp_obj_para.text = munge.url_links(line.to!string.strip).replaceFirst(rgx.para_attribs, ""); comp_obj_para.ocn = 0; comp_obj_para.obj_cite_number = ""; comp_obj_para.obj_cite_number_off = ""; comp_obj_para.obj_cite_number_type = 0; comp_obj_para.indent_hang = indent["hang_position"]; comp_obj_para.indent_base = indent["base_position"]; + comp_obj_para.inline_links = true; comp_obj_para.bullet = bullet; the_blurb_section ~= comp_obj_para; } diff --git a/src/sdp/meta/metadoc_from_src.d b/src/sdp/meta/metadoc_from_src.d index 784991c..9859f7b 100644 --- a/src/sdp/meta/metadoc_from_src.d +++ b/src/sdp/meta/metadoc_from_src.d @@ -543,6 +543,35 @@ template SiSUdocAbstraction() { "base_position" : 0, ]; bullet = false; + if (auto m = line.matchFirst(rgx.para_indent)) { + debug(paraindent) { // para indent + writeln(line); + } + indent["hang_position"] = (m.captures[1]).to!int; + indent["base_position"] = 0; + } else if (line.matchFirst(rgx.para_bullet)) { + debug(parabullet) { // para bullet + writeln(line); + } + bullet = true; + } else if (auto m = line.matchFirst(rgx.para_indent_hang)) { + debug(paraindenthang) { // para indent hang + writeln(line); + } + indent=[ + "hang_position" : (m.captures[1]).to!int, + "base_position" : (m.captures[2]).to!int, + ]; + } else if (auto m = line.matchFirst(rgx.para_bullet_indent)) { + debug(parabulletindent) { // para bullet indent + writeln(line); + } + indent=[ + "hang_position" : (m.captures[1]).to!int, + "base_position" : 0, + ]; + bullet = true; + } obj_type_status["para"] = State.on; line_occur["para"] = State.off; an_object_key="blurb_nugget"; @@ -612,13 +641,14 @@ template SiSUdocAbstraction() { comp_obj_para.of_section = "blurb"; comp_obj_para.is_of = "para"; comp_obj_para.is_a = "blurb"; - comp_obj_para.text = line.to!string.strip; + comp_obj_para.text = munge.url_links(line.to!string.strip).replaceFirst(rgx.para_attribs, ""); comp_obj_para.ocn = 0; comp_obj_para.obj_cite_number = ""; comp_obj_para.obj_cite_number_off = ""; comp_obj_para.obj_cite_number_type = 0; comp_obj_para.indent_hang = indent["hang_position"]; comp_obj_para.indent_base = indent["base_position"]; + comp_obj_para.inline_links = true; comp_obj_para.bullet = bullet; the_blurb_section ~= comp_obj_para; } |