Fixed broken links

Author: brynrhodes

ig.json

@@ -1,7 +1,7 @@
 {
 	"paths": {
 		"resources": ["resources"],
-		"specification": "http://cql.hl7.org",
+		"specification": "http://hl7.org/fhir/R4",
 		"pages": "spec",
 		"temp": "temp",
 		"output": "output",
@@ -12,11 +12,13 @@
 	"sct-edition": "http://snomed.info/sct/731000124108",
 	"tool": "jekyll",
 	"resources": {
-			"Binary/binary-cql-grammar": {
-      "source": "binary-cql-grammar.json"
+		"Binary/binary-cql-grammar": {
+      "source": "binary-cql-grammar.json",
+			"base": "Binary-binary-cql-grammar.html"
     },
     "Binary/binary-example-chlamydiascreening-cds-annotated-json": {
-      "source": "binary-example-chlamydiascreening-cds-annotated-json.json"
+      "source": "binary-example-chlamydiascreening-cds-annotated-json.json",
+			"base": "Binary-binary-example-chlamydiascreening-cds-annotated-json.html"
     },
     "Binary/binary-example-chlamydiascreening-cds-annotated-xml": {
       "source": "binary-example-chlamydiascreening-cds-annotated-xml.json"
@@ -231,5 +233,15 @@
 	"fixed-business-version": "1.5.0",
 	"source": "ig.xml",
   "license": "CC0-1.0",
-  "npm-name": "hl7.cql"
+	"logging": ["init", "progress", "context", "html", "tx"],
+  "npm-name": "hl7.cql",
+	"defaults": {
+		"Any": {
+			"template-format": "instance-template-format.html",
+			"template-base": "instance-template-base.html"
+		},
+		"Binary": {
+			"template-format": "instance-template-example.html"
+		}
+	}
 }

instance-template-base.html

@@ -0,0 +1,19 @@
+---
+# jekyll header
+---
+
+{% include header.html %}
+
+{% include container-start.html %}
+
+<h2>{{[type]}}-{{[id]}}</h2>
+
+<p>
+Formats: <a href="{{[type]}}-{{[id]}}.xml.html">XML</a>, <a href="{{[type]}}-{{[id]}}.json.html">JSON</a>, <a href="{{[type]}}-{{[id]}}.ttl.html">Turtle</a>
+</p>
+
+{% include {{[type]}}-{{[name]}}.xhtml %}
+          
+{% include container-end.html %}
+
+{% include footer.html %}

instance-template-example.html

@@ -0,0 +1,19 @@
+---
+# jekyll header
+---
+
+{% include header.html %}
+
+{% include container-start.html %}
+
+<h2>Example: {{[type]}}-{{[id]}}</h2>
+
+<p>
+Formats: <a href="{{[type]}}-{{[id]}}.xml.html">XML</a>, <a href="{{[type]}}-{{[id]}}.json.html">JSON</a>, <a href="{{[type]}}-{{[id]}}.ttl.html">Turtle</a>
+</p>
+
+{% include {{[type]}}-{{[name]}}.xhtml %}
+          
+{% include container-end.html %}
+
+{% include footer.html %}

instance-template-format.html

@@ -0,0 +1,15 @@
+---
+# jekyll header
+---
+
+{% include header.html %}
+
+{% include container-start.html %}
+
+<h2>{{[title]}}</h2>
+
+{% include {{[type]}}-{{[name]}}.xhtml %}
+
+{% include container-end.html %}
+
+{% include footer.html %}

spec/history.html renamed to oldhistory.html

@@ -16,7 +16,8 @@
          "version": "1.5.0",
          "date": "2020-04-01",
          "desc": "Normative Ballot 1",
-         "changes": "history.html",
+         "descmd": "*   **Compatible, Substantive Changes:**\r\n    *   STU4#1877: Added support for modular arithmetic for quantities\r\n    *   STU4#1896: Added an overload of expand to take a single interval\r\n    *   STU4#1907: Added an aggregate clause to the query construct\r\n    *   STU4#1910: Added support for specifying search paths in the Retrieve\r\n    *   STU4#1918: Added support for comment annotations that result in tags in the ELM output\r\n    *   STU4#1920: Added a fluent keyword to support fluent-style function invocation\r\n    *   STU4#1921: Added support for specifying include and reverseInclude elements in the Retrieve\r\n    *   STU4#1923: Added System.Long to support 64-bit integers\r\n    *   STU4#1908: Added the ability to pass value sets and code systems as reference-type arguments\r\n    *   STU4#1917: Added a text/cql.identifier media type to support referencing the name of a defined CQL expression",
+         "changes": "v1.5-changelog.html",
          "path": "http://cql.hl7.org/2020May/index.html",
          "status": "ballot",
          "sequence": "Normative",
@@ -26,7 +27,9 @@
 				 "version": "1.4.1",
 				 "date": "2019-06-30",
 				 "desc": "STU4 Release",
-				 "changes": "history.html",
+         "descmd": "*   **Breaking Changes:**\r\n    *   STU4B#22: Added definitional and referential identifier categories to the grammar to resolve ambiguity\r\n    *   STU4B#23: Updated semantics of list operators to treat null elements as equal for the purposes of membership determination\r\n    *   STU4B#27: Changed ToDateTime(Date) to leave time components unspecified\r\n    *   STU4B#70: Changed `Unspecified` context name to `Unfiltered`\r\n    *   STU4B#94: Removed the scope attribute from the Retrieve in ELM\r\n*   **Breaking Changes (from 2019 May Ballot only):  \r\n    *   STU4B#79: Required related context retrieve expression to return a singleton\r\n    *   STU4B#114: ConvertQuantity operator now throws an error if the implementation does not support the conversion\r\n
+    **\r\n***   **Substantive Changes:**\r\n    *   STU4B#29: Added contextTargetRelationship to model information to support identifying target context elements\r\n    *   STU4B#32: Added target element to model information\r\n    *   STU4B#35: Changed timing phrase translations to add null check when the translation constructs an interval from a nullable element\r\n    *   STU4B#36: Added Precision, LowBoundary, and HighBoundary operators for Decimal, DateTime, Date, and Time types\r\n    *   STU4B#87: Added Ratio overload of ToQuantity operator\r\n    *   STU4B#109: Code paths specified in retrieves can now use literal indexers**",
+				 "changes": "v1.4-changelog.html",
 				 "path": "http://cql.hl7.org/STU4/index.html",
 				 "status": "trial-use",
 				 "sequence": "STU4",
@@ -37,7 +40,8 @@
          "version": "1.4.0",
          "date": "2019-03-24",
          "desc": "4th STU Ballot",
-         "changes": "history.html",
+         "descmd": "*   **Breaking Changes:**\r\n    *   #1716: Added support for non-patient, model-defined contexts\r\n    *   #1723: Define seconds as a Decimal for the purposes of comparison\r\n    *   #1724: Removed timezone offset from Time; changed timezone keyword to timezoneoffset\r\n    *   #1722: Removed the 'T' prefix from time formatting strings\r\n*   **Substantive Changes:**\r\n    *   #1707: Added a Size operator for intervals\r\n    *   #1719: Added support for namespaces for library names\r\n    *   #1720: Added support for qualifiers in retrieve code paths\r\n    *   #1722: Updated FHIRPath usage and translation mappings for FHIRPath Normative 3 ballot\r\n    *   #1727: Added unit conversion support for quantities\r\n    *   #1766: Added valuesetProperty to ELM Retrieve\r\n    *   Added support for related-context queries",
+         "changes": "v1.4-changelog.html",
          "path": "http://cql.hl7.org/2019May/index.html",
          "status": "ballot",
          "sequence": "STU4",
@@ -47,7 +51,8 @@
          "version": "1.3.1",
          "date": "2018-09-05",
          "desc": "STU3 Release",
-         "changes": "history.html",
+         "descmd": "*   Equality for types with components now only returns null if the values have different elements specified\r\n*   List membership and duplicate detection now use equality rather than equivalence semantics throughout\r\n*   Clarified date/time equality/equivalence/comparison semantics\r\n*   Symbolic date/time comparisons now occur at finest precision specified in either value\r\n*   Clarified relationship between symbolic/specified comparison operators\r\n*   Clarified relationship between date/time and interval overloads for equality/equivalence/comparison operators\r\n*   Clarified definition and behavior of interval promotion and demotion and indicated it is optional and disabled by default\r\n*   Improved conversion precedence\r\n*   Removed \"week\" operations that require a \"week number\"\r\n*   Changed AgeInYears() and AgeInMonths() to use Date, not DateTime\r\n*   Added a per clause to collapse\r\n*   Added SplitOnMatches\r\n*   Added backtick-delimited identifiers\r\n*   ELM operator content is now generated from the ELM model\r\n*   Numerous clarifications and errata throughout\r\n*   Added sidebar navigation",
+         "changes": "v1.3-changelog.html",
          "path": "http://cql.hl7.org/STU3/index.html",
          "status": "trial-use",
          "sequence": "STU3",
@@ -57,7 +62,8 @@
          "version": "1.3.0",
          "date": "2018-04-01",
          "desc": "STU3 Ballot",
-         "changes": "history.html",
+         "descmd": "*   **Language Changes:**\r\n    *   Added Ratio and Date system-defined types\r\n    *   Added difference of and duration between syntax\r\n    *   Named type specifiers now allow multiple qualifiers\r\n    *   Added Product and GeometricMean aggregate operators\r\n    *   Added Expand interval set operator\r\n    *   Invalid quantity operations and conversions now return null instead of error\r\n    *   Exists now ignores null elements\r\n    *   Added implicit conversion from Integer or Decimal to Quantity\r\n*   **ELM Changes:**\r\n    *   Added signature element to FunctionRef\r\n    *   Added ELM classes for new operators\r\n    *   BinaryExpression and TernaryExpression are now abstract\r\n    *   Union, Intersect, and Except are now NaryExpressions\r\n*   **FHIRPath Support:**\r\n    *   Added mappings for hasValue, conformsTo, memberOf, subsumes, subsumedBy, toChars\r\n    *   Added support for new aggregate()\r\n    *   Added support for $index and $total accessors",
+         "changes": "v1.3-changelog.html",
          "path": "http://cql.hl7.org/2018May/index.html",
          "status": "ballot",
          "sequence": "STU3",
@@ -67,7 +73,8 @@
          "version": "1.2.1",
          "date": "2016-12-06",
          "desc": "STU2 Release (w/ Errata)",
-         "changes": "history.html",
+         "descmd": "*   Adopted FHIRPath grammar as basis for expressions\r\n    *   Support for paths\r\n    *   Method-style invocation\r\n    *   List promotion and demotion\r\n    *   Empty list as null semantics\r\n    *   $ and % identifier scopes\r\n    *   Additional FHIRPath operators\r\n*   Support for declaration-only libraries\r\n*   Added choice type support\r\n*   Added Message operator to support run-time messages, errors, and warnings\r\n*   Added external function declarations\r\n*   Added debug and type information to ELM\r\n*   Specified JSON format for ELM\r\n*   Added less than/more than timing phrase modifiers\r\n*   Added on or/or on timing phrase modifiers\r\n*   Relaxed syntactic restriction on terminology target in a retrieve",
+         "changes": "v1.2-changelog.html",
          "path": "http://cql.hl7.org/STU2/index.html",
          "status": "trial-use",
          "sequence": "STU2",
@@ -77,7 +84,8 @@
          "version": "1.1.0",
          "date": "2016-07-01",
          "desc": "STU1 Update",
-         "changes": "history.html",
+         "descmd": "DSTU Update. Changes:\r\n*   Changed define clause to let within queries\r\n*   Changed matches to ~\r\n*   Changed <> to !=\r\n*   Changed lists to be 0-based instead of 1-based\r\n*   Renamed expand to flatten\r\n*   Added implicit conversion from List<Code> to Concept\r\n*   Added Exp operator (inverse of Ln)\r\n*   Added weeks duration\r\n*   Added support for forward declarations\r\n*   Added concept and code declarations",
+         "changes": "v1.1-changelog.html",
          "path": "http://www.hl7.org/documentcenter/public/standards/dstu/HL7_CQL_SPEC_R1_DSTUR1dot1_2016JUL.zip",
          "status": "trial-use",
          "sequence": "STU1",
@@ -87,7 +95,6 @@
          "version": "1.0.0",
          "date": "2015-05-01",
          "desc": "STU1 Release",
-         "changes": "history.html",
          "path": "http://www.hl7.org/documentcenter/public/standards/dstu/HL7_CQLANG_R1_DSTU_2015MAY.zip",
          "status": "trial-use",
          "sequence": "STU1",

package-list.json

@@ -18,7 +18,7 @@
   <packageId value="hl7.cql"/>
   <fhirVersion value="4.0.1"/>
   <definition>
-<resource>
+    <resource>
       <reference>
         <reference value="Binary/binary-cql-grammar"/>
       </reference>

resources/ig.xml

@@ -0,0 +1,8 @@
+<p></p>
+ </div>
+
+    </div>  <!-- /inner-wrapper -->
+            </div>  <!-- /row -->
+        </div>  <!-- /container -->
+
+</div> <!-- /segment-content -->

spec/_includes/container-end.html

@@ -0,0 +1,17 @@
+
+ <div id="segment-breadcrumb" class="segment">  <!-- segment-breadcrumb -->
+  <div class="container">  <!-- container -->
+   <ul class="breadcrumb">
+        <li title="Quality Measure Implementation Guide"><strong>Quality Measure Implementation Guide</strong></li>
+   </ul>
+  </div>  <!-- /container -->
+ </div>  <!-- /segment-breadcrumb -->
+
+ <div id="segment-content" class="segment">  <!-- segment-content -->
+ <div class="container">  <!-- container -->
+            <div class="row">
+             <div class="inner-wrapper">
+
+<!--ReleaseHeader--><p id="publish-box">Publish Box goes here</p><!--EndReleaseHeader-->
+
+<div id="contentDiv" class="col-11">

spec/_includes/container-start.html

@@ -0,0 +1,38 @@
+<div id="segment-footer" class="segment">  <!-- segment-footer -->
+  <div class="container">  <!-- container -->
+   <div class="inner-wrapper">
+     <p>
+     &copy; HL7.org 2014+. CQL (Development Build) (<a href="{{site.data.fhir.ig.contact[0].telecom[0]}}">{{site.data.fhir.ig.publisher}}</a>). {{site.data.fhir.packageId}}#{{site.data.fhir.igVer}} generated on {{ site.time }}
+     <span style="color: #FFFF77">|
+<!--               <a style="color: #81BEF7" href="http://services.w3.org/htmldiff?doc1=http%3A%2F%2Fcql.hl7.org%2FSTU2%2F<%rellink%>&amp;doc2=<%baseURL%><%rellink%>">Compare to STU2</a> | -->
+            <a style="color: #81BEF7" rel="license" href="license.html">License</a> |
+            <a style="color: #81BEF7" rel="history" href="http://cql.hl7.org/history.html">Version History</a> |
+            <a style="color: #81BEF7" target="_blank" href="http://www.hl7.org/implement/standards/product_brief.cfm?product_id=400">Propose a change</a>
+     </span>
+     </p>
+   </div>  <!-- /inner-wrapper -->
+  </div>  <!-- /container -->
+ </div>  <!-- /segment-footer -->
+  <!-- disqus thread -->
+  <!-- disqus -->
+  <!-- end disqus -->
+
+ <div id="segment-post-footer" class="segment hidden">  <!-- segment-post-footer -->
+  <div class="container">  <!-- container -->
+  </div>  <!-- /container -->
+ </div>  <!-- /segment-post-footer -->
+
+      <!-- JS and analytics only. -->
+      <!-- Bootstrap core JavaScript
+================================================== -->
+  <!-- Placed at the end of the document so the pages load faster -->
+<script src="assets/js/jquery.js"> </script>     <!-- note keep space here, otherwise it will be transformed to empty tag -> fails -->
+<script src="dist/js/bootstrap.min.js"> </script>
+<script src="assets/js/respond.min.js"> </script>
+
+<script src="assets/js/fhir.js"> </script>
+
+  <!-- Analytics Below
+================================================== -->
+</body>
+</html>

spec/_includes/footer.html

@@ -0,0 +1,36 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+  <meta charset="UTF-8"/>
+  <title>Clinical Quality Language Release 1</title>
+
+  <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+  <meta name="author" content="http://hl7.org/fhir"/>
+
+  <link href="fhir.css" rel="stylesheet"/>
+
+  <!-- Bootstrap core CSS -->
+  <link href="dist/css/bootstrap.css" rel="stylesheet"/>
+  <link href="assets/css/bootstrap-fhir.css" rel="stylesheet"/>
+
+  <!-- Project extras -->
+  <link href="assets/css/project.css" rel="stylesheet"/>
+  <link href="assets/css/pygments-manni.css" rel="stylesheet"/>
+  <link href="jquery-ui.css" rel="stylesheet"/>
+
+  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
+  <!--[if lt IE 9]>
+  <script src="assets/js/html5shiv.js"></script>
+  <script src="assets/js/respond.min.js"></script>
+  <![endif]-->
+
+  <!-- Favicons -->
+  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/ico/apple-touch-icon-144-precomposed.png"/>
+  <link rel="apple-touch-icon-precomposed" sizes="114x114" href="assets/ico/apple-touch-icon-114-precomposed.png"/>
+  <link rel="apple-touch-icon-precomposed" sizes="72x72" href="assets/ico/apple-touch-icon-72-precomposed.png"/>
+  <link rel="apple-touch-icon-precomposed" href="assets/ico/apple-touch-icon-57-precomposed.png"/>
+  <link rel="shortcut icon" href="assets/ico/favicon.png"/>
+
+</head>
+<body>
+
+{% include navbar.html %}

spec/_includes/header.html

@@ -0,0 +1,70 @@
+ <div id="segment-header" class="segment">  <!-- segment-header -->
+  <div class="container flex">  <!-- container -->
+   <a id="logo" no-external="true" href="http://hl7.org/fhir"><img alt="fhir logo" src="dist/fhir-logo-www.png"/> </a>
+   <div id="hl7-status">
+    <strong>Clinical Quality Language Release 1</strong>
+   </div>
+
+   <div id="hl7-nav">
+     <a id="hl7-logo" no-external="true" href="http://www.hl7.org">
+     <img height="50" alt="visit the hl7 website" width="42" src="dist/hl7-logo.png"/>
+    </a>
+   </div>
+   <!--<div id="hl7-nav"><a id="hl7-logo" no-external="true" href="http://hl7.org/fhir/search.cfm"><img alt="Search FHIR" src="dist/search.png"/></a></div> -->
+  </div>
+  <div class="container">  <!-- container -->
+ </div></div>  <!-- /segment-header -->
+
+ <div class="segment">  <!-- segment-navbar -->
+  <div class="container">  <!-- container -->
+   <!-- HEADER CONTENT -->
+
+   <nav class="navbar navbar-inverse">
+    <div class="container">
+     <button data-target=".navbar-inverse-collapse" class="navbar-toggle" data-toggle="collapse" type="button">
+      <span class="icon-bar"> </span>
+      <span class="icon-bar"> </span>
+      <span class="icon-bar"> </span>
+      <span class="icon-bar"> </span>
+     </button>
+     <a class="navbar-brand hidden" href="{{site.data.fhir.path}}index.html">FHIR</a>
+     <div class="nav-collapse collapse navbar-inverse-collapse">
+       <ul class="nav navbar-nav">
+         <li class = "dropdown">
+     <a href="index.html" class = "dropbtn">Documentation</a>
+   <div class = "dropdown-content">
+     <a href="01-introduction.html">Chapter 1 - Introduction</a>
+     <a href="02-authorsguide.html">Chapter 2 - Author's Guide</a>
+     <a href="03-developersguide.html">Chapter 3 - Developer's Guide</a>
+     <a href="04-logicalspecification.html">Chapter 4 - Logical Specification</a>
+     <a href="05-languagesemantics.html">Chapter 5 - Language Semantics</a>
+     <a href="06-translationsemantics.html">Chapter 6 - Translation Semantics</a>
+     <a href="07-physicalrepresentation.html">Chapter 7 - Physical Representation</a>
+     <a href="08-a-cqlsyntax.html">Appendix A - CQL Syntax Formal Specification</a>
+     <a href="09-b-cqlreference.html">Appendix B - CQL Reference</a>
+     <a href="10-c-referenceimplementations.html">Appendix C - Reference Implementations</a>
+     <a href="11-d-references.html">Appendix D - References</a>
+     <a href="12-e-acronyms.html">Appendix E - Acronyms</a>
+     <a href="13-f-glossary.html">Appendix F - Glossary</a>
+     <a href="14-g-formattingconventions.html">Appendix G - Formatting Conventions</a>
+     <a href="15-h-timeintervalcalculations.html">Appendix H - Time Interval Calculation Examples</a>
+     <a href="16-i-fhirpathtranslation.html">Appendix I - FHIRPath Function Translation</a>
+     <a href="17-j-listoftables.html">Appendix J - List Of Tables</a>
+     <a href="18-k-listoffigures.html">Appendix K - List Of Figures</a>
+   </div>
+   </li>
+         <li><a href="grammar.html">Grammar</a></li>
+   <li><a href="elm.html">ELM</a></li>
+   <li><a href="examples.html">Examples</a></li>
+         <li><a href="tests.html">Tests</a></li>
+         <li><a href="downloads.html">Downloads</a></li>
+         <li><a href="http://cql.hl7.org/history.html">Version History</a><!--current--></li>
+
+       </ul>
+     </div>  <!-- /.nav-collapse -->
+    </div>  <!-- /.container -->
+   </nav>  <!-- /.navbar -->
+
+  <!-- /HEADER CONTENT -->
+  </div>  <!-- /container -->
+ </div>  <!-- /segment-navbar -->