From 39db6b1351a394a7510d41c1df0a16e1b04ed8b8 Mon Sep 17 00:00:00 2001 From: Marius Date: Fri, 4 Feb 2011 11:20:15 +0200 Subject: beta 2011.02.04 10:01 --- tex/context/base/back-pdf.mkiv | 24 +++++----- tex/context/base/catc-ini.mkiv | 66 ++++++++++++++-------------- tex/context/base/cont-new.mkii | 2 +- tex/context/base/cont-new.mkiv | 2 +- tex/context/base/context.mkii | 2 +- tex/context/base/context.mkiv | 2 +- tex/context/base/core-def.mkiv | 12 ----- tex/context/base/luat-ini.lua | 2 + tex/context/base/luat-run.lua | 22 ++++++++++ tex/context/base/math-ini.mkiv | 8 ++-- tex/context/base/status-files.pdf | Bin 23175 -> 23173 bytes tex/context/base/syst-ini.mkiv | 4 ++ tex/generic/context/luatex-fonts-merged.lua | 2 +- 13 files changed, 83 insertions(+), 65 deletions(-) diff --git a/tex/context/base/back-pdf.mkiv b/tex/context/base/back-pdf.mkiv index e0b1b46e6..392dc8984 100644 --- a/tex/context/base/back-pdf.mkiv +++ b/tex/context/base/back-pdf.mkiv @@ -37,17 +37,19 @@ %D We will minimize the number of calls to \PDF\ specific primitives %D and delegate all management and injection of code to the backend. %D -%D Here we initialize some internal quantities. - -\pdfoutput = 1 -\pdfhorigin = 1 true in -\pdfvorigin = 1 true in -\pdfimageresolution = 300 -\pdfpkresolution = 600 -\pdfdecimaldigits = 10 -\pdfinclusionerrorlevel = 0 -\pdfminorversion = 6 % maybe even 7 -%pdfuniqueresname = 1 +%D Here we initialize some internal quantities. We also protect them. + +\pdfoutput 1 \let\pdfoutput \undefined \newcount\pdfoutput \pdfoutput 1 +\pdfhorigin 1 true in \let\pdfhorigin\undefined \newdimen\pdfhorigin \pdfhorigin 1 true in +\pdfvorigin 1 true in \let\pdfvorigin\undefined \newdimen\pdfvorigin \pdfvorigin 1 true in + +% most of these will be protected as well + +\pdfimageresolution 300 +\pdfpkresolution 600 +\pdfdecimaldigits 10 +\pdfinclusionerrorlevel 0 +\pdfminorversion 6 % use setupbackend for changes %D This one can be consulted by users although the suffix is also %D a system mode. diff --git a/tex/context/base/catc-ini.mkiv b/tex/context/base/catc-ini.mkiv index 56a8f87e1..9221d17c5 100644 --- a/tex/context/base/catc-ini.mkiv +++ b/tex/context/base/catc-ini.mkiv @@ -316,39 +316,39 @@ % \tracecatcodetables -%D Only in \MKIV\ (to be used when crossing pages with changed catcodes -%D in the current vector): -%D -%D \starttyping -%D \normalprotected\def\startcrap -%D {\bgroup -%D \pushcatcodes -%D \whitespace -%D \obeylines -%D \activatespacehandler\v!yes -%D \strut} -%D -%D \normalprotected\def\stopcrap -%D {\popcatcodes -%D \egroup} -%D \stoptyping - -\newcount\catcodetablelevel - -\def\pushcatcodes - {\bgroup - \global\advance\catcodetablelevel\plusone - \ifcsname @@ccf:\number\catcodetablelevel\endcsname \else - \global\advance\cctdefcounter\plusone - \expandafter\global\expandafter\chardef\csname @@ccf:\number\catcodetablelevel\endcsname\cctdefcounter - \fi - \catcodetable\ctxcatcodes - \expandafter\savecatcodetable\csname @@ccf:\number\catcodetablelevel\endcsname - \egroup - \expandafter\catcodetable\csname @@ccf:\number\catcodetablelevel\endcsname} - -\def\popcatcodes - {\global\advance\catcodetablelevel\minusone} +% D Only in \MKIV\ (to be used when crossing pages with changed catcodes +% D in the current vector): +% D +% D \starttyping +% D \normalprotected\def\startcrap +% D {\bgroup +% D \pushcatcodes +% D \whitespace +% D \obeylines +% D \activatespacehandler\v!yes +% D \strut} +% D +% D \normalprotected\def\stopcrap +% D {\popcatcodes +% D \egroup} +% D \stoptyping +% +% \newcount\catcodetablelevel +% +% \def\pushcatcodes +% {\bgroup +% \global\advance\catcodetablelevel\plusone +% \ifcsname @@ccf:\number\catcodetablelevel\endcsname \else +% \global\advance\cctdefcounter\plusone +% \expandafter\global\expandafter\chardef\csname @@ccf:\number\catcodetablelevel\endcsname\cctdefcounter +% \fi +% \catcodetable\ctxcatcodes +% \expandafter\savecatcodetable\csname @@ccf:\number\catcodetablelevel\endcsname +% \egroup +% \expandafter\catcodetable\csname @@ccf:\number\catcodetablelevel\endcsname} +% +% \def\popcatcodes +% {\global\advance\catcodetablelevel\minusone} \endinput diff --git a/tex/context/base/cont-new.mkii b/tex/context/base/cont-new.mkii index fa64d0998..a171025fa 100644 --- a/tex/context/base/cont-new.mkii +++ b/tex/context/base/cont-new.mkii @@ -11,7 +11,7 @@ %C therefore copyrighted by \PRAGMA. See mreadme.pdf for %C details. -\newcontextversion{2011.02.04 00:30} +\newcontextversion{2011.02.04 10:01} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv index 6a5e1e7ef..f077a9bb2 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{2011.02.04 00:30} +\newcontextversion{2011.02.04 10:01} %D This file is loaded at runtime, thereby providing an %D excellent place for hacks, patches, extensions and new diff --git a/tex/context/base/context.mkii b/tex/context/base/context.mkii index dd590a9ae..71000f4ad 100644 --- a/tex/context/base/context.mkii +++ b/tex/context/base/context.mkii @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.02.04 00:30} +\edef\contextversion{2011.02.04 10:01} %D For those who want to use this: diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv index 1768d5269..cfe2cedaa 100644 --- a/tex/context/base/context.mkiv +++ b/tex/context/base/context.mkiv @@ -20,7 +20,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2011.02.04 00:30} +\edef\contextversion{2011.02.04 10:01} %D For those who want to use this: diff --git a/tex/context/base/core-def.mkiv b/tex/context/base/core-def.mkiv index 36cd323b1..59c2c89c1 100644 --- a/tex/context/base/core-def.mkiv +++ b/tex/context/base/core-def.mkiv @@ -92,16 +92,4 @@ \synchronizelocallinespecs \to \everyswitchtobodyfont -\def\synctexwarning - {\ifdefined\synctex \ifnum\synctex=\zerocount \else - \writeline - \writestatus\m!systems{BEWARE: synctex functionality is enabled!}% - \writeline - \globallet\synctexwarning\relax - \fi \fi} - -\prependtoks \synctexwarning \to \everyjob -\prependtoks \synctexwarning \to \everystarttext -\appendtoks \synctexwarning \to \everystoptext - \protect \endinput diff --git a/tex/context/base/luat-ini.lua b/tex/context/base/luat-ini.lua index cd79cd492..9a8651a9c 100644 --- a/tex/context/base/luat-ini.lua +++ b/tex/context/base/luat-ini.lua @@ -6,6 +6,8 @@ if not modules then modules = { } end modules ['luat-ini'] = { license = "see context related readme files" } +-- rather experimental down here ... will change with lua 5.2 -- + --~ local ctxcatcodes = tex.ctxcatcodes local debug = require "debug" diff --git a/tex/context/base/luat-run.lua b/tex/context/base/luat-run.lua index 580137d8a..77147c862 100644 --- a/tex/context/base/luat-run.lua +++ b/tex/context/base/luat-run.lua @@ -113,3 +113,25 @@ function luatex.cleanuptempfiles() end luatex.registerstopactions(luatex.cleanuptempfiles) + +-- for the moment here + +local synctex = false + +local report_system = logs.new("system") + +directives.register("system.synctex", function(v) + synctex = v + if v then + report_system("synctex functionality is enabled!") + else + report_system("synctex functionality is disabled!") + end + tex.synctex = synctex and 1 or 0 +end) + +statistics.register("synctex tracing",function() + if synctex or tex.synctex > 0 then + return "syntex has been enabled (extra log file generated)" + end +end) diff --git a/tex/context/base/math-ini.mkiv b/tex/context/base/math-ini.mkiv index 5d1c7e8b7..ce487702d 100644 --- a/tex/context/base/math-ini.mkiv +++ b/tex/context/base/math-ini.mkiv @@ -397,17 +397,17 @@ \newconditional \knuthmode \def\nonknuthmode - {\pushcatcodes + {\pushcatcodetable \setcatcodetable\ctxcatcodes \the\everynonknuthmode \let\nonknuthmode\relax - \popcatcodes} + \popcatcodetable} \def\donknuthmode - {\pushcatcodes + {\pushcatcodetable \setcatcodetable\ctxcatcodes \the\everydonknuthmode - \popcatcodes} + \popcatcodetable} \bgroup diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf index b7e3252c4..c5fbf7ba6 100644 Binary files a/tex/context/base/status-files.pdf and b/tex/context/base/status-files.pdf differ diff --git a/tex/context/base/syst-ini.mkiv b/tex/context/base/syst-ini.mkiv index 5f9162aa2..293ce4258 100644 --- a/tex/context/base/syst-ini.mkiv +++ b/tex/context/base/syst-ini.mkiv @@ -904,6 +904,10 @@ \edef\texengineversion{0} \fi +%D We only can set this one via directives (system.synctex). + +\let\synctex\undefined \newcount\synctex + %D While cleaning this code up a bit I was listening to Heather %D Nova's \CD\ Redbird. The first song on that \CD\ ends with %D a few lines suitable for ending this initialization module: diff --git a/tex/generic/context/luatex-fonts-merged.lua b/tex/generic/context/luatex-fonts-merged.lua index cae16b0c3..eb4c35d4a 100644 --- a/tex/generic/context/luatex-fonts-merged.lua +++ b/tex/generic/context/luatex-fonts-merged.lua @@ -1,6 +1,6 @@ -- merged file : luatex-fonts-merged.lua -- parent file : luatex-fonts.lua --- merge date : 02/04/11 00:30:28 +-- merge date : 02/04/11 10:01:54 do -- begin closure to overcome local limits and interference -- cgit v1.2.3