gcode source highlight. multi-lang tweaks.

input/blog/2022/2022_06_12_shjs_ini.md

@@ -2,6 +2,7 @@ title: Blog
 post: Improved syntax highlighting on my website
 description: Getting to know SHJS and GNU source-highlight
 date: 2022-06-12
+update: 2022-11-10
 comments: true
 ---
 
@@ -81,3 +82,21 @@ $ java -jar ~/bin/yuicompressor-2.4.8.jar desktop_test.lang.js > desktop_test.la
 That's it, worked flawlessly!
 Now I have some nicer ini file syntax highlighting.
 And this was a fun little exercise for sunday morning!
+
+**Update** from November 2022:
+
+I also added [YAML](https://gist.githubusercontent.com/AlexZeitler/48813447f253360ccc431ae22d6939fd/raw/1c1d9372cce5fb2b568b2dd953d334ef8fe3f33d/yaml.lang), for which I found a ready-made language definition file by AlexZeitler.
+
+And I added support for G-Code by making my own language definition, [based on this](https://github.com/PrismJS/prism/blob/master/components/prism-gcode.js):
+
+<pre>
+# highlighting for CNC G-Code
+# based on https://github.com/PrismJS/prism/blob/master/components/prism-gcode.js
+
+comment = `;.*|\B\(.*?\)\B`
+string = `"(?:""|[^"])*"`
+keyword = `\b[GM]\d+(?:\.\d+)?\b`
+function = `\b[A-Z]`
+number = `(\*)\d+`
+label = `[:*]`
+</pre>

macros.py

@@ -95,7 +95,7 @@ def printMenuItem(p, yearsAsHeading = False, showDateSpan = False, showOnlyStart
     if lang != "":
         if p.get("title_" + lang, "") != "":
             title = p.get("title_" + lang, "")
-    if p.title == "Blog":
+    if title == "Blog":
         title = p.post
 
     year = p.get("date", "")[0:4]
@@ -142,7 +142,7 @@ def printRecentMenu(count = 5):
         printMenuItem(p, False, False, False, True, "0", "", False)
 
 def printBlogMenu():
-    posts = [p for p in pages if "post" in p]
+    posts = [p for p in pages if "post" in p and p.lang == "en"]
     posts.sort(key=lambda p: p.get("date", "9999-01-01"), reverse=True)
     lastyear = "0"
     for p in posts:
@@ -375,12 +375,6 @@ def hook_preconvert_anotherlang():
                                     else p["title"]
             # Keep track of the current lang of the virtual page
             vp["lang"] = lang
-            # Fix post name if exists
-            if vp.has_key("post"):
-                if lang == "en":
-                    vp["post"] = vp["post"][:]
-                else:
-                    vp["post"] = vp["post"][:-len(lang) - 1]
             page_vpages[lang] = vp
 
         # Each virtual page has to know about its sister vpages

page.html

@@ -78,8 +78,14 @@ else:
                     else:
                         print "<h1>%s</h1>" % (page.get("title", ""))
 
-                if page.get("description", "") != "":
-                    print "<h5>%s</h5>" % (page.get("description", ""))
+                if page.get("lang", "en") == "de":
+                    if page.get("description_de", "") != "":
+                        print "<h5>%s</h5>" % (page.get("description_de", ""))
+                    elif page.get("description", "") != "":
+                        print "<h5>%s</h5>" % (page.get("description", ""))
+                else:
+                    if page.get("description", "") != "":
+                        print "<h5>%s</h5>" % (page.get("description", ""))
 
                 if page.get("date", "") != "":
                     if page.get("title", "") == "Blog":

static/js/sh/sh_gcode.min.js

@@ -0,0 +1 @@
+if(!this.sh_languages){this.sh_languages={}}sh_languages.gcode=[[[/;.*|\B\(.*?\)\B/g,"sh_comment",-1],[/"(?:""|[^"])*"/g,"sh_string",-1],[/\b[GM]\d+(?:\.\d+)?\b/g,"sh_keyword",-1],[/\b[A-Z]/g,"sh_function",-1],[/(\*)\d+/g,"sh_number",-1],[/[:*]/g,"sh_label",-1]]];