2017-08-02 19:04:00

1 files changed, 15 insertions, 13 deletions

diff --git a/tex/context/base/mkiv/buff-ver.lua b/tex/context/base/mkiv/buff-ver.lua
index ed0e327a1..6af56b327 100644
--- a/tex/context/base/mkiv/buff-ver.lua
+++ b/tex/context/base/mkiv/buff-ver.lua
@@ -44,6 +44,8 @@ local v_yes                = variables.yes
 local v_last               = variables.last
 local v_all                = variables.all
 local v_absolute           = variables.absolute
+local v_inline             = variables.inline
+local v_display            = variables.display
 
 -- beware, all macros have an argument:
 
@@ -66,7 +68,7 @@ local ctx_verbatimspace             = context.doverbatimspace
 local CargOne = Carg(1)
 
 local function f_emptyline(s,settings)
-    if settings and settings.nature == "inline" then
+    if settings and settings.nature == v_inline then
         ctx_inlineverbatimemptyline()
     else
         ctx_displayverbatimemptyline()
@@ -74,7 +76,7 @@ local function f_emptyline(s,settings)
 end
 
 local function f_beginline(s,settings)
-    if settings and settings.nature == "inline" then
+    if settings and settings.nature == v_inline then
         ctx_inlineverbatimbeginline()
     else
         ctx_displayverbatimbeginline()
@@ -82,7 +84,7 @@ local function f_beginline(s,settings)
 end
 
 local function f_newline(s,settings)
-    if settings and settings.nature == "inline" then
+    if settings and settings.nature == v_inline then
         ctx_inlineverbatimnewline()
     else
         ctx_displayverbatimnewline()
@@ -90,7 +92,7 @@ local function f_newline(s,settings)
 end
 
 local function f_start(s,settings)
-    if settings and settings.nature == "inline" then
+    if settings and settings.nature == v_inline then
         ctx_inlineverbatimstart()
     else
         ctx_displayverbatimstart()
@@ -98,7 +100,7 @@ local function f_start(s,settings)
 end
 
 local function f_stop(s,settings)
-    if settings and settings.nature == "inline" then
+    if settings and settings.nature == v_inline then
         ctx_inlineverbatimstop()
     else
         ctx_displayverbatimstop()
@@ -500,7 +502,7 @@ local function visualize(content,settings) -- maybe also method in settings
         else
             m = specifications[method] or specifications.default
         end
-        local nature = settings.nature or "display"
+        local nature = settings.nature or v_display
         local n = m and m[nature]
         if n then
             if trace_visualize then
@@ -534,15 +536,15 @@ local function checkedsettings(settings,nature)
 end
 
 function visualizers.visualizestring(content,settings)
-    visualize(content,checkedsettings(settings,"inline"))
+    visualize(content,checkedsettings(settings,v_inline))
 end
 
 function visualizers.visualizefile(name,settings)
-    visualize(resolvers.loadtexfile(name),checkedsettings(settings,"display"))
+    visualize(resolvers.loadtexfile(name),checkedsettings(settings,v_display))
 end
 
 function visualizers.visualizebuffer(name,settings)
-    visualize(buffers.getcontent(name),checkedsettings(settings,"display"))
+    visualize(buffers.getcontent(name),checkedsettings(settings,v_display))
 end
 
 -- --
@@ -739,7 +741,7 @@ local function filter(lines,settings) -- todo: inline or display in settings
         first, last = getstrip(lines,first,last)
     end
     -- \r is \endlinechar but \n would is more generic so this choice is debatable
-    local content = concat(lines,(settings.nature == "inline" and " ") or "\n",first,last)
+    local content = concat(lines,(settings.nature == v_inline and " ") or "\n",first,last)
     return content, m
 end
 
@@ -755,7 +757,7 @@ local function typebuffer(settings)
         if content and content ~= "" then
          -- content = decodecomment(content)
             content = dotabs(content,settings)
-            visualize(content,checkedsettings(settings,"display"))
+            visualize(content,checkedsettings(settings,v_display))
         end
     end
 end
@@ -804,7 +806,7 @@ local function typestring(settings)
         end
      -- content = decodecomment(content)
      -- content = dotabs(content,settings)
-        visualize(content,checkedsettings(settings,"inline"))
+        visualize(content,checkedsettings(settings,v_inline))
     end
 end
 
@@ -824,7 +826,7 @@ local function typefile(settings)
                 local content, m = filter(lines,settings)
                 if content and content ~= "" then
                     content = dotabs(content,settings)
-                    visualize(content,checkedsettings(settings,"display"))
+                    visualize(content,checkedsettings(settings,v_display))
                 end
             end
         end