Merge branch 'master' into MLJ-prepub-edits

HL7 · Mar 31, 2023 · d3261be · d3261be
2 parents 9fc4b58 + 0448aeb
commit d3261be
Show file tree

Hide file tree

Showing 89 changed files with 5,476 additions and 104 deletions.
diff --git a/.ci/asciidoc-converter/src/main/kotlin/org/sdpi/AsciidocConverter.kt b/.ci/asciidoc-converter/src/main/kotlin/org/sdpi/AsciidocConverter.kt
@@ -26,7 +26,6 @@ class AsciidocConverter(
         val asciidoctor = Asciidoctor.Factory.create()
 
         val anchorReplacements = mutableMapOf<String, LabelInfo>()
-        val customReferences = mutableSetOf<String>()
 
         val requirementsBlockProcessor = RequirementsBlockProcessor()
         asciidoctor.javaExtensionRegistry().block(requirementsBlockProcessor)
@@ -41,9 +40,9 @@ class AsciidocConverter(
         )
         asciidoctor.javaExtensionRegistry().treeprocessor(RequirementLevelProcessor())
         asciidoctor.javaExtensionRegistry().preprocessor(DisableSectNumsProcessor())
-        asciidoctor.javaExtensionRegistry().preprocessor(ReferenceSanitizerPreprocessor())
+        asciidoctor.javaExtensionRegistry().preprocessor(ReferenceSanitizerPreprocessor(anchorReplacements))
         asciidoctor.javaExtensionRegistry()
-            .postprocessor(ReferenceSanitizerPostprocessor(anchorReplacements, customReferences))
+            .postprocessor(ReferenceSanitizerPostprocessor(anchorReplacements))
 
         asciidoctor.requireLibrary("asciidoctor-diagram") // enables plantuml
         when (inputType) {

diff --git a/...-converter/src/main/kotlin/org/sdpi/asciidoc/extension/ReferenceSanitizerPostprocessor.kt b/...-converter/src/main/kotlin/org/sdpi/asciidoc/extension/ReferenceSanitizerPostprocessor.kt
@@ -14,7 +14,8 @@ enum class LabelSource {
     SECTION,
     TABLE_OR_FIGURE,
     APPENDIX,
-    VOLUME
+    VOLUME,
+    UNKNOWN
 }
 
 data class LabelInfo(
@@ -25,8 +26,7 @@ data class LabelInfo(
 )
 
 class ReferenceSanitizerPostprocessor(
-    private val anchorLabels: Map<String, LabelInfo>,
-    private val customReferences: Set<String>
+    private val anchorLabels: Map<String, LabelInfo>
 ) : Postprocessor() {
     override fun process(document: Document, output: String): String {
         // skip numbering if xref style has been changed to reduce likelihood of broken references
@@ -84,6 +84,7 @@ class ReferenceSanitizerPostprocessor(
                     LabelSource.TABLE_OR_FIGURE -> anchor.text(anchorText ?: it.label)
                     LabelSource.APPENDIX -> anchor.text(anchorText ?: "$appendixSig${it.prefix}:${it.label}")
                     LabelSource.VOLUME -> anchor.text(anchorText ?: "$chapterSig${it.prefix}")
+                    LabelSource.UNKNOWN -> anchor.text(anchorText ?: it.label)
                 }
             }
         }

diff --git a/...c-converter/src/main/kotlin/org/sdpi/asciidoc/extension/ReferenceSanitizerPreprocessor.kt b/...c-converter/src/main/kotlin/org/sdpi/asciidoc/extension/ReferenceSanitizerPreprocessor.kt
@@ -7,7 +7,9 @@ import java.net.URLEncoder
 import java.util.*
 
 
-class ReferenceSanitizerPreprocessor : Preprocessor() {
+class ReferenceSanitizerPreprocessor(
+    private val anchorReplacements: MutableMap<String, LabelInfo>
+) : Preprocessor() {
     private val variables = mutableMapOf<String, String>()
 
     override fun process(document: org.asciidoctor.ast.Document, reader: PreprocessorReader) {
@@ -23,6 +25,7 @@ class ReferenceSanitizerPreprocessor : Preprocessor() {
                     val substitutedVariables = substituteVariables(refs[1].trim())
                     val encodedRefText = URLEncoder.encode(substitutedVariables, Charsets.UTF_8)
                     val transformed = "<<${refs[0]}$refSeparator$encodedRefText>>"
+                    anchorReplacements[refs[0]] = LabelInfo(substitutedVariables, LabelSource.UNKNOWN)
                     logger.info { "Found reference with custom label: ${it.groupValues.first()} => $transformed" }
                     transformed
                 }

diff --git a/.github/copy_images.sh b/.github/copy_images.sh
@@ -9,5 +9,7 @@ cd ..
 mkdir sdpi-supplement
 cp -R asciidoc/images sdpi-supplement/images
 cp -R asciidoc/js sdpi-supplement/js
+cp -R asciidoc/css sdpi-supplement/css
+cp -R asciidoc/fonts sdpi-supplement/fonts
 rm -rf sdpi-supplement/.asciidoctor
 rm -rf sdpi-supplement/readme.md