memoire

@@ -10,7 +10,7 @@ local recrw = dofile(SRC_DIR .. "recrw.lua")

 --[[

     load a deck (a table of tables of `Prompt`s) from a Recfile

 ]]

-local function loaddeck(fname)

+local function loaddeck(fname, conf)

     local fh = io.open(fname)

     if not fh then return nil end

     local rt = fh:read "a"

@@ -18,7 +18,7 @@ local function loaddeck(fname)

     fh:close()

     local pr = recrw.read(rt)

     if not pr then return nil end

-    local ep = Prompt:fromrecs(pr)

+    local ep = Prompt:fromrecs(pr, conf)

     return ep

 end

@@ -191,7 +191,7 @@ math.randomseed(os.time())

 ]]

 -- Add card(s)

 if action == "a" then

-    local deck = loader.load(deckfname)

+    local deck = loader.load(deckfname, config)

     if deck then

         if isatty() then

             io.write("Reading prompts -- press Ctrl-D to stop\n")

@@ -232,7 +232,7 @@ elseif action == "h" then

 elseif action == "r" then

     local deck

     if isatty() then

-        deck = loader.load(deckfname)

+        deck = loader.load(deckfname, config)

     else

         io.write("Review should be done in the terminal\n")

     end

@@ -312,7 +312,7 @@ elseif action == "r" then

                             local ev = io.read("l")

                             local cardrec = Prompt:torec(deck[ci])

                             cardrec.PromptText = { ev }

-                            deck[ci] = Prompt:fromrecs({ cardrec })[1]

+                            deck[ci] = Prompt:fromrecs({ cardrec }, config)[1]

                         -- assume all other inputs to mean Cancel

                         else

                         end

@@ -43,7 +43,7 @@ end

     extracts `Prompt`s from a record-based deck

     returns a table of tables of `Prompt`s

 ]]

-function Prompt:fromrecs(recs)

+function Prompt:fromrecs(recs, conf)

     local ret = {}

     for i, rec in ipairs(recs) do

         -- only bother with records with `PromptText`