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

HL7 · Apr 7, 2024 · 66c14a5 · 66c14a5
2 parents 7ecf358 + 52b65c9
commit 66c14a5
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/includes/fragment-pagebegin.html b/includes/fragment-pagebegin.html
@@ -3,7 +3,7 @@
 <html xml:lang="en" xmlns="http://www.w3.org/1999/xhtml" lang="en">
   <head>
     <meta content="text/html;charset=utf-8" http-equiv="Content-Type"/>
-    <title>{{site.data.pages[page.path].title | escape_once}} - {{site.data.fhir.ig.title}} v{{site.data.fhir.ig.version}}</title>
+    <title>{{site.data.pages[page.path].title | escape_once}} - {{site.data.fhir.ig.title | escape_once}} v{{site.data.fhir.ig.version | escape_once}}</title>
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
     <meta name="author" content="http://hl7.org/fhir"/>

diff --git a/package-list.json b/package-list.json
@@ -1,4 +1,4 @@
-{
+{
   "package-id" : "fhir.base.template",
   "title" : "Base template for FHIR IGs",
   "canonical" : "http://fhir.org/templates/fhir.base.template",
@@ -11,14 +11,22 @@
       "status" : "ci-build",
       "current" : true
     },
+    {
+      "version" : "0.7.0",
+      "desc" : "Force snapshot release of all templates prior to making a change to the base template that depends on a new IG publisher",
+      "path" : "http://fhir.org/templates/fhir.base.template/0.7.0",
+      "status" : "release",
+      "sequence" : "Publications",
+      "date" : "2024-03-07",
+      "current" : true
+    },
     {
       "version" : "0.6.0",
       "desc" : "Update template for apply-wg",
       "path" : "http://fhir.org/templates/fhir.base.template/0.6.0",
       "status" : "release",
       "sequence" : "Publications",
-      "date" : "2023-09-21",
-      "current" : true
+      "date" : "2023-09-21"
     },
     {
       "version" : "0.5.0",

diff --git a/package/package.json b/package/package.json
@@ -1,9 +1,9 @@
-{
+{
   "name" : "fhir.base.template",
   "type" : "fhir.template",
   "license" : "CC0-1.0",
   "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.6.0"
+  "version" : "0.7.0"
 }
diff --git a/scripts/ant.xml b/scripts/ant.xml
@@ -98,13 +98,13 @@
   <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 -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 -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"/>

diff --git a/scripts/createArtifactSummary.xslt b/scripts/createArtifactSummary.xslt
@@ -5,7 +5,8 @@
   <xsl:param name="version"/>
   <xsl:param name="globals"/>
   <xsl:template match="f:ImplementationGuide">
-    <xsl:comment>DO NOT EDIT THIS FILE - It is generated and any changes made will be overwritten</xsl:comment>
+    <!-- Include a note in the output with breadcrumbs back to this script -->
+    <xsl:comment>DO NOT EDIT THIS FILE - It is generated by https://github.com/HL7/ig-template-base/blob/master/scripts/createArtifactSummary.xslt and any changes made will be overwritten</xsl:comment>
     <div class="markdown-toc">
       <p>Contents:</p>
       <ul>
@@ -50,13 +51,10 @@
     </div>
   </xsl:template>
   <xsl:template match="f:grouping">
-    <p> 
       <xsl:text>{% capture grouping_desc %}</xsl:text>
       <xsl:value-of select="f:description/@value" disable-output-escaping="no"/>
        <xsl:text>{% endcapture %}
     {{ grouping_desc | markdownify}}</xsl:text>
-    </p>
-    <p>
       <xsl:variable name="showDescriptions" select="count(parent::f:definition/f:resource[f:groupingId/@value=current()/@id]/f:description/@value)!=0"/>
       <table class="grid">
         <col style="width:20%"/>
@@ -88,7 +86,6 @@
           </xsl:for-each>
         </tbody>
       </table>
-    </p>
   </xsl:template>
   <xsl:template match="f:grouping" mode="first">
     <tr>