From 972aee458314571bcfaf689655ea606788acbc3c Mon Sep 17 00:00:00 2001
From: Radon Rosborough <radon.neon@gmail.com>
Date: Sat, 11 Jul 2020 13:08:22 -0600
Subject: [PATCH] New languages: wiki markup dialects

---
 backend/src/langs.ts                | 58 +++++++++++++++++++++++++++++
 frontend/styles/index.css           |  2 +-
 scripts/docker-install-phase3c.bash | 13 -------
 scripts/docker-install-phase3d.bash |  3 --
 scripts/docker-install-phase4.bash  |  5 ++-
 scripts/docker-install-phase5.bash  |  5 +++
 6 files changed, 68 insertions(+), 18 deletions(-)

diff --git a/backend/src/langs.ts b/backend/src/langs.ts
index 0ce8574..a305623 100644
--- a/backend/src/langs.ts
+++ b/backend/src/langs.ts
@@ -191,6 +191,16 @@ int main() {
     main: "main.lisp",
     run: "rlwrap sbcl --userinit main.lisp",
     template: `(format t "Hello, world!")
+`,
+  },
+  confluence: {
+    aliases: ["jira", "atlassian"],
+    name: "Confluence",
+    monacoLang: "plaintext",
+    main: "main.txt",
+    compile: "pandoc main.txt -f jira -o main.html",
+    run: "prettier --no-config main.html",
+    template: `Hello, world!
 `,
   },
   cpp: {
@@ -332,6 +342,16 @@ void main() {
     compile: "cat main.dhall | dhall-to-json > main.json",
     run: "cat main.json | jq .",
     template: `{ output = "Hello, world!" }
+`,
+  },
+  dokuwiki: {
+    aliases: ["doku"],
+    name: "DokuWiki",
+    monacoLang: "plaintext",
+    main: "main.txt",
+    compile: "pandoc main.txt -f dokuwiki -o main.html",
+    run: "prettier --no-config main.html",
+    template: `Hello, world!
 `,
   },
   elixir: {
@@ -689,6 +709,16 @@ KTHXBYE
     compile: "pandoc main.md -o main.html",
     run: "prettier --no-config main.html",
     template: `Hello, world!
+`,
+  },
+  mediawiki: {
+    aliases: ["media"],
+    name: "MediaWiki",
+    monacoLang: "plaintext",
+    main: "main.txt",
+    compile: "pandoc main.txt -f mediawiki -o main.html",
+    run: "prettier --no-config main.html",
+    template: `Hello, world!
 `,
   },
   mips: {
@@ -1230,6 +1260,16 @@ END
     compile: "pandoc main.textile -o main.html",
     run: "prettier --no-config main.html",
     template: `Hello, world!
+`,
+  },
+  tikiwiki: {
+    aliases: ["tiki"],
+    name: "Tiki Wiki",
+    monacoLang: "plaintext",
+    main: "main.txt",
+    compile: "pandoc main.txt -f tikiwiki -o main.html",
+    run: "prettier --no-config main.html",
+    template: `Hello, world!
 `,
   },
   toml: {
@@ -1240,6 +1280,15 @@ END
     compile: "cat main.toml | yj -tj > main.json",
     run: "cat main.json | jq .",
     template: `output = "Hello, world!"
+`,
+  },
+  twiki: {
+    name: "TWiki",
+    monacoLang: "plaintext",
+    main: "main.txt",
+    compile: "pandoc main.txt -f twiki -o main.html",
+    run: "prettier --no-config main.html",
+    template: `Hello, world!
 `,
   },
   typescript: {
@@ -1270,6 +1319,15 @@ END
     run: `vim -c "$(< main.vim)"`,
     lsp: "vim-language-server --stdio",
     template: `:echo "Hello, world!"
+`,
+  },
+  vimwiki: {
+    name: "Vimwiki",
+    monacoLang: "plaintext",
+    main: "main.txt",
+    compile: "pandoc main.txt -f vimwiki -o main.html",
+    run: "prettier --no-config main.html",
+    template: `Hello, world!
 `,
   },
   visualbasic: {
diff --git a/frontend/styles/index.css b/frontend/styles/index.css
index 0b2d9a1..f461a7a 100644
--- a/frontend/styles/index.css
+++ b/frontend/styles/index.css
@@ -15,7 +15,7 @@ body {
 }
 
 div.language {
-  width: 120px;
+  width: 140px;
   height: 60px;
   border: solid;
   margin: 5px;
diff --git a/scripts/docker-install-phase3c.bash b/scripts/docker-install-phase3c.bash
index 5efe927..b91737b 100755
--- a/scripts/docker-install-phase3c.bash
+++ b/scripts/docker-install-phase3c.bash
@@ -6,10 +6,6 @@ set -x
 
 packages="
 
-# Markdown
-pandoc
-prettier
-
 # MIPS
 gcc-mips64-linux-gnuabi64
 qemu-user-static
@@ -34,9 +30,6 @@ ocaml
 # Octave
 octave
 
-# Org
-pandoc
-
 # Pascal
 fpc
 
@@ -61,16 +54,10 @@ r-base
 # Racket
 racket
 
-# reStructuredText
-pandoc
-
 # RISC-V
 gcc-riscv64-linux-gnu
 qemu-user-static
 
-# roff
-pandoc
-
 # Ruby
 ruby
 ruby-dev
diff --git a/scripts/docker-install-phase3d.bash b/scripts/docker-install-phase3d.bash
index fe75baf..5917be0 100755
--- a/scripts/docker-install-phase3d.bash
+++ b/scripts/docker-install-phase3d.bash
@@ -42,9 +42,6 @@ liblua5.3-dev
 luarocks
 texlive-binaries
 
-# Textile
-pandoc
-
 # Unlambda
 unlambda
 
diff --git a/scripts/docker-install-phase4.bash b/scripts/docker-install-phase4.bash
index 15f78bc..41dded7 100755
--- a/scripts/docker-install-phase4.bash
+++ b/scripts/docker-install-phase4.bash
@@ -27,6 +27,9 @@ for file in /opt/rust/bin/*; do
     ln -s /opt/rust/wrapper "/usr/bin/${file##*/}"
 done
 
+# Shared
+npm install -g prettier
+
 # Bash
 npm install -g bash-language-server
 
@@ -56,7 +59,7 @@ cpanm -n Devel::REPL
 npm install -g intelephense
 
 # Pug
-npm install -g prettier pug-cli
+npm install -g pug-cli
 
 # ReasonML
 npm install -g bs-platform
diff --git a/scripts/docker-install-phase5.bash b/scripts/docker-install-phase5.bash
index 856cdf1..7a19dbb 100755
--- a/scripts/docker-install-phase5.bash
+++ b/scripts/docker-install-phase5.bash
@@ -14,6 +14,11 @@ git clone https://github.com/circulosmeos/gdown.pl.git
 mv gdown.pl/gdown.pl /usr/bin/gdown
 rm -rf gdown.pl
 
+# Shared
+wget -nv https://github.com/jgm/pandoc/releases/download/2.10/pandoc-2.10-linux-amd64.tar.gz
+tar -xf pandoc-*-linux-amd64.tar.gz -C /usr --strip-components=1
+rm pandoc-*-linux-amd64.tar.gz
+
 # Ada
 wget -nv https://dl.bintray.com/reznikmm/ada-language-server/linux-latest.tar.gz
 tar -xf linux-latest.tar.gz