Skip to content

Commit

Permalink
Merge pull request #10 from cqframework/0.7.0-Release
Browse files Browse the repository at this point in the history
0.7.0 Release prep
  • Loading branch information
grahamegrieve authored Sep 4, 2024
2 parents 7e36c1f + b17c708 commit 7bcd20f
Show file tree
Hide file tree
Showing 4 changed files with 82 additions and 7 deletions.
41 changes: 39 additions & 2 deletions content/assets/css/cqf.css
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,39 @@
font-weight: bold;
}

/*
==================================
JSON/XML/TTL Example Styling Start
==================================
*/

/* Liquid Narrative Styling */
pre.json {
width: 100%;
overflow: scroll;
}

pre.xml {
width: 100%;
overflow: scroll;
}

pre.rdf {
width: 100%;
overflow: scroll;
}

/*
==================================
JSON/XML/RTL Example Styling End
==================================
*/


/*
===============================
Liquid Narrative Styling Start
===============================
*/

.narrative-table {
border: 1pt inset rgb(0, 0, 0);
Expand Down Expand Up @@ -146,4 +177,10 @@
.content-container {
max-width: 873px;
}
}
}

/*
===============================
Liquid Narrative Styling End
===============================
*/
21 changes: 21 additions & 0 deletions content/assets/js/cql.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Prism.languages.cql = {
// 'function': TODO
'comment': {
pattern: /(^|[^\\])(?:\/\*[\s\S]*?\*\/|(?:\/\/|#).*)/,
lookbehind: true
},
'string': {
pattern: /(')(?:\\[\s\S]|(?!\1)[^\\]|\1\1)*\1/,
greedy: true
},
'variable':
{
pattern: /(["`])(?:\\[\s\S]|(?!\1)[^\\])+\1/,
greedy: true
},
'keyword': /\b(?:after|aggregate|all|and|as|asc|ascending|before|between|by|called|case|cast|code|Code|codesystem|codesystems|collapse|concept|Concept|contains|context|convert|date|day|days|default|define|desc|descending|difference|display|distinct|div|duration|during|else|end|ends|except|exists|expand|false|flatten|fluent|from|function|hour|hours|if|implies|in|include|includes|included in|intersect|Interval|is|less|let|library|List|maximum|meets|millisecond|milliseconds|minimum|minute|minutes|mod|month|months|more|not|null|occurs|of|on|or|overlaps|parameter|per|point|predecessor|private|properly|public|return|same|singleton|second|seconds|start|starting|starts|sort|successor|such that|then|time|timezoneoffset|to|true|Tuple|union|using|valueset|version|week|weeks|where|when|width|with|within|without|xor|year|years)\b/i,
'boolean': /\b(?:null|false|null)\b/i,
'number': /\b0x[\da-f]+\b|\b\d+(?:\.\d*)?|\B\.\d+\b/i,
'punctuation': /[;[\]()`,.]/,
'operator': /[-+*\/=%^~]|&&?|\|\|?|!=?|<(?:=>?|<|>)?|>[>=]?\b/i
};
21 changes: 19 additions & 2 deletions package-list.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,32 @@
"status" : "ci-build",
"current" : true
},
{
"version": "0.7.0",
"path": "http://fhir.org/templates/cqf.fhir.template/0.7.0",
"status": "release",
"sequence": "Publications",
"fhirversion": "4.0.1",
"desc": "Updated styling for generated Liquid narratives and XML/JSON/TTL examples. Added cql.js for syntax highlighting in examples/snippets.",
"current": true
},
{
"version": "0.6.1",
"path": "http://fhir.org/templates/cqf.fhir.template/0.6.1",
"status": "release",
"sequence": "Publications",
"fhirversion": "4.0.1",
"desc": "Upgrade for dependency on fhir.base.template",
"date": "2024-07-06"
},
{
"version" : "0.6.0",
"path" : "http://fhir.org/templates/cqf.fhir.template/0.6.0",
"status" : "release",
"sequence" : "Publications",
"fhirversion" : "4.0.1",
"desc" : "Upgrade for dependency on fhir.base.template",
"date" : "2024-04-25",
"current" : true
"date" : "2024-04-25"
},
{
"version" : "0.5.0",
Expand Down
6 changes: 3 additions & 3 deletions package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"canonical" : "http://fhir.org/templates/cqf.fhir.template",
"base" : "fhir.base.template",
"dependencies" : {
"fhir.base.template" : "0.8.0"
"fhir.base.template" : "0.8.1"
},
"version" : "0.6.0",
"date" : "20240425221526"
"version" : "0.7.0",
"date" : "2024-07-06"
}

0 comments on commit 7bcd20f

Please sign in to comment.