7 files changed, 30 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/optex/base/README b/Master/texmf-dist/doc/optex/base/README
index ac773589136..bd8d5824e87 100644
--- a/Master/texmf-dist/doc/optex/base/README
+++ b/Master/texmf-dist/doc/optex/base/README
@@ -19,6 +19,10 @@ doc/   ... PDF version of the OpTeX documentation and sources.
 
 History:
 
+<1.05> Jan. 2022:
+       \_par used internally instead \par if \partokenname is available.
+       Extended format \ref[label]{text} and \pgref[label]{text} introduced.
+       Fixed a few bugs.
 <1.04> Aug. 2021:
        Color handling reimplemented, LuaTeX's attributes are used now.
        Loading Unicode math fonts reimplemented, (s)script size given by font.
diff --git a/Master/texmf-dist/doc/optex/base/omls.tex b/Master/texmf-dist/doc/optex/base/omls.tex
index 5c21fd5671e..a7ac9edd01e 100644
--- a/Master/texmf-dist/doc/optex/base/omls.tex
+++ b/Master/texmf-dist/doc/optex/base/omls.tex
@@ -44,7 +44,12 @@
 %\ttindent=0pt
 \everylist={\advance\ttindent by-1em}
 \hyperlinks \Green \Green
-\def\cskip{\par\nobreak}
+\ifx\_partokenset\undefined
+   \def\cskip{\par\nobreak}
+\else
+   \def\cskip{\_par\nobreak}
+\fi
+
 \def\begblock{\medskip\hbox\bgroup\vrule\vbox\bgroup\hrule\smallskip
    \_fnset\leftskip=\parindent \rightskip=\parindent \medskip\noindent}
 \def\endblock{\medskip\hrule\egroup\vrule\egroup}
diff --git a/Master/texmf-dist/doc/optex/base/optex-doc.pdf b/Master/texmf-dist/doc/optex/base/optex-doc.pdf
index 910019b5d94..85260e0fdc2 100644
--- a/Master/texmf-dist/doc/optex/base/optex-doc.pdf
+++ b/Master/texmf-dist/doc/optex/base/optex-doc.pdf
diff --git a/Master/texmf-dist/doc/optex/base/optex-doc.tex b/Master/texmf-dist/doc/optex/base/optex-doc.tex
index f8cb192d86f..1c9af23aa9f 100644
--- a/Master/texmf-dist/doc/optex/base/optex-doc.tex
+++ b/Master/texmf-dist/doc/optex/base/optex-doc.tex
@@ -21,7 +21,7 @@
 \tit Format Based on Plain \TeX/ and OPmac\fnotemark1
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
-\hfill Version 1.04
+\hfill Version 1.05
 
 \centerline{\it Petr Olšák, 2020, 2021}
 
diff --git a/Master/texmf-dist/doc/optex/base/optex-math.tex b/Master/texmf-dist/doc/optex/base/optex-math.tex
index 5f590d5b25c..4c9d5dd01ff 100644
--- a/Master/texmf-dist/doc/optex/base/optex-math.tex
+++ b/Master/texmf-dist/doc/optex/base/optex-math.tex
@@ -859,9 +859,12 @@ stretchability in the `\>` space, and more stretchability in the `\;` space.
 The registers \x`\thinmuskip`, \x`\medmuskip`, and \x`\thickmuskip` store so-called
 \ii mu/values {\em mu values} given by math unit `mu`. It is 1/18 em and this unit depends
 on the current font size used in the math formula ($S$ or $SS$ styles use
-smaller font size, the `mu` unit is smaller here). You can use \x`\muskip`
-instead `\hskip` or \x`\mukern` instead `\kern` if you want to use this
-special mu unit. It is allowed only in math mode.
+smaller font size, the `mu` unit is smaller here). You can use \x`\mskip`
+instead `\hskip` or \x`\mkern` instead `\kern` if you want to use this
+special `mu` unit. It is allowed only in math mode.
+
+If \x`\nonscript` precedes `\hskip`, `\mskip`, `\kern`, or `\mkern` then this
+space is applied only in $D$ or $T$ style.
 
 The \x`\quad` and \x`\qquad` spaces have fixed width and they can be used in text
 mode too. (\OpTeX/ allows to use `\,` in text mode too).
diff --git a/Master/texmf-dist/doc/optex/base/optex-techdoc.tex b/Master/texmf-dist/doc/optex/base/optex-techdoc.tex
index 4f94e8be702..1748e9f3eaa 100644
--- a/Master/texmf-dist/doc/optex/base/optex-techdoc.tex
+++ b/Master/texmf-dist/doc/optex/base/optex-techdoc.tex
@@ -254,7 +254,7 @@ The `\margins` macro is documented in the section~\ref[marg].
 \secc[langphrases] Multilingual phrases and quotation marks
 \printdoc languages.opm
 
-\sec Other macros
+\sec[others] Other macros
 Miscellaneous macros are here.
 \printdoc others.opm
 
diff --git a/Master/texmf-dist/doc/optex/base/optex-userdoc.tex b/Master/texmf-dist/doc/optex/base/optex-userdoc.tex
index 16fd468c1fa..3fefc226573 100644
--- a/Master/texmf-dist/doc/optex/base/optex-userdoc.tex
+++ b/Master/texmf-dist/doc/optex/base/optex-userdoc.tex
@@ -564,7 +564,8 @@ if optional parameter
 `[<label>]` is appended to \^`\chap`, \^`\sec`,
 \^`\secc`, \^`\caption/t`, \^`\caption/f` or \^`\eqmark`. The alternative syntax is
 to use \^`\label[<label>]` before mentioned commands (not necessarily directly
-before). The reference is realized by \^`\ref[<label>]` or \^`\pgref[<label>]`.
+before). The reference is realized by \^`\ref[<label>]` (prints the number
+of the referenced object) or \^`\pgref[<label>]` (prints the page number).
 Example:
 
 \begtt
@@ -582,6 +583,13 @@ or write something about the equation~\ref[pythagoras]. Finally there
 is an interesting Table~\ref[comp-depend].
 \endtt
 
+The text printed by \^`\ref` or \^`\pgref` can be given explicitly by
+\^`\ref[<label>]{<text>}` or \^`\pgref[<label>]{<text>}`. If the `<text>`
+includes the `@` character, it is replaced by implicitly printed text.
+Example: `see \ref[lab]{section~@}` prints the same as `see section~\ref[lab]`,
+but first case creates larger active area for mouse clicking, when
+\~`\hyperlinks` are declared.
+
 If there are forward referenced objects then users have to run \TeX{} twice.
 During each pass, the working `*.ref` file (with references data) is created
 and this file is used (if it exists) at the beginning of the document.
@@ -663,7 +671,7 @@ If the linked text have to be different than the URL, you can use
 `\ulink[http://petr.olsak.net/optex]{\OpTeX/ page}`
 outputs to the text
 \ulink[http://petr.olsak.net/optex]{\OpTeX/ page}.
-The characters \code{\%}, `\`, `#`, `{`, and `}` must by escaped in
+The characters \code{\%}, `\`, `#`, `{`, and `}` must be escaped in
 the <url> parameter.
 
 The PDF format provides {\em outlines} which are notes placed in the special frame of
@@ -1862,7 +1870,6 @@ put it as the first command in your document:
 
 ~magscale'[factor]  % resize typesetting, line/page breaking unchanged
 ~margins'/pg format (left, right, top, bottom)unit % margins setting
-
 ~report' ~letter' ~slides'  % style declaration macros
 \endtt
 
@@ -1959,11 +1966,9 @@ control sequences with the same meaning: in prefixed and unprefixed form.
 For example `\hbox` is equal to `\_hbox`.
 Internal macros of \OpTeX/ have and use only prefixed form. User should use
 unprefixed forms, but prefixed forms are accessible too because the `_` is
-set as a letter category code globally (in macro files and users document too). User
+set as a letter category code globally (in macro files and users document too). Users
 should re-define unprefixed forms of control sequences without worries that
-something internal will be broken (only the sequence `\par` cannot be
-re-defined without change of internal \TeX/ behavior because it is
-hard-coded in \TeX/, unfortunately).
+something internal will be broken.
 
 \new
 The Latin Modern 8bit fonts instead Computer Modern 7bit fonts are