diff options
| -rw-r--r-- | context/data/scite/scite-context-readme.pdf | bin | 210827 -> 210958 bytes | |||
| -rw-r--r-- | context/data/scite/scite-context-readme.tex | 6 | ||||
| -rw-r--r-- | scripts/context/stubs/mswin/mtxrun.dll | bin | 7680 -> 7680 bytes | |||
| -rw-r--r-- | scripts/context/stubs/source/mtxrun_dll.c | 63 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4085 -> 4114 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/node-nut.lua | 1 | ||||
| -rw-r--r-- | tex/context/base/page-lay.mkiv | 6 | ||||
| -rw-r--r-- | tex/context/base/spac-ver.lua | 2 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24813 -> 24810 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 233037 -> 233044 bytes | |||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
13 files changed, 58 insertions, 26 deletions
diff --git a/context/data/scite/scite-context-readme.pdf b/context/data/scite/scite-context-readme.pdf Binary files differindex b6a751a36..99f05a2a5 100644 --- a/context/data/scite/scite-context-readme.pdf +++ b/context/data/scite/scite-context-readme.pdf diff --git a/context/data/scite/scite-context-readme.tex b/context/data/scite/scite-context-readme.tex index ef1475fa2..42f5e0a98 100644 --- a/context/data/scite/scite-context-readme.tex +++ b/context/data/scite/scite-context-readme.tex @@ -821,12 +821,18 @@ from the on|-|line help pages. \NC \type{Ctrl+Right} \NC next word; \type{Shift} extends selection \NC \NR \NC \type{Ctrl+/} \NC previous word part; \type{Shift} extends selection \NC \NR \NC \type{Ctrl+\ } \NC next word part; \type{Shift} extends selection \NC \NR +\ML +\NC \type{F12 / Ctrl+F7} \NC check (or process) \NC \NR +\NC \type{Ctrl+F12 / Ctrl+F7} \NC process (run) \NC \NR +\NC \type{Alt+F12 / Ctrl+F7} \NC process (run) using the luajit vm (if applicable) \NC \NR \LL \stoptabulate \stopbuffer \getbuffer[keybindings] +\page + \subject{Affiliation} \starttabulate[|l|l|] diff --git a/scripts/context/stubs/mswin/mtxrun.dll b/scripts/context/stubs/mswin/mtxrun.dll Binary files differindex 42b38cb23..943e76a4b 100644 --- a/scripts/context/stubs/mswin/mtxrun.dll +++ b/scripts/context/stubs/mswin/mtxrun.dll diff --git a/scripts/context/stubs/source/mtxrun_dll.c b/scripts/context/stubs/source/mtxrun_dll.c index dc312a145..3e75cc9ab 100644 --- a/scripts/context/stubs/source/mtxrun_dll.c +++ b/scripts/context/stubs/source/mtxrun_dll.c @@ -128,23 +128,48 @@ __declspec(dllexport) int dllrunscript( int argc, char *argv[] ) // find texlua.exe - if ( !SearchPath( - getenv( "PATH" ), // path to search (optional) - (is_jit ? "luajittex.exe":"luatex.exe"), // file name to search - NULL, // file extension to add (optional) - MAX_PATH, // output buffer size - luatexpath, // output buffer pointer - &luatexfname ) // pointer to a file part in the output buffer (optional) - ) - if ( !SearchPath( - dirpath, // path to search (optional) - (is_jit ? "luajittex.exe":"luatex.exe"), // file name to search - NULL, // file extension to add (optional) - MAX_PATH, // output buffer size - luatexpath, // output buffer pointer - &luatexfname ) // pointer to a file part in the output buffer (optional) - ) - DIE( "unable to locate texlua.exe on the search path" ); + + local binary = "" + + if ( SearchPath( + getenv( "PATH" ), // path to search (optional) + (is_jit ? "luajittex.exe":"luatex.exe"), // file name to search + NULL, // file extension to add (optional) + MAX_PATH, // output buffer size + luatexpath, // output buffer pointer + &luatexfname ) // pointer to a file part in the output buffer (optional) + ) { + binary = is_jit ? "luajittex.exe":"luatex.exe" + } else if ( SearchPath( + dirpath, // path to search (optional) + (is_jit ? "luajittex.exe":"luatex.exe"), // file name to search + NULL, // file extension to add (optional) + MAX_PATH, // output buffer size + luatexpath, // output buffer pointer + &luatexfname ) // pointer to a file part in the output buffer (optional) + ) { + binary = is_jit ? "luajittex.exe":"luatex.exe" + } else if ( SearchPath( + getenv( "PATH" ), // path to search (optional) + (is_jit ? "texluajitexe":"texlua.exe"), // file name to search + NULL, // file extension to add (optional) + MAX_PATH, // output buffer size + luatexpath, // output buffer pointer + &luatexfname ) // pointer to a file part in the output buffer (optional) + ) { + binary= is_jit ? "texluajit.exe":"texlua.exe" + } else if ( SearchPath( + dirpath, // path to search (optional) + (is_jit ? "texluajit.exe":"texlua.exe"), // file name to search + NULL, // file extension to add (optional) + MAX_PATH, // output buffer size + luatexpath, // output buffer pointer + &luatexfname ) // pointer to a file part in the output buffer (optional) + ) { + binary = is_jit ? "texluajit.exe":"texlua.exe" + } else { + DIE( "unable to locate texlua.exe on the search path" ); + } // link directly with luatex.dll if available in texlua's dir @@ -159,7 +184,7 @@ __declspec(dllexport) int dllrunscript( int argc, char *argv[] ) lua_argv = (char **)malloc( (argc + 4) * sizeof(char *) ); if ( lua_argv == NULL ) DIE( "out of memory\n" ); - lua_argv[lua_argc=0] = (is_jit ? "luajittex.exe":"luatex.exe"); + lua_argv[lua_argc=0] = binary; lua_argv[++lua_argc] = "--luaonly"; lua_argv[++lua_argc] = scriptpath; // script to execute if (passprogname) { @@ -179,7 +204,7 @@ __declspec(dllexport) int dllrunscript( int argc, char *argv[] ) // we are still here, so no luatex.dll; spawn texlua.exe instead - strcpy( luatexfname,(is_jit ? "luajittex.exe":"luatex.exe")); + strcpy( luatexfname,binary); strcpy( cmdline, " --luaonly " ); strcpy( cmdline, "\"" ); strcat( cmdline, luatexpath ); diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 6aca0c324..94aad6d4f 100644 --- a/tex/context/base/cont-new.mkiv +++ b/tex/context/base/cont-new.mkiv @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2014.01.21 16:07} +\newcontextversion{2014.01.21 21:25} %D This file is loaded at runtime, thereby providing an excellent place for %D hacks, patches, extensions and new features. diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf Binary files differindex 8edd7684d..acbb535a2 100644 --- a/tex/context/base/context-version.pdf +++ b/tex/context/base/context-version.pdf diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index c9d05af02..e06b9d358 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -28,7 +28,7 @@ %D up and the dependencies are more consistent. \edef\contextformat {\jobname} -\edef\contextversion{2014.01.21 16:07} +\edef\contextversion{2014.01.21 21:25} \edef\contextkind {beta} %D For those who want to use this: diff --git a/tex/context/base/node-nut.lua b/tex/context/base/node-nut.lua index eb6d21646..b933ff096 100644 --- a/tex/context/base/node-nut.lua +++ b/tex/context/base/node-nut.lua @@ -232,6 +232,7 @@ local d_find_tail = direct.tail local d_insert_after = direct.insert_after local d_insert_before = direct.insert_before local d_slide = direct.slide +local d_copy_node = direct.copy local function remove(head,current,free_too) local t = current diff --git a/tex/context/base/page-lay.mkiv b/tex/context/base/page-lay.mkiv index 81eb0423c..19f237242 100644 --- a/tex/context/base/page-lay.mkiv +++ b/tex/context/base/page-lay.mkiv @@ -1026,12 +1026,12 @@ \unexpanded\def\startlayout[#1]% {\page - \pushmacro\currentlayout + \globalpushmacro\currentlayout \doiflayoutdefinedelse{#1}{\setuplayout[#1]}\donothing} % {\setuplayout[\currentlayout]}} \unexpanded\def\stoplayout {\page - \popmacro\currentlayout + \globalpopmacro\currentlayout \setuplayout[\currentlayout]} % NOG EENS NAGAAN WANNEER NU GLOBAL EN WANNEER NIET @@ -1275,7 +1275,7 @@ {\globalpopmacro\currentlayout \globalpopmacro\page_paper_restore \page_paper_restore - \setuplayout\relax} + \setuplayout[\currentlayout]\relax} % explicit ! %D \macros %D {showprint, showframe, showlayout, showsetups} diff --git a/tex/context/base/spac-ver.lua b/tex/context/base/spac-ver.lua index 66d7ca642..7d78d6c12 100644 --- a/tex/context/base/spac-ver.lua +++ b/tex/context/base/spac-ver.lua @@ -774,7 +774,7 @@ local splittopskip_code = skipcodes.splittopskip -- end local free_glue_node = free_node -local free_glue_spec = free_node +local free_glue_spec = function() end -- free_node function vspacing.snapbox(n,how) local sv = snapmethods[how] diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf Binary files differindex aca6c4612..e6a969988 100644 --- a/tex/context/base/status-files.pdf +++ b/tex/context/base/status-files.pdf diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf Binary files differindex 78427d0ff..6ddf05dac 100644 --- a/tex/context/base/status-lua.pdf +++ b/tex/context/base/status-lua.pdf diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua index e1c1e21a3..6fc688722 100644 --- a/tex/generic/context/luatex/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 01/21/14 16:07:10 +-- merge date : 01/21/14 21:25:09 do -- begin closure to overcome local limits and interference |