context-simplefonts update (23sep09)

git-svn-id: svn://tug.org/texlive/trunk@15436 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 21 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex
index 66ef335bae4..c345ca4dfa8 100644
--- a/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex
+++ b/Master/texmf-dist/tex/context/third/simplefonts/t-simplefonts.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [     file=t-simplefonts,
-%D      version=2009.09.16,
+%D      version=2009.09.20,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Simplefonts,
 %D       author=Wolfgang Schuster,
@@ -64,6 +64,7 @@
   \setinterfaceconstant {contextversion}          {contextversion}
   \setinterfaceconstant {sf}                      {sf}
   \setinterfaceconstant {bc}                      {bc}
+  \setinterfaceconstant {mode}                    {mode}
 \stopinterface
 
 \startinterface all
@@ -90,6 +91,7 @@
   \setinterfacevariable {handwriting}             {handwriting}
   \setinterfacevariable {calligraphy}             {calligraphy}
   \setinterfacevariable {fontfamily}              {fontfamily}
+  \setinterfacevariable {node}                    {node}
 \stopinterface
 
 \startinterface all
@@ -110,7 +112,7 @@
   \setinterfacemessage{simplefonts}{title}{simplefonts}
   \setinterfacemessage{simplefonts}{1}    {font '--' not found}
   \setinterfacemessage{simplefonts}{2}    {feature '--' is not defined}
-  \setinterfacemessage{simplefonts}{3}    {your context is too old, you need at last version '--'}
+  \setinterfacemessage{simplefonts}{3}    {your context is too old, you use you need at last version '--'}
 \stopinterface
 
 %D Module setup
@@ -122,6 +124,16 @@
 
 %D Check ConTeXt version
 
+\ifx\forcequitjob\undefined % copied from core-job, needed for older installations
+
+  \def\forcequitjob#1%
+    {\writestatus\m!systems{forcing quit: #1}%
+     \batchmode
+     \dorecurse\textlevel{\stoptext}
+     \normalend}
+
+\fi
+
 \doifolderversionelse\contextversion{\currentmoduleparameter\c!contextversion}
   {\showmessage\m!simplefonts{3}{\currentmoduleparameter\c!contextversion}\forcequitjob\v!simplefonts}
    \donothing
@@ -170,7 +182,7 @@
 
 \def\simplefonts!parameters
   {\c!regularfont,\c!italicfont,\c!slantedfont,\c!boldfont,\c!bolditalicfont,\c!boldslantedfont,
-   \c!capsfont,\c!italiccapsfont,\c!slantedcapsfont,\c!boldcapsfont,\c!bolditaliccapsfont,
+   \c!capsfont,\c!italiccapsfont,\c!slantedcapsfont,\c!boldcapsfont,\c!bolditaliccapsfont,\c!mode,
    \c!boldslantedcapsfont,\c!features,\c!regularfeatures,\c!italicfeatures,\c!slantedfeatures,
    \c!size,\c!style,\c!boldfeatures,\c!bolditalicfeatures,\c!boldslantedfeatures,\c!smallcapsfeatures,
    \c!capsfeatures,\c!italiccapsfeatures,\c!slantedcapsfeatures,\c!boldcapsfeatures,\c!expansion,
@@ -389,9 +401,11 @@
 
     % expansion and protrusion could bet se either global for all styles or local for only one style
 
-    \doifdefined{\????sf\c!expansion   }{\appendtocommalist{\c!expansion =\namedsimplefontparameter{#1}\c!expansion }\simplefont!features}
-    \doifdefined{\????sf\c!protrusion  }{\appendtocommalist{\c!protrusion=\namedsimplefontparameter{#1}\c!protrusion}\simplefont!features}
+    \doifdefined{\????sf\c!mode        }{\appendtocommalist{\c!mode      =\csname\????sf\c!mode      \endcsname     }\simplefont!features}
+    \doifdefined{\????sf\c!expansion   }{\appendtocommalist{\c!expansion =\csname\????sf\c!expansion \endcsname     }\simplefont!features}
+    \doifdefined{\????sf\c!protrusion  }{\appendtocommalist{\c!protrusion=\csname\????sf\c!protrusion\endcsname     }\simplefont!features}
 
+    \doifdefined{\????sf#1\c!mode      }{\appendtocommalist{\c!expansion =\namedsimplefontparameter{#1}\c!mode      }\simplefont!features}
     \doifdefined{\????sf#1\c!expansion }{\appendtocommalist{\c!expansion =\namedsimplefontparameter{#1}\c!expansion }\simplefont!features}
     \doifdefined{\????sf#1\c!protrusion}{\appendtocommalist{\c!protrusion=\namedsimplefontparameter{#1}\c!protrusion}\simplefont!features}
 
@@ -757,7 +771,8 @@
   [\c!size=\moduleparameter\v!simplefonts\c!size,
    \c!style=\moduleparameter\v!simplefonts\c!style,
    \c!features=\v!default,
-   \c!smallcapsfeatures=\v!smallcaps]
+   \c!smallcapsfeatures=\v!smallcaps,
+   \c!mode=\v!node]
 
 %D Default fonts