[latex3-commits] [git/LaTeX3-latex3-luaotfload] dev: Clean up shaper selection in harf tests (bfba5c1)

Marcel Fabian Krüger tex at 2krueger.de
Sun Nov 3 01:14:40 CET 2019


Repository : https://github.com/latex3/luaotfload
On branch  : dev
Link       : https://github.com/latex3/luaotfload/commit/bfba5c17ab984356065ea9a64c3ec269b9b47432

>---------------------------------------------------------------

commit bfba5c17ab984356065ea9a64c3ec269b9b47432
Author: Marcel Fabian Krüger <tex at 2krueger.de>
Date:   Sun Nov 3 01:14:40 2019 +0100

    Clean up shaper selection in harf tests


>---------------------------------------------------------------

bfba5c17ab984356065ea9a64c3ec269b9b47432
 testfiles-harf/arabic-gr.lvt       |  3 +--
 testfiles-harf/arabic.lvt          |  9 ++++-----
 testfiles-harf/arabic.tlg          | 18 +++++++++---------
 testfiles-harf/color.lvt           |  3 +--
 testfiles-harf/color.tlg           | 10 +++++-----
 testfiles-harf/discretionaries.lvt |  5 ++---
 testfiles-harf/discretionaries.tlg | 18 +++++++++---------
 testfiles-harf/math.lvt            |  3 +--
 testfiles-harf/scripts.lvt         |  5 ++---
 testfiles-harf/scripts.tlg         | 20 ++++++++++----------
 testfiles-harf/story.lvt           |  9 ++++-----
 testfiles-harf/story.tlg           | 20 ++++++++++----------
 12 files changed, 58 insertions(+), 65 deletions(-)

diff --git a/testfiles-harf/arabic-gr.lvt b/testfiles-harf/arabic-gr.lvt
index 8902856..b209b1c 100644
--- a/testfiles-harf/arabic-gr.lvt
+++ b/testfiles-harf/arabic-gr.lvt
@@ -3,7 +3,6 @@
 \documentclass{article}
 \usepackage{setspace}
 \usepackage{fontspec}
-\defaultfontfeatures{RawFeature={mode=harf}}
 
 \directlua{
   local cbs = luatexbase.callback_descriptions'glyph_info'
@@ -15,7 +14,7 @@
   end, 'Harf glyph_info callback -- testing variant')
 }
 
-\setmainfont{AwamiNastaliq-Regular.ttf}[Script=Arabic]
+\setmainfont{AwamiNastaliq-Regular.ttf}[Renderer=Harfbuzz, Script=Arabic]
 \begin{document}
 \showoutput
 \START
diff --git a/testfiles-harf/arabic.lvt b/testfiles-harf/arabic.lvt
index 69da103..55a37f7 100644
--- a/testfiles-harf/arabic.lvt
+++ b/testfiles-harf/arabic.lvt
@@ -3,7 +3,6 @@
 \documentclass{article}
 \usepackage{setspace}
 \usepackage{fontspec}
-\defaultfontfeatures{RawFeature={mode=harf}}
 
 \directlua{
   local cbs = luatexbase.callback_descriptions'glyph_info'
@@ -15,7 +14,7 @@
   end, 'Harf glyph_info callback -- testing variant')
 }
 
-\setmainfont{Amiri}[Script=Arabic]
+\setmainfont{Amiri}[Renderer=Harfbuzz, Script=Arabic]
 \begin{document}
 \showoutput
 \START
@@ -56,19 +55,19 @@
 }
 
 \begingroup\pardir TRT\textdir TRT
-\fontspec{Amiri}[Script=Arabic, Scale=1.6]
+\fontspec{Amiri}[Renderer=Harfbuzz, Script=Arabic, Scale=1.6]
 \setstretch{2.4}
 \arabictext
 \par\endgroup\newpage
 
 \begingroup\pardir TRT\textdir TRT
-\fontspec{ArefRuqaa-Regular.ttf}[Script=Arabic, Scale=1.2]
+\fontspec{ArefRuqaa-Regular.ttf}[Renderer=Harfbuzz, Script=Arabic, Scale=1.2]
 \setstretch{2.4}
 \arabictext
 \par\endgroup\newpage
 
 \begingroup\pardir TRT\textdir TRT
-\fontspec{NotoNastaliqUrdu-Regular.ttf}[Script=Arabic]
+\fontspec{NotoNastaliqUrdu-Regular.ttf}[Renderer=Harfbuzz, Script=Arabic]
 \setstretch{2.5}
 \arabictext
 \par\endgroup\newpage
diff --git a/testfiles-harf/arabic.tlg b/testfiles-harf/arabic.tlg
index 36197b8..5456983 100644
--- a/testfiles-harf/arabic.tlg
+++ b/testfiles-harf/arabic.tlg
@@ -1179,22 +1179,22 @@ luaotfload | aux : font no 31 (nil) does not define feature smcp for script arab
 luaotfload | aux : font no 32 (nil) does not define feature smcp for script arab with language dflt
 Package fontspec Info: Font family 'Amiri(1)' created for font 'Amiri' with
 (fontspec)             options
-(fontspec)             [RawFeature={mode=harf},Extension=.ttf,UprightFont=*-Regular,ItalicFont=*-Slanted,BoldFont=*-Bold,BoldItalicFont=*-BoldSlanted,Script=Arabic,Scale=1.6].
+(fontspec)             [Extension=.ttf,UprightFont=*-Regular,ItalicFont=*-Slanted,BoldFont=*-Bold,BoldItalicFont=*-BoldSlanted,Renderer=Harfbuzz,Script=Arabic,Scale=1.6].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->s*[1.6]"[Amiri-Regular.ttf]:mode=node;script=arab;language=DFLT;mode=harf;"
+(fontspec)             <->s*[1.6]"[Amiri-Regular.ttf]:mode=harf;script=arab;language=DFLT;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 (fontspec)             - 'bold' (bx/n) with NFSS spec.:
-(fontspec)             <->s*[1.6]"[Amiri-Bold.ttf]:mode=node;script=arab;language=DFLT;mode=harf;"
+(fontspec)             <->s*[1.6]"[Amiri-Bold.ttf]:mode=harf;script=arab;language=DFLT;"
 (fontspec)             - 'bold small caps'  (bx/sc) with NFSS spec.: 
 (fontspec)             - 'italic' (m/it) with NFSS spec.:
-(fontspec)             <->s*[1.6]"[Amiri-Slanted.ttf]:mode=node;script=arab;language=DFLT;mode=harf;"
+(fontspec)             <->s*[1.6]"[Amiri-Slanted.ttf]:mode=harf;script=arab;language=DFLT;"
 (fontspec)             - 'italic small caps'  (m/itsc) with NFSS spec.: 
 (fontspec)             - 'bold italic' (bx/it) with NFSS spec.:
-(fontspec)             <->s*[1.6]"[Amiri-BoldSlanted.ttf]:mode=node;script=arab;language=DFLT;mode=harf;"
+(fontspec)             <->s*[1.6]"[Amiri-BoldSlanted.ttf]:mode=harf;script=arab;language=DFLT;"
 (fontspec)             - 'bold italic small caps'  (bx/itsc) with NFSS spec.: 
 LaTeX Font Info:    Font shape `TU/Amiri(1)/m/n' will be
 (Font)              scaled to size 16.00006pt on input line ....
@@ -2272,13 +2272,13 @@ Completed box being shipped out [2]
 luaotfload | aux : font no 37 (nil) does not define feature smcp for script arab with language dflt
 Package fontspec Info: Font family 'ArefRuqaa-Regular.ttf(0)' created for font
 (fontspec)             'ArefRuqaa-Regular.ttf' with options
-(fontspec)             [RawFeature={mode=harf},Script=Arabic,Scale=1.2].
+(fontspec)             [Renderer=Harfbuzz,Script=Arabic,Scale=1.2].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->s*[1.2]"[ArefRuqaa-Regular.ttf]:mode=node;script=arab;language=DFLT;mode=harf;"
+(fontspec)             <->s*[1.2]"[ArefRuqaa-Regular.ttf]:mode=harf;script=arab;language=DFLT;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 LaTeX Font Info:    Font shape `TU/ArefRuqaa-Regular.ttf(0)/m/n' will be
 (Font)              scaled to size 11.99997pt on input line ....
@@ -4527,13 +4527,13 @@ Completed box being shipped out [3]
 luaotfload | aux : font no 40 (nil) does not define feature smcp for script arab with language dflt
 Package fontspec Info: Font family 'NotoNastaliqUrdu-Regular.ttf(0)' created
 (fontspec)             for font 'NotoNastaliqUrdu-Regular.ttf' with options
-(fontspec)             [RawFeature={mode=harf},Script=Arabic].
+(fontspec)             [Renderer=Harfbuzz,Script=Arabic].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[NotoNastaliqUrdu-Regular.ttf]:mode=node;script=arab;language=DFLT;mode=harf;"
+(fontspec)             <->"[NotoNastaliqUrdu-Regular.ttf]:mode=harf;script=arab;language=DFLT;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Completed box being shipped out [4]
 \vbox(633.0+0.06)x407.0, direction TLT
diff --git a/testfiles-harf/color.lvt b/testfiles-harf/color.lvt
index 7641c6e..26c721f 100644
--- a/testfiles-harf/color.lvt
+++ b/testfiles-harf/color.lvt
@@ -3,7 +3,6 @@
 \documentclass{article}
 \usepackage{setspace}
 \usepackage{fontspec}
-\defaultfontfeatures{RawFeature={mode=harf}}
 
 \directlua{
   local cbs = luatexbase.callback_descriptions'glyph_info'
@@ -15,7 +14,7 @@
   end, 'Harf glyph_info callback -- testing variant')
 }
 
-\setmainfont{Amiri}[Script=Arabic]
+\setmainfont{Amiri}[Renderer=Harfbuzz, Script=Arabic]
 \begin{document}
 \showoutput
 \START
diff --git a/testfiles-harf/color.tlg b/testfiles-harf/color.tlg
index 600ec3f..75d0ff9 100644
--- a/testfiles-harf/color.tlg
+++ b/testfiles-harf/color.tlg
@@ -6,22 +6,22 @@ luaotfload | aux : font no 31 (nil) does not define feature smcp for script arab
 luaotfload | aux : font no 32 (nil) does not define feature smcp for script arab with language dflt
 Package fontspec Info: Font family 'Amiri(1)' created for font 'Amiri' with
 (fontspec)             options
-(fontspec)             [RawFeature={mode=harf},Ligatures=TeX,Extension=.ttf,UprightFont=*-Regular,ItalicFont=*-Slanted,BoldFont=*-Bold,BoldItalicFont=*-BoldSlanted,Script=Arabic,Color=FF000080].
+(fontspec)             [Ligatures=TeX,Extension=.ttf,UprightFont=*-Regular,ItalicFont=*-Slanted,BoldFont=*-Bold,BoldItalicFont=*-BoldSlanted,Renderer=Harfbuzz,Script=Arabic,Color=FF000080].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[Amiri-Regular.ttf]:mode=node;script=arab;language=DFLT;mode=harf;+tlig;color=FF000080;"
+(fontspec)             <->"[Amiri-Regular.ttf]:mode=harf;script=arab;language=DFLT;+tlig;color=FF000080;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 (fontspec)             - 'bold' (bx/n) with NFSS spec.:
-(fontspec)             <->"[Amiri-Bold.ttf]:mode=node;script=arab;language=DFLT;mode=harf;+tlig;color=FF000080;"
+(fontspec)             <->"[Amiri-Bold.ttf]:mode=harf;script=arab;language=DFLT;+tlig;color=FF000080;"
 (fontspec)             - 'bold small caps'  (bx/sc) with NFSS spec.: 
 (fontspec)             - 'italic' (m/it) with NFSS spec.:
-(fontspec)             <->"[Amiri-Slanted.ttf]:mode=node;script=arab;language=DFLT;mode=harf;+tlig;color=FF000080;"
+(fontspec)             <->"[Amiri-Slanted.ttf]:mode=harf;script=arab;language=DFLT;+tlig;color=FF000080;"
 (fontspec)             - 'italic small caps'  (m/itsc) with NFSS spec.: 
 (fontspec)             - 'bold italic' (bx/it) with NFSS spec.:
-(fontspec)             <->"[Amiri-BoldSlanted.ttf]:mode=node;script=arab;language=DFLT;mode=harf;+tlig;color=FF000080;"
+(fontspec)             <->"[Amiri-BoldSlanted.ttf]:mode=harf;script=arab;language=DFLT;+tlig;color=FF000080;"
 (fontspec)             - 'bold italic small caps'  (bx/itsc) with NFSS spec.: 
 Inserting `luaotfload.color_handler' at position 1 in `post_linebreak_filter'.
 Inserting `luaotfload.color_handler' at position 2 in `hpack_filter'.
diff --git a/testfiles-harf/discretionaries.lvt b/testfiles-harf/discretionaries.lvt
index 135e3dc..f617934 100644
--- a/testfiles-harf/discretionaries.lvt
+++ b/testfiles-harf/discretionaries.lvt
@@ -3,7 +3,6 @@
 \documentclass{article}
 \usepackage{setspace}
 \usepackage{fontspec}
-\defaultfontfeatures{RawFeature={mode=harf}}
 
 \directlua{
   local cbs = luatexbase.callback_descriptions'glyph_info'
@@ -15,7 +14,7 @@
   end, 'Harf glyph_info callback -- testing variant')
 }
 
-\setmainfont{NotoSerifCJK-Regular.ttc}[Script=Latin]
+\setmainfont{NotoSerifCJK-Regular.ttc}[Renderer=Harfbuzz, Script=Latin]
 \begin{document}
 \showoutput
 \START
@@ -42,7 +41,7 @@ offbeat office baffle coffee HAVANA\par
 offbeat office baffle coffee HAVANA\par
 \endgroup
 
-\fontspec{lmroman10-regular.otf}[Script=Latin, Ligatures=Discretionary, Ligatures=TeX]
+\fontspec{lmroman10-regular.otf}[Renderer=Harfbuzz, Script=Latin, Ligatures=Discretionary, Ligatures=TeX]
 \parindent=0pt
 
 \noindent
diff --git a/testfiles-harf/discretionaries.tlg b/testfiles-harf/discretionaries.tlg
index 24989d7..63f2252 100644
--- a/testfiles-harf/discretionaries.tlg
+++ b/testfiles-harf/discretionaries.tlg
@@ -6,44 +6,44 @@ luaotfload | aux : font no 29 (nil) does not define feature smcp for script latn
 luaotfload | aux : font no 29 (nil) does not define feature smcp for script latn with language dflt
 Package fontspec Info: Font family 'NotoSerifCJK-Regular.ttc(1)' created for
 (fontspec)             font 'NotoSerifCJK-Regular.ttc' with options
-(fontspec)             [RawFeature={mode=harf},Ligatures=TeX,Script=Latin,Ligatures=TeXOff].
+(fontspec)             [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin,Ligatures=TeXOff].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=node;script=latn;language=DFLT;mode=harf;-tlig;"
+(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=harf;script=latn;language=DFLT;-tlig;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 (fontspec)             - 'bold' (bx/n) with NFSS spec.:
-(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=node;script=latn;language=DFLT;mode=harf;-tlig;"
+(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=harf;script=latn;language=DFLT;-tlig;"
 (fontspec)             - 'bold small caps'  (bx/sc) with NFSS spec.: 
 (fontspec)             - 'italic' (m/it) with NFSS spec.:
-(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=node;script=latn;language=DFLT;mode=harf;-tlig;"
+(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=harf;script=latn;language=DFLT;-tlig;"
 (fontspec)             - 'italic small caps'  (m/itsc) with NFSS spec.: 
 (fontspec)             - 'bold italic' (bx/it) with NFSS spec.:
-(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=node;script=latn;language=DFLT;mode=harf;-tlig;"
+(fontspec)             <->"[NotoSerifCJK-Regular.ttc]:mode=harf;script=latn;language=DFLT;-tlig;"
 (fontspec)             - 'bold italic small caps'  (bx/itsc) with NFSS spec.: 
 luaotfload | aux : font no 33 (nil) does not define feature smcp for script latn with language dflt
 Package fontspec Info: Font family 'lmroman10-regular.otf(0)' created for font
 (fontspec)             'lmroman10-regular.otf' with options
-(fontspec)             [RawFeature={mode=harf},Script=Latin,Ligatures=Discretionary,Ligatures=TeX].
+(fontspec)             [Renderer=Harfbuzz,Script=Latin,Ligatures=Discretionary,Ligatures=TeX].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[lmroman10-regular.otf]:mode=node;script=latn;language=DFLT;mode=harf;+dlig;+tlig;"
+(fontspec)             <->"[lmroman10-regular.otf]:mode=harf;script=latn;language=DFLT;+dlig;+tlig;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 luaotfload | aux : font no 33 (nil) does not define feature smcp for script latn with language dflt
 Package fontspec Info: Font family 'lmroman10-regular.otf(1)' created for font
 (fontspec)             'lmroman10-regular.otf' with options
-(fontspec)             [RawFeature={mode=harf},Script=Latin,Ligatures=Discretionary,Ligatures=TeX,Ligatures=TeXOff].
+(fontspec)             [Renderer=Harfbuzz,Script=Latin,Ligatures=Discretionary,Ligatures=TeX,Ligatures=TeXOff].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[lmroman10-regular.otf]:mode=node;script=latn;language=DFLT;mode=harf;+dlig;-tlig;"
+(fontspec)             <->"[lmroman10-regular.otf]:mode=harf;script=latn;language=DFLT;+dlig;-tlig;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Completed box being shipped out [1]
 \vbox(633.0+0.0)x407.0, direction TLT
diff --git a/testfiles-harf/math.lvt b/testfiles-harf/math.lvt
index d0eb68b..87f91a5 100644
--- a/testfiles-harf/math.lvt
+++ b/testfiles-harf/math.lvt
@@ -3,7 +3,6 @@
 \documentclass{article}
 \usepackage{setspace}
 \usepackage{fontspec}
-\defaultfontfeatures{RawFeature={mode=harf}}
 
 \directlua{
   local cbs = luatexbase.callback_descriptions'glyph_info'
@@ -15,7 +14,7 @@
   end, 'Harf glyph_info callback -- testing variant')
 }
 
-\setmainfont{Amiri}[Script=Arabic]
+\setmainfont{Amiri}[Renderer=Harfbuzz, Script=Arabic]
 \begin{document}
 \showoutput
 \START
diff --git a/testfiles-harf/scripts.lvt b/testfiles-harf/scripts.lvt
index cbc5eef..fdf1c50 100644
--- a/testfiles-harf/scripts.lvt
+++ b/testfiles-harf/scripts.lvt
@@ -3,7 +3,6 @@
 \documentclass{article}
 \usepackage{setspace}
 \usepackage{fontspec}
-\defaultfontfeatures{RawFeature={mode=harf}}
 
 \directlua{
   local cbs = luatexbase.callback_descriptions'glyph_info'
@@ -15,7 +14,7 @@
   end, 'Harf glyph_info callback -- testing variant')
 }
 
-\setmainfont{amiri-regular.ttf}[Script=Latin]
+\setmainfont{amiri-regular.ttf}[Renderer=Harfbuzz, Script=Latin]
 \begin{document}
 \showoutput
 \START
@@ -25,7 +24,7 @@
 
 \def\l#1#2{%
   \begingroup%
-  \fontspec{amiri-regular.ttf}[Script=Arabic, Language=#1]
+  \fontspec{amiri-regular.ttf}[Renderer=Harfbuzz, Script=Arabic, Language=#1]
   #2%
   \endgroup%
 }
diff --git a/testfiles-harf/scripts.tlg b/testfiles-harf/scripts.tlg
index b62f524..fdfc81f 100644
--- a/testfiles-harf/scripts.tlg
+++ b/testfiles-harf/scripts.tlg
@@ -6,59 +6,59 @@ Package fontspec Warning: Font "amiri-regular" does not contain requested
 luaotfload | aux : font no 29 (nil) does not define feature smcp for script latn with language dflt
 Package fontspec Info: Font family 'amiri-regular.ttf(1)' created for font
 (fontspec)             'amiri-regular.ttf' with options
-(fontspec)             [RawFeature={mode=harf},Ligatures=TeX,Script=Latin,Script=Greek].
+(fontspec)             [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin,Script=Greek].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[amiri-regular.ttf]:mode=node;script=latn;language=DFLT;mode=harf;+tlig;"
+(fontspec)             <->"[amiri-regular.ttf]:mode=harf;script=latn;language=DFLT;+tlig;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 LaTeX Font Warning: Font shape `TU/amiri-regular.ttf(0)/m/it' undefined
 (Font)              using `TU/amiri-regular.ttf(0)/m/n' instead on input line ....
 luaotfload | aux : font no 29 (nil) does not define feature smcp for script arab with language ara
 Package fontspec Info: Font family 'amiri-regular.ttf(2)' created for font
 (fontspec)             'amiri-regular.ttf' with options
-(fontspec)             [RawFeature={mode=harf},Script=Arabic,Language=Arabic].
+(fontspec)             [Renderer=Harfbuzz,Script=Arabic,Language=Arabic].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[amiri-regular.ttf]:mode=node;script=arab;language=ARA;mode=harf;"
+(fontspec)             <->"[amiri-regular.ttf]:mode=harf;script=arab;language=ARA;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 luaotfload | aux : font no 29 (nil) does not define feature smcp for script arab with language urd
 Package fontspec Info: Font family 'amiri-regular.ttf(3)' created for font
 (fontspec)             'amiri-regular.ttf' with options
-(fontspec)             [RawFeature={mode=harf},Script=Arabic,Language=Urdu].
+(fontspec)             [Renderer=Harfbuzz,Script=Arabic,Language=Urdu].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[amiri-regular.ttf]:mode=node;script=arab;language=URD;mode=harf;"
+(fontspec)             <->"[amiri-regular.ttf]:mode=harf;script=arab;language=URD;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 luaotfload | aux : font no 29 (nil) does not define feature smcp for script arab with language snd
 Package fontspec Info: Font family 'amiri-regular.ttf(4)' created for font
 (fontspec)             'amiri-regular.ttf' with options
-(fontspec)             [RawFeature={mode=harf},Script=Arabic,Language=Sindhi].
+(fontspec)             [Renderer=Harfbuzz,Script=Arabic,Language=Sindhi].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[amiri-regular.ttf]:mode=node;script=arab;language=SND;mode=harf;"
+(fontspec)             <->"[amiri-regular.ttf]:mode=harf;script=arab;language=SND;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 luaotfload | aux : font no 29 (nil) does not define feature smcp for script arab with language ksh
 Package fontspec Info: Font family 'amiri-regular.ttf(5)' created for font
 (fontspec)             'amiri-regular.ttf' with options
-(fontspec)             [RawFeature={mode=harf},Script=Arabic,Language=Kashmiri].
+(fontspec)             [Renderer=Harfbuzz,Script=Arabic,Language=Kashmiri].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[amiri-regular.ttf]:mode=node;script=arab;language=KSH;mode=harf;"
+(fontspec)             <->"[amiri-regular.ttf]:mode=harf;script=arab;language=KSH;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 Completed box being shipped out [1]
 \vbox(633.0+0.03)x407.0, direction TLT
diff --git a/testfiles-harf/story.lvt b/testfiles-harf/story.lvt
index 619c703..9a3087c 100644
--- a/testfiles-harf/story.lvt
+++ b/testfiles-harf/story.lvt
@@ -3,7 +3,6 @@
 \documentclass{article}
 \usepackage{setspace}
 \usepackage{fontspec}
-\defaultfontfeatures{RawFeature={mode=harf}}
 
 \directlua{
   local cbs = luatexbase.callback_descriptions'glyph_info'
@@ -15,13 +14,13 @@
   end, 'Harf glyph_info callback -- testing variant')
 }
 
-\setmainfont{lmroman10-regular.otf}
+\setmainfont[Renderer=Harfbuzz]{lmroman10-regular.otf}
 \begin{document}
 \showoutput
 \START
-\newfontfamily\testb{lmroman10-bold.otf}[Script=Latin, mode=node]
-\newfontfamily\testi{lmromanslant10-regular.otf}[Script=Latin]
-\newfontfamily\testR{lmroman12-regular.otf}[Script=Latin, Scale=1.2]
+\newfontfamily\testb{lmroman10-bold.otf}[Renderer=Harfbuzz, Script=Latin, mode=node]
+\newfontfamily\testi{lmromanslant10-regular.otf}[Renderer=Harfbuzz, Script=Latin]
+\newfontfamily\testR{lmroman12-regular.otf}[Renderer=Harfbuzz, Script=Latin, Scale=1.2]
 \testr
 \hrule
 \vskip 1in
diff --git a/testfiles-harf/story.tlg b/testfiles-harf/story.tlg
index f73a82a..c91bc0c 100644
--- a/testfiles-harf/story.tlg
+++ b/testfiles-harf/story.tlg
@@ -4,7 +4,7 @@ Don't change this file in any respect.
 (LaTeX3)        ignored.
 For immediate help type H <return>.
  ...                                              
-l. ......lmroman10-bold.otf}[Script=Latin, mode=node]
+l. ......[Renderer=Harfbuzz, Script=Latin, mode=node]
 The module 'fontspec-opentype' does not have a key called
 'fontspec-opentype/mode'.
 Check that you have spelled the key name correctly.
@@ -12,42 +12,42 @@ Check that you have spelled the key name correctly.
 (LaTeX3)        ignored.
 For immediate help type H <return>.
  ...                                              
-l. ......lmroman10-bold.otf}[Script=Latin, mode=node]
+l. ......[Renderer=Harfbuzz, Script=Latin, mode=node]
 The module 'fontspec-opentype' does not have a key called
 'fontspec-opentype/mode'.
 Check that you have spelled the key name correctly.
 luaotfload | aux : font no 32 (nil) does not define feature smcp for script latn with language dflt
 Package fontspec Info: Font family 'lmroman10-bold.otf(0)' created for font
 (fontspec)             'lmroman10-bold.otf' with options
-(fontspec)             [RawFeature={mode=harf},Script=Latin,mode=node].
+(fontspec)             [Renderer=Harfbuzz,Script=Latin,mode=node].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[lmroman10-bold.otf]:mode=node;script=latn;language=DFLT;mode=harf;"
+(fontspec)             <->"[lmroman10-bold.otf]:mode=harf;script=latn;language=DFLT;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 luaotfload | aux : font no 34 (nil) does not define feature smcp for script latn with language dflt
 Package fontspec Info: Font family 'lmromanslant10-regular.otf(0)' created for
 (fontspec)             font 'lmromanslant10-regular.otf' with options
-(fontspec)             [RawFeature={mode=harf},Script=Latin].
+(fontspec)             [Renderer=Harfbuzz,Script=Latin].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[lmromanslant10-regular.otf]:mode=node;script=latn;language=DFLT;mode=harf;"
+(fontspec)             <->"[lmromanslant10-regular.otf]:mode=harf;script=latn;language=DFLT;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 luaotfload | aux : font no 36 (nil) does not define feature smcp for script latn with language dflt
 Package fontspec Info: Font family 'lmroman12-regular.otf(0)' created for font
 (fontspec)             'lmroman12-regular.otf' with options
-(fontspec)             [RawFeature={mode=harf},Script=Latin,Scale=1.2].
+(fontspec)             [Renderer=Harfbuzz,Script=Latin,Scale=1.2].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->s*[1.2]"[lmroman12-regular.otf]:mode=node;script=latn;language=DFLT;mode=harf;"
+(fontspec)             <->s*[1.2]"[lmroman12-regular.otf]:mode=harf;script=latn;language=DFLT;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 ! Undefined control sequence.
 l. ...\testr
@@ -415,13 +415,13 @@ Completed box being shipped out [1]
 luaotfload | aux : font no 29 (nil) does not define feature smcp for script latn with language dflt
 Package fontspec Info: Font family 'lmroman10-regular.otf(1)' created for font
 (fontspec)             'lmroman10-regular.otf' with options
-(fontspec)             [RawFeature={mode=harf},Ligatures=TeX,Script=Latin].
+(fontspec)             [Ligatures=TeX,Renderer=Harfbuzz,Script=Latin].
 (fontspec)              
 (fontspec)              This font family consists of the following NFSS
 (fontspec)             series/shapes:
 (fontspec)              
 (fontspec)             - 'normal' (m/n) with NFSS spec.:
-(fontspec)             <->"[lmroman10-regular.otf]:mode=node;script=latn;language=DFLT;mode=harf;+tlig;"
+(fontspec)             <->"[lmroman10-regular.otf]:mode=harf;script=latn;language=DFLT;+tlig;"
 (fontspec)             - 'small caps'  (m/sc) with NFSS spec.: 
 (../story.tex
 LaTeX Font Warning: Font shape `TU/lmroman10-regular.otf(0)/bx/n' undefined





More information about the latex3-commits mailing list