shortcuts updated

VisualComputing · May 12, 2024 · 538d000 · 538d000
1 parent daf8722
commit 538d000
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 38 deletions.
diff --git a/content/docs/shortcodes/p5/div.md b/content/docs/shortcodes/p5/div.md
@@ -7,7 +7,7 @@ p5 `div` [shortcodes](https://gohugo.io/content-management/shortcodes/) embed [p
 # p5-div
 
 ```html
-{{</* p5-div ver="1.8.0" sketch="/path/to/sketch.js" lib1="https://cdntolib1/lib1.js" */>}}
+{{</* p5-div ver="1.9.3" sketch="/path/to/sketch.js" lib1="https://cdntolib1/lib1.js" */>}}
 ```
 
 All parameters are optional but `sketch`. Default values are shown in the above snippet but for `libs*`. Up to `lib5` libs may be specified.
@@ -27,7 +27,7 @@ Look at [this](https://mathworld.wolfram.com/ScintillatingGridIllusion.html) and
 # p5-instance-div
 
 ```html
-{{</* p5-instance-div id="sketchid" ver="1.8.0" lib1="https://cdntolib1/lib1.js" >}}
+{{</* p5-instance-div id="sketchid" ver="1.9.3" lib1="https://cdntolib1/lib1.js" >}}
   // inline sketch code
 {{< /p5-instance-div */>}}
 ```

diff --git a/content/docs/shortcodes/p5/iframe.md b/content/docs/shortcodes/p5/iframe.md
@@ -7,7 +7,7 @@ p5 `iframe` [shortcodes](https://gohugo.io/content-management/shortcodes/) embed
 # p5-iframe
 
 ```html
-{{</* p5-iframe ver="1.8.0" sketch="/path/to/sketch.js" lib1="https://cdntolib1/lib1.js" width="800" height="600" */>}}
+{{</* p5-iframe ver="1.9.3" sketch="/path/to/sketch.js" lib1="https://cdntolib1/lib1.js" width="800" height="600" */>}}
 ```
 
 All parameters are optional but `sketch`. Default values are shown in the above snippet but for `libs*`. Up to `lib5` libs may be specified.
@@ -51,7 +51,7 @@ Example took from the [p5 examples](https://p5js.org/examples/sound-sound-effect
 # p5-global-iframe
 
 ```html
-{{</* p5-global-iframe id="sketchid" ver="1.8.0" lib1="https://cdntolib1/lib1.js" width="800" height="600" >}}
+{{</* p5-global-iframe id="sketchid" ver="1.9.3" lib1="https://cdntolib1/lib1.js" width="800" height="600" >}}
   // inline sketch code
 {{< /p5-global-iframe */>}}
 ```
@@ -146,18 +146,18 @@ Look at [this reference](https://michaelbach.de/ot/mot-breathingSquare/) for an
 The `p5-widget` [shortcode](https://gohugo.io/content-management/shortcodes/) embed [p5.js](https://p5js.org/) code within an [p5-widget](https://toolness.github.io/p5.js-widget/).
 
 ```html
-{{</* p5-widget autoplay=true height="400" width="400" ver="1.8.0" >}}
+{{</* p5-widget autoplay=true height="400" width="400" ver="1.9.3" >}}
   // inline sketch code
 {{< /p5-widget */>}}
 ```
 
-All parameters are optional. Default `ver` is `1.8.0`. For example:
+All parameters are optional. Default `ver` is `1.9.3`. For example:
 
 ## Widget example
 
 {{< details title="p5-widget markdown" open=false >}}
 {{< highlight html >}}
-{{</* p5-widget autoplay=true height="400" width="400" ver="1.8.0" >}}
+{{</* p5-widget autoplay=true height="400" width="400" ver="1.9.3" >}}
 function setup() {
   createCanvas(300, 300);
 }
@@ -169,7 +169,7 @@ function draw() {
 {{< /highlight >}}
 {{< /details >}}
 
-{{< p5-widget autoplay=true height="400" width="400" ver="1.8.0" >}}
+{{< p5-widget autoplay=true height="400" width="400" ver="1.9.3" >}}
 function setup() {
   createCanvas(300, 300);
 }

diff --git a/layouts/shortcodes/p5-div.html b/layouts/shortcodes/p5-div.html
@@ -1,18 +1,25 @@
-{{ $defver := `1.8.0` }}
+{{ $defver := `1.9.3` }}
 {{ $sketch := .Get `sketch` }}
+{{ $sound := default "false" (.Get "sound") | lower }}
+{{ $treegl := default "false" (.Get "treegl") | lower }}
+{{ $platonic := default "false" (.Get "platonic") | lower }}
+{{ $quadrille := default "false" (.Get "quadrille") | lower }}
 {{ $lib1 := .Get `lib1` }}
 {{ $lib2 := .Get `lib2` }}
 {{ $lib3 := .Get `lib3` }}
 {{ $lib4 := .Get `lib4` }}
 {{ $lib5 := .Get `lib5` }}
 
-<script src=https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/p5.min.js></script>
-<script src=https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/addons/p5.sound.min.js></script>
-{{ if isset .Params "lib1" }} <script src={{ $lib1 }}></script> {{ end }}
-{{ if isset .Params "lib2" }} <script src={{ $lib2 }}></script> {{ end }}
-{{ if isset .Params "lib3" }} <script src={{ $lib3 }}></script> {{ end }}
-{{ if isset .Params "lib4" }} <script src={{ $lib4 }}></script> {{ end }}
-{{ if isset .Params "lib5" }} <script src={{ $lib5 }}></script> {{ end }}
+<script src='https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/p5.min.js'></script>
+{{ if eq $sound "true" }}<script src='https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/addons/p5.sound.min.js'></script>{{ end }}
+{{ if eq $treegl "true" }}<script src='https://cdn.jsdelivr.net/gh/VisualComputing/p5.treegl/p5.treegl.min.js'></script>{{ end }}
+{{ if eq $platonic "true" }}<script src='https://cdn.jsdelivr.net/gh/VisualComputing/p5.platonic/p5.platonic.min.js'></script>{{ end }}
+{{ if eq $quadrille "true" }}<script src='https://cdn.jsdelivr.net/gh/objetos/p5.quadrille.js/p5.quadrille.min.js'></script>{{ end }}
+{{ if isset .Params "lib1" }}<script src={{ $lib1 }}></script>{{ end }}
+{{ if isset .Params "lib2" }}<script src={{ $lib2 }}></script>{{ end }}
+{{ if isset .Params "lib3" }}<script src={{ $lib3 }}></script>{{ end }}
+{{ if isset .Params "lib4" }}<script src={{ $lib4 }}></script>{{ end }}
+{{ if isset .Params "lib5" }}<script src={{ $lib5 }}></script>{{ end }}
 <script src={{ $sketch }}></script>
 
-<div id="{{ strings.TrimSuffix ".js" (path.Base $sketch) }}"></div>
+<div id="{{ strings.TrimSuffix ".js" (path.Base $sketch) }}"></div>
diff --git a/layouts/shortcodes/p5-global-iframe.html b/layouts/shortcodes/p5-global-iframe.html
@@ -1,4 +1,8 @@
-{{ $defver := `1.8.0` }}
+{{ $defver := `1.9.3` }}
+{{ $sound := default "false" (.Get "sound") | lower }}
+{{ $treegl := default "false" (.Get "treegl") | lower }}
+{{ $platonic := default "false" (.Get "platonic") | lower }}
+{{ $quadrille := default "false" (.Get "quadrille") | lower }}
 {{ $lib1 := .Get `lib1` }}
 {{ $lib2 := .Get `lib2` }}
 {{ $lib3 := .Get `lib3` }}
@@ -12,8 +16,11 @@
         <!DOCTYPE html>
         <html>
           <head>
-            <script src=https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/p5.min.js></script>
-            <script src=https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/addons/p5.sound.min.js></script>
+            <script src='https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/p5.min.js'></script>
+            {{ if eq $sound "true" }}<script src='https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/addons/p5.sound.min.js'></script>{{ end }}
+            {{ if eq $treegl "true" }}<script src='https://cdn.jsdelivr.net/gh/VisualComputing/p5.treegl/p5.treegl.min.js'></script>{{ end }}
+            {{ if eq $platonic "true" }}<script src='https://cdn.jsdelivr.net/gh/VisualComputing/p5.platonic/p5.platonic.min.js'></script>{{ end }}
+            {{ if eq $quadrille "true" }}<script src='https://cdn.jsdelivr.net/gh/objetos/p5.quadrille.js/p5.quadrille.min.js'></script>{{ end }}
             {{ if isset .Params "lib1" }} <script src={{ $lib1 }}></script> {{ end }}
             {{ if isset .Params "lib2" }} <script src={{ $lib2 }}></script> {{ end }}
             {{ if isset .Params "lib3" }} <script src={{ $lib3 }}></script> {{ end }}

diff --git a/layouts/shortcodes/p5-iframe.html b/layouts/shortcodes/p5-iframe.html
@@ -1,5 +1,9 @@
-{{ $defver := `1.8.0` }}
+{{ $defver := `1.9.3` }}
 {{ $sketch := .Get `sketch` }}
+{{ $sound := default "false" (.Get "sound") | lower }}
+{{ $treegl := default "false" (.Get "treegl") | lower }}
+{{ $platonic := default "false" (.Get "platonic") | lower }}
+{{ $quadrille := default "false" (.Get "quadrille") | lower }}
 {{ $lib1 := .Get `lib1` }}
 {{ $lib2 := .Get `lib2` }}
 {{ $lib3 := .Get `lib3` }}
@@ -13,13 +17,16 @@
         <!DOCTYPE html>
         <html>
           <head>
-            <script src=https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/p5.min.js></script>
-            <script src=https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/addons/p5.sound.min.js></script>
-            {{ if isset .Params "lib1" }} <script src={{ $lib1 }}></script> {{ end }}
-            {{ if isset .Params "lib2" }} <script src={{ $lib2 }}></script> {{ end }}
-            {{ if isset .Params "lib3" }} <script src={{ $lib3 }}></script> {{ end }}
-            {{ if isset .Params "lib4" }} <script src={{ $lib4 }}></script> {{ end }}
-            {{ if isset .Params "lib5" }} <script src={{ $lib5 }}></script> {{ end }}
+            <script src='https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/p5.min.js'></script>
+            {{ if eq $sound "true" }}<script src='https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/addons/p5.sound.min.js'></script>{{ end }}
+            {{ if eq $treegl "true" }}<script src='https://cdn.jsdelivr.net/gh/VisualComputing/p5.treegl/p5.treegl.min.js'></script>{{ end }}
+            {{ if eq $platonic "true" }}<script src='https://cdn.jsdelivr.net/gh/VisualComputing/p5.platonic/p5.platonic.min.js'></script>{{ end }}
+            {{ if eq $quadrille "true" }}<script src='https://cdn.jsdelivr.net/gh/objetos/p5.quadrille.js/p5.quadrille.min.js'></script>{{ end }}
+            {{ if isset .Params "lib1" }}<script src={{ $lib1 }}></script>{{ end }}
+            {{ if isset .Params "lib2" }}<script src={{ $lib2 }}></script>{{ end }}
+            {{ if isset .Params "lib3" }}<script src={{ $lib3 }}></script>{{ end }}
+            {{ if isset .Params "lib4" }}<script src={{ $lib4 }}></script>{{ end }}
+            {{ if isset .Params "lib5" }}<script src={{ $lib5 }}></script>{{ end }}
             <script src={{ $sketch }}></script>
           </head>
           <body>

diff --git a/layouts/shortcodes/p5-instance-div.html b/layouts/shortcodes/p5-instance-div.html
@@ -1,18 +1,25 @@
 {{ $id := .Get `id` }}
-{{ $defver := `1.8.0` }}
+{{ $defver := `1.9.3` }}
+{{ $sound := default "false" (.Get "sound") | lower }}
+{{ $treegl := default "false" (.Get "treegl") | lower }}
+{{ $platonic := default "false" (.Get "platonic") | lower }}
+{{ $quadrille := default "false" (.Get "quadrille") | lower }}
 {{ $lib1 := .Get `lib1` }}
 {{ $lib2 := .Get `lib2` }}
 {{ $lib3 := .Get `lib3` }}
 {{ $lib4 := .Get `lib4` }}
 {{ $lib5 := .Get `lib5` }}
 
-<script src=https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/p5.min.js></script>
-<script src=https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/addons/p5.sound.min.js></script>
-{{ if isset .Params "lib1" }} <script src={{ $lib1 }}></script> {{ end }}
-{{ if isset .Params "lib2" }} <script src={{ $lib2 }}></script> {{ end }}
-{{ if isset .Params "lib3" }} <script src={{ $lib3 }}></script> {{ end }}
-{{ if isset .Params "lib4" }} <script src={{ $lib4 }}></script> {{ end }}
-{{ if isset .Params "lib5" }} <script src={{ $lib5 }}></script> {{ end }}
+<script src='https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/p5.min.js'></script>
+{{ if eq $sound "true" }}<script src='https://cdnjs.cloudflare.com/ajax/libs/p5.js/{{ default $defver (.Get `ver`) }}/addons/p5.sound.min.js'></script>{{ end }}
+{{ if eq $treegl "true" }}<script src='https://cdn.jsdelivr.net/gh/VisualComputing/p5.treegl/p5.treegl.min.js'></script>{{ end }}
+{{ if eq $platonic "true" }}<script src='https://cdn.jsdelivr.net/gh/VisualComputing/p5.platonic/p5.platonic.min.js'></script>{{ end }}
+{{ if eq $quadrille "true" }}<script src='https://cdn.jsdelivr.net/gh/objetos/p5.quadrille.js/p5.quadrille.min.js'></script>{{ end }}
+{{ if isset .Params "lib1" }}<script src={{ $lib1 }}></script>{{ end }}
+{{ if isset .Params "lib2" }}<script src={{ $lib2 }}></script>{{ end }}
+{{ if isset .Params "lib3" }}<script src={{ $lib3 }}></script>{{ end }}
+{{ if isset .Params "lib4" }}<script src={{ $lib4 }}></script>{{ end }}
+{{ if isset .Params "lib5" }}<script src={{ $lib5 }}></script>{{ end }}
 
 <div id="{{ $id }}"></div>
 <script>

diff --git a/layouts/shortcodes/p5-widget.html b/layouts/shortcodes/p5-widget.html
@@ -1,4 +1,4 @@
-{{ $defver := `1.8.0` }}
+{{ $defver := `1.9.3` }}
 
 <script src="//toolness.github.io/p5.js-widget/p5-widget.js"></script>    
 {{ with .Get "lib1" }}<script src="{{ . }}"></script>{{ end }}

diff --git a/themes/book b/themes/book
+11 −1		.github/workflows/main.yml
+3 −3		README.md
+11 −1		assets/_markdown.scss
+3 −3		assets/manifest.json
+2 −2		assets/plugins/_numbered.scss
+3 −1		assets/search-data.json
+1 −1		assets/sw-register.js
+8 −4		exampleSite/config.toml
+8 −4		exampleSite/config.yaml
+14 −7		exampleSite/content.en/docs/shortcodes/katex.md
+11 −6		exampleSite/content.en/docs/shortcodes/mermaid.md
+3 −3		exampleSite/content.en/docs/shortcodes/section/_index.md
+1 −1		exampleSite/content.en/menu/index.md
+0 −1		exampleSite/resources/_gen/assets/scss/book.scss_50fc8c04e12a2f59027287995557ceff.json
+1 −1		exampleSite/resources/_gen/assets/scss/book.scss_e129fe35b8d0a70789c8a08429469073.content
+1 −0		exampleSite/resources/_gen/assets/scss/book.scss_e129fe35b8d0a70789c8a08429469073.json
+1 −1		i18n/es.yaml
+1 −1		layouts/_default/baseof.html
+2 −2		layouts/partials/docs/footer.html
+4 −2		layouts/partials/docs/html-head.html
+1 −1		layouts/posts/single.html
+1 −0		layouts/shortcodes/html.html
+3 −3		layouts/shortcodes/katex.html
+2 −0		layouts/shortcodes/section.html
+1 −1		layouts/taxonomy/list.html
+1,092 −613		static/mermaid.min.js