feat(inputs): Allow (escaped) quote mark in quoted command options

sile-typesetter · Jul 13, 2020 · 2e9d1b5 · 2e9d1b5
1 parent f08582a
commit 2e9d1b5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/core/inputs-texlike.lua b/core/inputs-texlike.lua
@@ -23,7 +23,9 @@ SILE.inputs.TeXlike.parser = function (_ENV)
   local sep = S",;" * _
   local eol = S"\r\n"
   local quote = P'"'
-  local quotedString = quote * C((1-quote)^1) * quote
+  local escaped_quote = B(P"\\") * quote
+  local unescapeQuote = function (str) local a = str:gsub('\\"', '"'); return a end
+  local quotedString = quote * C(((1-quote+escaped_quote)^1)/unescapeQuote) * quote
   local value = quotedString + (1-S",;]")^1
   local myID = C(SILE.inputs.TeXlike.identifier + S"{}\\%") / 1
   local pair = Cg(myID * _ * "=" * _ * C(value)) * sep^-1 / function (...) local tbl = {...}; return tbl[1], tbl[#tbl] end

diff --git a/spec/texlike_spec.lua b/spec/texlike_spec.lua
@@ -35,4 +35,10 @@ describe("#TeXlike #input", function ()
     assert.is.equal("bar", t[1][1])
   end)
 
+  it("command with quoted arg with escape", function()
+    local t = toTree([[\foo[baz="qiz \"qiz\""]{bar}]])
+    assert.is.equal("qiz \"qiz\"", t.options.baz)
+    assert.is.equal("bar", t[1][1])
+  end)
+
 end)