update manual

2 files changed, 24 insertions, 36 deletions

diff --git a/doc/context/third/letterspace/letterspace.tex b/doc/context/third/letterspace/letterspace.tex
index 9c04b11..3b84d39 100644
--- a/doc/context/third/letterspace/letterspace.tex
+++ b/doc/context/third/letterspace/letterspace.tex
@@ -70,15 +70,8 @@
 \usetypescript [serif] [hz] [highquality]
 \setupalign    [hanging,hz]
 
-% \setupbodyfontenvironment [default] [12pt] [interlinespace=15pt]
-% \setupbodyfontenvironment [default] [11pt] [interlinespace=13pt]
-% \setupbodyfontenvironment [default] [10pt] [interlinespace=12pt]
-% \setupbodyfontenvironment [default] [9pt]  [interlinespace=11pt]
-% \setupbodyfontenvironment [default] [8pt]  [interlinespace=10pt]
-
 \setupbodyfontenvironment [default] [em=italic]
 
-% \def\quote#1{\bgroup\italic#1\egroup}
 \definehighlight[quote][style=italic]
 \def\uprightslash{\bgroup\tf/\egroup}
 \def\uprightomiss{\bgroup\tf[\dots]\egroup}
@@ -161,14 +154,14 @@
 % Interaction                                                   %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+\setupcolor[dem]
+
 \definecolor [gutenred] [x=bf221f] % rubrication from digitized_Göttingen Gutenberg bible
 
 \setupinteraction[%
   state=start,
   color=gutenred,
   contrastcolor=gutenred,
-  %color=,
-  %contrastcolor=,
   style=,
   focus=standard,
   title={Letterspace Module},
@@ -236,17 +229,19 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 \def   \tocfontchapter#1{\WORD\LSchapter{#1}}
-%\def   \tocfontsection#1{\word\sc\LSsection{#1}}
 \def   \tocfontsection#1{\slightly{#1}}
 \def\tocfontsubsection#1{\LSsubsection{#1}}
 
 \setuplist [chapter] [
-  alternative=b,
+  before={\blank[2*line]},
+  alternative=c,
   textcommand=\tocfontchapter,
+  interaction=text,
 ]
 
 \setuplist [section] [
-  alternative=c,
+  before=\blank,
+  alternative=b,
   interaction=text,
   margin=2em,
   numberstyle=,
@@ -255,16 +250,13 @@
 ]
 
 \setuplist [subsection] [
-  %after=2.5em,    % from the hack
-  alternative=d,
+  alternative=b,
   interaction=text,
-  margin=3em,     % hanging
+  margin=3em,
   textcommand=\tocfontsubsection,
 ]
 
 \setuplistalternative[c] [
-  %distance=0em,
-  %width=0pt,
   stretch=.5em,
   command=\hskip.5em\phglistdots\hskip.5em\relax,
 ]
@@ -449,11 +441,11 @@
 
 \page
 
-\useURL [phg-mail] [megas.kapaneus@gmail.com]   [] []
+\useURL [phg-mail] [phg42.2a@gmail.com]         [] []
 \useURL [phg-bibu] [https://bitbucket.org/phg/] [] []
 \startstandardmakeup
   \vfill\raggedright\tfx
-  © 2011-03-16 {\italic Philipp Gesang}, Heidelberg\par
+  © 2011--2013 {\italic Philipp Gesang}, Radebeul\par
   The latest Version can be found at \from [phg-bibu].\par
   Mail bugs and fixes or complaints and suggestions to \from
   [phg-mail].\par
@@ -769,30 +761,27 @@ good: \te{O Tite,} tute, \te{Tati,} tibi tanta, \te{tyranne,} tulisti.)
 
 \stopsection
 
-\startsection[Capital Spacing]
+\startsection[title=Capital Spacing]
 \startbuffer [display:capitals]
   \start%
   \setupbodyfont [11pt]%
-  \framed[
+  \startframed[
     align=middle,
     background=color,
     backgroundcolor=gray:2,
     offset=1em,
     frame=off,
-  ]{%
-      \def\teststring{mispavayatsim}%
-      %\definefontfeature [capitals] [cpsp=yes,kern=yes]% how’s this supposed to work?
-      \bf%
-      {\color[gray:7]{\WORD\teststring}}\par
-      %{\setff{capitals}\WORD\teststring}\par % why doesn’t this have
-                                              %an effect with *any* font?
-      {\color[gray:8]{\subff{kerning}\WORD\teststring}}\par
-      {\color[gray:9]{\largecaps{\WORD\teststring}}}\par
-  }
+  ]
+    \def\teststring{mispavayatsim}%
+    \bf%
+    {\colored[gray:7]{\WORD\teststring}}\par
+    {\colored[gray:8]{\subff{kerning}\WORD\teststring}}\par
+    {\colored[gray:9]{\largecaps{\WORD\teststring}}}\par
+  \stopframed
   \stop%
 \stopbuffer
 
-\starthangaround{\getbuffer [display:capitals]}
+\starthanging[location=right]{\getbuffer [display:capitals]}
 Another natural use of letter spacing is to space out capitals and
 small caps, whose legibility suffers with increasing markup
 length.
@@ -804,7 +793,7 @@ Row number two has the kerning removed and thus the distance between
 letters increases.
 The final row, as the second, lacks kerning and adds
 20\,\letterpercent\ letter spacing.
-\stophangaround
+\stophanging
 
 As is apparent from the example, the difference in spacing
 particularly influences the outcome.
@@ -834,7 +823,7 @@ emphasis as well.
 
 \startchapter[title=License]
 
-Copyright 2011 \te{Philipp Gesang}. All rights reserved.
+Copyright 2011--2013 \te{Philipp Gesang}. All rights reserved.
 
 Redistribution and use in source and binary forms, with or
 without modification, are permitted provided that the following
diff --git a/tex/context/third/letterspace/t-letterspace.mkiv b/tex/context/third/letterspace/t-letterspace.mkiv
index 0a2744a..03c2e0d 100644
--- a/tex/context/third/letterspace/t-letterspace.mkiv
+++ b/tex/context/third/letterspace/t-letterspace.mkiv
@@ -1,6 +1,6 @@
 %D \module [
 %D         file=t-letterspace,
-%D      version=2011-03-15T12:59:48+0100 or later,
+%D      version=2013-03-27 22:55:19+0100 or later,
 %D        title=\CONTEXT\ User Module,
 %D     subtitle=Letterspacing commands,
 %D       author=Philipp Gesang,
@@ -82,7 +82,6 @@
       \subtractfontfeaturefromfont{letterspace:kerning}%
     }%
   }%
-  % \ifhmode\ifnum\lastnodetype=\@@gluenode
   \ifhmode\ifnum\lastnodetype=\gluenodecode
       \unskip{\letterspace_setstuff\ }%
     \fi