No commit message

breck7 · Aug 1, 2024 · e1ec779 · e1ec779
1 parent 782c144
commit e1ec779
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "scroll-cli",
-  "version": "112.1.2",
+  "version": "113.0.0",
   "description": "A language for scientists of all ages. A curated collection of tools for refining and sharing thoughts.",
   "main": "scroll.js",
   "engines": {

diff --git a/parsers/inlineMarkups.parsers b/parsers/inlineMarkups.parsers
@@ -2,6 +2,17 @@ inlineMarkupNameCell
  description Options to turn on some inline markups.
  enum bold italics code katex none
 
+inlineMarkupsParser
+ description Set global inline markups.
+ extends abstractTopLevelSingleMetaParser
+ cruxFromId
+ example
+  inlineMarkups
+   * 
+    // Disable * for bold
+   _ u
+    // Make _ underline
+
 inlineMarkupsOnParser
  cruxFromId
  description Enable these inline markups only.
@@ -15,12 +26,22 @@ inlineMarkupsOnParser
    return true
   }
   get markups() {
-    const markups = [{delimiter: "`", tag: "code", exclusive: true, name: "code"},{delimiter: "*", tag: "strong", name: "bold"}, {delimiter: "_", tag: "em", name: "italics"}]
+    const {root} = this
+    let markups = [{delimiter: "`", tag: "code", exclusive: true, name: "code"},{delimiter: "*", tag: "strong", name: "bold"}, {delimiter: "_", tag: "em", name: "italics"}]
     // only add katex markup if the root doc has katex.
-    if (this.root.has("katex"))
+    if (root.has("katex"))
       markups.unshift({delimiter: "$", tag: "span", attributes: ' class="scrollKatex"', exclusive: true, name: "katex"})
     if (this.content)
       return markups.filter(markup => this.content.includes(markup.name))
+    if (root.has("inlineMarkups")) {
+      root.getNode("inlineMarkups").forEach(markup => {
+        const delimiter = markup.getWord(0)
+        const tag = markup.getWord(1)
+        markups = markups.filter(mu => mu.delimiter !== delimiter) // Remove any overridden markups
+        if (tag)
+          markups.push({delimiter, tag})
+      })
+    }
     return markups
   }
   matchWholeLine = true

diff --git a/parsers/source.parsers b/parsers/source.parsers
@@ -22,9 +22,15 @@ printSourceStackParser
   get sources() {
     const {file} = this.root
     const passNames = ["codeAtStart", "codeAfterImportPass", "codeAfterMacroPass"]
-    return passNames.map(name => { return {
+    let lastCode = ""
+    return passNames.map(name => {
+      let code = file[name]
+      if (lastCode === code)
+        code = "[Unchanged]"
+      lastCode = file[name]
+      return {
       name,
-      code: file[name]
+      code
     }})
   }
   compile() {

diff --git a/releaseNotes.scroll b/releaseNotes.scroll
@@ -19,6 +19,10 @@ import microlangs/changes.parsers
 thinColumns
 
 📦 113.0.0 8/1/2024
+🎉 added `inlineMarkups` parser. Thanks to eugenesvk for the idea.
+ https://github.com/eugenesvk eugenesvk
+ https://github.com/breck7/scroll/issues/122 idea
+🎉 `printSourceStack` now prints [Unchanged] if the source was not changed during a compiler step.
 ⚠️ BREAKING: `wrapsOn` is now `inlineMarkupsOn`
 ⚠️ BREAKING: `wrap` is now `inlineMarkup`
 

diff --git a/tests/kitchenSink/customMarkups.scroll b/tests/kitchenSink/customMarkups.scroll
@@ -0,0 +1,19 @@
+buildHtml
+
+thinColumns 1
+
+gazetteCss
+
+# Custom Inline Markups Test
+
+belowAsCode 3
+inlineMarkups
+ *
+  // disable bold
+ _ u
+  // override underline
+ ~~~ marquee
+  // Add marquee!
+
+*This* should not be bold. ~~~This should be a marquee.~~~ And _this_ should be underlined.
+