diff options
Diffstat (limited to 'org')
| -rw-r--r-- | org/output_xmls.org | 128 |
1 files changed, 64 insertions, 64 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) ? "" : "<a name=\"" ~ obj.tags.heading_lev_anchor_tag ~ "\"></a>"; - if (obj.metainfo.object_number.empty) { - o = format(q"¶%s - <div class="substance"> - <h%s class="%s">%s%s - %s - </h%s> - </div>¶", - _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 <div class="substance"> <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> @@ -808,17 +793,32 @@ auto heading(M,O)( </h%s> </div>¶", _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 + <div class="substance"> + <h%s class="%s">%s%s + %s + </h%s> + </div>¶", + _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, "<a name=\"$1\"></a>"); - if (obj.metainfo.object_number.empty) { + if (!(obj.metainfo.identifier.empty)) { o = format(q"¶ <div class="substance"> - <p class="%s" indent="h%si%s">%s + <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> + <p class="%s" indent="h%si%s" id="%s">%s %s </p> </div>¶", + 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"¶ <div class="substance"> - <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> - <p class="%s" indent="h%si%s" id="%s">%s + <p class="%s" indent="h%si%s">%s %s </p> </div>¶", - 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"¶ <div class="substance"> - <p class="%s"> + <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> + <p class="%s" id="%s"> %s </p> </div>¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶ <div class="substance"> - <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> - <p class="%s" id="%s"> + <p class="%s"> %s </p> </div>¶", - 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"¶ <div class="substance"> - <p class="%s"> + <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> + <p class="%s" id="%s"> %s </p> </div>¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶ <div class="substance"> - <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> - <p class="%s" id="%s"> + <p class="%s"> %s </p> </div>¶", - 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"¶ <div class="substance"> - <p class="%s">%s</p> + <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> + <p class="%s" id="%s">%s</p> </div>¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt.stripRight ); } else { o = format(q"¶ <div class="substance"> - <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> - <p class="%s" id="%s">%s</p> + <p class="%s">%s</p> </div>¶", - 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"¶ <div class="substance"> - <p class="%s">%s</p> + if (!(obj.metainfo.identifier.empty)) { + o = format(q"¶ <div class="substance"> + <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> + <p class="%s" id="%s">%s</p> </div>¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶ <div class="substance"> - <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> - <p class="%s" id="%s">%s</p> + <p class="%s">%s</p> </div>¶", - 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"¶ <div class="substance"> - <p class="%s">%s</p> + if (!(obj.metainfo.identifier.empty)) { + o = format(q"¶ <div class="substance"> + <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> + <p class="%s" id="%s">%s</p> </div>¶", + obj.metainfo.identifier, + (obj.metainfo.object_number.empty) ? "" : obj.metainfo.identifier, obj.metainfo.is_a, + obj.metainfo.identifier, _txt ); } else { o = format(q"¶ <div class="substance"> - <label class="ocn"><a href="#%s" class="lnkocn">%s</a></label> - <p class="%s" id="%s">%s</p> + <p class="%s">%s</p> </div>¶", - obj.metainfo.object_number, - obj.metainfo.object_number, obj.metainfo.is_a, - obj.metainfo.object_number, _txt ); } |