stable 2004.08.18

8 files changed, 120 insertions, 27 deletions

diff --git a/context/data/type-buy.dat b/context/data/type-buy.dat
index b3d52d29d..4ad3b53fc 100644
--- a/context/data/type-buy.dat
+++ b/context/data/type-buy.dat
@@ -35,6 +35,12 @@
 --en=? --ve=lucas --co=antiqua --re
 --en=? --ve=lucas --co=antiqua --so=lucas/antiqua --ma --in
 
+# lucas thesans
+
+--en=? --ve=lucas --co=thesans --re
+--en=? --ve=lucas --co=thesans --so=lucas/thesans --ma --in
+--en=? --ve=lucas --co=thesans --so=lucas/thesans --ma --in --expert
+
 # creative arcadia
 
 --en=? --ve=creative --co=arcadia   --re
diff --git a/metapost/context/base/mp-core.mp b/metapost/context/base/mp-core.mp
index b905d85ce..eb038163e 100644
--- a/metapost/context/base/mp-core.mp
+++ b/metapost/context/base/mp-core.mp
@@ -1242,7 +1242,7 @@ vardef PrepareSyncTasks(expr n, collapse, extendtop, prestartnext) =
         NOfSyncPaths := NOfSyncPaths + 1 ;
         if not ok :
           if i>1 :
-% not yet correct when two of teh same follow each other
+% not yet correct when two of the same follow each other
             if sync_t[n][i-1] = sync_t[n][i] :
               SyncPaths[NOfSyncPaths] := SyncBox(n, i, SyncLeftOffset, SyncWidth, PaperHeight, -PaperHeight) ;
               SyncTasks[NOfSyncPaths] := i ;
diff --git a/metapost/context/base/mp-tool.mp b/metapost/context/base/mp-tool.mp
index 0db4a3f47..2609e130f 100644
--- a/metapost/context/base/mp-tool.mp
+++ b/metapost/context/base/mp-tool.mp
@@ -1520,26 +1520,26 @@ vardef inverted primary p =
   (p uncolored white)
 enddef ;
 
-primarydef p softened c =
-  if color p :
-    tripled(c) * p
-  else :
-    image
-      (save cc ; color cc ; cc := tripled(c) ;
-       for i within p :
-         addto currentpicture
-         if stroked i or filled i :
-           if filled i : contour else : doublepath fi pathpart i
-           dashed dashpart i withpen penpart i
-         else :
-          also i
-         fi
-         withcolor (redpart   cc * redpart   i,
-                    greenpart cc * greenpart i,
-                    bluepart  cc * bluepart  i) ;
-       endfor ;)
-  fi
-enddef ;
+% primarydef p softened c =
+%   if color p :
+%     tripled(c) * p
+%   else :
+%     image
+%       (save cc ; color cc ; cc := tripled(c) ;
+%        for i within p :
+%          addto currentpicture
+%          if stroked i or filled i :
+%            if filled i : contour else : doublepath fi pathpart i
+%            dashed dashpart i withpen penpart i
+%          else :
+%           also i
+%          fi
+%          withcolor (redpart   cc * redpart   i,
+%                     greenpart cc * greenpart i,
+%                     bluepart  cc * bluepart  i) ;
+%        endfor ;)
+%   fi
+% enddef ;
 
 primarydef p softened c =
   begingroup
diff --git a/tex/context/base/context.tex b/tex/context/base/context.tex
index ec535265a..ee9d715c4 100644
--- a/tex/context/base/context.tex
+++ b/tex/context/base/context.tex
@@ -15,7 +15,7 @@
 
 \catcode`\{=1 \catcode`\}=2
 
-\def\contextversion{2004.8.15}
+\def\contextversion{2004.8.18}
 
 %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-fig.tex b/tex/context/base/core-fig.tex
index 143dec45b..d2c303413 100644
--- a/tex/context/base/core-fig.tex
+++ b/tex/context/base/core-fig.tex
@@ -1576,7 +1576,7 @@
            {\externalfigure[##1][\c!kader=\v!aan,\c!breedte=6cm][##2]%
             \tfskip
             \framed[\c!breedte=\figurewidth,\c!hoogte=\figureheight]{}}}%
-        {\tfa ##1}%
+        {\tt\tfa\expanded{\asciistr{##1}}}%
         \blanko
         \tfx
         \def\docommando####1%
diff --git a/tex/context/base/core-sec.tex b/tex/context/base/core-sec.tex
index 3bd26334d..649382a34 100644
--- a/tex/context/base/core-sec.tex
+++ b/tex/context/base/core-sec.tex
@@ -1704,6 +1704,7 @@
                \else
                  \setupspacing
                \fi
+% overwegen \dontleavehmode, else unwanted cr due to #2
                \ifcase\headtimingmode#2\fi
                \getvalue{\??ko#1\c!voorcommando}%
                \placeheadmargintexts{#1}% binnen #3?
@@ -1762,6 +1763,7 @@
                \else
                  \setupspacing
                \fi
+% overwegen \dontleavehmode, else unwanted cr due to #2
                \ifcase\headtimingmode#2\fi
                \placeheadmargintexts{#1}% binnen #3?
                \ifdisplaysectionhead
@@ -1810,8 +1812,7 @@
    \resetinteractionparameter\c!kleur
    \resetinteractionparameter\c!contrastkleur
    \strictouterreferencestrue % tzt instelling
-   \def\localheadsetup%
-     {\dolocalheadsetup{#1}}%
+   \def\localheadsetup{\dolocalheadsetup{#1}}%
    \startsynchronisatie}
 
 \def\endheadplacement#1#2%
diff --git a/tex/context/base/type-buy.tex b/tex/context/base/type-buy.tex
index 8fff2a0f1..c8ce968a5 100644
--- a/tex/context/base/type-buy.tex
+++ b/tex/context/base/type-buy.tex
@@ -537,4 +537,90 @@
 
 \stoptypescript
 
+% thesans
+
+\starttypescript [map] [thesans] [ec,8r,texnansi]
+  \loadmapfile[\typescriptthree-lucas-thesans.map]
+\stoptypescript
+
+\starttypescript [sans] [thesans] [name]
+
+  \definefontsynonym [Sans]                [TheSans-Plain]
+  \definefontsynonym [SansItalic]          [TheSans-Italic]
+  \definefontsynonym [SansSlanted]         [TheSans-Italic]
+  \definefontsynonym [SansBold]            [TheSansBold-Plain]
+  \definefontsynonym [SansBoldItalic]      [TheSansBold-Italic]
+  \definefontsynonym [SansBoldSlanted]     [TheSansBold-Italic]
+
+  \definefontsynonym [SansCaps]            [TheSans-Caps]
+  \definefontsynonym [SansCapsItalic]      [TheSans-CapsItalic]
+  \definefontsynonym [SansCapsSlanted]     [TheSans-CapsItalic]
+  \definefontsynonym [SansCapsBold]        [TheSansBold-Caps]
+  \definefontsynonym [SansCapsBoldItalic]  [TheSansBold-CapsItalic]
+  \definefontsynonym [SansCapsBoldSlanted] [TheSansBold-CapsItalic]
+
+\stoptypescript
+
+\starttypescript [mono] [thesans] [name]
+
+  \definefontsynonym [Mono]            [TheSansTypewriter-Plain]
+  \definefontsynonym [MonoCaps]        [TheSansTypewriter-Plain]
+  \definefontsynonym [MonoItalic]      [TheSansTypewriter-Italic]
+  \definefontsynonym [MonoSlanted]     [TheSansTypewriter-Italic]
+  \definefontsynonym [MonoBold]        [TheSansTypewriter-Bold]
+  \definefontsynonym [MonoBoldItalic]  [TheSansTypewriter-BoldItalic]
+  \definefontsynonym [MonoBoldSlanted] [TheSansTypewriter-BoldItalic]
+
+\stoptypescript
+
+\starttypescript [sans] [thesans] [ec,8r,texnansi]
+
+  \definefontsynonym [TheSans-Plain]            [\typescriptthree-tsan5]   [encoding=\typescriptthree]
+  \definefontsynonym [TheSans-Italic]           [\typescriptthree-tsan5i]  [encoding=\typescriptthree]
+  \definefontsynonym [TheSansBold-Plain]        [\typescriptthree-tsan7]   [encoding=\typescriptthree]
+  \definefontsynonym [TheSansBold-Italic]       [\typescriptthree-tsan7i]  [encoding=\typescriptthree]
+
+  \definefontsynonym [TheSans-Caps]             [\typescriptthree-tsan5c]  [encoding=\typescriptthree]
+  \definefontsynonym [TheSans-CapsItalic]       [\typescriptthree-tsan5ci] [encoding=\typescriptthree]
+  \definefontsynonym [TheSansBold-Caps]         [\typescriptthree-tsan7c]  [encoding=\typescriptthree]
+  \definefontsynonym [TheSansBold-CapsItalic]   [\typescriptthree-tsan7ci] [encoding=\typescriptthree]
+
+%   \definefontsynonym[TheSans-B2ExtraLight]       [\typescriptthree-thesnb2]  [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B2ExtraLightItalic] [\typescriptthree-thesnb2i] [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B3Light]            [\typescriptthree-thesnb3]  [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B3LightItalic]      [\typescriptthree-thesnb3i] [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B4SemiLight]        [\typescriptthree-thesnb4]  [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B4SemiLightItalic]  [\typescriptthree-thesnb4i] [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B5Plain]            [\typescriptthree-thesnb5]  [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B5PlainItalic]      [\typescriptthree-thesnb5i] [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B6SemiBold]         [\typescriptthree-thesnb6]  [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B6SemiBoldItalic]   [\typescriptthree-thesnb6i] [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B7Bold]             [\typescriptthree-thesnb7]  [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B7BoldItalic]       [\typescriptthree-thesnb7i] [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B8ExtraBold]        [\typescriptthree-thesnb8]  [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B8ExtraBoldItalic]  [\typescriptthree-thesnb8i] [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B8ExtraBoldItalic]  [\typescriptthree-thesnb8i] [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B9Black]            [\typescriptthree-thesnb9]  [encoding=\typescriptthree]
+%   \definefontsynonym[TheSans-B9BlackItalic]      [\typescriptthree-thesnb9i] [encoding=\typescriptthree]
+
+\stoptypescript
+
+\starttypescript [mono] [thesans] [ec,8r,texnansi]
+
+  \definefontsynonym [TheSansTypewriter-Plain]      [\typescriptthree-tsaty5]  [encoding=\typescriptthree]
+  \definefontsynonym [TheSansTypewriter-Italic]     [\typescriptthree-tsaty5i] [encoding=\typescriptthree]
+  \definefontsynonym [TheSansTypewriter-Bold]       [\typescriptthree-tsaty7]  [encoding=\typescriptthree]
+  \definefontsynonym [TheSansTypewriter-BoldItalic] [\typescriptthree-tsaty7i] [encoding=\typescriptthree]
+
+\stoptypescript
+
+\starttypescript [expert] [thesans]
+
+  \definefontsynonym [TheSans-Expert]           [tsan5e]  [encoding=\typescriptthree]
+  \definefontsynonym [TheSans-ExpertItalic]     [tsan5ei] [encoding=\typescriptthree]
+  \definefontsynonym [TheSansBold-Expert]       [tsan7e]  [encoding=\typescriptthree]
+  \definefontsynonym [TheSansBold-ExpertItalic] [tsan7ei] [encoding=\typescriptthree]
+
+\stoptypescript
+
 \endinput
diff --git a/tex/context/base/xtag-ext.tex b/tex/context/base/xtag-ext.tex
index 7d50d6156..bf119f551 100644
--- a/tex/context/base/xtag-ext.tex
+++ b/tex/context/base/xtag-ext.tex
@@ -207,10 +207,10 @@
      \@EA\secondoftwoarguments
    \fi}
 
-\def\doifXMLtextelse#1% new
+\gdef\doifXMLtextelse#1% new
   {\doiftextelse{\simplifyXMLelements#1}}
 
-\def\doifXMLtext#1#2% new
+\gdef\doifXMLtext#1#2% new
   {\doiftextelse{\simplifyXMLelements#1}{#2}\donothing}
 
 \gdef\convertXMLelement#1\to#2%