hdoc-tools 0.62.4 → 0.63.0

package/ui/js/highlightjs/styles/vs2015-accessible.css

@@ -0,0 +1,141 @@
+/*
+ * Visual Studio 2015 dark style - WCAG AAA Accessible Version
+ * Based on original by Nicolas LLOBERA <nllobera@gmail.com>
+ * Modified for 7:1 contrast ratio (WCAG 2.1 AAA)
+ * Background overridden by htl-doc.css to #494949
+ */
+
+.hljs {
+  display: block;
+  overflow-x: auto;
+  padding: 0.5em;
+  background: #494949;
+  color: #FFFFFF;
+  font-weight: normal;
+  --font-size: 1.15em !important;
+}
+
+/* Keywords, literals, symbols, names - bright blue for #494949 bg (7:1+) */
+.hljs-keyword,
+.hljs-literal,
+.hljs-symbol,
+.hljs-name {
+  color: #C0EDFF;
+}
+
+.hljs-link {
+  color: #A8E4FF;
+  text-decoration: underline;
+}
+
+/* Built-in types - bright teal */
+.hljs-built_in,
+.hljs-type {
+  color: #6EE7D6;
+}
+
+/* Markdown inline/fenced code spans.
+   Previously unstyled, so these tokens fell back to the base .hljs white and were
+   indistinguishable from surrounding prose in a markdown sample. Upstream vs2015 leaves
+   .hljs-code commented out, so there is no original colour to inherit.
+   #ABF1E7 is the teal above lightened until it clears 7:1 on BOTH code-block backgrounds
+   (#494949 in light mode, #000000 in dark - see .HTL-doc .hljs in htl-doc.css):
+   measured 7.06:1 on #494949 and 16.48:1 on #000000. It sits closest to .hljs-link's
+   #A8E4FF, which is acceptable because links are underlined and so stay distinguishable
+   without relying on colour. //-- SG */
+.hljs-code {
+  color: #ABF1E7;
+}
+
+/* Numbers, classes - bright green */
+.hljs-number,
+.hljs-class {
+  color: #D4EEBC;
+}
+
+/* Strings - bright salmon (7:1+) */
+.hljs-string,
+.hljs-meta-string {
+  color: #FFE8DD;
+}
+
+/* Regexp, template tags - bright orange */
+.hljs-regexp,
+.hljs-template-tag {
+  color: #FFB88A;
+}
+
+/* Subst, function, title, params - white */
+.hljs-subst,
+.hljs-function,
+.hljs-title,
+.hljs-params,
+.hljs-formula {
+  color: #FFFFFF;
+}
+
+/* Comments - bright green */
+.hljs-comment,
+.hljs-quote {
+  color: #98E088;
+  font-style: italic;
+}
+
+/* Doctag - bright green */
+.hljs-doctag {
+  color: #A8D89A;
+}
+
+/* Meta, tags - light gray (7:1+) */
+.hljs-meta,
+.hljs-meta-keyword,
+.hljs-tag {
+  color: #E8E8E8;
+}
+
+/* Variables - bright purple */
+.hljs-variable,
+.hljs-template-variable {
+  color: #EDA4F5;
+}
+
+/* Attributes - bright cyan */
+.hljs-attr,
+.hljs-attribute,
+.hljs-builtin-name {
+  color: #B8EEFF;
+}
+
+.hljs-section {
+  color: #FFE566;
+}
+
+.hljs-emphasis {
+  font-style: italic;
+}
+
+.hljs-strong {
+  font-weight: bold;
+}
+
+/* Selectors - bright yellow */
+.hljs-bullet,
+.hljs-selector-tag,
+.hljs-selector-id,
+.hljs-selector-class,
+.hljs-selector-attr,
+.hljs-selector-pseudo {
+  color: #F5DFA0;
+}
+
+.hljs-addition {
+  background-color: #2D6B2A;
+  display: inline-block;
+  width: 100%;
+}
+
+.hljs-deletion {
+  background-color: #8B2A2A;
+  display: inline-block;
+  width: 100%;
+}

package/ui/js/highlightjs-badge.js

@@ -93,33 +93,6 @@ Uses some ES6 features so won't work in IE without shims:
 if (typeof highlightJsBadgeAutoLoad !== 'boolean')
     var highlightJsBadgeAutoLoad = false;
 
-//-- LOCAL FIX: display names for the badge label, so a fence written as ```md shows "Markdown".
-//-- highlight.js 11 grammars carry a cased `name` and are preferred when present, but the pack
-//-- vendored here is a v9 build whose grammars have aliases and no name at all - hence this
-//-- table. Keyed by alias as well as canonical name, because the badge label is whatever the
-//-- author typed in the fence. Anything missing falls through and displays unchanged.
-var HDOC_LANG_DISPLAY_NAMES = {
-    apache: "Apache", apacheconf: "Apache",
-    bash: "Bash", sh: "Bash", zsh: "Bash", shell: "Shell", console: "Shell Session",
-    bat: "DOS Batch", cmd: "DOS Batch", dos: "DOS Batch",
-    c: "C", cpp: "C++", cs: "C#", csharp: "C#", objectivec: "Objective-C",
-    css: "CSS", scss: "SCSS", less: "Less",
-    dart: "Dart", diff: "Diff", patch: "Diff", dns: "DNS Zone",
-    dockerfile: "Dockerfile", docker: "Dockerfile",
-    fsharp: "F#", go: "Go", golang: "Go", graphql: "GraphQL",
-    html: "HTML", xml: "XML", svg: "SVG", http: "HTTP",
-    ini: "INI", toml: "TOML", java: "Java",
-    js: "JavaScript", javascript: "JavaScript", json: "JSON",
-    kotlin: "Kotlin", lua: "Lua", makefile: "Makefile", md: "Markdown", markdown: "Markdown",
-    nginx: "Nginx", perl: "Perl", php: "PHP",
-    powershell: "PowerShell", ps: "PowerShell", ps1: "PowerShell", pwsh: "PowerShell",
-    python: "Python", py: "Python", r: "R", ruby: "Ruby", rb: "Ruby", rust: "Rust",
-    scala: "Scala", sql: "SQL", pgsql: "PostgreSQL", postgresql: "PostgreSQL",
-    swift: "Swift", ts: "TypeScript", typescript: "TypeScript",
-    vbnet: "VB.NET", vbscript: "VBScript", yaml: "YAML", yml: "YAML",
-    plaintext: "Plain Text", text: "Text"
-};
-
 function highlightJsBadge(opt) {
     var options = {
         // the selector for the badge template
@@ -228,20 +201,17 @@ function highlightJsBadge(opt) {
             else if (lang == "txt")
                 lang = "text"
 
-            //-- LOCAL FIX: show a full display name rather than whatever alias the author wrote
-            //-- in the fence - "Markdown" not "md", "C#" not "cs", "Bash" not "sh". A
-            //-- highlight.js 11 grammar carries its own cased `name` and is authoritative, so
-            //-- this keeps working if the pack is ever upgraded; the v9 pack vendored here has
-            //-- no such property, so the table above supplies it. Unknown languages fall through
-            //-- to the overrides above unchanged.
-            var langDef = (window.hljs && typeof window.hljs.getLanguage === "function")
-                ? window.hljs.getLanguage(lang)
-                : null;
-
-            if (langDef && langDef.name)
-                lang = langDef.name;
-            else if (HDOC_LANG_DISPLAY_NAMES[lang])
-                lang = HDOC_LANG_DISPLAY_NAMES[lang];
+            //-- LOCAL FIX: show highlight.js's own display name rather than whatever alias the
+            //-- author wrote in the fence - "Markdown" not "md", "C#" not "cs", "Bash" not "sh".
+            //-- getLanguage() resolves aliases, and registerLanguage only defaults .name to the
+            //-- registration key when the grammar does not declare one, so the grammar's cased
+            //-- name comes back. Unknown/unregistered languages fall through to the overrides
+            //-- above unchanged.
+            if (window.hljs && typeof window.hljs.getLanguage === "function") {
+                var langDef = window.hljs.getLanguage(lang);
+                if (langDef && langDef.name)
+                    lang = langDef.name;
+            }
 
             var html = hudText.replace("{{language}}", lang)
                               .replace("{{copyIconClass}}",options.copyIconClass)
@@ -346,22 +316,28 @@ function highlightJsBadge(opt) {
             "    .code-badge-pre {",
             "        position: relative;",
             "    }",
-            "    /* Rendered as a full-width header bar above the code, not",
-            "       absolutely positioned over it - overlapping the first line",
-            "       made both the badge and the code unreadable. */",
             "    .code-badge {",
             "        display: flex;",
             "        flex-direction: row;",
-            "        align-items: center;",
-            "        justify-content: space-between;",
             "        white-space: normal;",
+            "        background: transparent;",
             "        background: #333;",
             "        color: white;",
             "        font-size: 0.875em;",
-            "        border-radius: 7px 7px 0 0;",
+            "        opacity: 0.5;",
+            "        transition: opacity linear 0.5s;",
+            "        border-radius: 0 0 0 7px;",
             "        padding: 5px 8px 5px 8px;",
-            "        width: 100%;",
-            "        box-sizing: border-box;",
+            "        position: absolute;",
+            "        right: 0;",
+            "        top: 0;",
+            "    }",            
+            "    .code-badge.active {",
+            "        opacity: 0.8;",
+            "    }",
+            "",
+            "    .code-badge:hover {",
+            "        opacity: .95;",
             "    }",
             "",
             "    .code-badge a,",
@@ -378,9 +354,9 @@ function highlightJsBadge(opt) {
             "        font-size: 1.2em;",
             "        cursor: pointer;",
             "        padding: 0 7px;",
-            "        margin-top:2;",
+            "        margin-top: 2px;",
             "    }",
-            "    .fa.text-success:{ color: limegreen !important }",
+            "    .fa.text-success { color: #006737 !important }",
             "</style>",
             "<div id=\"CodeBadgeTemplate\" style=\"display:none\">",
             "    <div class=\"code-badge\">",
@@ -431,16 +407,23 @@ if (highlightJsBadgeAutoLoad)
     .code-badge {
         display: flex;
         flex-direction: row;
-        align-items: center;
-        justify-content: space-between;
         white-space: normal;
+        background: transparent;
         background: #333;
         color: white;
         font-size: 0.875em;
-        border-radius: 7px 7px 0 0;
+        opacity: 0.5;
+        border-radius: 0 0 0 7px;
         padding: 5px 8px 5px 8px;
-        width: 100%;
-        box-sizing: border-box;
+        position: absolute;
+        right: 0;
+        top: 0;
+    }
+    .code-badge.active {
+        opacity: 0.8;
+    }
+    .code-badge:hover {
+        opacity: .95;
     }
     .code-badge a,
     .code-badge a:hover {
@@ -456,9 +439,9 @@ if (highlightJsBadgeAutoLoad)
         font-size: 1.2em;
         cursor: pointer;
         padding: 0 7px;
-        margin-top:2;
+        margin-top: 2px;
     }
-    .fa.text-success:{ color: limegreen !important}    
+    .fa.text-success { color: #006737 !important}    
 </style>
 <div id="CodeBadgeTemplate" style="display:none">
     <div class="code-badge">