From 1d6918d927e6cb4b3d6d747eb7b9ac89dc75bf9b Mon Sep 17 00:00:00 2001
From: perro <hi@perrotuerto.blog>
Date: Mon, 29 May 2023 13:33:28 -0700
Subject: [PATCH] Fix: lit won't be a rock, but nat would be

---
 dist/lin.min.lua      |  9 +--------
 scripts/make_dist.lua | 20 +++++++-------------
 src/literate.lua      |  2 --
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/dist/lin.min.lua b/dist/lin.min.lua
index 49ac8a6..7237b8e 100644
--- a/dist/lin.min.lua
+++ b/dist/lin.min.lua
@@ -7,14 +7,7 @@ Computable Pandoc:
 
 require "fennel"
 require "dog"
-
------------------------------------ NATURAL -----------------------------------
-
-local nat = {}
-
-function nat.get(str)
-  return str
-end
+require "nat"
 
 ---------------------------------- LITERATE ----------------------------------
 
diff --git a/scripts/make_dist.lua b/scripts/make_dist.lua
index 5aadc5e..d52a26c 100644
--- a/scripts/make_dist.lua
+++ b/scripts/make_dist.lua
@@ -20,14 +20,11 @@ local function make_dist(name, bundle)
   -- Variables
   local bundle = (bundle == nil or bundle == true)
   local dist = pandoc.path.join({"dist", name})
-  local ext = chomp(optpath .. "dog.lua")
-  local fnl = chomp(optpath .. "fennel.lua")
-  local fnl = fnl:gsub("\nreturn mod\n", "\nlocal fnl = mod\n")
-  local pan = chomp("src/pandoc.lua")
+  local fnl = chomp(optpath .. "fennel.lua"):gsub("\nreturn mod\n", "\nlocal fnl = mod\n")
+  local dog = chomp(optpath .. "dog.lua")
   local nat = chomp("src/natural.lua"):gsub("\nreturn nat\n", "")
-  local msg = ("src/locale.yaml"):readtext()
-  local lit = chomp("src/literate.lua"):gsub("\nreturn lit\n", "")
-  local lit = lit:gsub("#locale%(%)", msg)
+  local lit = chomp("src/literate.lua"):gsub("#locale%(%)", ("src/locale.yaml"):readtext())
+  local pan = chomp("src/pandoc.lua")
   local license = string.strip([[
 Computable Pandoc:
   (C) 2023 perro hi@perrotuerto.blog
@@ -46,18 +43,15 @@ Fennel:
   ]])
 
   -- Bundles Fennel and Computable Pandoc
-  -- TODO: lit and nat should be rocks and, therefore, should be:
-  --  added only in bundle
-  --  use 'require' in minimal
   file = io.open(dist, "w")
   if bundle then
     file:write("--[[\n", extralicense, "\n]]--\n")
-    file:write(fnl, ext)
+    file:write(fnl, dog, nat)
   else
     file:write("--[[\n", license, "\n]]--\n")
-    file:write('\nrequire "fennel"\nrequire "dog"\n')
+    file:write('\nrequire "fennel"\nrequire "dog"\nrequire "nat"\n')
   end
-  file:write(nat, lit, pan)
+  file:write(lit, pan)
   file:close()
 end
 
diff --git a/src/literate.lua b/src/literate.lua
index d1436d1..94fb9a2 100644
--- a/src/literate.lua
+++ b/src/literate.lua
@@ -286,5 +286,3 @@ function lit.exam(doc)
             :walk { Code = function(inline) return insert(inline) end }
             :walk { Pandoc = function(_) assert() end }
 end
-
-return lit