stable 2006.11.22 11:02

11 files changed, 54 insertions, 51 deletions

diff --git a/scripts/context/ruby/base/tex.rb b/scripts/context/ruby/base/tex.rb
index f6f3dc4ed..d7b4fb392 100644
--- a/scripts/context/ruby/base/tex.rb
+++ b/scripts/context/ruby/base/tex.rb
@@ -169,6 +169,7 @@ class TEX
     @@runoptions['pdftex']  = ['--8bit ']         # pdftex is now pdfetex
     @@runoptions['luatex']  = ['']
     @@runoptions['aleph']   = ['--8bit ']
+    @@runoptions['mpost']   = ['--8bit ']
 
     @@booleanvars = [
         'batchmode', 'nonstopmode', 'fast', 'fastdisabled', 'silentmode', 'final',
@@ -651,8 +652,8 @@ run_luatools("--ini --compile #{texformat}")
             if FileTest.writable?(mpsformatpath) then
                 mpsformats.each do |mpsformat|
                     report("generating mps format #{mpsformat}")
-                  # runcommand([quoted(mpsengine),prognameflag(progname),iniflag,tcxflag,mpsformat,mpsmakeextras(mpsformat)])
-                    runcommand([quoted(mpsengine),iniflag,tcxflag,mpsformat,mpsmakeextras(mpsformat)])
+                    runcommand([quoted(mpsengine),prognameflag(progname),iniflag,tcxflag,runoptions(mpsengine),mpsformat,mpsmakeextras(mpsformat)])
+                    # runcommand([quoted(mpsengine),iniflag,tcxflag,mpsformat,mpsmakeextras(mpsformat)])
                 end
             else
                 report("unable to make format due to lack of permissions")
@@ -1518,8 +1519,8 @@ end
         progname  = validprogname(getvariable('progname'))
         if mpsengine && mpsformat && progname then
             ENV["MPXCOMMAND"] = "0" unless mpx
-          # runcommand([quoted(mpsengine),prognameflag(progname),formatflag(mpsengine,mpsformat),tcxflag,runoptions(mpsengine),filename,mpsprocextras(mpsformat)])
-            runcommand([quoted(mpsengine),formatflag(mpsengine,mpsformat),tcxflag,runoptions(mpsengine),mpname,mpsprocextras(mpsformat)])
+            runcommand([quoted(mpsengine),prognameflag(progname),formatflag(mpsengine,mpsformat),tcxflag,runoptions(mpsengine),filename,mpsprocextras(mpsformat)])
+            # runcommand([quoted(mpsengine),formatflag(mpsengine,mpsformat),tcxflag,runoptions(mpsengine),mpname,mpsprocextras(mpsformat)])
             true
         else
             false
diff --git a/scripts/context/ruby/texmfstart.rb b/scripts/context/ruby/texmfstart.rb
index b9ced8813..a886b2aa1 100644
--- a/scripts/context/ruby/texmfstart.rb
+++ b/scripts/context/ruby/texmfstart.rb
@@ -1506,11 +1506,6 @@ $makelist = [
     # no, 'texmfstart'
 ]
 
-# if ENV['TEXMFSTART_MODE'] = 'experimental' then
-    # $predefined['texexec'] = 'newtexexec.rb'
-    # $predefined['pstopdf'] = 'newpstopdf.rb'
-# end
-
 $scriptlist   = 'rb|pl|py|lua|jar'
 $documentlist = 'pdf|ps|eps|htm|html'
 
diff --git a/tex/context/base/cont-fil.tex b/tex/context/base/cont-fil.tex
index dcd3ce9d3..3ff54d356 100644
--- a/tex/context/base/cont-fil.tex
+++ b/tex/context/base/cont-fil.tex
@@ -111,4 +111,7 @@
 %definefilesynonym [practexjournal]  [ptj-01]
 \definefilesynonym [pracjourn]       [ptj-01]
 
+\definefilesynonym [maps]            [map-10]
+\definefilesynonym [map-se]          [map-10] % for some time
+
 \endinput
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index 320bd9c3a..eb1bb26ac 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.11.20 09:49}
+\edef\contextversion{2006.11.22 11:02}
 
 %D For those who want to use this:
 
@@ -148,6 +148,8 @@
 \loadcorefile{syst-var.tex}
 \loadcorefile{syst-str.tex}
 
+%loadcorefile{syst-tra.tex}
+
 \loadcorefile{syst-rtp.tex}
 
 \loadcorefile{math-pln.tex}
@@ -175,7 +177,6 @@
 \loadmkivfile{luat-ini.tex}
 % \loadmkivfile{luat-lib.tex}
 \loadmkivfile{luat-lmx.tex}
-\loadmkivfile{luat-deb.tex}
 
 \loadmkivfile{luat-uni.tex}
 
@@ -192,6 +193,7 @@
 %D modules implement some basic typesetting functionality.
 
 \loadcorefile{core-var.tex}
+\loadmkivfile{luat-deb.tex}
 
 \loadcorefile{supp-box.tex}
 \loadcorefile{supp-mrk.tex}
diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex
index 1e8188ea0..50032edcd 100644
--- a/tex/context/base/core-sec.tex
+++ b/tex/context/base/core-sec.tex
@@ -1852,7 +1852,7 @@
 %D      [frame=off,offset=.5em,align=middle,width=broad]
 %D      {\sc\def\stretchedspaceamount{.3em}\stretchednormalcase{#1}}}
 %D
-%D \definehead[MySubject]
+%D \definehead[MySubject][subject]
 %D \setuphead [MySubject][deeptextcommand=\StretchedBox]
 %D
 %D \MySubject{feeling stretched feeling stretched feeling stretched feeling stretched}
@@ -2169,7 +2169,7 @@
 
 \let\@@kolist=\empty
 
-\def\dodefinehead[#1][#2]%   % don't preset prefix to much
+\def\dododefinehead#1#2%   % don't preset prefix to much
   {\presetlabeltext[#1=]%
    \getparameters
      [\??ko#1]
@@ -2265,6 +2265,15 @@
    \setevalue{\??by\v!by#1}{\getvalue{\??ko#1\c!section}}%
    \setvalue{#1}{\dodoubleempty\doconstructhead[#1]}}
 
+\def\dodefinehead[#1][#2]%
+  {\doifelsenothing{#2}
+     {% todo: message that it's an invalid definition
+      \setvalue{#1}{\endgraf[#1]\kern.5em}}
+     {\doifassignmentelse{#2}
+        {\dododefinehead{#1}{#2}}
+        {\doifdefined{\??ko#2\c!section}
+           {\dododefinehead{#1}{#2}}}}}
+
 \def\definehead
   {\dodoubleemptywithset\dodefinehead}
 
diff --git a/tex/context/base/core-spa.tex b/tex/context/base/core-spa.tex
index fa6e24a5b..c498ee015 100644
--- a/tex/context/base/core-spa.tex
+++ b/tex/context/base/core-spa.tex
@@ -2729,14 +2729,14 @@
 \newskip\ctxrightskip
 \newskip\ctxmidskip
 
-% \def\dosinglenarrower#1%
-%   {\processaction
-%      [#1]
-%      [     \v!left=>\global\advance\ctxleftskip  \@@slleft,
-%          \v!middle=>\global\advance\ctxmidskip   \@@slmiddle,
-%           \v!right=>\global\advance\ctxrightskip \@@slright,
-%            \v!none=>,
-%         \s!unknown=>\global\advance\ctxmidskip   \commalistelement]}
+\def\dosinglenarrower#1%
+  {\processaction
+     [#1]
+     [     \v!left=>\global\advance\ctxleftskip  \@@slleft,
+         \v!middle=>\global\advance\ctxmidskip   \@@slmiddle,
+          \v!right=>\global\advance\ctxrightskip \@@slright,
+           \v!none=>,
+        \s!unknown=>\global\advance\ctxmidskip   \commalistelement]}
 
 % \def\donarrower[#1]% hm, can be dorepeat directly
 %   {\processaction
diff --git a/tex/context/base/font-uni.tex b/tex/context/base/font-uni.tex
index 3dee48ec4..5d9e7a881 100644
--- a/tex/context/base/font-uni.tex
+++ b/tex/context/base/font-uni.tex
@@ -450,7 +450,7 @@
    % the following \relax's are realy needed
    \doifvalue{\??uc#1\c!interlinespace}\v!yes
       \setupinterlinespace\relax
-   \doifvalue{\??uc#1\c!strut}\v!yes
+   \doifelsevalue{\??uc#1\c!strut}\v!yes
       {\setunicodestrut\unicodeheight\unicodedepth}
       {\resetunicodestrut}%
    \getvalue{\??uc#1\c!commands}\relax}
diff --git a/tex/context/base/s-ptj-01.tex b/tex/context/base/s-ptj-01.tex
index 98ec3ae03..1effb7d73 100644
--- a/tex/context/base/s-ptj-01.tex
+++ b/tex/context/base/s-ptj-01.tex
@@ -11,22 +11,6 @@
 %C This module is part of the \CONTEXT\ macro||package and is
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
-%C
-%C This work may be distributed and|/|or modified under the
-%C conditions of the \LATEX\ Project Public License, either version~1.3
-%C of this license or (at your option) any later version.
-%C The latest version of this license is in
-%C   \hyphenatedurl{http://www.latex-project.org/lppl.txt}
-%C and version~1.3 or later is part of all distributions of \LATEX\
-%C version~2005/12/01 or later.
-%C
-%C This work has the LPPL maintenance status \quote{maintained}.
-%C
-%C The Current Maintainer of this work is Aditya Mahajan.
-%C
-%C The Base Interpreter for this work is any \CONTEXT||formal.
-%C
-%C This work consists of the file \filename{t-pracjourn.tex}.
 
 %M % These macros are needed to compile the documentation.
 %M \def\PracTeX{Prac\kern-0.07em\TeX}
@@ -38,14 +22,19 @@
 
 %D This module is for producing acticles for \from[TPJ]. It merely copies the
 %D layout of the the \LATEX\ class \filename{pracjourn.cls} available from
-%D \TPJ\ website (\url[TPJ]). A sample document is given at the end of this
-%D file. The typeset sample can be obtained by
+%D \TPJ\ website (\url[TPJ]).  This module has a filename synonym
+%D \filename{pracjourn}. So to use this module, you can write:
 %D \starttyping
-%D texexec --mode=demo s-pracjourn.tex
+%D \usemodule[pracjourn]
+%D \stoptyping
+%D A sample document is given at the end of this file. The typeset sample can
+%D be obtained by
+%D \starttyping
+%D texexec --mode=demo s-ptj-01.tex
 %D \stoptyping
 %D The documentation is written as comments. If you want to see a \PDF\ copy
 %D \starttyping
-%D texexec --module s-pracjourn.tex
+%D texexec --module s-ptj-01.tex
 %D \stoptyping
 
 \startmodule[pracjourn]
@@ -78,14 +67,13 @@
         footerdistance=.25in,
   ]
 
-
 %D Next we do the font setup. \TPJ\ uses mathpazo for roman and math faces and
 %D uses latin modern for sans serif and monotype. For the main face, 12pt is
 %D used with a 15.5pt baseline skip. Font protrusion is enabled, but font
-%D expansion is not. We follow these conventions, but use
-%D Pagella fonts from \TEX{gyre} project, and scale latin modern fonts by
-%D 1.1 for better matching. Most of the numbers (page numbers, figure numbers,
-%D section numbers) are set in oldstyle.
+%D expansion is not. We follow these conventions, but use Pagella fonts from
+%D \TEX{gyre} project, and scale latin modern fonts by 1.1 for better
+%D matching. Most of the numbers (page numbers, figure numbers, section
+%D numbers) are set in oldstyle.
 
 \usetypescript  [serif,sans,mono] [hanging] [pure]
 \setupalign     [hanging]
@@ -368,8 +356,9 @@
 \setupwhitespace  [medium]
 \setupblank       [medium]
 
-%D We define logos for \PRACTEX\ and \TPJ. These can be accessed by
-%D \type|\PracTeX|, \type|\PRACTEX| and \type|\TPJ|.
+%D We define logos for \PRACTEX\ and \TPJ. These definitions are copied from
+%D \filename{pracjourn.cls} and can be accessed by \type|\PracTeX|,
+%D \type|\PRACTEX| and \type|\TPJ|.
 
 \def\PracTeX{Prac\kern-0.07em\TeX}
 \def\PRACTEX{\PracTeX}
@@ -409,6 +398,7 @@
 \immediate\closein\scratchread
 
 \protect
+
 \stopmodule
 
 \doifnotmode{demo}{\endinput}
diff --git a/tex/context/base/spec-dpx.tex b/tex/context/base/spec-dpx.tex
index 0f0380342..1522304e7 100644
--- a/tex/context/base/spec-dpx.tex
+++ b/tex/context/base/spec-dpx.tex
@@ -119,7 +119,7 @@
 
 % \definefileinsertion{dpx}{mps}{\handleepsimage}
 
-\definefileinsertion{tpd}{mps}
+\definefileinsertion{dpx}{mps}
   {\hbox
      {\convertMPtoPDF\@@DriverImageFile{1}{1}%
       \global\let\PDFimagereference\empty}}
diff --git a/tex/context/base/spec-tst.tex b/tex/context/base/spec-tst.tex
index 9f150dfe3..b8424e18e 100644
--- a/tex/context/base/spec-tst.tex
+++ b/tex/context/base/spec-tst.tex
@@ -31,6 +31,7 @@
 
 \long\def\sanitizePDFuniencoding#1\to#2%
   {\enablePDFunicrlf
+   \simplifycommands % added due to Dohyun Kim
    \let\unicodechar\relax % prevent further expansion
    \retainlccodes\lccode32=255 % slooow
    \lowercasestring\PDFunicodetrigger#1\to#2%
diff --git a/tex/context/base/unic-cjk.tex b/tex/context/base/unic-cjk.tex
index 2835e6cf1..a4155f136 100644
--- a/tex/context/base/unic-cjk.tex
+++ b/tex/context/base/unic-cjk.tex
@@ -11,6 +11,8 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\dostepwiserecurse{40}{159}{1}{\expanded{\defineunicodecommand {\recurselevel}} {\lookaheaduchar}}
+\dostepwiserecurse {40}{159}{1}{\expanded{\defineunicodecommand{\recurselevel}} {\lookaheaduchar}}
+\dostepwiserecurse{172}{215}{1}{\expanded{\defineunicodecommand{\recurselevel}} {\lookaheaduchar}}
+\dostepwiserecurse{249}{250}{1}{\expanded{\defineunicodecommand{\recurselevel}} {\lookaheaduchar}}
 
 \endinput