2021-04-26 00:54:00

3 files changed, 26 insertions, 2 deletions

diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf
index 94831209e..a9e16374a 100644
--- a/doc/context/documents/general/manuals/luametatex.pdf
+++ b/doc/context/documents/general/manuals/luametatex.pdf
diff --git a/doc/context/sources/general/manuals/followingup/followingup-fonts.tex b/doc/context/sources/general/manuals/followingup/followingup-fonts.tex
index 502370d7d..411ee7b5e 100644
--- a/doc/context/sources/general/manuals/followingup/followingup-fonts.tex
+++ b/doc/context/sources/general/manuals/followingup/followingup-fonts.tex
@@ -230,7 +230,7 @@ In order to deal with this kind of scaling, we now operate not only on the font
 (id) and dynamic feature axes, but also on the scales, of which we have three
 variants: glyph scale, glyph xscale and glyph yscale. There is actually also a
 state dimension but we omit that for now (think of flagging glyphs as initial or
-final). This brings the number of axis to six. It is important to stress that in
+final). This brings the number of axes to six. It is important to stress that in
 these examples the same font instance is used!
 
 Just for the record: several approaches to switching fonts are possible but for
diff --git a/doc/context/sources/general/manuals/luatex/luatex-fonts.tex b/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
index e944b2c5b..136d20dd3 100644
--- a/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
+++ b/doc/context/sources/general/manuals/luatex/luatex-fonts.tex
@@ -1,4 +1,4 @@
-% language=uk
+% language=uk engine=luatex
 
 \environment luatex-style
 
@@ -882,6 +882,30 @@ The effective values are never negative. The zero mode is the default.
 \LL
 \stoptabulate
 
+\stopsubsection
+
+\startsubsection[title={\type {\discretionaryligaturemode}}]
+
+This parameter controls how complex ligatures interact with discretionaries (as
+injected by the hyphenator). The non||zero values prevent the construction of
+so called init and select discretionaries.
+
+\definefontfeature[ligmodetest][default][mode=base]
+\definefont       [ligmodefont][Serif*ligmodetest]
+
+\hyphenation{xx-f-f-i-xx}
+
+\starttabulate[|p|p|p|]
+    \DB 0 \BC 1 \BC 2 \NC \NR
+    \TB
+    \NC \ligmodefont \discretionaryligaturemode0 \hsize1pt xxffixx
+    \NC \ligmodefont \discretionaryligaturemode1 \hsize1pt xxffixx
+    \NC \ligmodefont \discretionaryligaturemode2 \hsize1pt xxffixx \NC \NR
+    \LL
+\stoptabulate
+
+\stopsubsection
+
 \stopsection
 
 \stopchapter