Merge branch 'master' of https://github.com/HL7/ig-template-base

HL7 · Aug 28, 2024 · ae153de · ae153de
2 parents 21b073b + fc77737
commit ae153de
Show file tree

Hide file tree

Showing 11 changed files with 2,080 additions and 24 deletions.
diff --git a/config/_config.yml b/config/_config.yml
@@ -1,2 +1,3 @@
 kramdown:
-  toc_levels:    1..3
+  toc_levels:    1..3
+  smart_quotes: ["apos", "apos", "quot", "quot"]
diff --git a/content/assets/css/project.css b/content/assets/css/project.css
@@ -755,3 +755,9 @@ li a[href^="http://"]:not([no-external^="true"]):after,li a[href^="https://"]:no
   border-width: 0px;
   background-color: transparent;
 }
+
+
+code[class*="language-"],
+pre[class*="language-"] {
+    text-shadow: none;
+}
diff --git a/content/assets/js/mermaid-init.js b/content/assets/js/mermaid-init.js
@@ -0,0 +1,12 @@
+document.addEventListener('DOMContentLoaded', function() {
+  const mermaidCodes = document.querySelectorAll('pre.language-mermaid code.language-mermaid');
+  Array.from(mermaidCodes).forEach(function(code) {
+    const pre = code.parentNode;
+    const content = code.textContent;
+    const mermaidDiv = document.createElement('div');
+    mermaidDiv.className = 'mermaid';
+    mermaidDiv.textContent = content;
+    pre.parentNode.replaceChild(mermaidDiv, pre);
+  });
+  mermaid.initialize({ securityLevel: 'sandbox' });
+});
diff --git a/content/assets/js/mermaid.js b/content/assets/js/mermaid.js
diff --git a/includes/fragment-pagebegin.html b/includes/fragment-pagebegin.html
@@ -38,7 +38,8 @@
   <body onload="document.body.style.opacity='1'">
 {% assign label = {{site.data.pages[page.path].label}} | split: '.0' %}
 	  <script src="{{site.data.info.assets}}assets/js/prism.js"></script>
-
+    <script type="text/javascript" src="{{site.data.info.assets}}assets/js/mermaid.js"></script>
+    <script type="text/javascript" src="{{site.data.info.assets}}assets/js/mermaid-init.js"></script>
     <style type="text/css">h2{--heading-prefix:"{{site.data.info.headingOffset}}{{label}}"}
     h3,h4,h5,h6{--heading-prefix:"{{site.data.info.headingOffset}}{{site.data.pages[page.path].label}}"}</style>
     <div id="segment-header" class="segment">  <!-- segment-header -->

diff --git a/includes/fragment-pageend.html b/includes/fragment-pageend.html
@@ -55,7 +55,7 @@
     <div class="container">  <!-- container -->
     </div>  <!-- /container -->
   </div>  <!-- /segment-post-footer -->
-  
+
   <!-- JS and analytics only. -->
   <!-- Bootstrap core JavaScript
   ================================================== -->
@@ -66,7 +66,6 @@
   <script type="text/javascript" src="assets/js/clipboard.min.js"> </script>
   <script type="text/javascript" src="assets/js/clipboard-btn.js"> </script>
   <script type="text/javascript" src="{{site.data.info.assets}}assets/js/anchor-hover.js"> </script>
-
   <!-- Analytics Below
   ================================================== -->
   </body>

diff --git a/layouts/layout-ext.html b/layouts/layout-ext.html
@@ -131,7 +131,7 @@ <h3 id="profile">Formal Views of Extension Content</h3>
         <p>This structure is derived from <a href="{{site.data.structuredefinitions['{{[id]}}'].basepath}}">{{site.data.structuredefinitions['{{[id]}}'].basename}}</a>
         </p>
         <div id="all-summ-inner">
-          {%include StructureDefinition-{{[id]}}-summary.xhtml%}
+          {%include StructureDefinition-{{[id]}}-summary-all.xhtml%}
         </div>
       </div>
       <div id="all-tbl-diff">
@@ -141,15 +141,15 @@ <h3 id="profile">Formal Views of Extension Content</h3>
         <p>This structure is derived from <a href="{{site.data.structuredefinitions['{{[id]}}'].basepath}}">{{site.data.structuredefinitions['{{[id]}}'].basename}}</a>
         </p>
         <div id="all-tbl-diff-inner">
-          {%include StructureDefinition-{{[id]}}-diff.xhtml%}
+          {%include StructureDefinition-{{[id]}}-diff-all.xhtml%}
         </div>
       </div>
       <div id="all-tbl-snap">
         <p>
           <b>Snapshot View</b>
         </p>
         <div id="all-tbl-snap-inner">
-          {%include StructureDefinition-{{[id]}}-snapshot.xhtml%}
+          {%include StructureDefinition-{{[id]}}-snapshot-all.xhtml%}
         </div>
       </div>
 {% unless excludexml == 'y' %}

diff --git a/layouts/layout-profile.html b/layouts/layout-profile.html
@@ -93,7 +93,7 @@ <h3 id="profile">Formal Views of Profile Content</h3>
           {% endcapture %}
           <!-- 218 is size of empty table -->
           {% unless invariantsdiff.size <= 218 %}
-            <a name="inv"> </a>
+            <a name="inv-diff"> </a>
             <!--Constraints  heading in the fragment -->
             {% include StructureDefinition-{{[id]}}-inv-diff.xhtml %}
           {% endunless%}
@@ -113,7 +113,7 @@ <h3 id="profile">Formal Views of Profile Content</h3>
           {% endcapture %}
           <!-- 218 is size of empty table -->
           {% unless invariantskey.size <= 218 %}
-            <a name="inv"> </a>
+            <a name="inv-key"> </a>
             <!--Constraints  heading in the fragment -->
             {% include StructureDefinition-{{[id]}}-inv-key.xhtml %}
           {% endunless%}
@@ -133,7 +133,7 @@ <h3 id="profile">Formal Views of Profile Content</h3>
           {% endcapture %}
           <!-- 218 is size of empty table -->
           {% unless invariants.size <= 218 %}
-            <a name="inv"> </a>
+            <a name="inv-snap"> </a>
             <!--Constraints  heading in the fragment -->
             {% include StructureDefinition-{{[id]}}-inv.xhtml %}
           {% endunless%}
@@ -190,7 +190,7 @@ <h3 id="profile">Formal Views of Profile Content</h3>
         <p>This structure is derived from <a href="{{site.data.structuredefinitions['{{[id]}}'].basepath}}">{{site.data.structuredefinitions['{{[id]}}'].basename}}</a>
         </p>
         <div id="all-tbl-diff-inner">
-          {%include StructureDefinition-{{[id]}}-diff.xhtml%}
+          {%include StructureDefinition-{{[id]}}-diff-all.xhtml%}
           <!--Terminology Bindings heading in the fragment -->
           {%include StructureDefinition-{{[id]}}-tx-diff.xhtml%}
 
@@ -199,7 +199,7 @@ <h3 id="profile">Formal Views of Profile Content</h3>
           {% endcapture %}
           <!-- 218 is size of empty table -->
           {% unless invariantsdiff.size <= 218 %}
-            <a name="inv"> </a>
+            <a name="inv-all-diff"> </a>
             <!--Constraints  heading in the fragment -->
             {% include StructureDefinition-{{[id]}}-inv-diff.xhtml %}
           {% endunless%}
@@ -210,7 +210,7 @@ <h3 id="profile">Formal Views of Profile Content</h3>
           <b>Key Elements View</b>
         </p>
         <div id="all-tbl-key-inner">
-          {%include StructureDefinition-{{[id]}}-snapshot-by-key.xhtml%}
+          {%include StructureDefinition-{{[id]}}-snapshot-by-key-all.xhtml%}
           <!--Terminology Bindings heading in the fragment -->
           {%include StructureDefinition-{{[id]}}-tx-key.xhtml%}
 
@@ -219,7 +219,7 @@ <h3 id="profile">Formal Views of Profile Content</h3>
           {% endcapture %}
           <!-- 218 is size of empty table -->
           {% unless invariantskey.size <= 218 %}
-            <a name="inv"> </a>
+            <a name="inv-all-key"> </a>
             <!--Constraints  heading in the fragment -->
             {% include StructureDefinition-{{[id]}}-inv-key.xhtml %}
           {% endunless%}
@@ -230,7 +230,7 @@ <h3 id="profile">Formal Views of Profile Content</h3>
           <b>Snapshot View</b>
         </p>
         <div id="all-tbl-snap-inner">
-          {%include StructureDefinition-{{[id]}}-snapshot.xhtml%}
+          {%include StructureDefinition-{{[id]}}-snapshot-all.xhtml%}
           <!--Terminology Bindings heading in the fragment -->
           {%include StructureDefinition-{{[id]}}-tx.xhtml%}
 
@@ -239,7 +239,7 @@ <h3 id="profile">Formal Views of Profile Content</h3>
           {% endcapture %}
           <!-- 218 is size of empty table -->
           {% unless invariants.size <= 218 %}
-            <a name="inv"> </a>
+            <a name="inv-all-snap"> </a>
             <!--Constraints  heading in the fragment -->
             {% include StructureDefinition-{{[id]}}-inv.xhtml %}
           {% endunless%}
@@ -279,7 +279,7 @@ <h3 id="profile">Formal Views of Profile Content</h3>
         <p>This structure is derived from <a href="{{site.data.structuredefinitions['{{[id]}}'].basepath}}">{{site.data.structuredefinitions['{{[id]}}'].basename}}</a>
         </p>
         <div id="all-summ-inner">
-          {%include StructureDefinition-{{[id]}}-summary.xhtml%}
+          {%include StructureDefinition-{{[id]}}-summary-all.xhtml%}
         </div>
       </div>
     </div>

diff --git a/package-list.json b/package-list.json
@@ -11,14 +11,22 @@
       "status" : "ci-build",
       "current" : true
     },
+    {
+      "version" : "0.8.1",
+      "desc" : "Use -all fragments to fix duplicate ids",
+      "path" : "http://fhir.org/templates/fhir.base.template/0.8.1",
+      "status" : "release",
+      "sequence" : "Publications",
+      "date" : "2024-07-06",
+      "current" : true
+    },
     {
       "version" : "0.8.0",
       "desc" : "Security fix after IG Publisher rule about anonymous scripts fixed",
       "path" : "http://fhir.org/templates/fhir.base.template/0.8.0",
       "status" : "release",
       "sequence" : "Publications",
-      "date" : "2024-04-25",
-      "current" : true
+      "date" : "2024-04-25"
     },
     {
       "version" : "0.7.0",

diff --git a/package/package.json b/package/package.json
@@ -5,5 +5,5 @@
   "description" : "FHIR IG Base Template - foundational for use by anyone",
   "author" : "http://hl7.org/fhir",
   "canonical" : "http://fhir.org/templates/fhir.base.template",
-  "version" : "0.8.0"
+  "version" : "0.8.1"
 }
diff --git a/scripts/ant.xml b/scripts/ant.xml
@@ -82,29 +82,29 @@
       <and>
         <available type="dir" file="${basedir}/${folder.input}/images-source"/>
         <resourcecount when="greater" count="0">
-          <fileset file="${basedir}/${folder.input}/images-source/*.plantuml"/>
+          <fileset file="${basedir}/${folder.input}/images-source/**.plantuml"/>
         </resourcecount>
       </and>
     </condition>
     <condition property="template.plantumlfiles.exist">
       <and>
         <available type="dir" file="${ig.template}/images-source"/>
         <resourcecount when="greater" count="0">
-          <fileset file="${ig.template}/images-source/*.plantuml"/>
+          <fileset file="${ig.template}/images-source/**.plantuml"/>
         </resourcecount>
       </and>
     </condition>
   </target>
   <target name="onGenerate.plantUml.ig" depends="check-plantumlfiles" if="ig.plantumlfiles.exist">
     <java jar="${ig.scripts}/plantuml.jar" fork="true" failonerror="true">
       <jvmarg line="-Dfile.encoding=UTF-8"/>
-      <arg line="-nometadata -failfast2 -tsvg -o &quot;${basedir}/${dir.temp.includes}&quot; &quot;${basedir}/${folder.input}/images-source/*.plantuml&quot;"/>
+      <arg line="-nometadata -failfast2 -tsvg -o &quot;${basedir}/${dir.temp.includes}&quot; &quot;${basedir}/${folder.input}/images-source/**.plantuml&quot;"/>
     </java>
   </target>
   <target name="onGenerate.plantUml.template" depends="check-plantumlfiles" if="template.plantumlfiles.exist">
     <java jar="${ig.scripts}/plantuml.jar" fork="true" failonerror="true">
       <jvmarg line="-Dfile.encoding=UTF-8"/>
-      <arg line="-nometadata -failfast2 -tsvg -o &quot;${basedir}/${dir.temp.includes}&quot; &quot;${ig.template}/images-source/*.plantuml&quot;"/>
+      <arg line="-nometadata -failfast2 -tsvg -o &quot;${basedir}/${dir.temp.includes}&quot; &quot;${ig.template}/images-source/**.plantuml&quot;"/>
     </java>
   </target>
   <target name="onGenerate.plantUml" depends="onGenerate.plantUml.ig,onGenerate.plantUml.template"/>