Merge pull request #125 from rweyrauch/hh2-print

Render links.
rweyrauch · May 5, 2023 · 52748e0 · 52748e0
2 parents 1513a8f + 55c1d71
commit 52748e0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 3 deletions.
diff --git a/css/prettyscribe.css b/css/prettyscribe.css
@@ -347,6 +347,10 @@ label {
     line-height: 1;
 }
 
+.hh2-rule-link {
+    color: black;
+}
+
 .hide_enabled .hide_able:hover {
     background-color: rgba(128, 128, 128, .4);
     cursor: pointer;
@@ -361,6 +365,7 @@ label {
     .hide_enabled .hidden {
         display: none;
     }
+    a, a:visited { color: black; text-decoration: none; }
 }
 
 .page_break {

diff --git a/dist/prettyscribe.js b/dist/prettyscribe.js
diff --git a/src/rendererHH2.ts b/src/rendererHH2.ts
@@ -489,6 +489,7 @@ export class RendererHH2 implements Renderer {
                     }
                     if (index != 0) {
                         let anchor = document.createElement('a');
+                        anchor.classList.add('hh2-rule-link');
                         anchor.href = "#" + text;
                         anchor.text = text;
                         weaponRules.appendChild(anchor);
@@ -529,6 +530,7 @@ export class RendererHH2 implements Renderer {
                     }
                     if (index != 0) {
                         let anchor = document.createElement('a');
+                        anchor.classList.add('hh2-rule-link');
                         anchor.href = "#" + text;
                         anchor.text = text;
                         weaponRules.appendChild(anchor);
@@ -607,6 +609,7 @@ export class RendererHH2 implements Renderer {
             }
             if (index != 0) {
                 let anchor = document.createElement('a');
+                anchor.classList.add('hh2-rule-link');
                 anchor.href = "#" + text;
                 anchor.text = text;
                 rulesDiv.appendChild(anchor);

diff --git a/src/rosterHH2.ts b/src/rosterHH2.ts
@@ -687,6 +687,10 @@ function LookupRole(roleText: string): UnitRole {
     return UnitRole.NONE;
 }
 
+function InternalKeyword(kw: string): boolean {
+    return kw.endsWith(':');
+}
+
 function CreateUnit(root: Element): Unit | null {
     let unit: Unit = new Unit();
     const unitName = ExpandBaseNotes(root, unit);
@@ -704,8 +708,10 @@ function CreateUnit(root: Element): Unit | null {
                 unit._role = unitRole;
             }
             else {
-                // Keyword
-                unit._keywords.add(catName);
+                if (!InternalKeyword(catName)) {
+                    // Keyword
+                    unit._keywords.add(catName);
+                }
             }
         }
     }