update luakeyval

Author: Udi-Fogiel

build.lua

@@ -20,7 +20,9 @@ packtdszip = true
 
 checkconfigs = {
     "configfiles/config-optex",
+    "configfiles/config-optex2",
     "configfiles/config-latex",
+    "configfiles/config-latex2",
     "configfiles/config-plain",
     "configfiles/config-nil",
 }

luakeyval.lua

@@ -5,47 +5,55 @@
 local put_next = token.unchecked_put_next
 local get_next = token.get_next
 local scan_toks = token.scan_toks
-local scan_keyword = token.scan_keyword
+local scan_keyword = token.scan_keyword_cs
 
 local relax = token.new(token.biggest_char() + 1)
-local texerror, uni_char = tex.error, utf8.char
+local texerror, utfchar = tex.error, utf8.char
 local format = string.format
-local function check_delimiter(str1, str2, key)
+
+local function check_delimiter(error1, error2, key)
     local tok = get_next()
     if tok.tok ~= relax.tok then
-        local tok_name = tok.csname or uni_char(tok.mode)
-        texerror(format(str1, key, tok_name),{format(str2, key, tok_name)})
+        local tok_name = tok.csname or utfchar(tok.mode)
+        texerror(format(error1, key, tok_name),{format(error2, key, tok_name)})
         put_next({tok})
     end
 end
 
 local unpack, insert = table.unpack, table.insert 
-local function process_keys(tbl, str1, str2)
+local function process_keys(keys, messages)
+    local matched, vals, curr_key = true, { }
+    local value_forbidden = messages.value_forbidden
+        or "luakeyval: the %s key does not accept a value"
+    local value_required = messages.value_required
+        or "luakeyval: the %s key require a value"
+    local error1 = messages.error1
+        or "wrong syntax when processing keys"
+    local error2 = messages.error2
+        or 'the last scanned key was "%s".\nthere is a "%s" in the way.'
     local toks = scan_toks()
-	insert(toks, relax)
+    insert(toks, relax)
     put_next(toks)
-    local matched, vals = true, { }
-    local curr_key
     while matched do
-	    matched = false
-        for key, param in pairs(tbl) do
-		    if scan_keyword(key) then
-			    matched = true
-				curr_key = key
-				local args = param.args or {}
-				local scanner = param.scanner
-				local val = scan_keyword('=') and 
-				  (scanner and scanner(unpack(args)) or true) or
-				  (param.default or true)
-			    local func = param.func
-				if func then func(key,val) end
-				vals[key] = val
-				break
-			end
-		end
+        matched = false
+        for key, param in pairs(keys) do
+            if scan_keyword(key) then
+                matched = true
+                curr_key = key
+                local args = param.args or { }
+                local scanner = param.scanner
+                local val = scan_keyword('=') and
+                  (scanner and scanner(unpack(args)) or texerror(format(value_forbidden, key)))
+                  or (param.default or texerror(format(value_required, key)))
+                local func = param.func
+                if func then func(key,val) end
+                vals[key] = val
+                break
+            end
+        end
     end
-	check_delimiter(str1, str2, curr_key)
-	return vals
+    check_delimiter(error1, error2, curr_key)
+    return vals
 end
 
 local function scan_choice(...)
@@ -59,14 +67,14 @@ end
 
 local function scan_bool()
     if scan_keyword('true') then 
-	    return true
+        return true
     elseif scan_keyword('flase') then
         return false
-    end		
+    end
 end
 
 return {
     process = process_keys,
-	choices = scan_choice,
-	bool = scan_bool,
+    choices = scan_choice,
+    bool = scan_bool,
 }

lualineno.lua

@@ -25,6 +25,11 @@ local scan_keyword = token.scan_keyword
 local keyval = require('luakeyval')
 local scan_choice = keyval.choices
 local process_keys = keyval.process
+local messages = {
+    error1 = "lualineno: wrong syntax in \\lualineno",
+    value_forbidden = "lualineno: the %s key does not accept a value",
+    value_rquired = "lualineno: the %s key require a value",
+}
 
 local setattribute = tex.setattribute
 local type_attr = luatexbase and luatexbase.new_attribute('lualineno_type') or 0
@@ -101,9 +106,7 @@ the last scanned key was "%s".
 there is a "%s" in the way.
 ]]
 local function set_defaults()
-    local vals = process_keys(defaults_keys,
-      "lualineno: wrong syntax when setting defaults",
-      help_message)
+    local vals = process_keys(defaults_keys,messages)
     for k,v in pairs(vals) do
         defaults[k] = v
     end
@@ -120,9 +123,7 @@ local function define_lineno()
 -- This function is used in the define key.
 -- It is very similar to the set_defaults() function,
 -- but it accepts a `column` and `name` keys as well.
-    local vals = process_keys(define_keys,
-      "lualineno: wrong syntax when defining a lineno",
-      help_message)
+    local vals = process_keys(define_keys,messages)
 -- A newly defined lualineno type must have a name
     local name = vals['name']
     if not name then 
@@ -210,10 +211,10 @@ end
 
 local lualineno_keys = {
     set = {scanner = scan_string},
-    unset = { },
+    unset = { default = true },
     define = {func = define_lineno},
     defaults = {func = set_defaults},
-    anchor = { },
+    anchor = { default = true },
     label = {scanner = scan_toks, args = {false, true}},
     line_attr = {scanner = scan_int},
     col_attr = {scanner = scan_int},
@@ -224,9 +225,7 @@ local find_line
 local function lualineno()
     local saved_endlinechar = tex.endlinechar
     tex.endlinechar = 32
-    local vals = process_keys(lualineno_keys,
-      "lualineno: wrong syntax in \\lualineno",
-      help_message)
+    local vals = process_keys(lualineno_keys,messages)
     tex.endlinechar = saved_endlinechar
     if vals.set then
         local attr = lineno_attr[vals.set]