diff options
| -rw-r--r-- | org/out_src_abstraction_peg_text.org | 9 | ||||
| -rw-r--r-- | src/sisudoc/io_out/create_abstraction_txt.d | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/org/out_src_abstraction_peg_text.org b/org/out_src_abstraction_peg_text.org index 597d8d4..5a8c686 100644 --- a/org/out_src_abstraction_peg_text.org +++ b/org/out_src_abstraction_peg_text.org @@ -162,7 +162,8 @@ template spineAbstractionTxt() { if (obj.metainfo.is_a == "heading") { string lev = obj.metainfo.marked_up_level; obj_decl ~= "heading :" ~ lev; - if (obj.metainfo.identifier.length > 0) { + if (obj.metainfo.identifier.length > 0 + && obj.metainfo.identifier != obj.metainfo.ocn.to!string) { obj_decl ~= " " ~ obj.metainfo.identifier; } } else { @@ -173,7 +174,8 @@ template spineAbstractionTxt() { /+ ↓ properties (only non-default values) +/ if (obj.metainfo.is_of_part.length > 0) output ~= ".part: " ~ obj.metainfo.is_of_part; - if (obj.metainfo.is_of_section.length > 0 && obj.metainfo.is_of_section != section) + if (obj.metainfo.is_of_section.length > 0 + && obj.metainfo.is_of_section != section) output ~= ".section: " ~ obj.metainfo.is_of_section; if (obj.metainfo.parent_ocn != 0) output ~= ".parent: " ~ obj.metainfo.parent_ocn.to!string; @@ -242,7 +244,8 @@ template spineAbstractionTxt() { /+ ↓ tag properties +/ if (obj.tags.in_segment_html.length > 0) output ~= ".segment: " ~ obj.tags.in_segment_html; - if (obj.tags.anchor_tag_html.length > 0 && obj.tags.anchor_tag_html != obj.tags.in_segment_html) + if (obj.tags.anchor_tag_html.length > 0 + && obj.tags.anchor_tag_html != obj.tags.in_segment_html) output ~= ".anchor: " ~ obj.tags.anchor_tag_html; if (obj.tags.segname_prev.length > 0) output ~= ".segment_prev: " ~ obj.tags.segname_prev; diff --git a/src/sisudoc/io_out/create_abstraction_txt.d b/src/sisudoc/io_out/create_abstraction_txt.d index a1e8f12..140a27d 100644 --- a/src/sisudoc/io_out/create_abstraction_txt.d +++ b/src/sisudoc/io_out/create_abstraction_txt.d @@ -180,7 +180,8 @@ template spineAbstractionTxt() { if (obj.metainfo.is_a == "heading") { string lev = obj.metainfo.marked_up_level; obj_decl ~= "heading :" ~ lev; - if (obj.metainfo.identifier.length > 0) { + if (obj.metainfo.identifier.length > 0 + && obj.metainfo.identifier != obj.metainfo.ocn.to!string) { obj_decl ~= " " ~ obj.metainfo.identifier; } } else { @@ -191,7 +192,8 @@ template spineAbstractionTxt() { /+ ↓ properties (only non-default values) +/ if (obj.metainfo.is_of_part.length > 0) output ~= ".part: " ~ obj.metainfo.is_of_part; - if (obj.metainfo.is_of_section.length > 0 && obj.metainfo.is_of_section != section) + if (obj.metainfo.is_of_section.length > 0 + && obj.metainfo.is_of_section != section) output ~= ".section: " ~ obj.metainfo.is_of_section; if (obj.metainfo.parent_ocn != 0) output ~= ".parent: " ~ obj.metainfo.parent_ocn.to!string; @@ -260,7 +262,8 @@ template spineAbstractionTxt() { /+ ↓ tag properties +/ if (obj.tags.in_segment_html.length > 0) output ~= ".segment: " ~ obj.tags.in_segment_html; - if (obj.tags.anchor_tag_html.length > 0 && obj.tags.anchor_tag_html != obj.tags.in_segment_html) + if (obj.tags.anchor_tag_html.length > 0 + && obj.tags.anchor_tag_html != obj.tags.in_segment_html) output ~= ".anchor: " ~ obj.tags.anchor_tag_html; if (obj.tags.segname_prev.length > 0) output ~= ".segment_prev: " ~ obj.tags.segname_prev; |