cstex (11feb15)

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

1 files changed, 29 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/cstex/opmac-u-en.tex b/Master/texmf-dist/doc/cstex/opmac-u-en.tex
index 82c65e45165..c81b6c9ac19 100644
--- a/Master/texmf-dist/doc/cstex/opmac-u-en.tex
+++ b/Master/texmf-dist/doc/cstex/opmac-u-en.tex
@@ -487,7 +487,8 @@ character between h and i.
 \sec Colors
 %%%%%%%%%%%
 
-The colors selection macros are working only if pdf\TeX-like engine is used.
+The colors selection macros are working only if pdf\TeX-like engine (or
+Xe\TeX) is used.
 OPmac provides a small number of color selectors: 
 {\localcolor\Blue "\Blue"}, 
 {\localcolor\Red "\Red"}, 
@@ -499,31 +500,31 @@ OPmac provides a small number of color selectors:
 {"\White"}, 
 {\localcolor\Grey "\Grey"}, 
 {\localcolor\LightGrey "\LightGrey"} and
-"\Black". But user can define more
+"\Black". User can define more
 such selectors by setting the CMYK components. For example
 
 \begtt
 \def\Orange{\setcmykcolor{0 0.5 1 0}}
 \endtt
 
-The selectors itself change the color of the text and of the lines with the
-thickness more than 1bp. If the "\linecolor" immediately precedes the color
-selector then the lines with thickness less or equal 1bp are colored. This
-is a second independent type of the color.
+The current color in CMYK format is saved in the "\currentcolor" macro, thus you
+can save it to your macro "\let\yourmacro=\currentcolor" and you can return to
+this color by "\setcmykcolor\yourmacro".
 
-The color selectors work globally on the one page. If the colored text is
-broken to the next page then the color is correctly set on the following
-page(s) after the second run of \TeX, because this event is implemented via
-external file. User can write "\localcolor" inside the group. This command
-saves the current color and restore it after the group is completed. It is
-supposed that the group corresponds to the boundary of a box which cannot break 
-to more pages. If this is not true case then user can use "\longlocalcolor" 
-instead "\localcolor". Example:
+The color selectors work globally by default. It means that colors don't
+respect the \TeX{} groups and you have to return back to the black
+typesetting explicitly by the "\Black" selector. 
+
+OPmac provides the macro "\localcolor". If it is used then the
+colors return back to the original value after \TeX{} groups automatically.
+The macro has local validity. You can use it at begin of your document 
+(for all \TeX{} broups) or only in selected \TeX{} group (for this group 
+and nested goups). Example:
 
 \begtt
 \Red The text is red
-\hbox{\localcolor \Blue here is blue {\localcolor \Green and green}
-      restored blue \Brown and brown}
+{\localcolor \Blue here is blue {\Green and green} 
+             restored blue \Brown and brown}
 now the text is red.
 \endtt
 
@@ -1153,7 +1154,7 @@ Parameters are:
 
 \begitems
 * <pg> \dots\ "1" or "2" specifies one-page or two-pages design.
-* <fmt> \dots\ paper format (a4, a4l, etc.).
+* <fmt> \dots\ paper format (a4, a4l, a5, letter, etc. or user defined).
 * <left>, <right>, <top>, <bot> \dots\ gives the amount of left, right,
       top and bottom margins.
 * <unit> \dots\ unit used for values <left>, <right>, <top>, <bot>.
@@ -1177,6 +1178,17 @@ declared margins are true for odd pages. The margins at the even pages are
 mirrored in such case, it means that <left> is replaced by <right> and vice
 versa.
 
+The "<fmt>" can be in the form "(<width>,<height>)<unit>" where "<unit>" is
+optional. If it is missing then "<unit>" after margins sspecification is
+used. Fo example:
+
+\begtt
+\margins/1 (100,200) (7,7,7,7)mm
+\endtt
+%
+declares the paper 100$\times$200\,mm with all four margins 7\,mm. The spaces
+before and after "<fmt>" parameter are necessery.
+
 The command "\magscale[<factor>]" scales the whole typesetting area. The
 fixed point of such scaling is the so called the ``Knuth's point'': 1in
 below and 1in right of paper sides. Typesetting (breakpoints etc.) is