From 268c88f5433d2a87d1eeab40076c8737b5786b08 Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Mon, 26 Jun 2017 20:11:45 +0000 Subject: catch up with the recent eqn(7) improvements --- regress/eqn/nullary/Makefile | 5 +++-- regress/eqn/nullary/roman.in | 26 ++++++++++++++++++++++---- regress/eqn/nullary/roman.out_ascii | 10 +++++++--- regress/eqn/nullary/roman.out_html | 16 +++++++++++++++- regress/eqn/nullary/symbol.in | 19 +++++++++++++++++++ regress/eqn/nullary/symbol.out_ascii | 10 ++++++++++ regress/eqn/nullary/symbol.out_html | 6 ++++++ regress/eqn/nullary/symbol.out_utf8 | 10 ++++++++++ 8 files changed, 92 insertions(+), 10 deletions(-) create mode 100644 regress/eqn/nullary/symbol.in create mode 100644 regress/eqn/nullary/symbol.out_ascii create mode 100644 regress/eqn/nullary/symbol.out_html create mode 100644 regress/eqn/nullary/symbol.out_utf8 (limited to 'regress/eqn/nullary') diff --git a/regress/eqn/nullary/Makefile b/regress/eqn/nullary/Makefile index ec5dfa06..de4bcf05 100644 --- a/regress/eqn/nullary/Makefile +++ b/regress/eqn/nullary/Makefile @@ -1,6 +1,7 @@ # $OpenBSD: Makefile,v 1.1.1.1 2015/01/01 12:53:46 schwarze Exp $ -REGRESS_TARGETS = roman -HTML_TARGETS = roman +REGRESS_TARGETS = roman symbol +UTF8_TARGETS = symbol +HTML_TARGETS = roman symbol .include diff --git a/regress/eqn/nullary/roman.in b/regress/eqn/nullary/roman.in index f4a081f1..f808ba7a 100644 --- a/regress/eqn/nullary/roman.in +++ b/regress/eqn/nullary/roman.in @@ -1,14 +1,32 @@ -.Dd October 12, 2014 +.Dd June 25, 2017 .Dt NULLARY-ROMAN 1 .Os OpenBSD .Sh NAME .Nm nullary-roman .Nd equation tokens set in roman font .Sh DESCRIPTION -initial text +initial text \(em .EQ -sin cos tan sinh cosh tanh arc +roman "unquoted words:" +sin cos tan sec csc asin acos atan asec acsc +sinh cosh tanh coth arc max min lim log ln exp Re Im and if for det +\(em +roman "quoted words:" +"sin" "cos" "tan" "sec" "csc" "asin" "acos" "atan" "asec" "acsc" +"sinh" "cosh" "tanh" "coth" "arc" +"max" "min" "lim" "log" "ln" "exp" +"Re" "Im" "and" "if" "for" "det" +\(em +roman "font operations:" +bold sin +bold "sin" +\(em +roman "superstring:" +sinus +\(em +roman "composite word:" +tan = sin/cos .EN -final text +\(em final text diff --git a/regress/eqn/nullary/roman.out_ascii b/regress/eqn/nullary/roman.out_ascii index cc6ff3a8..7b50dc46 100644 --- a/regress/eqn/nullary/roman.out_ascii +++ b/regress/eqn/nullary/roman.out_ascii @@ -4,7 +4,11 @@ NNAAMMEE nnuullllaarryy--rroommaann - equation tokens set in roman font DDEESSCCRRIIPPTTIIOONN - initial text sin cos tan sinh cosh tanh arc max min lim log ln exp Re Im - and if for det final text + initial text -- unquoted words: sin cos tan sec csc asin acos atan asec + acsc sinh cosh tanh coth arc max min lim log ln exp Re Im and if for det + -- quoted words: _s_i_n _c_o_s _t_a_n _s_e_c _c_s_c _a_s_i_n _a_c_o_s _a_t_a_n _a_s_e_c _a_c_s_c _s_i_n_h _c_o_s_h + _t_a_n_h _c_o_t_h _a_r_c _m_a_x _m_i_n _l_i_m _l_o_g _l_n _e_x_p _R_e _I_m _a_n_d _i_f _f_o_r _d_e_t -- font + operations: sin ssiinn -- superstring: _s_i_n_u_s -- composite word: tan = _s_i_n / + _c_o_s -- final text -OpenBSD October 12, 2014 OpenBSD +OpenBSD June 25, 2017 OpenBSD diff --git a/regress/eqn/nullary/roman.out_html b/regress/eqn/nullary/roman.out_html index 115daa05..151c858b 100644 --- a/regress/eqn/nullary/roman.out_html +++ b/regress/eqn/nullary/roman.out_html @@ -1 +1,15 @@ -sincostansinhcoshtanharcmaxminlimloglnexpReImandiffordet +unquoted +words:sincostan +seccsc +asinacosatanasec +acscsinh +coshtanhcotharc +maxminlimloglnexpReImandiffordet—quoted +words: +sincos +tanseccscasinacosatanasecacscsinhcoshtanhcotharcmaxminlimloglnexpReImandiffordet—font +operations: +sinsin—superstring:sinus—composite +word: +tan=sin/ +cos diff --git a/regress/eqn/nullary/symbol.in b/regress/eqn/nullary/symbol.in new file mode 100644 index 00000000..f43e9e5a --- /dev/null +++ b/regress/eqn/nullary/symbol.in @@ -0,0 +1,19 @@ +.Dd June 25, 2017 +.Dt NULLARY-SYMBOL 1 +.Os OpenBSD +.Sh NAME +.Nm nullary-symbol +.Nd equation tokens for symbols +.Sh DESCRIPTION +initial text \(em +.EQ +roman "unquoted words:" +epsilon prime +\(em +roman "quoted words:" +"epsilon" "prime" +\(em +roman "composite word:" +epsilon-prime +.EN +\(em final text diff --git a/regress/eqn/nullary/symbol.out_ascii b/regress/eqn/nullary/symbol.out_ascii new file mode 100644 index 00000000..bbb74390 --- /dev/null +++ b/regress/eqn/nullary/symbol.out_ascii @@ -0,0 +1,10 @@ +NULLARY-SYMBOL(1) General Commands Manual NULLARY-SYMBOL(1) + +NNAAMMEE + nnuullllaarryy--ssyymmbbooll - equation tokens for symbols + +DDEESSCCRRIIPPTTIIOONN + initial text -- unquoted words: e ' -- quoted words: _e_p_s_i_l_o_n _p_r_i_m_e -- + composite word: _e_p_s_i_l_o_n - _p_r_i_m_e -- final text + +OpenBSD June 25, 2017 OpenBSD diff --git a/regress/eqn/nullary/symbol.out_html b/regress/eqn/nullary/symbol.out_html new file mode 100644 index 00000000..4e07edc4 --- /dev/null +++ b/regress/eqn/nullary/symbol.out_html @@ -0,0 +1,6 @@ +unquoted +words:ε′— +quoted words: +epsilonprime—composite +word: +epsilon-prime diff --git a/regress/eqn/nullary/symbol.out_utf8 b/regress/eqn/nullary/symbol.out_utf8 new file mode 100644 index 00000000..7fae3b44 --- /dev/null +++ b/regress/eqn/nullary/symbol.out_utf8 @@ -0,0 +1,10 @@ +NULLARY-SYMBOL(1) General Commands Manual NULLARY-SYMBOL(1) + +NNAAMMEE + nnuullllaarryy--ssyymmbbooll – equation tokens for symbols + +DDEESSCCRRIIPPTTIIOONN + initial text — unquoted words: ε ′ — quoted words: _e_p_s_i_l_o_n _p_r_i_m_e — + composite word: _e_p_s_i_l_o_n - _p_r_i_m_e — final text + +OpenBSD June 25, 2017 OpenBSD -- cgit v1.2.3-56-ge451