diff options
| author | Hans Hagen <pragma@wxs.nl> | 2012-06-07 18:39:00 +0200 |
|---|---|---|
| committer | Hans Hagen <pragma@wxs.nl> | 2012-06-07 18:39:00 +0200 |
| commit | 8498c91926dd70afc51962fd9893944214f3f8ef (patch) | |
| tree | 659f621c5092180da6cba5fe5348b97ecb3a3edd /scripts | |
| parent | a6d02bd9da605a902fd062a2d53e09368477b844 (diff) | |
| download | context-8498c91926dd70afc51962fd9893944214f3f8ef.tar.gz | |
beta 2012.06.07 18:39
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/context/lua/mtx-context.lua | 16 | ||||
| -rw-r--r-- | scripts/context/lua/mtxrun.lua | 6 | ||||
| -rw-r--r-- | scripts/context/stubs/mswin/mtxrun.lua | 6 | ||||
| -rwxr-xr-x | scripts/context/stubs/unix/mtxrun | 6 |
4 files changed, 11 insertions, 23 deletions
diff --git a/scripts/context/lua/mtx-context.lua b/scripts/context/lua/mtx-context.lua index be492f5b9..3aff2bee2 100644 --- a/scripts/context/lua/mtx-context.lua +++ b/scripts/context/lua/mtx-context.lua @@ -643,14 +643,7 @@ function scripts.context.run(ctxdata,filename) end os.exit(1) break - elseif returncode > 0 then - report("fatal error: return code: %s",returncode or "?") - if resultname then - result_save_error(oldbase,newbase) - end - os.exit(returncode) - break - else + elseif returncode == 0 then multipass_copyluafile(jobname) newhash = multipass_hashfiles(jobname) if multipass_changed(oldhash,newhash) then @@ -658,6 +651,13 @@ function scripts.context.run(ctxdata,filename) else break end + else + report("fatal error: return code: %s",returncode or "?") + if resultname then + result_save_error(oldbase,newbase) + end + os.exit(1) -- (returncode) + break end -- end diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 8bd243b54..78cc06e0e 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -4831,10 +4831,6 @@ local function set(key,value) hash[key] = value end -local function set(key,value) - hash[key] = value -end - local pattern_a_s = (pattern_a/set)^1 local pattern_b_s = (pattern_b/set)^1 local pattern_c_s = (pattern_c/set)^1 @@ -4885,7 +4881,7 @@ end local separator = comma * space^0 local value = P(lbrace * C((nobrace + nested)^0) * rbrace) + C((nested + (1-comma))^0) -local pattern = Ct(value*(separator*value)^0) +local pattern = spaces * Ct(value*(separator*value)^0) -- "aap, {noot}, mies" : outer {} removes, leading spaces ignored diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 8bd243b54..78cc06e0e 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -4831,10 +4831,6 @@ local function set(key,value) hash[key] = value end -local function set(key,value) - hash[key] = value -end - local pattern_a_s = (pattern_a/set)^1 local pattern_b_s = (pattern_b/set)^1 local pattern_c_s = (pattern_c/set)^1 @@ -4885,7 +4881,7 @@ end local separator = comma * space^0 local value = P(lbrace * C((nobrace + nested)^0) * rbrace) + C((nested + (1-comma))^0) -local pattern = Ct(value*(separator*value)^0) +local pattern = spaces * Ct(value*(separator*value)^0) -- "aap, {noot}, mies" : outer {} removes, leading spaces ignored diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 8bd243b54..78cc06e0e 100755 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -4831,10 +4831,6 @@ local function set(key,value) hash[key] = value end -local function set(key,value) - hash[key] = value -end - local pattern_a_s = (pattern_a/set)^1 local pattern_b_s = (pattern_b/set)^1 local pattern_c_s = (pattern_c/set)^1 @@ -4885,7 +4881,7 @@ end local separator = comma * space^0 local value = P(lbrace * C((nobrace + nested)^0) * rbrace) + C((nested + (1-comma))^0) -local pattern = Ct(value*(separator*value)^0) +local pattern = spaces * Ct(value*(separator*value)^0) -- "aap, {noot}, mies" : outer {} removes, leading spaces ignored |