...

grado.nimble

@@ -34,10 +34,7 @@ task css, "Builds the CSS":
 task htmljs, "Generates single html page's JavaScript":
   exec "nim js -d:relativePath --out:dist/app.js src/frontend"
 
-task htmlpage, "Generates a single html page":
-  exec "nimble css"
-  exec "nimble htmljs"
-
+proc copyDist() = 
   mkDir "dist"
   cpFile "public/css/style.css", "dist/style.css"
   cpDir "public/img", "dist/img"
@@ -50,32 +47,20 @@ task htmlpage, "Generates a single html page":
       "frontend": "./app.js",
       "style": "./style.css",
       "favicon": "./img/favicon.ico",
-      "mathjax": "./js/mathjax/tex-chtml.js",
+      "mathjax": "./js/mathjax/es5/tex-chtml.js",
       "matterwrap": "./js/matter-wrap/matter-wrap.min.js",
       "matterjs": "./js/matter-js/matter.min.js",
       # "timestamp": encodeUrl(CompileDate & CompileTime),
       # "ga": config.ga
     }.newStringTable()
 
+task htmlpage, "Generates a single html page":
+  exec "nimble css"
+  exec "nimble htmljs"
+  copyDist()
+
 task rhtmlpage, "Generates a single html page":
   exec "nimble c -r -d:release --mm:refc src/buildcss"
   exec "nim js -d:relativePath -d:release --out:dist/app.js src/frontend"
 
-  mkDir "dist"
-  cpFile "public/css/style.css", "dist/style.css"
-  cpDir "public/img", "dist/img"
-  cpDir "public/js", "dist/js"
-  rmFile "dist/js/frontend.js"
-
-  writeFile "dist/index.html", readFile("public/karax.html") %
-    {
-      "title": config.title,
-      "frontend": "./app.js",
-      "style": "./style.css",
-      "favicon": "./img/favicon.ico",
-      "mathjax": "./js/mathjax/tex-chtml.js",
-      "matterwrap": "./js/matter-wrap/matter-wrap.min.js",
-      "matterjs": "./js/matter-js/matter.min.js",
-      # "timestamp": encodeUrl(CompileDate & CompileTime),
-      # "ga": config.ga
-    }.newStringTable()
+  copyDist()