README.md

@@ -2,145 +2,32 @@
 
 for expanding random table entries
 
-1. [Requirements](#requirements)
-2. [Installing](#installing)
-3. [Architecture](#architecture)
-4. [Tutorial](#tutorial)
-   * [Random Selections](#random-selections)
-   * [Expansion](#expansion)
-   * [Filters](#filters)
-5. [Roadmap](#roadmap)
-6. [Resources](#resources)
-
 ## Requirements
 
-- Fennel 1.3.1 on PUC Lua 5.4
+Built with
-- gnu recutils 1.9: for querying metadata
+Fennel 1.3.1 on PUC Lua 5.4
-- just 1.34.0: just a task runner
 
-## Installing
+## Usage
 
 You can run the script: `fennel src/main.fnl`.
 
 Or you can compile a binary and use that.
 See `just compile`.
 
-There is also a vim plugin for the `tbls` format.
-See `vim-tbls/README.md`.
-
-## Architecture
-
-- `src/story.fnl`: core of the project. where all the file handling and text parsing happens
-- `src/main.fnl`: wrapper for story.fnl. the ui.
-- `src/filter.fnl` logic for applying filters to strings
-- `lib/*.fnl` libraries and helper functions
-
-![Autogenerated Dependency Graph][deps]
-
-[deps]: doc/deps.png "Autogenerated Dependency Graph"
-
-## Tutorial
-
-### Random Selections
-
-At its most basic, `tbls` selects a random element from a table.
-
-Suppose you have a few tables:
-
-```
-:: suit
-Hearts
-Bells
-Whistles
-Cups
-Knives
-Shovels
-
-:: card
-Ace
-One
-Two
-[...]
-Queen
-King
-Beast
-```
-
-`tbls` might return "Whistles" from suit.
-Or "Two" from card.
-
-### Expansion
-
-But wait there's more.
-`tbls` will also expand certain text found in a table entry.
-
-Let's add another table:
-
-```
-:: draw
-[card] of [suit]
-```
-
-When you place the name of a table in `[squarebrackets]`,
-then `tbls` views that as a placeholder
-for a random item from that table.
-It will expand that text.
-So 'draw' might end up being "Thief of Shovels"
-or "Twelve or Cups".
-
-### Filters
-
-`tbls` can run arbitary filters on text after expanding it.
-Example filters can be found in `lib/filters.fnl`.
-
-To apply filters,
-dot-chain them at the end
-of a table reference.
-
-Consider the following tables:
-
-```
-:: origin
-Evelyn eats one [fruit.c]
-Evelyn eats many [fruit.c.s]
-
-:: fruit
-banana
-apple
-pear
-```
-
-`s`, `plural`, and `pluralize`
-are all different ways
-to call the 'plural' filter function.
-`c` is 'capitalize.'
-
-Example output:
-
-```
-Evelyn eats one Pear
-Evelyn eats many Bananas
-```
-
-
 ## Roadmap
 
 - [x] random table entries (ADDED in vHydrogen)
 - [x] expanding macros (ADDED in vHydrogen)
-- [x] table files plugin: syntax highlighting + folding (ADDED vHelium)
+- [ ] table files plugin: syntax highlighting + folding
-- [x] expansion filters (ADDED vHelium)
+- [ ] expansion filters 
-- [ ] table context
 
 ## Resources
 
 inspired heavily by tracery:
-<https://github.com/galaxykate/tracery>
+https://github.com/galaxykate/tracery
 
-and this list-to-html geneator from slight adjustments:
+and paper elemental's list-to-html generator:
-<https://slightadjustments.blogspot.com/p/generator.html>
+https://paperelemental.blogspot.com/p/list-to-html-generator.html
-
-but also paper elemental's:
-<https://paperelemental.blogspot.com/p/list-to-html-generator.html>
 
 and perchance:
-<https://perchance.org/welcome>
+https://perchance.org/welcome

doc/History.md

@@ -1,15 +0,0 @@
-# History
-
-`tbls` began as the Story module for a board game I was writing.
-When I completed all the features for the board game itself,
-I wanted to add some kind of a generative story engine
-based on the state of the game
-and on player moves.
-
-This ended up complicating the game quite a bit,
-and also I couldn't figure out how or where
-to actually incorporate the story.
-So I scrapped it for that particular project,
-but continued to develop the story engine on its own.
-
-It became `tbls`.

doc/Tutorial.md

@@ -1,7 +1,5 @@
 ## Tutorial
 
-### Random Selections
-
 At its most basic, `tbls` selects a random element from a table.
 
 Suppose you have a few tables:
@@ -19,19 +17,21 @@ Shovels
 Ace
 One
 Two
-[...]
+...
+Ten
+Eleven
+Twelve
+Thief
 Queen
 King
 Beast
 ```
 
 `tbls` might return "Whistles" from suit.
-Or "Two" from card.
+Or "Twelve" from card.
-
-### Expansion
 
 But wait there's more.
-`tbls` will also expand certain text found in a table entry.
+`tbls` will also expand macros found in table entries.
 
 Let's add another table:
 
@@ -43,40 +43,6 @@ Let's add another table:
 When you place the name of a table in `[squarebrackets]`,
 then `tbls` views that as a placeholder
 for a random item from that table.
-It will expand that text.
+And it will expand the text.
-So 'draw' might end up being "Thief of Shovels"
+So this might end up being "Thief of Shovels"
 or "Twelve or Cups".
-
-### Filters
-
-`tbls` can run arbitary filters on text after expanding it.
-Example filters can be found in `lib/filters.fnl`.
-
-To apply filters,
-dot-chain them at the end
-of a table reference.
-
-Consider the following tables:
-
-```
-:: origin
-Evelyn eats one [fruit.c]
-Evelyn eats many [fruit.c.s]
-
-:: fruit
-banana
-apple
-pear
-```
-
-`s`, `plural`, and `pluralize`
-are all different ways
-to call the 'plural' filter function.
-`c` is 'capitalize.'
-
-Example output:
-
-```
-Evelyn eats one Pear
-Evelyn eats many Bananas
-```

doc/meta.rec

@@ -5,5 +5,5 @@
 name: tbls
 author: dozens@tilde.team
 created: 2024-07-31
-updated: 2024-08-03
+updated: 2024-08-01
-version: Helium
+version: Hydrogen

doc/src/readme.m4

@@ -1,65 +0,0 @@
-changequote(<!,!>)dnl Or else `code blocks` confuse m4
-# tbls
-
-for expanding random table entries
-
-1. [Requirements](#requirements)
-2. [Installing](#installing)
-3. [Architecture](#architecture)
-4. [Tutorial](#tutorial)
-   * [Random Selections](#random-selections)
-   * [Expansion](#expansion)
-   * [Filters](#filters)
-5. [Roadmap](#roadmap)
-6. [Resources](#resources)
-
-## Requirements
-
-- Fennel 1.3.1 on PUC Lua 5.4
-- gnu recutils 1.9: for querying metadata
-- just 1.34.0: just a task runner
-
-## Installing
-
-You can run the script: `fennel src/main.fnl`.
-
-Or you can compile a binary and use that.
-See `just compile`.
-
-There is also a vim plugin for the `tbls` format.
-See `vim-tbls/README.md`.
-
-## Architecture
-
-- `src/story.fnl`: core of the project. where all the file handling and text parsing happens
-- `src/main.fnl`: wrapper for story.fnl. the ui.
-- `src/filter.fnl` logic for applying filters to strings
-- `lib/*.fnl` libraries and helper functions
-
-![Autogenerated Dependency Graph][deps]
-
-[deps]: doc/deps.png "Autogenerated Dependency Graph"
-
-include(<!doc/Tutorial.md!>)
-
-## Roadmap
-
-- [x] random table entries (ADDED in vHydrogen)
-- [x] expanding macros (ADDED in vHydrogen)
-- [x] table files plugin: syntax highlighting + folding (ADDED vHelium)
-- [x] expansion filters (ADDED vHelium)
-- [ ] table context
-
-## Resources
-
-inspired heavily by tracery:
-<https://github.com/galaxykate/tracery>
-
-and this list-to-html geneator from slight adjustments:
-<https://slightadjustments.blogspot.com/p/generator.html>
-
-but also paper elemental's:
-<https://paperelemental.blogspot.com/p/list-to-html-generator.html>
-
-and perchance:
-<https://perchance.org/welcome>

justfile

@@ -1,85 +1,34 @@
-set quiet
-
 # show all recipes
 default:
   just --list --unsorted
 
 # compile binary
-[group('build')]
 compile:
   fennel --compile-binary src/main.fnl tbls /usr/local/lib/liblua.a /usr/local/include/lua5.4
-alias build := compile
-
-# install all
-[group('install')]
-install: install-plugin install-binary
-
-# install vim plugin
-[group('install')]
-install-plugin:
-  cp -r vim-tbls/* ~/.config/nvim
-
-# install binary
-[group('install')]
-install-binary: compile
-  cp tbls ~/bin
-
-# run all tests
-[group('test')]
-test: test-main test-story
 
 # run test file
-[group('test')]
+_test-story:
-test-story:
   fennel test/story.test.fnl
 
 # test main
-[group('test')]
+_test-main:
-test-main:
   for i in $(seq 1 10); do fennel src/main.fnl -i test/morpheme-word-epithet.txt -k name; done
 
-# build all docs
+# run all tests
-[group('docs')]
+test: _test-main _test-story
-docs: deps readme
-
-# build readme
-[group('docs')]
-readme:
-  m4 doc/src/readme.m4 > README.md
-
-# create dependency graph
-[group('docs')]
-deps:
-  ag require src \
-    | sed 's/\(.*\.fnl\).*require :\([^\.]*\)\.\([^)]*\)).*/"\1" -> "\2\/\3.fnl"/' \
-    | awk 'BEGIN { print "digraph {" } { print } END { print "}" }' \
-    | dot -Tpng \
-    > doc/deps.png
-
-# create dependency graph but sixel
-[group('docs')]
-depsxl:
-  ag require src \
-    | sed 's/\(.*\.fnl\).*require :\([^\.]*\)\.\([^)]*\)).*/"\1" -> "\2\/\3.fnl"/' \
-    | awk 'BEGIN { print "digraph {" } { print } END { print "}" }' \
-    | dot -Tpng \
-    | magick - -geometry 800 sixel:-
 
 # bump version
-[group('docs')]
 bump:
   #!/usr/local/bin/bash
-  currname=$(recsel doc/v/meta.rec -P version)
+  currname=$(recsel doc/meta.rec -P version)
-  currnum=$(recsel doc/v/versions.rec -e "Name = '$currname'" -P Number)
+  currnum=$(recsel doc/versions.rec -e "Name = '$currname'" -P Number)
   nextnum=$((currnum + 1))
-  nextname=$(recsel doc/v/versions.rec -e "Number = $nextnum" -P Name)
+  nextname=$(recsel doc/versions.rec -e "Number = $nextnum" -P Name)
   echo "Bumping version from $currname to $nextname:"
-  recset doc/v/meta.rec -f version -s $nextname
+  recset doc/meta.rec -f version -s $nextname
-  recset doc/v/meta.rec -f updated -S $(gdate +'%Y-%m-%d')
+  recset doc/meta.rec -f updated -S $(gdate +'%Y-%m-%d')
-  recsel doc/v/meta.rec
+  recsel doc/meta.rec
 
 # show full metadata
-[group('docs')]
 meta:
-  awk 'FNR==1{print ""}{print}' doc/v/*.rec | recsel -t meta -j version
+  awk 'FNR==1{print ""}{print}' doc/*.rec | recsel -t meta -j version
-

lib/filters.fnl

@@ -1,30 +0,0 @@
-(fn capitalize [s]
-  (s:gsub "." string.upper 1)) 
-
-(fn uppercase [s]
-  (string.upper s))
-
-(fn lowercase [s]
-  (string.lower s))
-
-(fn plural [s]
-  (.. s :s))
-
-{
- :capitalize {
-   :call [:c :cap :capital :capitalize]
-   :fun capitalize
-   }
- :uppercase {
-   :call [:u :upper :uppercase]
-   :fun uppercase
-   }
- :lowercase {
-   :call [:l :lower :lowercase]
-   :fun lowercase
-   }
- :plural {
-   :call [:s :plural :pluralize]
-   :fun plural
-   }
-}

lib/string.fnl

@@ -1,7 +0,0 @@
-(fn split [pattern str]
-  (let [res []]
-    (each [seg (str:gmatch pattern)]
-      (table.insert res seg))
-    res))
-
-{: split}

lib/table.fnl

@@ -1,20 +0,0 @@
-(fn contains? [t x]
-  "does sequence t contain element x?"
-  (accumulate [found false
-               _ v (ipairs t)
-               &until found] ; escape early
-    (or found (= x v))))
-
-(fn keys [t]
-  "takes a table returns a sequential list of its keys"
-  (local out [])
-  (each [k _ (pairs t)] (table.insert out k))
-  out)
-
-(fn has-key? [t k]
-  (contains? (keys t) k))
-
-{: contains?
- : keys
- : has-key?
- }

src/filter.fnl

@@ -1,16 +0,0 @@
-(local {: contains?} (require :lib.table))
-(local {:split split-full} (require :lib.string))
-(local split (partial split-full "[^%.]*"))
-
-(fn filter [s]
-  (let [filters (require :lib.filters)
-       [str & funs] (split s)]
-    (var res str)
-    (each [_ f (ipairs funs)]
-       (each [_ filter (pairs filters)]
-          (when (contains? filter.call f)
-            (set res (filter.fun res)))))
-    res))
-
-{: filter
- }

src/main.fnl

@@ -8,7 +8,6 @@
   (print)
   (print "Basic Options:")
   (print " -h|--help                         print this message and exit")
-  (print " -v|--version                      print version and exit")
   (print " -i|--input <file>                 name of input file")
   (print " -k|--origin-table-key <key>       name of a table in the input file")
   (print " -s|--origin-table-string <string> a string template")
@@ -29,12 +28,6 @@
             (do
               (show-help)
               (os.exit 0)) 
-          (where [a] (or (= a "-v") (= a "--version")))
-            (let [handle (io.popen "recsel doc/meta.rec -P version")
-                  result (handle:read "*a")]
-              (print result)
-              (handle:close)
-              (os.exit 0))
           (where [a input] (or (= a "-i") (= a "--input")))
             (set opts.input input)
           (where [a key] (or (= a "-k") (= a "--origin-table-key")))
@@ -47,7 +40,8 @@
 
 (fn main []
   (let [opts (parse-args arg)
-        corpus (create-corpus opts.input)]
+        corpus (create-corpus opts.input)
+        ]
     (if opts.key
       (print (flatten corpus (. corpus opts.key)))
       (print (flatten corpus opts.string)))))

src/story.fnl

@@ -1,8 +1,20 @@
 ;; helper funs
-(local tbl (require :lib.table))
+(local tbl {
-(local {: filter} (require :src.filter))
+  :contains? (fn contains [t x]
-(local split
+    "does sequence t contain element x?"
-  (partial (. (require :lib.string) :split) "[^%.]*"))
+    (accumulate [found false
+                 _ v (ipairs t)
+                 &until found] ; escape early
+      (or found (= x v))))
+  :keys (fn keys [t]
+    "takes a table returns a sequential list of its keys"
+    (local out [])
+    (each [k v (pairs t)] (table.insert out k))
+    out)
+})
+(fn has-key? [t k]
+  (tbl.contains? (tbl.keys t) k))
+
 
 (fn lines [filename callback]
   (case (pcall #(with-open [file (io.open filename)] (each [line (file:lines)] (callback line))))
@@ -10,7 +22,7 @@
 
 (fn _create-corpus [lines data]
   (var current-key nil)
-  (local corpus {})
+  (var corpus {})
   (lines data
     #(let [key (string.match $1 "^::%s+([%a-]+)")
            blank? (or (= nil $1) (= "" $1))
@@ -38,7 +50,7 @@
         seed (math.randomseed random) ;; SIDE EFFECT
         whatever (handle:close)       ;; SIDE EFFECT
         idx (math.random len)
-        keys (accumulate [acc [] k _ (pairs t)] (do (table.insert acc k) acc))
+        keys (accumulate [acc [] k v (pairs t)] (do (table.insert acc k) acc))
         rndkey (. keys idx)
         ]
     (. t rndkey)))
@@ -48,24 +60,18 @@
               "string" origin
               "table"  (one-of origin)
               _ (error "Origin must be a table or a string"))
-        template-pattern "%[[%a-%.]+%]" ; [word]
+        template-pattern "%[[%a-]+%]" ; [word]
-        word-pattern "%[([%a-%.]+)%]"   ; word
+        word-pattern "%[([%a-]+)%]"   ; word
         (i j) (string.find str template-pattern) ; indices
-        raw-word (or (string.match str word-pattern) str)
+        word (string.match str word-pattern)]    ; the actual keyword
-        [word & fs] (split raw-word)
-        ]
     (if (not i)
       str
       (do
-        (assert (tbl.has-key? corpus word)
+        (assert (has-key? corpus word)
-          (string.format
+          (string.format "Error trying to expand \"%s\". Corpus does not contain a table called \"%s\"" str word))
-            "Error trying to expand \"%s\". Corpus does not contain a table called \"%s\""
-            str word))
         (let [next-str (string.format "%s%s%s"
                 (string.sub str 1 (- i 1))
-                (if (length fs)
+                (one-of (. corpus word))
-                  (filter (.. (one-of (. corpus word)) "." (table.concat fs ".")))
-                  (one-of (. corpus word)))
                 (string.sub str (+ j 1)))]
           (flatten corpus next-str j)))))) ;; this is a tail call!
 

test/morpheme-word-epithet.txt

@@ -2,350 +2,349 @@
 
 :: name
 ## Entry point / origin
-[morpheme.c][word] [epithet]
+[morpheme][word] [epithet]
-[prefix] [morpheme.c][word]
+[prefix] [morpheme][word]
-[prefix] [morpheme.c][word.s]
+[prefix] [morpheme][word] [epithet]
-[prefix] [morpheme.c][word] [epithet]
+[morpheme][word]'[morpheme]
-[morpheme.c][word]'[morpheme.c]
+[morpheme] [morpheme][word]
-[morpheme.c] [morpheme.c][word]
 
 :: morpheme
 ## A random sound
-brog
+Brog
-guyn
+Guyn
-driz
+Driz
-oy
+Oy
-poin
+Poin
-broin
+Broin
-dray
+Dray
-hoy
+Hoy
-khu
+Khu
-elbb
+Elbb
-zee
+Zee
-teg
+Teg
-thig
+Thig
-volor
+Volor
-moror
+Moror
-zarn
+Zarn
-zark
+Zark
-zarzl
+Zarzl
-zhong
+Zhong
-zok
+Zok
-krinc
+Krinc
-prunc
+Prunc
-seld
+Seld
-serd
+Serd
-quo
+Quo
-quog
+Quog
-wast
+Wast
-writ
+Writ
-wub
+Wub
-eem
+Eem
-eo
+Eo
-ev
+Ev
-wuld
+Wuld
-rond
+Rond
-trop
+Trop
-yhoo
+Yhoo
-urdd
+Urdd
-ing
+Ing
-ogg
+Ogg
-phef
+Phef
-aph
+Aph
-fro
+Fro
-drov
+Drov
-frol
+Frol
-gis
+Gis
-hirn
+Hirn
-wilk
+Wilk
-rof
+Rof
-roch
+Roch
-thip
+Thip
-throg
+Throg
-teng
+Teng
-tirk
+Tirk
-tenk
+Tenk
-twu
+Twu
-twal
+Twal
-yuth
+Yuth
-yirg
+Yirg
-ull
+Ull
-uk
+Uk
-iv
+Iv
-irch
+Irch
-ok
+Ok
-ort
+Ort
-ool
+Ool
-oon
+Oon
-oos
+Oos
-oop
+Oop
-pur
+Pur
-purth
+Purth
-pux
+Pux
-pix
+Pix
-ang
+Ang
-ank
+Ank
-ack
+Ack
-arr
+Arr
-arc
+Arc
-sor
+Sor
-shri
+Shri
-sarc
+Sarc
-sib
+Sib
-spo
+Spo
-snil
+Snil
-dral
+Dral
-dax
+Dax
-druz
+Druz
-droon
+Droon
-tiong
+Tiong
-snid
+Snid
-phra
+Phra
-vang
+Vang
-gawp
+Gawp
-hool
+Hool
-grul
+Grul
-dhoop
+Dhoop
-jair
+Jair
-qim
+Qim
-quisl
+Quisl
-fiaz
+Fiaz
-prax
+Prax
-aal
+Aal
-righ
+Righ
-ugh
+Ugh
-yog
+Yog
-yig
+Yig
-yair
+Yair
-var
+Var
-vaq
+Vaq
-skog
+Skog
-drij
+Drij
-volg
+Volg
-dem
+Dem
-ghil
+Ghil
-uvar
+Uvar
-err
+Err
-azil
+Azil
-obil
+Obil
-zanzil
+Zanzil
-zhat
+Zhat
-blug
+Blug
-blig
+Blig
-hroo
+Hroo
-waf
+Waf
-xar
+Xar
-grar
+Grar
-lorp
+Lorp
-vuh
+Vuh
-ee
+Ee
-ay
+Ay
-oo
+Oo
-ux
+Ux
-ix
+Ix
-whal
+Whal
-mun
+Mun
-ilun
+Ilun
-fargl
+Fargl
-xab
+Xab
-frang
+Frang
-bao
+Bao
-bif
+Bif
-xif
+Xif
-zij
+Zij
-quix
+Quix
-vonch
+Vonch
-van
+Van
-klanc
+Klanc
-lug
+Lug
-nirm
+Nirm
-zirm
+Zirm
-sil
+Sil
-wev
+Wev
-vil
+Vil
-vran
+Vran
-quiv
+Quiv
-squan
+Squan
-squank
+Squank
-squop
+Squop
-akun
+Akun
-apar
+Apar
-epar
+Epar
-iq
+Iq
-exy
+Exy
-eny
+Eny
-ery
+Ery
-uth
+Uth
-ist
+Ist
-ost
+Ost
-hrosh
+Hrosh
-imb
+Imb
-omb
+Omb
-onk
+Onk
-arem
+Arem
-urum
+Urum
-irim
+Irim
-irik
+Irik
-eliv
+Eliv
-wep
+Wep
-wroov
+Wroov
-droov
+Droov
-seef
+Seef
-hiqa
+Hiqa
-ayy
+Ayy
-jaal
+Jaal
-khee
+Khee
-ish
+Ish
-xiliv
+Xiliv
-whij
+Whij
-koj
+Koj
-krong
+Krong
-swue
+Swue
-aur
+Aur
-eth
+Eth
-qeth
+Qeth
-neth
+Neth
-veth
+Veth
-yeth
+Yeth
-aer
+Aer
-aen
+Aen
-ain
+Ain
-aun
+Aun
-uon
+Uon
-xiv
+Xiv
-ung
+Ung
-ong
+Ong
-eng
+Eng
-ehal
+Ehal
-dhar
+Dhar
-dhom
+Dhom
-hom
+Hom
-kom
+Kom
-rom
+Rom
-qom
+Qom
-eez
+Eez
-dhezz
+Dhezz
-elpz
+Elpz
-upz
+Upz
-akz
+Akz
-auz
+Auz
-goaz
+Goaz
-goz
+Goz
-mepz
+Mepz
-tepz
+Tepz
-crunz
+Crunz
-grenz
+Grenz
-purb
+Purb
-ony
+Ony
-igy
+Igy
-eart
+Eart
-ehng
+Ehng
-leng
+Leng
-jub
+Jub
-zhoon
+Zhoon
-zhewt
+Zhewt
-juju
+Juju
-lhop
+Lhop
-lhow
+Lhow
-ewl
+Ewl
-ewil
+Ewil
-avul
+Avul
-ap
+Ap
-ip
+Ip
-ep
+Ep
-eb
+Eb
-en
+En
-el
+El
-ek
+Ek
-eh
+Eh
-ez
+Ez
-es
+Es
-ej
+Ej
-ol
+Ol
-om
+Om
-ob
+Ob
-oc
+Oc
-ot
+Ot
-oz
+Oz
-os
+Os
-oq
+Oq
-mork
+Mork
-morg
+Morg
-borg
+Borg
-franken
+Franken
-pranken
+Pranken
-lankim
+Lankim
-khim
+Khim
-khem
+Khem
-vinken
+Vinken
-inken
+Inken
-swohd
+Swohd
-glup
+Glup
-blubil
+Blubil
-bulbil
+Bulbil
-ziz
+Ziz
-miz
+Miz
-lilip
+Lilip
-soong
+Soong
-yolp
+Yolp
-grang
+Grang
-grunc
+Grunc
-gharn
+Gharn
-bral
+Bral
-criv
+Criv
-durn
+Durn
-flom
+Flom
-griv
+Griv
-harn
+Harn
-jurn
+Jurn
-klom
+Klom
-larn
+Larn
-mird
+Mird
-norl
+Norl
-plen
+Plen
-qarn
+Qarn
-rilk
+Rilk
-skiv
+Skiv
-tarm
+Tarm
-ulm
+Ulm
-vorn
+Vorn
-wim
+Wim
-yorn
+Yorn
-blen
+Blen
-cril
+Cril
-dorn
+Dorn
-frel
+Frel
-glim
+Glim
-jiln
+Jiln
-kren
+Kren
-lom
+Lom
-morn
+Morn
-nix
+Nix
-polm
+Polm
-quen
+Quen
-ralk
+Ralk
-shil
+Shil
-trok
+Trok
-ulk
+Ulk
-vlim
+Vlim
-yiln
+Yiln
-brim
+Brim
-crev
+Crev
-dril
+Dril
-flon
+Flon
-gril
+Gril
-jorn
+Jorn
-kliv
+Kliv
-lorn
+Lorn
-mirk
+Mirk
-norn
+Norn
-plim
+Plim
-qril
+Qril
-rik
+Rik
-skon
+Skon
-trel
+Trel
-ulv
+Ulv
-vril
+Vril
 
 :: word
 ## A regular old word
@@ -1012,4 +1011,3 @@ Sister
 Sour
 Pickled
 The Machine known as
-# vim:set filetype=tbls:

test/story.test.fnl

@@ -5,11 +5,11 @@
 
   (let [corpus (create-corpus "test/morpheme-word-epithet.txt")
         origin-key :name
-        origin-table ["[morpheme.c][word] [epithet]"
+        origin-table ["[morpheme][word] [epithet]"
-                      "[prefix] [morpheme.c][word] [epithet]"
+                      "[prefix] [morpheme][word] [epithet]"
-                      "[prefix] [morpheme.c][word]"
+                      "[prefix] [morpheme][word]"
                       ]
-        origin-string "[morpheme.c][word] [epithet]"
+        origin-string "[morpheme][word] [epithet]"
         get-story-with-key
           (partial flatten corpus (. corpus origin-key))
         get-story-with-table

vim-tbls/README.md

@@ -1,25 +0,0 @@
-# vim-tbls
-
-syntax, filtetype detection, folding, and navigation for tbls files
-
-## installing
-
-1. find out where your `syntax` and `ftdetect` files are. e.g. `$HOME/.config/nvim/` or `$HOME/.vim/`.
-
-2. copy `syntax/tbls.vim` and `ftdetect/tbls.vim` to the appropriate folders
-
-after installing, any `.tbl` file should be detected.
-
-to use syntax for, e.g. a `.txt` file, in vim do `:set filetype=tbls`
-
-## using
-
-the syntax defines a foldable table block as the region between a `:: header` and a blank line.
-all folding commands should work.
-(e.g. `zj` and `zk` to jump to next fold. see `:help fold`.)
-the plugin file sets the foldmethod to syntax,
-so your tables should start out folded if folding in enabled.
-
-the plugin file also maps `]]` and `[[`
-(next section and previous section, respectively)
-to jump between table headers.

vim-tbls/ftdetect/tbls.vim

@@ -1 +0,0 @@
-au BufRead,BufNewFile *.tbl set filetype=tbls

vim-tbls/ftplugin/tbls.vim

@@ -1,3 +0,0 @@
-setlocal foldmethod=syntax
-nnoremap <silent><buffer> ]] m':call search('^::', "W")<CR>
-nnoremap <silent><buffer> [[ m':call search('^::', "bW")<CR>

vim-tbls/syntax/tbls.vim

@@ -1,15 +0,0 @@
-if exists("b:current_syntax")
-  finish
-endif
-
-syntax match tblsComment "^#.*$"
-syntax match tblsTitle "^:\+ .*$"
-syntax match tblsRef "\[[^\]]*\]"
-
-syntax region tblsTable start=":: .*" end="^$" fold transparent
-
-highlight default link tblsComment Comment
-highlight default link tblsTitle Statement
-highlight default link tblsRef Type
-
-let b:current_syntax = "tbls"