diff options
| -rw-r--r-- | scripts/context/ruby/base/tex.rb | 18 | ||||
| -rw-r--r-- | scripts/context/ruby/ctxtools.rb | 2 | ||||
| -rw-r--r-- | tex/context/base/cont-new.tex | 2 | ||||
| -rw-r--r-- | tex/context/base/context.tex | 2 | ||||
| -rw-r--r-- | tex/context/base/core-not.tex | 15 | ||||
| -rw-r--r-- | tex/context/base/core-var.tex | 3 | ||||
| -rw-r--r-- | tex/context/base/syst-ext.tex | 6 | ||||
| -rw-r--r-- | web2c/context.cnf | 8 |
8 files changed, 33 insertions, 23 deletions
diff --git a/scripts/context/ruby/base/tex.rb b/scripts/context/ruby/base/tex.rb index 1b526f6e5..eee599801 100644 --- a/scripts/context/ruby/base/tex.rb +++ b/scripts/context/ruby/base/tex.rb @@ -594,16 +594,16 @@ class TEX else report('updating file database') Kpse.update - end - if getvariable('luatex') then - begin - luatools = `texmfstart luatools --format=texmfscripts luatools.lua`.chomp.strip - unless luatools.empty? then - runcommand(["luatex","--luaonly=#{luatools}","--generate","--verbose"]) + if getvariable('luatex') then + begin + luatools = `texmfstart luatools --format=texmfscripts luatools.lua`.chomp.strip + unless luatools.empty? then + runcommand(["luatex","--luaonly=#{luatools}","--generate","--verbose"]) + end + rescue + report("run 'luatex --luaonly=....../luatools.lua --generate' manually") + exit end - rescue - report("run 'luatex --luaonly=....../luatools.lua --generate' manually") - exit end end # goody diff --git a/scripts/context/ruby/ctxtools.rb b/scripts/context/ruby/ctxtools.rb index 567c927a5..275739a72 100644 --- a/scripts/context/ruby/ctxtools.rb +++ b/scripts/context/ruby/ctxtools.rb @@ -1612,7 +1612,7 @@ class Commands @@languagedata['la' ] = [ 'ec' , ['lahyph.tex'] ] # mnhyph @@languagedata['nl' ] = [ 'ec' , ['nehyph96.tex'] ] - @@languagedata['no' ] = [ 'ec' , ['nohyph.tex'] ] + @@languagedata['no' ] = [ 'ec' , ['nohyphbx.tex','nohyph2.tex','nohyph1.tex','nohyph.tex'] ] @@languagedata['agr'] = [ 'agr' , [['grahyph4.tex','oldgrhyph.tex']] ] # new, todo @@languagedata['pl' ] = [ 'ec' , ['plhyph.tex'] ] @@languagedata['pt' ] = [ 'ec' , ['pthyph.tex'] ] diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex index a730ab928..638fb28ed 100644 --- a/tex/context/base/cont-new.tex +++ b/tex/context/base/cont-new.tex @@ -13,7 +13,7 @@ % it's about time to clean up this file ... -\newcontextversion{2006.12.20 23:52} +\newcontextversion{2007.01.02 10:34} %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.tex b/tex/context/base/context.tex index 76e3c7a54..ae1c3a151 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -42,7 +42,7 @@ %D your styles an modules. \edef\contextformat {\jobname} -\edef\contextversion{2006.12.27 11:34} +\edef\contextversion{2007.01.02 10:34} %D For those who want to use this: diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex index 1d764e412..c013dba40 100644 --- a/tex/context/base/core-not.tex +++ b/tex/context/base/core-not.tex @@ -673,6 +673,13 @@ \newconditional\processingnote +\def\footnotereferencefrom + {\rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}} + +\def\footnotereferenceto + {\global\advance\crossreferencenumber\minusone\relax % else problem, needs further testing + \rawreference\s!fnt{\s!fnt:t:\internalfootreference}{}} + \def\dostartnote% nog gobble als in pagebody {\bgroup \settrue\processingnote @@ -711,9 +718,9 @@ \fi \doifelse{\noteparameter\c!interaction}\v!no {\ifconditional\pagewisenotes - \rawreference\s!fnt{\s!fnt:t:\internalfootreference}{}% + \footnotereferenceto \fi}% - {\rawreference\s!fnt{\s!fnt:t:\internalfootreference}{}}}% + {\footnotereferenceto}}% \bgroup \postponenotes \aftergroup\dostopnote @@ -737,12 +744,12 @@ \doifelse{\noteparameter\c!interaction}\v!no {\dodonotesymbol{\lastnotenumber\domovednote\v!previouspage\v!nextpage}% \ifconditional\pagewisenotes - \rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}% + \footnotereferencefrom \fi} {\gotobox {\dodonotesymbol{\lastnotenumber\domovednote\v!previouspage\v!nextpage}}% [\s!fnt:t:\internalfootreference]% - \rawreference\s!fnt{\s!fnt:f:\internalfootreference}{}}% + \footnotereferencefrom}% \globallet\lastnotesymbol\relax} \let\lastnotesymbol\relax diff --git a/tex/context/base/core-var.tex b/tex/context/base/core-var.tex index 6b019d658..2317d7bf7 100644 --- a/tex/context/base/core-var.tex +++ b/tex/context/base/core-var.tex @@ -626,9 +626,6 @@ % \def\blabelgroup {\begingroup} % why no \let ? % \let\elabelgroup \endgroup - - - %D Concepts: \chardef\conceptmode\zerocount diff --git a/tex/context/base/syst-ext.tex b/tex/context/base/syst-ext.tex index 262d5f0b0..bee6049bf 100644 --- a/tex/context/base/syst-ext.tex +++ b/tex/context/base/syst-ext.tex @@ -2521,6 +2521,12 @@ {\scratchcounter#2% \setxvalue{#1}{\the\scratchcounter}} +\def\incrementcounter#1#2% #1 name #2 value + {\setxvalue{#1}{\the\numexpr\csname#1\endcsname+#2\relax}} + +\def\decrementcounter#1#2% #1 name #2 value + {\setxvalue{#1}{\the\numexpr\csname#1\endcsname-#2\relax}} + %D \macros %D {savecounter,restorecounter} %D diff --git a/web2c/context.cnf b/web2c/context.cnf index 4e9425b6f..5cd5cd824 100644 --- a/web2c/context.cnf +++ b/web2c/context.cnf @@ -205,10 +205,10 @@ mp_buf_size = 30000 mf_buf_size = 30000 mpost_buf_size = 30000 -max_print_line.pdftex = 250 -max_print_line.luatex = 250 -max_print_line.mpost = 250 -max_print_line.metafun = 250 +max_print_line.pdftex = 255 +max_print_line.luatex = 255 +max_print_line.mpost = 255 +max_print_line.metafun = 255 extra_mem_top.mptopdf = 1000000 extra_mem_bot.mptopdf = 1000000 |