From e208f6c6f40b84edf3556f03ec41500bebbe21a2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 6 Jun 2017 17:45:07 -0400 Subject: heading auto-numbering, fixes --- org/ao_doc_abstraction.org | 8 ++++---- src/sdp/ao/abstract_doc_source.d | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/org/ao_doc_abstraction.org b/org/ao_doc_abstraction.org index 8c5c5c8..a81e658 100644 --- a/org/ao_doc_abstraction.org +++ b/org/ao_doc_abstraction.org @@ -5146,12 +5146,12 @@ private: break; } } - /+ num_depth minimum 0 (1.) default 2 (1.1.1) max 3 (1.1.1.1) implement +/ + /+ num_depth minimum 0 + (1.) default 2 (1.1.1) max 3 (1.1.1.1) implement +/ if ( heading_num_top_level > obj_["lev_markup_number"].to!uint ) { - heading_num_0 = 0; heading_num_1 = 0; heading_num_2 = 0; heading_num_3 = 0; @@ -5220,8 +5220,8 @@ private: debug(heading_number_auto) { writeln(heading_number_auto_composite); } - if (!(munge_.match(rgx.heading_anchor_tag)) - && !empty(heading_number_auto_composite)) { + if ((!empty(heading_number_auto_composite)) + && (obj_["lev_markup_number"].to!uint >= heading_num_top_level)) { munge_=(munge_) .replaceFirst(rgx.heading, "$1~$2 " ~ heading_number_auto_composite ~ ". ") diff --git a/src/sdp/ao/abstract_doc_source.d b/src/sdp/ao/abstract_doc_source.d index 9fee954..dfd0dd9 100644 --- a/src/sdp/ao/abstract_doc_source.d +++ b/src/sdp/ao/abstract_doc_source.d @@ -4082,12 +4082,12 @@ template SiSUdocAbstraction() { break; } } - /+ num_depth minimum 0 (1.) default 2 (1.1.1) max 3 (1.1.1.1) implement +/ + /+ num_depth minimum 0 + (1.) default 2 (1.1.1) max 3 (1.1.1.1) implement +/ if ( heading_num_top_level > obj_["lev_markup_number"].to!uint ) { - heading_num_0 = 0; heading_num_1 = 0; heading_num_2 = 0; heading_num_3 = 0; @@ -4156,8 +4156,8 @@ template SiSUdocAbstraction() { debug(heading_number_auto) { writeln(heading_number_auto_composite); } - if (!(munge_.match(rgx.heading_anchor_tag)) - && !empty(heading_number_auto_composite)) { + if ((!empty(heading_number_auto_composite)) + && (obj_["lev_markup_number"].to!uint >= heading_num_top_level)) { munge_=(munge_) .replaceFirst(rgx.heading, "$1~$2 " ~ heading_number_auto_composite ~ ". ") -- cgit v1.2.3