diff options
32 files changed, 272 insertions, 177 deletions
diff --git a/context/data/type-buy.dat b/context/data/type-buy.dat index 97aacf7c7..0693d3b25 100644 --- a/context/data/type-buy.dat +++ b/context/data/type-buy.dat @@ -3,13 +3,13 @@ --en=? --ve=itc --co=officina --re --en=? --ve=itc --co=officina --so=itc/officina --ma --in ---en=? --ve=itc --co=officina --so=itc/officina --ca=* ovbk_* ---en=? --ve=itc --co=officina --so=itc/officina --sl=* ovbk_* ---en=? --ve=itc --co=officina --so=itc/officina --sl=* ovb_* +--en=? --ve=itc --co=officina --so=itc/officina --ca=* --pattern=ovbk_* +--en=? --ve=itc --co=officina --so=itc/officina --sl=* --pattern=ovbk_* +--en=? --ve=itc --co=officina --so=itc/officina --sl=* --pattern=ovb_* ---en=? --ve=itc --co=officina --so=itc/officina --ca=* owbk_* ---en=? --ve=itc --co=officina --so=itc/officina --sl=* owbk_* ---en=? --ve=itc --co=officina --so=itc/officina --sl=* owb_* +--en=? --ve=itc --co=officina --so=itc/officina --ca=* --pattern=owbk_* +--en=? --ve=itc --co=officina --so=itc/officina --sl=* --pattern=owbk_* +--en=? --ve=itc --co=officina --so=itc/officina --sl=* --pattern=owb_* # bh lucida @@ -22,8 +22,8 @@ --en=? --ve=fontfont --co=meta --so=fontfont/meta-1 --ma --in --expert --en=? --ve=fontfont --co=meta --so=fontfont/meta-2 --ma --in --expert ---en=? --ve=fontfont --co=meta --so=fontfont/meta-1 --sl=* mtbk_* ---en=? --ve=fontfont --co=meta --so=fontfont/meta-1 --sl=* mtbd_* +--en=? --ve=fontfont --co=meta --so=fontfont/meta-1 --sl=* --pattern=mtbk_* +--en=? --ve=fontfont --co=meta --so=fontfont/meta-1 --sl=* --pattern=mtbd_* # lucas sun @@ -68,11 +68,11 @@ --en=? --so=adobe/myriad --weight=400 --width=600 MyriadMM-It --en=? --so=adobe/myriad --weight=700 --width=600 MyriadMM-It ---en=? --ve=adobe --co=myriad --so=adobe/myriad --ma --in MyriadMM-we* ---en=? --ve=adobe --co=myriad --so=adobe/myriad --ma --in MyriadMM-It-we* +--en=? --ve=adobe --co=myriad --so=adobe/myriad --ma --in --pattern=MyriadMM-we* +--en=? --ve=adobe --co=myriad --so=adobe/myriad --ma --in --pattern=MyriadMM-It-we* ---en=? --ve=adobe --co=myriad --so=adobe/myriad --sl=* MyriadMM-we* ---en=? --ve=adobe --co=myriad --so=adobe/myriad --ca=* MyriadMM-we* +--en=? --ve=adobe --co=myriad --so=adobe/myriad --sl=* --pattern=MyriadMM-we* +--en=? --ve=adobe --co=myriad --so=adobe/myriad --ca=* --pattern=MyriadMM-we* # adobe frutiger diff --git a/context/data/type-fsf.dat b/context/data/type-fsf.dat index 1bb6fcbbb..c303bdcd8 100644 --- a/context/data/type-fsf.dat +++ b/context/data/type-fsf.dat @@ -1,23 +1,25 @@ +# Please use the originals instead ! ! ! ! ! + # fontsite opus --en=? --ve=fontsite --co=opus --re ---en=? --ve=fontsite --co=opus --so=fsf/all --ma --in opus* +--en=? --ve=fontsite --co=opus --so=fsf/all --ma --in --pattern=opus* ---en=? --ve=fontsite --co=opus --so=fsf/all --sl=* opusrg_* ---en=? --ve=fontsite --co=opus --so=fsf/all --sl=* opusb_* +--en=? --ve=fontsite --co=opus --so=fsf/all --sl=* --pattern=opusrg_* +--en=? --ve=fontsite --co=opus --so=fsf/all --sl=* --pattern=opusb_* # fontsite typewriter --en=? --ve=fontsite --co=typewriter --re ---en=? --ve=fontsite --co=typewriter --so=fsf/all --ma --in type* +--en=? --ve=fontsite --co=typewriter --so=fsf/all --ma --in --pattern=type* ---en=? --ve=fontsite --co=typewriter --so=fsf/all --sl=* typerg_* ---en=? --ve=fontsite --co=typewriter --so=fsf/all --sl=* typeb_* +--en=? --ve=fontsite --co=typewriter --so=fsf/all --sl=* --pattern=typerg_* +--en=? --ve=fontsite --co=typewriter --so=fsf/all --sl=* --pattern=typeb_* # fontsite garamond --en=? --ve=fontsite --co=garamond --re ---en=? --ve=fontsite --co=garamond --so=fsf/all --ma --in gara* +--en=? --ve=fontsite --co=garamond --so=fsf/all --ma --in --pattern=gara* ---en=? --ve=fontsite --co=garamond --so=fsf/all --sl=* garamond* ---en=? --ve=fontsite --co=garamond --so=fsf/all --sl=* garab_*
\ No newline at end of file +--en=? --ve=fontsite --co=garamond --so=fsf/all --sl=* --pattern=garamond* +--en=? --ve=fontsite --co=garamond --so=fsf/all --sl=* --pattern=garab_* diff --git a/scripts/context/perl/texexec.pl b/scripts/context/perl/texexec.pl index daf640bbf..1ee2cc41b 100644 --- a/scripts/context/perl/texexec.pl +++ b/scripts/context/perl/texexec.pl @@ -81,7 +81,7 @@ my $TotalTime = time; # if ( $RandomSeed > 1440 ) { $RandomSeed -= 1440 } my ($sec, $min) = gmtime; -my $RandomSeed = ($min * 60 + $sec) % 1440; +my $RandomSeed = ($min * 60 + $sec) % 2880; # else still overflow # See usage of $Random and $RandomSeed later on. # @@ -2758,37 +2758,12 @@ if ( $SetFile ne "" ) { load_set_file( $SetFile, $Verbose ) } sub check_texmf_root { } sub check_texmf_tree { } -#~ sub AnalyzeVersion - #~ { my ($texengine,$type); - #~ open (LOG, "<texvers.log") ; - #~ while (<LOG>) - #~ { /^\s*This is (.*pdf(|e)TeX.*?) \(format.*$/o and $texengine = $1 ; - #~ /^\s*ConTeXt (.*int: ([a-z]+).*?)\s*$/o and $type = $1; } - #~ $type =~ s/ int: ([a-z]+)//; - #~ $texengine =~ s/ Version//; - #~ close (LOG); - #~ return ($texengine,$type) } - -#~ sub AnalyzeVersion - #~ { my $str = join("\n", @_) ; - #~ my ($texengine,$type); - #~ if ($str =~ /^\s*This is (.*pdf(|e)TeX.*?) \(format.*$/mos) { - #~ $texengine = $1 ; - #~ } - #~ if ($str =~ /^\s*ConTeXt (.*int: ([a-z]+).*?)\s*$/mos) { - #~ $type = $1 ; - #~ } - #~ $type =~ s/ int: ([a-z]+)//; - #~ $texengine =~ s/ Version//; - #~ return ($texengine,$type) } - - sub AnalyzeVersion { my $str = join("\n", @_) ; my ($texengine,$type) = ('unknown', 'unknown'); open (LOG, "<texvers.log") ; while (<LOG>) - { /^\s*This is (.*pdf(|e)TeX.*?)$/o and $texengine = $1 ; + { /^\s*This is (.*pdf(|e|x)TeX.*?)$/o and $texengine = $1 ; /^\s*ConTeXt (.*int: ([a-z]+).*?)\s*$/o and $type = $1; } $type =~ s/ int: ([a-z]+)//; $texengine =~ s/ Version//; diff --git a/scripts/context/perl/texfont.pl b/scripts/context/perl/texfont.pl index 2b80a87d5..a39be0d94 100644 --- a/scripts/context/perl/texfont.pl +++ b/scripts/context/perl/texfont.pl @@ -8,6 +8,10 @@ eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' && eval 'exec perl -S $0 $ # todo : ttf (partially doen already) +# added: $pattern in order to avoid fuzzy shelle expansion of +# filenames (not consistent over perl and shells); i hate that +# kind of out of control features. + #D \module #D [ file=texfont.pl, #D version=2004.02.06, % 2000.12.14 @@ -141,6 +145,7 @@ my $expert = 0 ; my $trace = 0 ; my $afmpl = 0 ; my $trees = 'TEXMFFONTS,TEXMFLOCAL,TEXMFEXTRA,TEXMFMAIN' ; +my $pattern = '' ; my $fontsuffix = "" ; my $namesuffix = "" ; @@ -194,6 +199,7 @@ my @cleanup = () ; # atl: build list of generated files to delete "afmpl" => \$afmpl, "afm2pl" => \$afmpl, "rootlist=s" => \$trees, + "pattern=s" => \$pattern, "trace" => \$trace, # --verbose conflicts with --ve "preproc" => \$preproc, # atl: trigger conversion to pfb "lcdf" => \$lcdf ) ; # atl: trigger use of lcdf fonttoools @@ -249,7 +255,7 @@ sub error { # The banner. print "\n" ; -report ("TeXFont 2.2.0 - ConTeXt / PRAGMA ADE 2000-2004") ; +report ("TeXFont 2.2.1 - ConTeXt / PRAGMA ADE 2000-2004") ; print "\n" ; # Handy for scripts: one can provide a preferred path, if it @@ -629,7 +635,7 @@ if ($variant) { report "encoding variant : $variant" } if ($install) { report "source path : $sourcepath" } -my $fntlist = my $pattern = "" ; +my $fntlist = "" ; my $runpath = $sourcepath ; @@ -691,9 +697,10 @@ sub globafmfiles } return @files } -if ($ARGV[0]) - { $pattern = $ARGV[0] ; - report ("processing files : all in pattern $ARGV[0]") ; +if ($pattern eq '') { if ($ARGV[0]) { $pattern = $ARGV[0] } } + +if ($pattern ne '') + { report ("processing files : all in pattern $pattern") ; @files = globafmfiles($runpath,$pattern) } elsif ("$extend$narrow$slant$spaced$caps" ne "") { error ("transformation needs file spec") } diff --git a/scripts/context/ruby/ctxtools.rb b/scripts/context/ruby/ctxtools.rb index 5af38f25f..a7af031d1 100644 --- a/scripts/context/ruby/ctxtools.rb +++ b/scripts/context/ruby/ctxtools.rb @@ -8,6 +8,8 @@ # This script will harbor some handy manipulations on context # related files. +# todo: move scite here + banner = ['CtxTools', 'version 1.0', '2004', 'PRAGMA ADE/POD'] unless defined? ownpath @@ -98,9 +100,61 @@ class Commands end + def jeditinterface + + return unless FileTest.file?("cont-en.xml") + + interfaces = @commandline.arguments + + if interfaces.empty? then + interfaces = ['en', 'cz','de','it','nl','ro'] + end + + interfaces.each do |interface| + begin + collection = Hash.new + mappings = Hash.new + if f = open("keys-#{interface}.xml") then + while str = f.gets do + if str =~ /\<cd\:command\s+name=\"(.*?)\"\s+value=\"(.*?)\".*?\>/o then + mappings[$1] = $2 + end + end + f.close + if f = open("cont-en.xml") then + while str = f.gets do + if str =~ /\<cd\:command\s+name=\"(.*?)\"\s+type=\"environment\".*?\>/o then + collection["start#{mappings[$1]}"] = '' + collection["stop#{mappings[$1]}"] = '' + elsif str =~ /\<cd\:command\s+name=\"(.*?)\".*?\>/o then + collection["#{mappings[$1]}"] = '' + end + end + f.close + if f = open("context-jedit-#{interface}.xml", 'w') then + f.puts("<?xml version='1.0'?>\n\n") + f.puts("<!DOCTYPE MODE SYSTEM 'xmode.dtd'>\n\n") + f.puts("<MODE>\n") + f.puts(" <RULES>\n") + f.puts(" <KEYWORDS>\n") + collection.keys.sort.each do |name| + f.puts(" <KEYWORD2>\\#{name}</KEYWORD2>\n") unless name.empty? + end + f.puts(" </KEYWORDS>\n") + f.puts(" </RULES>\n") + f.puts("</MODE>\n") + f.close + end + end + end + end + end + + end + def translateinterface - # since we know what kind of file we're dealign with, + # since we know what kind of file we're dealing with, # we do it quick and dirty instead of using rexml or # xslt @@ -200,6 +254,7 @@ commandline = CommandLine.new commandline.registeraction('touchcontextfile', '') commandline.registeraction('translateinterface', '') +commandline.registeraction('jeditinterface', '') commandline.registeraction('help') commandline.registeraction('version') diff --git a/scripts/context/ruby/texmfstart.rb b/scripts/context/ruby/texmfstart.rb index bdf2aa212..74d9e3d24 100644 --- a/scripts/context/ruby/texmfstart.rb +++ b/scripts/context/ruby/texmfstart.rb @@ -2,7 +2,7 @@ # program : texmfstart # copyright : PRAGMA Advanced Document Engineering -# version : 1.04 - 2003/2004 +# version : 1.05 - 2003/2004 # author : Hans Hagen # # project : ConTeXt / eXaMpLe @@ -20,10 +20,15 @@ # turning this into a service would be nice, so some day ... +# --locate => provides location +# --exec => exec instead of system +# --iftouched=a,b => only if timestamp a<>b + require "rbconfig" $mswindows = Config::CONFIG['host_os'] =~ /mswin/ $separator = File::PATH_SEPARATOR +$version = "1.05" if $mswindows then @@ -83,6 +88,27 @@ else end + +class File + + def File.needsupdate(oldname,newname) + begin + return File.stat(oldname).mtime != File.stat(newname).mtime + rescue + return true + end + end + + def File.syncmtimes(oldname,newname) + begin + t = File.mtime(oldname) # i'm not sure if the time is frozen, so we do it here + File.utime(0,t,newname) + rescue + end + end + +end + $applications = Hash.new $suffixinputs = Hash.new $predefined = Hash.new @@ -99,9 +125,11 @@ $predefined['texfont'] = 'texfont.pl' $predefined['examplex'] = 'examplex.rb' $predefined['concheck'] = 'concheck.rb' $predefined['textools'] = 'textools.rb' +$predefined['ctxtools'] = 'ctxtools.rb' $predefined['pdftools'] = 'pdftools.rb' $predefined['exatools'] = 'exatools.rb' $predefined['xmltools'] = 'xmltools.rb' +$predefined['pstopdf'] = 'pstopdf.rb' $scriptlist = 'rb|pl|py|jar' $documentlist = 'pdf|ps|eps|htm|html' @@ -163,7 +191,9 @@ def expanded(arg) end def runcommand(command) - if $execute then + if $locate then + print(command) + elsif $execute then report("using 'exec' instead of 'system' call") if $verbose exec(command) else @@ -213,15 +243,17 @@ def report(str) end def usage - print "version : 1.05 - 2003/2004 - www.pragma-ade.com\n" + print "version : #{$version} - 2003/2004 - www.pragma-ade.com\n" print("\n") print("usage : texmfstart [switches] filename [optional arguments]\n") print("\n") - print("switches : --verbose --report --browser --direct --execute\n") + print("switches : --verbose --report --browser --direct --execute --locate\n") print(" --program --file --page --arguments\n") print(" --make --lmake --wmake\n") print("\n") print("example : texmfstart pstopdf.rb cow.eps\n") + print(" texmfstart --locate examplex.rb\n") + print(" texmfstart --execute examplex.rb\n") print(" texmfstart --browser examplap.pdf\n") print(" texmfstart showcase.pdf\n") print(" texmfstart --page=2 --file=showcase.pdf\n") @@ -496,6 +528,7 @@ $report = $directives['report'] || false $verbose = $directives['verbose'] || false $arguments = $directives['arguments'] || '' $execute = $directives['execute'] || $directives['exec'] || false +$locate = $directives['locate'] || false $make = $directives['make'] || false $unix = $directives['unix'] || false @@ -503,6 +536,8 @@ $windows = $directives['windows'] || false $stubpath = $directives['stubpath'] || '' $indirect = $directives['indirect'] || false +$iftouched = $directives['iftouched'] || false + $applications['unknown'] = '' $applications['perl'] = $applications['pl'] = 'perl' $applications['ruby'] = $applications['rb'] = 'ruby' @@ -522,20 +557,44 @@ end $applications['htm'] = $applications['html'] $applications['eps'] = $applications['ps'] +def process(&block) + + if $iftouched then + files = $directives['iftouched'].split(',') + oldname, newname = files[0], files[1] + if oldname && newname && File.needsupdate(oldname,newname) then + yield + File.syncmtimes(oldname,newname) + end + else + yield + end + +end + +# system("perl -V") + if $help || ! $filename || $filename.empty? then usage -elsif $make then - if $windows then - make($filename,true,false) - elsif $unix then - make($filename,false,true) +else + report("texmfstart version #{$version}") if $verbose + if $make then + if $windows then + make($filename,true,false) + elsif $unix then + make($filename,false,true) + else + make($filename,$mswindows,!$mswindows) + end + elsif $browser && $filename =~ /^http\:\/\// then + launch($filename) else - make($filename,$mswindows,!$mswindows) + process do + if $direct || $filename =~ /^bin\:/ then + direct($filename) + else + run(find(shortpathname($filename),$program)) + end + end end -elsif $browser && $filename =~ /^http\:\/\// then - launch($filename) -elsif $direct || $filename =~ /^bin\:/ then - direct($filename) -else - run(find(shortpathname($filename),$program)) end diff --git a/tex/context/base/colo-ini.tex b/tex/context/base/colo-ini.tex index caed6a63e..93c258897 100644 --- a/tex/context/base/colo-ini.tex +++ b/tex/context/base/colo-ini.tex @@ -1035,15 +1035,6 @@ %D We need to register spot colors (i.e.\ resources need to %D be created. -% \def\registerspotcolor#1:% -% {\ifundefined{\??cl:\c!p:\@@cl@@n}% -% \letgvalue{\??cl:\c!p:\@@cl@@n}\empty -% %\@EA\@EA\csname registerspotcolor#1\endcsname -% \csname registerspotcolor#1\@EA\endcsname -% \else -% \@EA\dontregisterspotcolor -% \fi} - \def\registerspotcolor#1:% {\ifundefined{\??cl:\c!p:\@@cl@@n}% \letgvalue{\??cl:\c!p:\@@cl@@n}\empty @@ -1053,12 +1044,6 @@ \@EA\dontregisterspotcolor \fi} -% \def\dontregisterspotcolor #1\od{} -% \def\registerspotcolorR #1:#2:#3:#4\od{\doregisterrgbspotcolor \@@cl@@n{#1}{#2}{#3}} -% \def\registerspotcolorC#1:#2:#3:#4:#5\od{\doregistercmykspotcolor\@@cl@@n{#1}{#2}{#3}{#4}} -% \def\registerspotcolorS #1:#2\od{\doregistergrayspotcolor\@@cl@@n{#1}} -% \def\registerspotcolorP #1:#2:#3\od{\doregistergrayspotcolor\@@cl@@n{#2}} - \def\dontregisterspotcolor #1\od{} \def\registerspotcolorR #1:#2:#3:#4\od{\doregisterrgbspotcolor \@@cl@@n\@@cl@@f\@@cl@@d\@@cl@@p{#1}{#2}{#3}} \def\registerspotcolorC#1:#2:#3:#4:#5\od{\doregistercmykspotcolor\@@cl@@n\@@cl@@f\@@cl@@d\@@cl@@p{#1}{#2}{#3}{#4}} diff --git a/tex/context/base/cont-log.tex b/tex/context/base/cont-log.tex index 92b04e9c9..463df089a 100644 --- a/tex/context/base/cont-log.tex +++ b/tex/context/base/cont-log.tex @@ -225,7 +225,7 @@ \let\ETEX \eTeX \let\PDFTEX \pdfTeX \let\PDFETEX \pdfeTeX -\let\PDFETEX \XeTeX +\let\XETEX \XeTeX \def\XML {XML} \def\MATHML {MathML} diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex index e774c83a8..f5b5b81f5 100644 --- a/tex/context/base/context.tex +++ b/tex/context/base/context.tex @@ -31,7 +31,7 @@ %D 2004.8.30 the low level interface is english. Watch out and adapt %D your styles an modules. -\def\contextversion{2004.11.23} +\def\contextversion{2004.12.06} %D Welcome to the main module. When this module is ran through %D \type{initex} or \type {tex -i} or \type {whatevertex} using diff --git a/tex/context/base/core-con.tex b/tex/context/base/core-con.tex index a8d8f9fc5..bfe3783d1 100644 --- a/tex/context/base/core-con.tex +++ b/tex/context/base/core-con.tex @@ -847,11 +847,21 @@ \beginXETEX \number -\defineconversionvector{arabicnumerals} {"0660} -\defineconversionvector{persiannumerals}{"06F0} - -\defineconversion[arabicnumerals] [\conversionnumber{arabicnumerals}] -\defineconversion[persiannumerals][\conversionnumber{persiannumerals}] +\defineconversionvector{arabicnumerals} {"0660} +\defineconversionvector{persiannumerals} {"06F0} +\defineconversionvector{thainumerals} {"0E50} +\defineconversionvector{devanagarinumerals}{"0966} +\defineconversionvector{gurmurkhinumerals} {"0A66} +\defineconversionvector{gujaratinumerals} {"0AE6} +\defineconversionvector{tibetannumerals} {"0F20} % also "half numerals?" + +\defineconversion[arabicnumerals] [\conversionnumber{arabicnumerals}] +\defineconversion[persiannumerals] [\conversionnumber{persiannumerals}] +\defineconversion[thainumerals] [\conversionnumber{thainumerals}] +\defineconversion[devanagarinumerals][\conversionnumber{devanagarinumerals}] +\defineconversion[gurmurkhinumerals] [\conversionnumber{gurmurkhinumerals}] +\defineconversion[gujaratinumerals] [\conversionnumber{gujaratinumerals}] +\defineconversion[tibetannumerals] [\conversionnumber{tibetannumerals}] \endXETEX diff --git a/tex/context/base/core-fig.tex b/tex/context/base/core-fig.tex index d90c0287e..8c6446002 100644 --- a/tex/context/base/core-fig.tex +++ b/tex/context/base/core-fig.tex @@ -272,7 +272,7 @@ \processcommacommand[\figurepathlist]\dododoanalyzefigurefiles \fi} -\def\dododoanalyzefigurefiles#1% +\def\dododoanalyzefigurefiles#1% todo: use the \applied ones, less messy {\ifcase\figurestatus \def\@@efcurrentpath{#1}% \sanitizefilename#1\to\@@efcurrentpath @@ -718,7 +718,7 @@ {\setupexternalfigures [\c!option=,\c!maxwidth=,\c!maxheight=, %\c!splitcolor=,% needed ? - \c!foregroundcolor=, + \c!foregroundcolor=,\c!color=, \c!frame=\v!off,\c!background=]} %D Since we only need to reset some parameters, we can @@ -728,7 +728,7 @@ {\getparameters[\??ef] [\c!option=,\c!maxwidth=,\c!maxheight=, %\c!splitcolor=,% needed ? - \c!foregroundcolor=, + \c!foregroundcolor=,\c!color=, \c!frame=\v!off,\c!background=]} %D This one dropped the runtime of the \MAPS\ bibliography @@ -740,6 +740,7 @@ \let\@@efmaxwidth \empty \let\@@efmaxheight \empty \let\@@efframe \v!off + \let\@@efcolor \empty \let\@@efforegroundcolor\empty \let\@@efbackground \empty} @@ -1404,6 +1405,8 @@ \def\appliedfigureidentifier{\@@efobjectname} \def\appliedfigureoptions {\@@efoption} +\def\appliedfigurefilesuffix{\figureextension{\@@efcurrenttype}} + %D In \PDF\ one can specify an alternative graphic. This means %D that for instance a low resolution graphic can be used for %D viewing and a high res one for printing. Because this diff --git a/tex/context/base/core-lst.tex b/tex/context/base/core-lst.tex index 0d5b0f0de..b3283bb65 100644 --- a/tex/context/base/core-lst.tex +++ b/tex/context/base/core-lst.tex @@ -409,24 +409,12 @@ \setvalue{\@@dodolijstelement f}{\let\dosomelijstelement\dodofixdlijstelementF} \setvalue{\@@dodolijstelement g}{\let\dosomelijstelement\dodofixdlijstelementG} -\setvalue{\@@dodolijstelement\v!none}% - {\def\dosomelijstelement{\dodofreevlijstelement}} +\setvalue{\@@dodolijstelement\v!none }{\def\dosomelijstelement{\dodofreevlijstelement}} +\setvalue{\@@dodolijstelement\v!vertical }{\def\dosomelijstelement{\dodofreevlijstelement}} +\setvalue{\@@dodolijstelement\v!horizontal}{\def\dosomelijstelement{\dodofreehlijstelement}} +\setvalue{\@@dodolijstelement\v!command }{\let\dosomelijstelement\dodocommandlijstelement} -\setvalue{\@@dodolijstelement\v!vertical}% - {\def\dosomelijstelement{\dodofreevlijstelement}} - -\setvalue{\@@dodolijstelement\v!horizontal}% - {\def\dosomelijstelement{\dodofreehlijstelement}} - -\setvalue{\@@dodolijstelement\v!command}% - {\let\dosomelijstelement\dodocommandlijstelement} - -% Here I learned something new: \leftskip can be changed -% within a paragraph and the last one counts. Therefore we -% cannot use \bgroup's! The placement of the \leftskip -% assignment and the \endgraf's may not be changed. We have to -% end the preceding paragraph before changing \leftskip. This is -% because every listelement sets the \leftskip. +% don't mess arround with endgraf/grouping else we loose leftskip % \strippedcsname\dodolijstelement @@ -546,9 +534,12 @@ {\hbox{##2}}}% \doifvalue{\??li#1\c!interaction}\v!text % not supported {\setlistparameter{#1}\c!interaction\v!all}% +% \makelijstelement\v!all +% {\hbox to \hsize \makelijstelement\v!all - {\hbox to \hsize - {\dostartattributes{\??li#1}\c!style\c!color\empty + {\setlocalhsize \hsize\localhsize \hbox to \hsize + {\forgetall + \dostartattributes{\??li#1}\c!style\c!color\empty \!!widthb\hsize \setbox2\hbox \ifdim\!!widtha>\zeropoint to \!!widtha \fi {\makelijstelement\v!sectionnumber @@ -611,6 +602,28 @@ \allowbreak \getvalue{\??li#1\c!after}} +% % example from the context list +% +% \setuphead [part] [page=right,placehead=yes] +% \setuplist [chapter] [alternative=d,before=\blank,after=\blank] +% \setuplist [part] [before=\blank,after=\blank] +% +% \starttext +% \startnarrower[2*right] \placecontent \stopnarrower +% \blank[4*big] +% \startsetups chapter +% \blank \startnarrower[3*middle] \placecontent[criterium=local] \stopnarrower +% \stopsetups +% \placelist[part][criterium=text,after=\setups{chapter}] +% +% \part{First part} \chapter{Chapter one} \chapter{Chapter two} +% \chapter{Chapter three} \chapter{Chapter four} \chapter{Chapter five} +% \part{Second part} \chapter{Chapter one} \chapter{Chapter two} +% \chapter{Chapter three} \chapter{Chapter four} \chapter{Chapter five} +% \part{Third part} \chapter{Chapter one} \chapter{Chapter two} +% \chapter{Chapter three} \chapter{Chapter four} \chapter{Chapter five} +% \stoptext + % overrulen interactie kan sneller, bv door hulpconstanten % te gebruiken en die te letten diff --git a/tex/context/base/core-new.tex b/tex/context/base/core-new.tex index 9c5ec0578..3909356d2 100644 --- a/tex/context/base/core-new.tex +++ b/tex/context/base/core-new.tex @@ -212,7 +212,7 @@ {\docheckforallmodes\gobbleoneargument\firstofoneargument} \long\def\dostartallmodes[#1]% - {\docheckallformodes\donothing\dostopallmodes{#1}} + {\docheckforallmodes\donothing\dostopallmodes{#1}} \long\def\dostartnotallmodes[#1]% {\docheckforallmodes\dostopallmodes\donothing{#1}} diff --git a/tex/context/base/core-not.tex b/tex/context/base/core-not.tex index 5cde5fb57..9d06c0567 100644 --- a/tex/context/base/core-not.tex +++ b/tex/context/base/core-not.tex @@ -872,10 +872,10 @@ %D \stoptyping \def\dosynchronizenotes - {\insert\currentnoteins{\unvbox\currentnoteins}} + {\ifvoid\currentnoteins\else\insert\currentnoteins{\unvbox\currentnoteins}\fi} \def\synchronizenotes - {\ifvoid\currentnoteins\else\processnotes\dosynchronizenotes\fi} + {\processnotes\dosynchronizenotes} %D There are several placement alternatives. diff --git a/tex/context/base/core-ref.tex b/tex/context/base/core-ref.tex index 9f5444841..238fd3390 100644 --- a/tex/context/base/core-ref.tex +++ b/tex/context/base/core-ref.tex @@ -2994,7 +2994,8 @@ \edef\otherfile{#1}% \fi \else - \let\doexternaldocument\setouterfilelocation + \let\doexternaldocument\setouterfilelocation % will change + \let\doexternalurl \setouterfilelocation % will change \csname\v!file:::#1\endcsname \fi \setfalse\forceURLlocation diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex index 30f8c5351..3ebc072e8 100644 --- a/tex/context/base/core-spa.tex +++ b/tex/context/base/core-spa.tex @@ -446,33 +446,33 @@ \defineblankmethod [\v!big] {\addblankskip+\bigskipamount \openlineheight} \defineblankmethod [-\v!big] {\addblankskip-\bigskipamount \openlineheight} -\defineblankmethod [\v!medium] {\addblankskip+\medskipamount {.5\openlineheight}} -\defineblankmethod [-\v!medium] {\addblankskip-\medskipamount {.5\openlineheight}} -\defineblankmethod [\v!small] {\addblankskip+\smallskipamount{.25\openlineheight}} -\defineblankmethod [-\v!small] {\addblankskip-\smallskipamount{.25\openlineheight}} -\defineblankmethod [\v!white] {\addblankskip+\parskip \openlineheight} -\defineblankmethod [-\v!white] {\addblankskip-\parskip \openlineheight} -\defineblankmethod [\v!line] {\addblankskip+\openlineheight \openlineheight} -\defineblankmethod [-\v!line] {\addblankskip-\openlineheight \openlineheight} - -\defineblankmethod [\v!formula] {\global\advance\blankoskip\medskipamount} -\defineblankmethod [\v!nowhite] {\global\blankogeenwittrue} -\defineblankmethod [\v!disable] {\global\blankoblokkeertrue} +\defineblankmethod [\v!medium] {\addblankskip+\medskipamount {.5\openlineheight}} +\defineblankmethod [-\v!medium] {\addblankskip-\medskipamount {.5\openlineheight}} +\defineblankmethod [\v!small] {\addblankskip+\smallskipamount{.25\openlineheight}} +\defineblankmethod [-\v!small] {\addblankskip-\smallskipamount{.25\openlineheight}} +\defineblankmethod [\v!white] {\addblankskip+\parskip \openlineheight} +\defineblankmethod [-\v!white] {\addblankskip-\parskip \openlineheight} +\defineblankmethod [\v!line] {\addblankskip+\openlineheight \openlineheight} +\defineblankmethod [-\v!line] {\addblankskip-\openlineheight \openlineheight} + +\defineblankmethod [\v!formula] {\global\advance\blankoskip\medskipamount} +\defineblankmethod [\v!nowhite] {\global\blankogeenwittrue} +\defineblankmethod [\v!disable] {\global\blankoblokkeertrue} \defineblankmethod [\v!force] {\global\blankoforceertrue} -\defineblankmethod [\v!outer] {\ifvmode\ifinner\blankobuitentrue\fi\fi} -\defineblankmethod [\v!reset] {\global\blankoresettrue} -\defineblankmethod [\v!flexible] {\global\lokaalblankoflexibeltrue} -\defineblankmethod [\v!fixed] {\global\lokaalblankovasttrue} -\defineblankmethod [\v!back] {\global\blankogobacktrue} % {\geenblanko} +\defineblankmethod [\v!outer] {\ifvmode\ifinner\blankobuitentrue\fi\fi} +\defineblankmethod [\v!reset] {\global\blankoresettrue} +\defineblankmethod [\v!flexible] {\global\lokaalblankoflexibeltrue} +\defineblankmethod [\v!fixed] {\global\lokaalblankovasttrue} +\defineblankmethod [\v!back] {\global\blankogobacktrue} % {\geenblanko} \defineblankmethod [\v!halfline] {\ifgridsnapping\global\fuzzyvskiptrue\fi \global\advance\blankoskip .5\lineheight} -\defineblankmethod [\v!none] {\global\blankoresettrue} -\defineblankmethod [\v!joinedup] {\ifvmode\nointerlineskip\fi} +\defineblankmethod [\v!none] {\global\blankoresettrue} +\defineblankmethod [\v!joinedup] {\ifvmode\nointerlineskip\fi} % happens often, so we speed this up: -\defineblankmethod [2*\v!line] {\addblankskip+{2\openlineheight}{2\openlineheight}} +\defineblankmethod [2*\v!line] {\addblankskip+{2\openlineheight}{2\openlineheight}} \defineblankmethod [2*\v!big] {\addblankskip+{2\bigskipamount }{2\openlineheight}} % ETEX ! ! ! diff --git a/tex/context/base/hand-ini.tex b/tex/context/base/hand-ini.tex index 1cef5c56c..3ff52ee34 100644 --- a/tex/context/base/hand-ini.tex +++ b/tex/context/base/hand-ini.tex @@ -92,9 +92,9 @@ \def\dosetpairhandling#1#2#3 #4 #5 % no define since directly set {\ifskiphandlingdef \else \doifnumberelse{\string#2} - {#1{#2#3}{#4}} + {#1{#2#3}{#4}{#5}} {\doifelsenothing{#3} - {#1{`#2}{#4}} + {#1{`#2}{#4}{#5}} {\let\char\empty \doifnumberelse{\csname#2#3\endcsname}{#1{\csname#2#3\endcsname}{#4}{#5}}\donothing \let\char\normalchar}}% @@ -103,9 +103,7 @@ \def\doinhsomehandling#1#2 #3 % {\ifskiphandlingdef \else \let\char\empty - \doifnumberelse{\csname#2\endcsname} - {#1{\csname#2\endcsname}{`#3}} - \donothing + \doifnumberelse{\csname#2\endcsname}{#1{\csname#2\endcsname}{`#3}}\donothing \let\char\normalchar \fi} @@ -292,7 +290,7 @@ \def\protrudethreshold{36\onepoint} - \def\redodefineprotrudefactor#1% + \def\redodefineprotrudefactor {\ifdim\fontdimen6\font>\protrudethreshold \divide\scratchdimen\fontdimen6\font \multiply\scratchdimen\wd\charbox diff --git a/tex/context/base/lang-spe.tex b/tex/context/base/lang-spe.tex index 306d4369c..c030c8045 100644 --- a/tex/context/base/lang-spe.tex +++ b/tex/context/base/lang-spe.tex @@ -45,7 +45,7 @@ {\ifcase\protectionlevel \the\everyresetlanguagespecifics \else % to be translated - \writestatus\m!systems{don't change language in unprotected mode!}% + % \writestatus\m!systems{don't change language in unprotected mode!}% \fi} \appendtoks diff --git a/tex/context/base/spec-fdf.tex b/tex/context/base/spec-fdf.tex index f1e7ed7df..94bc756e4 100644 --- a/tex/context/base/spec-fdf.tex +++ b/tex/context/base/spec-fdf.tex @@ -2792,22 +2792,6 @@ \definespecial\doregisterspotcolorname{\doPDFregisterspotcolorname} -% \def\doPDFregisterrgbspotcolor#1#2#3#4% -% {\doPDFregistersomespotcolor -% {#1}{RGB}{[0.0 1.0 0.0 1.0 0.0 1.0]}% -% {{dup #2 mul exch dup #3 mul exch #4 mul}}} -% -% \def\doPDFregistercmykspotcolor#1#2#3#4#5% -% {\doPDFregistersomespotcolor -% {#1}{CMYK}{[0.0 1.0 0.0 1.0 0.0 1.0 0.0 1.0]}% -% {{dup #2 mul exch dup #3 mul exch dup #4 mul exch #5 mul}}} -% -% \def\doPDFregistergrayspotcolor#1#2% -% {\doPDFregistersomespotcolor -% {#1}{Gray}{[0.0 1.0]}% -% {{pop}}} - - \def\doPDFregisterrgbspotcolor#1#2#3#4#5#6#7% name noffractions names p's r g b {\doPDFregistersomespotcolor{#1}{#2}{#3}{#4}{RGB}{0.0 1.0 0.0 1.0 0.0 1.0}% {\ifcase#2\or dup #5 mul exch dup #6 mul exch #7 mul\else#5 #6 #7\fi}} diff --git a/tex/context/base/spec-tpd.tex b/tex/context/base/spec-tpd.tex index 38cc014f1..51720d6a7 100644 --- a/tex/context/base/spec-tpd.tex +++ b/tex/context/base/spec-tpd.tex @@ -597,8 +597,7 @@ \let\PDFspotcolornames \empty \let\PDFspotcolordomain\empty \def\dospotcolorcommand##1% - {%\edef\PDFspotcolornames {\PDFspotcolornames/##1\space}% - \edef\PDFspotcolornames {\PDFspotcolornames/\executeifdefined{@@pdf@@scn@@##1}{##1}\space}% + {\edef\PDFspotcolornames {\PDFspotcolornames/\executeifdefined{@@pdf@@scn@@##1}{##1}\space}% \edef\PDFspotcolordomain{\PDFspotcolordomain 0.0 1.0\space}}% \processcommacommand[#3]\dospotcolorcommand \edef\PDFspotcolornames{/DeviceN [\PDFspotcolornames]}% @@ -620,8 +619,7 @@ \let\PDFspotcolornames \empty \let\PDFspotcolordomain\empty \def\docommand##1% - {%\edef\PDFspotcolornames {\PDFspotcolornames/##1\space}% - \edef\PDFspotcolornames{\PDFspotcolornames/\executeifdefined{@@pdf@@scn@@##1}{##1}\space}% + {\edef\PDFspotcolornames{\PDFspotcolornames/\executeifdefined{@@pdf@@scn@@##1}{##1}\space}% \edef\PDFspotcolordomain{\PDFspotcolordomain 0.0 1.0\space}}% \processcommacommand[#3,None]\docommand \let\PDFcolorindexvector\empty diff --git a/tex/context/base/supp-pdf.tex b/tex/context/base/supp-pdf.tex index eaca8a0e9..3e0e99568 100644 --- a/tex/context/base/supp-pdf.tex +++ b/tex/context/base/supp-pdf.tex @@ -22,6 +22,8 @@ % as scratch registers ; inside context we may consider % using dedicated registers +% fails: ( ) vect10 9.96265 fshow % \040\040\040\040 + %D These macros are written as generic as possible. Some %D general support macro's are loaded from a small module %D especially made for non \CONTEXT\ use. In this module I diff --git a/tex/context/base/symb-uni.tex b/tex/context/base/symb-uni.tex index b33d9a159..fcd613e7f 100644 --- a/tex/context/base/symb-uni.tex +++ b/tex/context/base/symb-uni.tex @@ -36,9 +36,9 @@ {\def\USymbChar #1#2{\bgroup\UnicodeSymbolFont \uchar{#1}{#2}\relax\egroup} \def\USymbCharTwo #1#2{\bgroup\UnicodeSymbolFontTwo \uchar{#1}{#2}\relax\egroup} \def\USymbCharZapf#1#2{\bgroup\UnicodeSymbolFontZapf\uchar{#1}{#2}\relax\egroup} - \doifundefined{UnicodeSymbolFont} {\definefont[UnicodeSymbolFont] [{"Apple Symbols"} sa 1]} - \doifundefined{UnicodeSymbolFontTwo} {\definefont[UnicodeSymbolFontTwo] [{"Lucida Grande"} sa 1]} - \doifundefined{UnicodeSymbolFontZapf}{\definefont[UnicodeSymbolFontZapf][{"Zapf Dingbats"} sa 1]}} + \doifundefined{UnicodeSymbolFont} {\definefont[UnicodeSymbolFont] ["Apple Symbols" sa *]} + \doifundefined{UnicodeSymbolFontTwo} {\definefont[UnicodeSymbolFontTwo] ["Lucida Grande" sa *]} + \doifundefined{UnicodeSymbolFontZapf}{\definefont[UnicodeSymbolFontZapf]["Zapf Dingbats" sa *]}} \startsymbolset[Unicode Additional Punctuation] % 0x2000: Requires UnicodeRegular20 diff --git a/tex/context/base/type-enc.tex b/tex/context/base/type-enc.tex index fa1a10308..47eba37fb 100644 --- a/tex/context/base/type-enc.tex +++ b/tex/context/base/type-enc.tex @@ -28,6 +28,8 @@ % % \starttext \showfont[Serif] \stoptext +% todo: plr- il2- ec- in distribution + \starttypescript [all] [latin-modern] [texnansi,ec,qx] % Regular diff --git a/tex/context/base/x-fe.tex b/tex/context/base/x-fe.tex index 75fc6a9f0..6e24417ac 100644 --- a/tex/context/base/x-fe.tex +++ b/tex/context/base/x-fe.tex @@ -97,7 +97,7 @@ \defineXMLargument [fe:message] [category=XML-FO] - {\writeFOstatus{\XMLop{category}}} + {\expanded{\writestatus{\XMLop{category}}}} %D Handy diff --git a/tex/context/base/x-xml-02.tex b/tex/context/base/x-xml-02.tex index 8411cdef5..8c1063780 100644 --- a/tex/context/base/x-xml-02.tex +++ b/tex/context/base/x-xml-02.tex @@ -47,7 +47,8 @@ \setupalign [broad,right] -\lowercasestring \inputfilename \to \lcinputfilename +\lowercasestring \inputfilename \to \lcinputfilename +\convertcommand \lcinputfilename \to \lcinputfilename % make _ safe \setupheadertexts [\lcinputfilename] diff --git a/tex/context/base/xtag-mmc.tex b/tex/context/base/xtag-mmc.tex index 2e6d3d988..d10b26ceb 100644 --- a/tex/context/base/xtag-mmc.tex +++ b/tex/context/base/xtag-mmc.tex @@ -854,7 +854,7 @@ complex-cartesian=>\let\next\MMLccartesian, \doif{\XMLpar{dummy}{type}{}}{fn}{#2}{#3}} {#2}}} -\def\subMMLcelement #1#2{^{#2}} +\def\subMMLcelement #1#2{_{#2}} \def\superMMLcelement#1#2{^{#2}} \remapXMLsequence [lowlimit][CPA] \MMLcLOWLIMIT diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml index 904c6147b..290a7d44e 100644 --- a/tex/context/interface/keys-cz.xml +++ b/tex/context/interface/keys-cz.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2004.11.23"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2004.12.06"> <cd:variables> <cd:variable name="one" value="jedna"/> diff --git a/tex/context/interface/keys-de.xml b/tex/context/interface/keys-de.xml index e3d111047..4e2d03bd1 100644 --- a/tex/context/interface/keys-de.xml +++ b/tex/context/interface/keys-de.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2004.11.23"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2004.12.06"> <cd:variables> <cd:variable name="one" value="eins"/> diff --git a/tex/context/interface/keys-en.xml b/tex/context/interface/keys-en.xml index 98243d440..6ae70c2dd 100644 --- a/tex/context/interface/keys-en.xml +++ b/tex/context/interface/keys-en.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.11.23"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2004.12.06"> <cd:variables> <cd:variable name="one" value="one"/> diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml index 74ba49bc9..2caba051e 100644 --- a/tex/context/interface/keys-it.xml +++ b/tex/context/interface/keys-it.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2004.11.23"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2004.12.06"> <cd:variables> <cd:variable name="one" value="uno"/> diff --git a/tex/context/interface/keys-nl.xml b/tex/context/interface/keys-nl.xml index ef36320a2..ffa076af4 100644 --- a/tex/context/interface/keys-nl.xml +++ b/tex/context/interface/keys-nl.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2004.11.23"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2004.12.06"> <cd:variables> <cd:variable name="one" value="een"/> diff --git a/tex/context/interface/keys-ro.xml b/tex/context/interface/keys-ro.xml index 7b46a9642..ebafd1281 100644 --- a/tex/context/interface/keys-ro.xml +++ b/tex/context/interface/keys-ro.xml @@ -1,6 +1,6 @@ <?xml version="1.0"?> -<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2004.11.23"> +<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2004.12.06"> <cd:variables> <cd:variable name="one" value="unu"/> |