stable 2006.11.29 09:55

13 files changed, 137 insertions, 48 deletions

diff --git a/tex/context/base/cont-new.tex b/tex/context/base/cont-new.tex
index 5ccc67fd3..2b2110fe0 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.11.27 11:04}
+\newcontextversion{2006.11.29 09:55}
 
 %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 0be6eba56..dd6a50af8 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.27 11:04}
+\edef\contextversion{2006.11.29 09:55}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/math-ext.tex b/tex/context/base/math-ext.tex
index 177e3c8a4..e2155503d 100644
--- a/tex/context/base/math-ext.tex
+++ b/tex/context/base/math-ext.tex
@@ -63,6 +63,13 @@
 
 % temp here
 
+%D We next define extensible arrows. Extensible arrows are arrows that change
+%D their length accoding to the width of the text to be placed above and below
+%D the arrow. Since we need to define a lot of arrows, we first define some
+%D helper macros. The basic idea is to measure the width of the box to be
+%D placed above and below the arrow, and make the \quotation{body} of the
+%D arrow as long as the bigger of the two widths.
+
 \def\mtharrfactor{1}
 \def\mtharrextra {0}
 
@@ -109,6 +116,9 @@
 
 \let\domthxarrsingle\domthxarr
 
+%D There are some arrows which are created by stacking two arrows. The next
+%D macro helps in defining such \quotation{double arrows}.
+
 \def\domthxarrdouble#1#2#3#4#5#6#7% opt l r sp rs top bot
   {\mathrel
      {\scratchdimen.22ex\relax
@@ -118,6 +128,67 @@
       \kern-\wd2
       \lower\scratchdimen\box2}}
 
+%D \macros{definematharrow}
+%D Macro for defining new arrows. We can define two types of arrows|<|single
+%D arrows and double arrows. Single arrows are defined as
+%D \starttyping
+%D \definematharrow [xrightarrow]        [0359] [\rightarrowfill]
+%D \stoptyping
+%D The first argument is the name of the arrow (\tex{xrightarrow} in this case.)
+%D The second argument consists of a set of 4 numbers and specify the spacing
+%D correction in math units~\type{mu}. These numbers define:
+%D \startlines
+%D   1st number: arrow||tip correction
+%D   2nd number: arrow||tip correction
+%D   3rd number: space (multiplied by \tex{matharrfactor} and advanced by \tex{matharrextra})
+%D   4th number: space (multiplied by \tex{matharrfactor} and advanced by \tex{matharrextra})
+%D \stoplines
+%D 
+%D The third argument is the name of the extensible fill. The third argument
+%D is optional when the arrow is redefined later (this is useful for font
+%D specific tweaking of the skips.) For example,
+%D \startbuffer
+%D \math{\xrightarrow{above}}
+%D \definematharrow[xrightarrow][0000]
+%D \math{\xrightarrow{above}}
+%D \definematharrow[xrightarrow][55{50}{50}]
+%D \math{\xrightarrow{above}}
+%D \stopbuffer
+%D \typebuffer gives {\getbuffer}
+%D
+%D The double arrows are defined as follows
+%D \starttyping
+%D \definematharrow [xrightleftharpoons] [3095,0359] 
+%D                  [\rightharpoonupfill,\leftharpoondownfill]
+%D \stoptyping
+%D The second and the third set of arguments consist of comma separated
+%D values. The first element of the second argument (\type{3095}) corresponds
+%D to the spacing correction of top arrow fill (\tex{rightarrowupfill}).
+%D Similarly, \type{0359} corresponds to bottom arrow fill
+%D \tex{leftharpoondownfill}). Stacking them on top of each other we get
+%D $\xrightleftharpoons[big]{above}{below}$.
+%D The following math arrows are defined
+%D \midaligned{\starttable[|l|m|]
+%D   \NC \tex{xrightarrow        }  \NC \xrightarrow        [big]  \NC \NR
+%D   \NC \tex{xleftarrow         }  \NC \xleftarrow         [big]  \NC \NR
+%D   \NC \tex{xequal             }  \NC \xequal             [big]  \NC \NR
+%D   \NC \tex{xRightarrow        }  \NC \xRightarrow        [big]  \NC \NR
+%D   \NC \tex{xLeftarrow         }  \NC \xLeftarrow         [big]  \NC \NR
+%D   \NC \tex{xLeftrightarrow    }  \NC \xLeftrightarrow    [big]  \NC \NR
+%D   \NC \tex{xleftrightarrow    }  \NC \xleftrightarrow    [big]  \NC \NR
+%D   \NC \tex{xmapsto            }  \NC \xmapsto            [big]  \NC \NR
+%D   \NC \tex{xtwoheadrightarrow }  \NC \xtwoheadrightarrow [big]  \NC \NR
+%D   \NC \tex{xtwoheadleftarrow  }  \NC \xtwoheadleftarrow  [big]  \NC \NR
+%D   \NC \tex{xrightharpoondown  }  \NC \xrightharpoondown  [big]  \NC \NR
+%D   \NC \tex{xrightharpoonup    }  \NC \xrightharpoonup    [big]  \NC \NR
+%D   \NC \tex{xleftharpoondown   }  \NC \xleftharpoondown   [big]  \NC \NR
+%D   \NC \tex{xleftharpoonup     }  \NC \xleftharpoonup     [big]  \NC \NR
+%D   \NC \tex{xhookleftarrow     }  \NC \xhookleftarrow     [big]  \NC \NR
+%D   \NC \tex{xhookrightarrow    }  \NC \xhookrightarrow    [big]  \NC \NR
+%D   \NC \tex{xleftrightharpoons }  \NC \xleftrightharpoons [big]  \NC \NR
+%D   \NC \tex{xrightleftharpoons }  \NC \xrightleftharpoons [big]  \NC \NR
+%D \stoptable}
+
 \def\definematharrow
   {\doquadrupleargument\dodefinematharrow}
 
@@ -166,6 +237,14 @@
 
 % Adapted from amsmath.
 
+%D \macros{mtharrowfill,defaultmtharrowfill}
+%D To extend the arrows we need to define a \quotation{math arrow fill}. This
+%D command takes 7 arguments: the first four correspond the second argument of
+%D \tex{definematharrow} explained above. The other three specify the tail,
+%D body and head of the arrow. \tex{defaultmtharrowfill} has values tweaked to
+%D match latin modern fonts. For fonts that are significantly different (e.g.
+%D cows) a different set of values need to be determined.
+
 \def\mtharrowfill#1#2#3#4#5#6#7%
   {$\mathsurround 0pt
     \thickmuskip0mu\medmuskip\thickmuskip\thinmuskip\thickmuskip
@@ -176,7 +255,8 @@
 
 \def\defaultmtharrowfill{\mtharrowfill 7227}
 
-% Maybe redefine leftarrowfill and rightarrowfill using arrowfill
+%D We now define some arrow fills that will be used for defining the arrows.
+%D \tex{leftarrowfill} and \tex{rightarrowfill} are redefined using \tex{defaultmtharrowfill}.
 
 \def\rightarrowfill       {\defaultmtharrowfill \relbar              \relbar \rightarrow       }
 \def\leftarrowfill        {\defaultmtharrowfill \leftarrow           \relbar \relbar           }
@@ -196,7 +276,9 @@
 \def\hookleftfill {\defaultmtharrowfill \leftarrow            \relbar{\relbar\joinrel\rhook}}
 \def\hookrightfill{\defaultmtharrowfill{\lhook\joinrel\relbar}\relbar \rightarrow}
 
-% From amsmath.sty, extarrows.sty, extpfel.sty and mathtools.sty(ams)
+%D Now we define most commonly used arrows. These include arrows defined in
+%D \filename{amsmath.sty}, \filename{extarrows.sty}, \filename{extpfel.sty}
+%D and mathtools.sty packages for \LATEX.
 
 \definematharrow [xrightarrow]        [0359] [\rightarrowfill]
 \definematharrow [xleftarrow]         [3095] [\leftarrowfill]
@@ -216,17 +298,21 @@
 \definematharrow [xleftrightharpoons] [3399,3399] [\leftharpoonupfill,\rightharpoondownfill]
 \definematharrow [xrightleftharpoons] [3399,3399] [\rightharpoonupfill,\leftharpoondownfill]
 
-\definematharrow [xhdefaultookleftarrow]  [3095] [\hookleftfill]
-\definematharrow [xhdefaultookrightarrow] [0395] [\hookrightfill]
-
-% \startformula \xrightarrow{stuff on top}\stopformula
-% \startformula \xrightarrow{}{stuff on top}\stopformula
-% \startformula \xrightarrow{stuff below}{}\stopformula
-% \startformula \xrightarrow{stuff below}{stuff on top}\stopformula
-
-% \startformula \xleftarrow [none]{stuff below}{stuff on top}\stopformula
-% \startformula \xleftarrow [small]{stuff below}{stuff on top}\stopformula
-% \startformula \xleftarrow [medium]{stuff below}{stuff on top}\stopformula
-% \startformula \xleftarrow [big]{stuff below}{stuff on top}\stopformula
+\definematharrow [xhookleftarrow]  [3095] [\hookleftfill]
+\definematharrow [xhookrightarrow] [0395] [\hookrightfill]
+
+%D These arrows can be used as folows:
+%D \startbuffer
+%D \startformula \xrightarrow{stuff on top}\stopformula
+%D \startformula \xrightarrow{}{stuff on top}\stopformula
+%D \startformula \xrightarrow{stuff below}{}\stopformula
+%D \startformula \xrightarrow{stuff below}{stuff on top}\stopformula
+%D
+%D \startformula \xleftarrow [none]{stuff below}{stuff on top}\stopformula
+%D \startformula \xleftarrow [small]{stuff below}{stuff on top}\stopformula
+%D \startformula \xleftarrow [medium]{stuff below}{stuff on top}\stopformula
+%D \startformula \xleftarrow [big]{stuff below}{stuff on top}\stopformula
+%D \stopbuffer
+%D \typebuffer which gives \getbuffer
 
 \protect \endinput
diff --git a/tex/context/base/math-tex.tex b/tex/context/base/math-tex.tex
index d2516bc62..fc3cd7ae6 100644
--- a/tex/context/base/math-tex.tex
+++ b/tex/context/base/math-tex.tex
@@ -414,6 +414,7 @@
 \definemathsymbol [grave]     [accent] [mr] ["12]
 \definemathsymbol [ddot]      [accent] [mr] ["7F]
 \definemathsymbol [tilde]     [accent] [mr] ["7E]
+\definemathsymbol [mathring]  [accent] [mr] ["17]
 \definemathsymbol [bar]       [accent] [mr] ["16]
 \definemathsymbol [breve]     [accent] [mr] ["15]
 \definemathsymbol [check]     [accent] [mr] ["14]
diff --git a/tex/context/base/s-ptj-01.tex b/tex/context/base/s-ptj-01.tex
index 1effb7d73..188af73bd 100644
--- a/tex/context/base/s-ptj-01.tex
+++ b/tex/context/base/s-ptj-01.tex
@@ -1,6 +1,6 @@
 %D \module
 %D   [      file=s-ptj-01,
-%D        version=2006.11.14,
+%D        version=2006.11.28,
 %D          title=\CONTEXT\ Style File,
 %D       subtitle=PracTeX Journal Style,
 %D         author=Aditya Mahajan,
@@ -17,6 +17,7 @@
 %M \def\PRACTEX{\PracTeX}
 %M \def\TPJ    {The \PRACTEX\ Journal}
 %M \useurl[TPJ][http://www.tug.org/pracjourn/][][\TPJ]
+%M \useurl[texgyre][http://www.gust.org.pl/projects/e-foundry/tex-gyre/]
 
 \writestatus  {loading}   {Context Module for the PracTeX Journal}
 
@@ -30,11 +31,11 @@
 %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 texmfstart 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-ptj-01.tex
+%D texmfstart texexec --module s-ptj-01.tex
 %D \stoptyping
 
 \startmodule[pracjourn]
@@ -72,8 +73,9 @@
 %D used with a 15.5pt baseline skip. Font protrusion is enabled, but font
 %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.
+%D matching. Right now, the \TEX{gyre} fonts are not distributed with
+%D \CONTEXT. They can be downloaded from \url[texgyre]. Most of the numbers
+%D (page numbers, figure numbers, section numbers) are set in oldstyle.
 
 \usetypescript  [serif,sans,mono] [hanging] [pure]
 \setupalign     [hanging]
@@ -223,8 +225,8 @@
     {\doadditionalinfo{Address}{\getvariable{pracjourn}{address}}}
   \iftitleskipdone  \blank[big] \fi
   \doadditionalinfo{Abstract}%
-    {\setupindenting[yes]
-     \setupinterlinespace
+    {\setupindenting[yes]%
+     \setupinterlinespace%
      \getbuffer[abstract]
      \endgraf}
   \egroup
diff --git a/tex/context/base/symb-glm.tex b/tex/context/base/symb-glm.tex
index 63ac4ed26..b07a3a426 100644
--- a/tex/context/base/symb-glm.tex
+++ b/tex/context/base/symb-glm.tex
@@ -36,26 +36,26 @@
 %
 % but was also one of the reasons for triggering the lm project, so:
 
-\definefontsynonym [GuilSerif]            [cork-lmr10]    [encoding=ec]
-\definefontsynonym [GuilSerifBold]        [cork-lmbx10]   [encoding=ec]
-\definefontsynonym [GuilSerifItalic]      [cork-lmti10]   [encoding=ec]
-\definefontsynonym [GuilSerifSlanted]     [cork-lmsl10]   [encoding=ec]
-\definefontsynonym [GuilSerifBoldItalic]  [cork-lmbxti10] [encoding=ec]
-\definefontsynonym [GuilSerifBoldSlanted] [cork-lmbxsl10] [encoding=ec]
+\definefontsynonym [GuilSerif]            [ec-lmr10]    [encoding=ec]
+\definefontsynonym [GuilSerifBold]        [ec-lmbx10]   [encoding=ec]
+\definefontsynonym [GuilSerifItalic]      [ec-lmti10]   [encoding=ec]
+\definefontsynonym [GuilSerifSlanted]     [ec-lmsl10]   [encoding=ec]
+\definefontsynonym [GuilSerifBoldItalic]  [ec-lmbxti10] [encoding=ec]
+\definefontsynonym [GuilSerifBoldSlanted] [ec-lmbxsl10] [encoding=ec]
 
-\definefontsynonym [GuilSans]             [cork-lmss10]   [encoding=ec]
-\definefontsynonym [GuilSansBold]         [cork-lmssbx10] [encoding=ec]
-\definefontsynonym [GuilSansItalic]       [cork-lmssi10]  [encoding=ec]
-\definefontsynonym [GuilSansSlanted]      [cork-lmssi10]  [encoding=ec]
-\definefontsynonym [GuilSansBoldItalic]   [cork-lmssbi10] [encoding=ec]
-\definefontsynonym [GuilSansBoldSlanted]  [cork-lmssbi10] [encoding=ec]
+\definefontsynonym [GuilSans]             [ec-lmss10]   [encoding=ec]
+\definefontsynonym [GuilSansBold]         [ec-lmssbx10] [encoding=ec]
+\definefontsynonym [GuilSansItalic]       [ec-lmssi10]  [encoding=ec]
+\definefontsynonym [GuilSansSlanted]      [ec-lmssi10]  [encoding=ec]
+\definefontsynonym [GuilSansBoldItalic]   [ec-lmssbi10] [encoding=ec]
+\definefontsynonym [GuilSansBoldSlanted]  [ec-lmssbi10] [encoding=ec]
 
-\definefontsynonym [GuilMono]             [cork-lmtt10]   [encoding=ec]
-%definefontsynonym [GuilMonoBold]         [cork-lmtt10]   [encoding=ec]
-%definefontsynonym [GuilMonoSlanted]      [cork-lmtt10]   [encoding=ec]
-%definefontsynonym [GuilMonoItalic]       [cork-lmtt10]   [encoding=ec]
-%definefontsynonym [GuilMonoBoldItalic]   [cork-lmtt10]   [encoding=ec]
-%definefontsynonym [GuilMonoBoldSlanted]  [cork-lmtt10]   [encoding=ec]
+\definefontsynonym [GuilMono]             [ec-lmtt10]   [encoding=ec]
+%definefontsynonym [GuilMonoBold]         [ec-lmtt10]   [encoding=ec]
+%definefontsynonym [GuilMonoSlanted]      [ec-lmtt10]   [encoding=ec]
+%definefontsynonym [GuilMonoItalic]       [ec-lmtt10]   [encoding=ec]
+%definefontsynonym [GuilMonoBoldItalic]   [ec-lmtt10]   [encoding=ec]
+%definefontsynonym [GuilMonoBoldSlanted]  [ec-lmtt10]   [encoding=ec]
 
 \definesymbol [xleftguillemot]   [\getglyph{Guil}{\char19}]
 \definesymbol [xrightguillemot]  [\getglyph{Guil}{\char20}]
diff --git a/tex/context/interface/keys-cz.xml b/tex/context/interface/keys-cz.xml
index b2bc2225e..2e029e507 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="2006.11.27 11:04">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="cz" version="2006.11.29 09:55">
 
   <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 3268f705d..d3826a6b2 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="2006.11.27 11:04">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="de" version="2006.11.29 09:55">
 
   <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 3bc84189f..bba126e29 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="2006.11.27 11:04">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="en" version="2006.11.29 09:55">
 
   <cd:variables>
     <cd:variable name="one" value="one"/>
diff --git a/tex/context/interface/keys-fr.xml b/tex/context/interface/keys-fr.xml
index 68f74858e..83d023a17 100644
--- a/tex/context/interface/keys-fr.xml
+++ b/tex/context/interface/keys-fr.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.11.27 11:04">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="fr" version="2006.11.29 09:55">
 
   <cd:variables>
     <cd:variable name="one" value="un"/>
diff --git a/tex/context/interface/keys-it.xml b/tex/context/interface/keys-it.xml
index 094875084..1eede06e2 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="2006.11.27 11:04">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="it" version="2006.11.29 09:55">
 
   <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 8341fcf11..d6d4b105a 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="2006.11.27 11:04">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="nl" version="2006.11.29 09:55">
 
   <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 c8e8db8ba..dd412333b 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="2006.11.27 11:04">
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands" name="context" language="ro" version="2006.11.29 09:55">
 
   <cd:variables>
     <cd:variable name="one" value="unu"/>