summaryrefslogtreecommitdiff
path: root/macros/optex/doc
diff options
context:
space:
mode:
Diffstat (limited to 'macros/optex/doc')
-rw-r--r--macros/optex/doc/omls.tex3
-rw-r--r--macros/optex/doc/optex-doc.pdfbin1383214 -> 1387160 bytes
-rw-r--r--macros/optex/doc/optex-doc.tex2
-rw-r--r--macros/optex/doc/optex-math.tex7
-rw-r--r--macros/optex/doc/optex-techdoc.tex4
-rw-r--r--macros/optex/doc/optex-userdoc.tex36
6 files changed, 30 insertions, 22 deletions
diff --git a/macros/optex/doc/omls.tex b/macros/optex/doc/omls.tex
index 0f42e4b3c0..5c21fd5671 100644
--- a/macros/optex/doc/omls.tex
+++ b/macros/optex/doc/omls.tex
@@ -509,7 +509,8 @@ output of the \LaTeX/ source file.
italic, \.`\bf` selects upright bold font, \.`\bi` selects bold italic and
\.`\tt` selects a monospaced font, \.`\em` select italic (if upright is current) or upright
(if italic is current). The font sizes or other font features are typically ignored
-by cnv-programs. The actual font selection is closed at the end of the current group.
+by cnv-programs. Selection of font is local to a group (i.e. should be reverted
+at the end of the current group).
The groups are given:
\begitems
* explicitly by `{` and `}` characters (which are not delimiters of
diff --git a/macros/optex/doc/optex-doc.pdf b/macros/optex/doc/optex-doc.pdf
index 3bcf1a843e..910019b5d9 100644
--- a/macros/optex/doc/optex-doc.pdf
+++ b/macros/optex/doc/optex-doc.pdf
Binary files differ
diff --git a/macros/optex/doc/optex-doc.tex b/macros/optex/doc/optex-doc.tex
index 8d056698f4..f8cb192d86 100644
--- a/macros/optex/doc/optex-doc.tex
+++ b/macros/optex/doc/optex-doc.tex
@@ -21,7 +21,7 @@
\tit Format Based on Plain \TeX/ and OPmac\fnotemark1
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\hfill Version 1.03
+\hfill Version 1.04
\centerline{\it Petr Olšák, 2020, 2021}
diff --git a/macros/optex/doc/optex-math.tex b/macros/optex/doc/optex-math.tex
index 57afd22334..5f590d5b25 100644
--- a/macros/optex/doc/optex-math.tex
+++ b/macros/optex/doc/optex-math.tex
@@ -954,6 +954,7 @@ should be at baseline if the repeating symbol is at baseline. Or they should be
at the math axis if the repeating symbol is at the math axis. We have to use \x`\cdots` instead
`\dots` in the second case. Example:
$$
+ \addto\_ttfont{\thefontsize[9.5]}
`a_1, a_2, \dots, a_n, \quad a_1 + a_2 + \cdots + a_n` \qquad
a_1, a_2, \dots, a_n, \quad a_1 + a_2 + \cdots + a_n
$$
@@ -1576,8 +1577,7 @@ We can re-define the `\_normalmath` macro by:
\begtt \typosize[10/12]
\addto\_normalmath {\_loadmathfamily 5 bbold }
-\_regtfm bbold 0 bbold5 5.5 bbold6 6.5 bbold7 7.5 bbold8 8.5 bbold9
- 9.5 bbold10 11.1 bbold12 15 bbold17 * % using all bbold*.tfm
+\_regtfm bbold 0 bbold5 6 bbold7 8.5 bbold10 * % using all bbold*.pfb
\_normalmath % reload the math fonts collection
\endtt
%
@@ -1585,8 +1585,7 @@ The string \"`bbold`" is declared by `\_regtfm` as a collection of all
`bbold*.tfm` fonts, the optical sizes are supported.
\addto\_normalmath {\_loadmathfamily 5 bbold }
-\_regtfm bbold 0 bbold5 5.5 bbold6 6.5 bbold7 7.5 bbold8 8.5 bbold9
- 9.5 bbold10 11.1 bbold12 15 bbold17 * % using all bbold*.tfm
+\_regtfm bbold 0 bbold5 6 bbold7 8.5 bbold10 * % using all bbold*.pfb
\_normalmath
\Umathchardef \bbplus 2 5 "2B
\Umathchardef \bble 3 5 "3C
diff --git a/macros/optex/doc/optex-techdoc.tex b/macros/optex/doc/optex-techdoc.tex
index 31f789d56c..4f94e8be70 100644
--- a/macros/optex/doc/optex-techdoc.tex
+++ b/macros/optex/doc/optex-techdoc.tex
@@ -269,6 +269,10 @@ allocators, and callback management. Callback management is a nice extension
and is actually used in \OpTeX/. Other functions are defined more or less just
to suit luaotfload's use.
+The allocations are declared in subsection~\ref[lua-alloc], calbacks are
+implemented in subsection~\ref[callbacks] and handling with colors can be
+found in the subsection~\ref[lua-colors].
+
\newtoks \_hisyntaxlua
\_hisyntaxlua={%
\_hicolor C \Green
diff --git a/macros/optex/doc/optex-userdoc.tex b/macros/optex/doc/optex-userdoc.tex
index 93dad28377..16fd468c1f 100644
--- a/macros/optex/doc/optex-userdoc.tex
+++ b/macros/optex/doc/optex-userdoc.tex
@@ -1349,14 +1349,16 @@ using this empty internal name.
{`\White`},
{\Grey `\Grey`},
{\LightGrey `\LightGrey`} and
-`\Black`. User can define more
-such selectors by setting four CMYK components
-\new
-or three RGB components. For example
+`\Black`. More
+such selectors can be defined
+by setting four CMYK components (using \^`\setcmykcolor`),
+or three RGB components (using \^`\setrgbcolor`)
+or one grey component (using \^`\setgreycolor`). For example
\begtt
\def \Orange {\setcmykcolor{0 0.5 1 0}}
\def \Purple {\setrgbcolor{1 0 1}}
+\def \DarkGrey {\setgreycolor{.1}}
\endtt
\new
@@ -1368,7 +1370,7 @@ name, then the letters B, C, etc. are appended to the name in \OpTeX/. For examp
`\Chocolate` is Chocolate1, `\ChocolateB` is Chocolate2 etc.
\new
-The color selectors work locally in groups by default but with limitations. See
+The color selectors work locally in groups by default. See
the technical documentation, section~\ref[colors] for more information.
The basic colors \^`\Blue`, \^`\Red`, \^`\Cyan`, \^`\Yellow` etc.\ are defined
@@ -1405,23 +1407,24 @@ If a convex linear combination (as in the last example above) is used then it
emulates color behavior on a painter's palette.
You can use \^`\rgbcolordef` instead of \^`\colordef` if you want to mix colors
in the additive RGB color space.
+If \^`\onlyrgb` is set then \^`\colordef` works like \^`\rgbcolordef`.
\def\coloron#1#2#3{%
- \setbox0=\hbox{{#2#3}}\leavevmode
- \localcolor \rlap{#1\strut \vrule width\wd0}\box0
+ \setbox0=\hbox{#2#3}\leavevmode
+ \rlap{#1\strut \vrule width\wd0}\box0
}
-The following example defines the macro for the
-\coloron\Yellow\Brown{colored text on the colored background}. Usage:
+The following example defines the macro for
+\coloron\Yellow\Brown{colored text on colored background}. Usage:
`\coloron<background><foreground>{<text>}`
-The `\coloron` can be defined as follows:
+The `\coloron` macro can be defined as follows:
\begtt
\def\coloron#1#2#3{%
- \setbox0=\hbox{{#2#3}}%
+ \setbox0=\hbox{#2#3}%
\leavevmode \rlap{#1\strut \vrule width\wd0}\box0
}
-\coloron\Yellow\Brown{The brown text on the yellow background}
+\coloron\Yellow\Brown{Brown text on yellow background}
\endtt
\secc Images
@@ -1718,12 +1721,12 @@ temporarily standard category codes during loading and it tries to
load `<filename>.opm` or `<filename>.tex` or `<filename>`, the first occurence
wins. Example:
\begtt
-\load [qrcode, tikz]
+\load [qrcode, scanbase]
\endtt
%
-does `\input qrcode.opm` \,and `\input tikz.tex` \,and it saves
-local information about the fact that these file names
-`qrcode` and `tikz` were already used, i.\,e. next \^`\load` will skip them.
+does `\input qrcode.opm` \,and \,and `\input scanbase.tex`.
+It saves local information about the fact that these file names
+(`qrcode`, `scanbase`) were loaded, i.e.\ next \^`\load` will skip them.
It is strongly recommended to use the `\load` macro for loading external
macros if you need them. On the other hand, if your source document is structured
@@ -1733,6 +1736,7 @@ The macro packages intended to \OpTeX/ have the name `*.opm`.
The following packages are distributed as part of \OpTeX/:
\begitems
* `qrcode.opm` enables to create QR codes.
+* `tikz.opm` does `\input tikz.tex`, i.e.\ loads Ti{\it k\/}Z. It adds \OpTeX/-specific code.
* \ulink[http://petr.olsak.net/ftp/olsak/optex/mte-doc.pdf]{\tt mte.opm}
includes settings for microtypographic extensions (protrusions+expanding fonts).
* `vlna.opm` enables to protect of one-letter prepositions and more things automatically.