134/136 numbering of table in annex appears to be wrong / defective f…

…igure rendering (#137) * #136 Fix path to XML file. * #134 Fix numbering offset error. * Change merge strategy for changelog file to "union" * #134 #136 Add changelog entries. * #134 Change changelog text. * #136 Change changelog text
HL7 · Apr 10, 2023 · 0816dce · 0816dce
1 parent 8e44006
commit 0816dce
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/.ci/asciidoc-converter/src/main/kotlin/org/sdpi/asciidoc/extension/NumberingProcessor.kt b/.ci/asciidoc-converter/src/main/kotlin/org/sdpi/asciidoc/extension/NumberingProcessor.kt
@@ -228,7 +228,7 @@ class NumberingProcessor(
                     }
 
                     else -> if (section.isAppendix()) {
-                        currentAppendix = sdpiOffset.first()
+                        currentAppendix = sdpiOffset.first() - 1
                     } else {
                         numbering[level] = sdpiOffset.toInt().let {
                             numbering[level].copy(offset = it)
@@ -307,11 +307,12 @@ class NumberingProcessor(
         numbering[level] = numbering[level].copy(
             title = section.title,
             appendix = if (section.isAppendix()) {
-                validate(currentAppendix <= 'Z', section) {
+                val appendixChar = ++currentAppendix
+                validate(appendixChar <= 'Z', section) {
                     "Maximum number of appendices exceeded (26, A to Z)."
                 }
-                section.caption = "$appendixCaption${volumePrefix()}$currentAppendix "
-                (currentAppendix++).toString()
+                section.caption = "$appendixCaption${volumePrefix()}$appendixChar "
+                appendixChar.toString()
             } else {
                 null
             }

diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+CHANGELOG.md merge=union
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,4 +20,7 @@ Each section shall contain a list of action items of the following format: `<bri
 
 ### Changed
 
+- Wrong appendix numbering offset in tables to be aligned with appendix letter (#134).
+- Path to XML file to correctly render Figure 3:8.7.3.17-1 Physiologic Monitor Containment Tree Example (#136).
+
 ### Removed
diff --git a/asciidoc/volume3/tf3-ch-8.7.3-physiologic-monitor.adoc b/asciidoc/volume3/tf3-ch-8.7.3-physiologic-monitor.adoc
@@ -30,6 +30,6 @@ The following XML snippet profiles BICEPS semantics in line with the containment
 ====
 [source#vol3_clause_sdc_biceps_content_module_physio_monitor_snippet1,xml]
 ----
-include::../../listings/vol3-clause-sdc-biceps-content-module-physio-monitor-snippet1.xml[]
+include::../listings/vol3-clause-sdc-biceps-content-module-physio-monitor-snippet1.xml[]
 ----
 ====