From da510342e09ec27e8775ea6613f3d7df3327869b Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 8 Nov 2018 22:31:33 -0500 Subject: xmls more on anchor tags, scroll fix where no ocn --- org/output_xmls.org | 128 +++++++++++++++++++++---------------------- src/doc_reform/output/xmls.d | 128 +++++++++++++++++++++---------------------- 2 files changed, 128 insertions(+), 128 deletions(-) diff --git a/org/output_xmls.org b/org/output_xmls.org index 321889b..672a589 100644 --- a/org/output_xmls.org +++ b/org/output_xmls.org @@ -784,22 +784,7 @@ auto heading(M,O)( heading_lev_anchor_tag = (obj.tags.heading_lev_anchor_tag.empty) ? "" : ""; - if (obj.metainfo.object_number.empty) { - o = format(q"¶%s -
- %s%s - %s - -
¶", - _horizontal_rule, - obj.metainfo.heading_lev_markup, - obj.metainfo.is_a, - tags, - heading_lev_anchor_tag, - _txt, - obj.metainfo.heading_lev_markup, - ); - } else { + if (!(obj.metainfo.identifier.empty)) { o = format(q"¶%s
@@ -808,17 +793,32 @@ auto heading(M,O)(
¶", _horizontal_rule, - obj.metainfo.object_number, - obj.metainfo.object_number, + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.heading_lev_markup, obj.metainfo.is_a, - obj.metainfo.object_number, - obj.metainfo.object_number, + obj.metainfo.identifier, + obj.metainfo.identifier, tags, heading_lev_anchor_tag, _txt, obj.metainfo.heading_lev_markup, ); + } else { + o = format(q"¶%s +
+ %s%s + %s + +
¶", + _horizontal_rule, + obj.metainfo.heading_lev_markup, + obj.metainfo.is_a, + tags, + heading_lev_anchor_tag, + _txt, + obj.metainfo.heading_lev_markup, + ); } return o; } @@ -880,31 +880,31 @@ auto para(M,O)( _txt = (obj.attrib.bullet) ? ("●  " ~ _txt) : _txt; _txt = _txt.replaceFirst(rgx.inline_link_anchor, ""); - if (obj.metainfo.object_number.empty) { + if (!(obj.metainfo.identifier.empty)) { o = format(q"¶
-

%s + +

%s %s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, obj.attrib.indent_hang, obj.attrib.indent_base, + obj.metainfo.identifier, tags, _txt ); } else { o = format(q"¶
- -

%s +

%s %s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, obj.attrib.indent_hang, obj.attrib.indent_base, - obj.metainfo.object_number, tags, _txt ); @@ -965,26 +965,26 @@ auto quote(M,O)( ) { _txt = font_face(_txt); string o; - if (obj.metainfo.object_number.empty) { + if (!(obj.metainfo.identifier.empty)) { o = format(q"¶
-

+ +

%s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶
- -

+

%s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, - obj.metainfo.object_number, _txt ); } @@ -1044,26 +1044,26 @@ auto group(M,O)( ) { _txt = font_face(_txt); string o; - if (obj.metainfo.object_number.empty) { + if (!(obj.metainfo.identifier.empty)) { o = format(q"¶
-

+ +

%s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶
- -

+

%s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, - obj.metainfo.object_number, _txt ); } @@ -1124,22 +1124,22 @@ auto block(M,O)( ) { _txt = font_face(_txt); string o; - if (obj.metainfo.object_number.empty) { + if (!(obj.metainfo.identifier.empty)) { o = format(q"¶
-

%s

+ +

%s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt.stripRight ); } else { o = format(q"¶
- -

%s

+

%s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, - obj.metainfo.object_number, _txt.stripRight ); } @@ -1200,22 +1200,22 @@ auto verse(M,O)( ) { _txt = font_face(_txt); string o; - if (obj.metainfo.object_number.empty) { - o = format(q"¶
-

%s

+ if (!(obj.metainfo.identifier.empty)) { + o = format(q"¶
+ +

%s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶
- -

%s

+

%s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, - obj.metainfo.object_number, _txt ); } @@ -1274,22 +1274,22 @@ auto code(M,O)( string _txt, ) { string o; - if (obj.metainfo.object_number.empty) { - o = format(q"¶
-

%s

+ if (!(obj.metainfo.identifier.empty)) { + o = format(q"¶
+ +

%s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶
- -

%s

+

%s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, - obj.metainfo.object_number, _txt ); } diff --git a/src/doc_reform/output/xmls.d b/src/doc_reform/output/xmls.d index b69d1a7..6f1f925 100644 --- a/src/doc_reform/output/xmls.d +++ b/src/doc_reform/output/xmls.d @@ -623,22 +623,7 @@ template outputXHTMLs() { heading_lev_anchor_tag = (obj.tags.heading_lev_anchor_tag.empty) ? "" : ""; - if (obj.metainfo.object_number.empty) { - o = format(q"¶%s -
- %s%s - %s - -
¶", - _horizontal_rule, - obj.metainfo.heading_lev_markup, - obj.metainfo.is_a, - tags, - heading_lev_anchor_tag, - _txt, - obj.metainfo.heading_lev_markup, - ); - } else { + if (!(obj.metainfo.identifier.empty)) { o = format(q"¶%s
@@ -647,17 +632,32 @@ template outputXHTMLs() {
¶", _horizontal_rule, - obj.metainfo.object_number, - obj.metainfo.object_number, + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.heading_lev_markup, obj.metainfo.is_a, - obj.metainfo.object_number, - obj.metainfo.object_number, + obj.metainfo.identifier, + obj.metainfo.identifier, tags, heading_lev_anchor_tag, _txt, obj.metainfo.heading_lev_markup, ); + } else { + o = format(q"¶%s +
+ %s%s + %s + +
¶", + _horizontal_rule, + obj.metainfo.heading_lev_markup, + obj.metainfo.is_a, + tags, + heading_lev_anchor_tag, + _txt, + obj.metainfo.heading_lev_markup, + ); } return o; } @@ -700,31 +700,31 @@ template outputXHTMLs() { _txt = (obj.attrib.bullet) ? ("●  " ~ _txt) : _txt; _txt = _txt.replaceFirst(rgx.inline_link_anchor, ""); - if (obj.metainfo.object_number.empty) { + if (!(obj.metainfo.identifier.empty)) { o = format(q"¶
-

%s + +

%s %s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, obj.attrib.indent_hang, obj.attrib.indent_base, + obj.metainfo.identifier, tags, _txt ); } else { o = format(q"¶
- -

%s +

%s %s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, obj.attrib.indent_hang, obj.attrib.indent_base, - obj.metainfo.object_number, tags, _txt ); @@ -766,26 +766,26 @@ template outputXHTMLs() { ) { _txt = font_face(_txt); string o; - if (obj.metainfo.object_number.empty) { + if (!(obj.metainfo.identifier.empty)) { o = format(q"¶
-

+ +

%s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶
- -

+

%s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, - obj.metainfo.object_number, _txt ); } @@ -826,26 +826,26 @@ template outputXHTMLs() { ) { _txt = font_face(_txt); string o; - if (obj.metainfo.object_number.empty) { + if (!(obj.metainfo.identifier.empty)) { o = format(q"¶
-

+ +

%s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶
- -

+

%s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, - obj.metainfo.object_number, _txt ); } @@ -887,22 +887,22 @@ template outputXHTMLs() { ) { _txt = font_face(_txt); string o; - if (obj.metainfo.object_number.empty) { + if (!(obj.metainfo.identifier.empty)) { o = format(q"¶
-

%s

+ +

%s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt.stripRight ); } else { o = format(q"¶
- -

%s

+

%s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, - obj.metainfo.object_number, _txt.stripRight ); } @@ -944,22 +944,22 @@ template outputXHTMLs() { ) { _txt = font_face(_txt); string o; - if (obj.metainfo.object_number.empty) { - o = format(q"¶
-

%s

+ if (!(obj.metainfo.identifier.empty)) { + o = format(q"¶
+ +

%s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶
- -

%s

+

%s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, - obj.metainfo.object_number, _txt ); } @@ -1080,22 +1080,22 @@ template outputXHTMLs() { string _txt, ) { string o; - if (obj.metainfo.object_number.empty) { - o = format(q"¶
-

%s

+ if (!(obj.metainfo.identifier.empty)) { + o = format(q"¶
+ +

%s

¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶
- -

%s

+

%s

¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, - obj.metainfo.object_number, _txt ); } -- cgit v1.2.3