diff options
| author | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2017-06-26 20:11:24 +0000 |
|---|---|---|
| committer | Ingo Schwarze <schwarze@cvs.openbsd.org> | 2017-06-26 20:11:24 +0000 |
| commit | 6d1b9ae505d900c0e589570d41432996f5fddce2 (patch) | |
| tree | b584755aec7e029f7f8941ffb38b89c827b5a2dc | |
| parent | 938a14f5a35fc5f3da4eb6a9cfbd3956156dd870 (diff) | |
catch up with the recent eqn(7) improvements
42 files changed, 233 insertions, 41 deletions
diff --git a/regress/usr.bin/mandoc/eqn/Makefile b/regress/usr.bin/mandoc/eqn/Makefile index ef5effd16c0..e73dd860f1f 100644 --- a/regress/usr.bin/mandoc/eqn/Makefile +++ b/regress/usr.bin/mandoc/eqn/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.2 2015/01/28 21:10:28 schwarze Exp $ +# $OpenBSD: Makefile,v 1.3 2017/06/26 20:11:23 schwarze Exp $ -SUBDIR = fromto define matrix nullary over size subsup unary +SUBDIR = fromto define delim matrix nullary over size subsup unary .include "../Makefile.sub" .include <bsd.subdir.mk> diff --git a/regress/usr.bin/mandoc/eqn/define/Makefile b/regress/usr.bin/mandoc/eqn/define/Makefile index ea03b23dcb7..9112da8f7cd 100644 --- a/regress/usr.bin/mandoc/eqn/define/Makefile +++ b/regress/usr.bin/mandoc/eqn/define/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.2 2017/03/11 16:03:24 schwarze Exp $ +# $OpenBSD: Makefile,v 1.3 2017/06/26 20:11:23 schwarze Exp $ -REGRESS_TARGETS = invalid infinite -LINT_TARGETS = invalid infinite +REGRESS_TARGETS = font infinite invalid quoted +LINT_TARGETS = infinite invalid .include <bsd.regress.mk> diff --git a/regress/usr.bin/mandoc/eqn/define/font.in b/regress/usr.bin/mandoc/eqn/define/font.in new file mode 100644 index 00000000000..627c7e053f3 --- /dev/null +++ b/regress/usr.bin/mandoc/eqn/define/font.in @@ -0,0 +1,15 @@ +.Dd June 25, 2017 +.Dt DEFINE-FONT 1 +.Os OpenBSD +.Sh NAME +.Nm define-font +.Nd font selection takes place after define resolution +.Sh DESCRIPTION +initial text +.EQ +define alias 'sin x' +alias +define sin 'value' +sin +.EN +final text diff --git a/regress/usr.bin/mandoc/eqn/define/font.out_ascii b/regress/usr.bin/mandoc/eqn/define/font.out_ascii new file mode 100644 index 00000000000..571992572e6 --- /dev/null +++ b/regress/usr.bin/mandoc/eqn/define/font.out_ascii @@ -0,0 +1,9 @@ +DEFINE-FONT(1) General Commands Manual DEFINE-FONT(1) + +NNAAMMEE + ddeeffiinnee--ffoonntt - font selection takes place after define resolution + +DDEESSCCRRIIPPTTIIOONN + initial text sin _x _v_a_l_u_e final text + +OpenBSD June 25, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/define/invalid.out_ascii b/regress/usr.bin/mandoc/eqn/define/invalid.out_ascii index 0725dde22a3..62496650939 100644 --- a/regress/usr.bin/mandoc/eqn/define/invalid.out_ascii +++ b/regress/usr.bin/mandoc/eqn/define/invalid.out_ascii @@ -4,11 +4,11 @@ NNAAMMEE ddeeffiinnee--iinnvvaalliidd - invalid define and undef statements DDEESSCCRRIIPPTTIIOONN - define without variable name: 1/2 bruch eol + define without variable name: 1/2 _b_r_u_c_h eol - define without value: 1/2 bruch eol + define without value: 1/2 _b_r_u_c_h eol - define without value: 1/2 bruch eol + define without value: 1/2 _b_r_u_c_h eol tdefine without variable name: eol diff --git a/regress/usr.bin/mandoc/eqn/define/quoted.in b/regress/usr.bin/mandoc/eqn/define/quoted.in new file mode 100644 index 00000000000..a98733f1fa8 --- /dev/null +++ b/regress/usr.bin/mandoc/eqn/define/quoted.in @@ -0,0 +1,17 @@ +.Dd June 25, 2017 +.Dt DEFINE-QUOTED 1 +.Os OpenBSD +.Sh NAME +.Nm define-quoted +.Nd interaction of the define control statement with quoting +.Sh DESCRIPTION +initial text +.EQ +define unquoted 'sin' +"unquoted" +unquoted +define quoted '"sin"' +"quoted" +quoted +.EN +final text diff --git a/regress/usr.bin/mandoc/eqn/define/quoted.out_ascii b/regress/usr.bin/mandoc/eqn/define/quoted.out_ascii new file mode 100644 index 00000000000..ed86222fa6f --- /dev/null +++ b/regress/usr.bin/mandoc/eqn/define/quoted.out_ascii @@ -0,0 +1,9 @@ +DEFINE-QUOTED(1) General Commands Manual DEFINE-QUOTED(1) + +NNAAMMEE + ddeeffiinnee--qquuootteedd - interaction of the define control statement with quoting + +DDEESSCCRRIIPPTTIIOONN + initial text _u_n_q_u_o_t_e_d sin _q_u_o_t_e_d _s_i_n final text + +OpenBSD June 25, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/delim/Makefile b/regress/usr.bin/mandoc/eqn/delim/Makefile new file mode 100644 index 00000000000..cd0c4d3fd37 --- /dev/null +++ b/regress/usr.bin/mandoc/eqn/delim/Makefile @@ -0,0 +1,5 @@ +# $OpenBSD: Makefile,v 1.1 2017/06/26 20:11:23 schwarze Exp $ + +REGRESS_TARGETS = basic + +.include <bsd.regress.mk> diff --git a/regress/usr.bin/mandoc/eqn/delim/basic.in b/regress/usr.bin/mandoc/eqn/delim/basic.in new file mode 100644 index 00000000000..60a0970127e --- /dev/null +++ b/regress/usr.bin/mandoc/eqn/delim/basic.in @@ -0,0 +1,21 @@ +.Dd June 26, 2017 +.Dt DELIM-BASIC 1 +.Os OpenBSD +.Sh NAME +.Nm delim-basic +.Nd inline eqn delimiters +.Sh DESCRIPTION +initial text +.EQ +delim <>alpha +.EN +inline <beta> +.EQ +delim offgamma +.EN +inline <delta> +.EQ +delim onepsilon +.EN +inline <zeta> +final text diff --git a/regress/usr.bin/mandoc/eqn/delim/basic.out_ascii b/regress/usr.bin/mandoc/eqn/delim/basic.out_ascii new file mode 100644 index 00000000000..d139aabd005 --- /dev/null +++ b/regress/usr.bin/mandoc/eqn/delim/basic.out_ascii @@ -0,0 +1,9 @@ +DELIM-BASIC(1) General Commands Manual DELIM-BASIC(1) + +NNAAMMEE + ddeelliimm--bbaassiicc - inline eqn delimiters + +DDEESSCCRRIIPPTTIIOONN + initial text a inline B y inline <delta> e inline ,C final text + +OpenBSD June 26, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/fromto/basic.out_ascii b/regress/usr.bin/mandoc/eqn/fromto/basic.out_ascii index 1c3105d444c..f8572579ac4 100644 --- a/regress/usr.bin/mandoc/eqn/fromto/basic.out_ascii +++ b/regress/usr.bin/mandoc/eqn/fromto/basic.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE ffrroommttoo--bbaassiicc - vertical stacking DDEESSCCRRIIPPTTIIOONN - initial text E_(i = 1)^oo 1/i^2 final text + initial text E_(_i = 1)^oo 1/_i^2 final text OpenBSD January 1, 2015 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/fromto/basic.out_html b/regress/usr.bin/mandoc/eqn/fromto/basic.out_html index 700edcc2cd5..a5789c1962a 100644 --- a/regress/usr.bin/mandoc/eqn/fromto/basic.out_html +++ b/regress/usr.bin/mandoc/eqn/fromto/basic.out_html @@ -1 +1 @@ -<mrow><munderover><mi>∑</mi><mrow><mi>i</mi><mi>=</mi><mi>1</mi></mrow><mi>∞</mi></munderover><mfrac><mi>1</mi><msup><mi>i</mi><mi>2</mi></msup></mfrac></mrow> +<mrow><munderover><mo>∑</mo><mrow><mi>i</mi><mo>=</mo><mn>1</mn></mrow><mo>∞</mo></munderover><mfrac><mn>1</mn><msup><mi>i</mi><mn>2</mn></msup></mfrac></mrow> diff --git a/regress/usr.bin/mandoc/eqn/fromto/noarg.out_ascii b/regress/usr.bin/mandoc/eqn/fromto/noarg.out_ascii index 06d2ae8167b..312fc36eebe 100644 --- a/regress/usr.bin/mandoc/eqn/fromto/noarg.out_ascii +++ b/regress/usr.bin/mandoc/eqn/fromto/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE ffrroommttoo--nnooaarrgg - vertical stacking lacks final argument DDEESSCCRRIIPPTTIIOONN - initial text x_a^^ final text + initial text _x__a^^ final text OpenBSD January 1, 2015 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/matrix/basic.in b/regress/usr.bin/mandoc/eqn/matrix/basic.in index d7beea0d6ff..09e318b3c08 100644 --- a/regress/usr.bin/mandoc/eqn/matrix/basic.in +++ b/regress/usr.bin/mandoc/eqn/matrix/basic.in @@ -13,5 +13,8 @@ right ) left ( pile { b sub 1 above b sub 2 } right ) +left [ +bold pile { sin above "sin" } +right ] .EN final text diff --git a/regress/usr.bin/mandoc/eqn/matrix/basic.out_ascii b/regress/usr.bin/mandoc/eqn/matrix/basic.out_ascii index b510090673a..a7a1ba21692 100644 --- a/regress/usr.bin/mandoc/eqn/matrix/basic.out_ascii +++ b/regress/usr.bin/mandoc/eqn/matrix/basic.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE mmaattrriixx--bbaassiicc - matrixes in equations DDEESSCCRRIIPPTTIIOONN - initial text ((a_11 a_21) (a_12 a_22)) (b_1 b_2) final text + initial text ((_a_11 _a_21) (_a_12 _a_22)) (_b_1 _b_2) [sin ssiinn] final text OpenBSD October 10, 2014 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/matrix/basic.out_html b/regress/usr.bin/mandoc/eqn/matrix/basic.out_html index d33b6b2d47e..b02fe584b08 100644 --- a/regress/usr.bin/mandoc/eqn/matrix/basic.out_html +++ b/regress/usr.bin/mandoc/eqn/matrix/basic.out_html @@ -1 +1 @@ -<mrow><mfenced open="(" close=")"><mrow><mtable><mtr><mtd><msub><mi>a</mi><mi>11</mi></msub></mtd><mtd><msub><mi>a</mi><mi>12</mi></msub></mtd></mtr><mtr><mtd><msub><mi>a</mi><mi>21</mi></msub></mtd><mtd><msub><mi>a</mi><mi>22</mi></msub></mtd></mtr></mtable></mrow></mfenced><mfenced open="(" close=")"><mrow><mtable><mtr><mtd><msub><mi>b</mi><mi>1</mi></msub></mtd></mtr><mtr><mtd><msub><mi>b</mi><mi>2</mi></msub></mtd></mtr></mtable></mrow></mfenced></mrow> +<mrow><mfenced open="(" close=")"><mrow><mtable><mtr><mtd><msub><mi>a</mi><mn>11</mn></msub></mtd><mtd><msub><mi>a</mi><mn>12</mn></msub></mtd></mtr><mtr><mtd><msub><mi>a</mi><mn>21</mn></msub></mtd><mtd><msub><mi>a</mi><mn>22</mn></msub></mtd></mtr></mtable></mrow></mfenced><mfenced open="(" close=")"><mrow><mtable><mtr><mtd><msub><mi>b</mi><mn>1</mn></msub></mtd></mtr><mtr><mtd><msub><mi>b</mi><mn>2</mn></msub></mtd></mtr></mtable></mrow></mfenced><mfenced open="[" close="]"><mrow><mrow><mtable><mtr><mtd><mi>sin</mi></mtd></mtr><mtr><mtd><mi fontweight="bold">sin</mi></mtd></mtr></mtable></mrow></mrow></mfenced></mrow> diff --git a/regress/usr.bin/mandoc/eqn/nullary/Makefile b/regress/usr.bin/mandoc/eqn/nullary/Makefile index 85c84f41948..ebed2c213de 100644 --- a/regress/usr.bin/mandoc/eqn/nullary/Makefile +++ b/regress/usr.bin/mandoc/eqn/nullary/Makefile @@ -1,6 +1,7 @@ -# $OpenBSD: Makefile,v 1.1 2015/01/01 12:53:46 schwarze Exp $ +# $OpenBSD: Makefile,v 1.2 2017/06/26 20:11:23 schwarze Exp $ -REGRESS_TARGETS = roman -HTML_TARGETS = roman +REGRESS_TARGETS = roman symbol +UTF8_TARGETS = symbol +HTML_TARGETS = roman symbol .include <bsd.regress.mk> diff --git a/regress/usr.bin/mandoc/eqn/nullary/roman.in b/regress/usr.bin/mandoc/eqn/nullary/roman.in index f4a081f1470..f808ba7a84b 100644 --- a/regress/usr.bin/mandoc/eqn/nullary/roman.in +++ b/regress/usr.bin/mandoc/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/usr.bin/mandoc/eqn/nullary/roman.out_ascii b/regress/usr.bin/mandoc/eqn/nullary/roman.out_ascii index cc6ff3a8028..7b50dc46769 100644 --- a/regress/usr.bin/mandoc/eqn/nullary/roman.out_ascii +++ b/regress/usr.bin/mandoc/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/usr.bin/mandoc/eqn/nullary/roman.out_html b/regress/usr.bin/mandoc/eqn/nullary/roman.out_html index 115daa05ef9..151c858bba1 100644 --- a/regress/usr.bin/mandoc/eqn/nullary/roman.out_html +++ b/regress/usr.bin/mandoc/eqn/nullary/roman.out_html @@ -1 +1,15 @@ -<mrow><mi>sin</mi><mi>cos</mi><mi>tan</mi><mi>sinh</mi><mi>cosh</mi><mi>tanh</mi><mi>arc</mi><mi>max</mi><mi>min</mi><mi>lim</mi><mi>log</mi><mi>ln</mi><mi>exp</mi><mi>Re</mi><mi>Im</mi><mi>and</mi><mi>if</mi><mi>for</mi><mi>det</mi></mrow> +<mrow><mrow><mi>unquoted +words:</mi></mrow><mi>sin</mi><mi>cos</mi><mi>tan</mi> +<mi>sec</mi><mi>csc</mi> +<mi>asin</mi><mi>acos</mi><mi>atan</mi><mi>asec</mi> +<mi>acsc</mi><mi>sinh</mi> +<mi>cosh</mi><mi>tanh</mi><mi>coth</mi><mi>arc</mi> +<mi>max</mi><mi>min</mi><mi>lim</mi><mi>log</mi><mi>ln</mi><mi>exp</mi><mi>Re</mi><mi>Im</mi><mi>and</mi><mi>if</mi><mi>for</mi><mi>det</mi><mo>—</mo><mrow><mi>quoted +words:</mi></mrow> +<mi fontstyle="italic">sin</mi><mi fontstyle="italic">cos</mi> +<mi fontstyle="italic">tan</mi><mi fontstyle="italic">sec</mi><mi fontstyle="italic">csc</mi><mi fontstyle="italic">asin</mi><mi fontstyle="italic">acos</mi><mi fontstyle="italic">atan</mi><mi fontstyle="italic">asec</mi><mi fontstyle="italic">acsc</mi><mi fontstyle="italic">sinh</mi><mi fontstyle="italic">cosh</mi><mi fontstyle="italic">tanh</mi><mi fontstyle="italic">coth</mi><mi fontstyle="italic">arc</mi><mi fontstyle="italic">max</mi><mi fontstyle="italic">min</mi><mi fontstyle="italic">lim</mi><mi fontstyle="italic">log</mi><mi fontstyle="italic">ln</mi><mi fontstyle="italic">exp</mi><mi fontstyle="italic">Re</mi><mi fontstyle="italic">Im</mi><mi fontstyle="italic">and</mi><mi fontstyle="italic">if</mi><mi fontstyle="italic">for</mi><mi fontstyle="italic">det</mi><mo>—</mo><mrow><mi>font +operations:</mi></mrow> +<mrow><mi>sin</mi></mrow><mrow><mi fontweight="bold">sin</mi></mrow><mo>—</mo><mrow><mi>superstring:</mi></mrow><mi fontstyle="italic">sinus</mi><mo>—</mo><mrow><mi>composite +word:</mi></mrow> +<mi>tan</mi><mo>=</mo><mi fontstyle="italic">sin</mi><mo>/</mo> +<mi fontstyle="italic">cos</mi></mrow> diff --git a/regress/usr.bin/mandoc/eqn/nullary/symbol.in b/regress/usr.bin/mandoc/eqn/nullary/symbol.in new file mode 100644 index 00000000000..f43e9e5a3e6 --- /dev/null +++ b/regress/usr.bin/mandoc/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/usr.bin/mandoc/eqn/nullary/symbol.out_ascii b/regress/usr.bin/mandoc/eqn/nullary/symbol.out_ascii new file mode 100644 index 00000000000..bbb7439007e --- /dev/null +++ b/regress/usr.bin/mandoc/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/usr.bin/mandoc/eqn/nullary/symbol.out_html b/regress/usr.bin/mandoc/eqn/nullary/symbol.out_html new file mode 100644 index 00000000000..4e07edc4833 --- /dev/null +++ b/regress/usr.bin/mandoc/eqn/nullary/symbol.out_html @@ -0,0 +1,6 @@ +<mrow><mrow><mi>unquoted +words:</mi></mrow><mo>ε</mo><mo>′</mo><mo>—</mo> +<mrow><mi>quoted words:</mi></mrow> +<mi fontstyle="italic">epsilon</mi><mi fontstyle="italic">prime</mi><mo>—</mo><mrow><mi>composite +word:</mi></mrow> +<mi fontstyle="italic">epsilon</mi><mo>-</mo><mi fontstyle="italic">prime</mi></mrow> diff --git a/regress/usr.bin/mandoc/eqn/nullary/symbol.out_utf8 b/regress/usr.bin/mandoc/eqn/nullary/symbol.out_utf8 new file mode 100644 index 00000000000..7fae3b4413f --- /dev/null +++ b/regress/usr.bin/mandoc/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 diff --git a/regress/usr.bin/mandoc/eqn/over/precedence.out_ascii b/regress/usr.bin/mandoc/eqn/over/precedence.out_ascii index 3e930019d69..80bec6c26e7 100644 --- a/regress/usr.bin/mandoc/eqn/over/precedence.out_ascii +++ b/regress/usr.bin/mandoc/eqn/over/precedence.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE oovveerr--pprreecceeddeennccee - precedence of the fraction operator DDEESSCCRRIIPPTTIIOONN - initial text 1 + x + x^2/2 + x^3/(2 * 3) final text + initial text 1 + _x + _x^2/2 + _x^3/(2 * 3) final text OpenBSD October 10, 2014 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/over/precedence.out_html b/regress/usr.bin/mandoc/eqn/over/precedence.out_html index c0128021b3f..b7c4f36d526 100644 --- a/regress/usr.bin/mandoc/eqn/over/precedence.out_html +++ b/regress/usr.bin/mandoc/eqn/over/precedence.out_html @@ -1 +1 @@ -<mrow><mi>1</mi><mi>+</mi><mi>x</mi><mi>+</mi><mfrac><msup><mi>x</mi><mi>2</mi></msup><mi>2</mi></mfrac><mi>+</mi><mfrac><msup><mi>x</mi><mi>3</mi></msup><mrow><mi>2</mi><mi>*</mi><mi>3</mi></mrow></mfrac></mrow> +<mrow><mn>1</mn><mo>+</mo><mi>x</mi><mo>+</mo><mfrac><msup><mi>x</mi><mn>2</mn></msup><mn>2</mn></mfrac><mo>+</mo><mfrac><msup><mi>x</mi><mn>3</mn></msup><mrow><mn>2</mn><mo>*</mo><mn>3</mn></mrow></mfrac></mrow> diff --git a/regress/usr.bin/mandoc/eqn/size/basic.out_ascii b/regress/usr.bin/mandoc/eqn/size/basic.out_ascii index 3177a1b5568..2f825eaa5c3 100644 --- a/regress/usr.bin/mandoc/eqn/size/basic.out_ascii +++ b/regress/usr.bin/mandoc/eqn/size/basic.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE ssiizzee--bbaassiicc - font sizes DDEESSCCRRIIPPTTIIOONN - initial text x x x x final text + initial text _x _x _x _x final text OpenBSD October 10, 2014 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/subsup/combine.out_ascii b/regress/usr.bin/mandoc/eqn/subsup/combine.out_ascii index 945a4ad3fa9..1eaeb504c3b 100644 --- a/regress/usr.bin/mandoc/eqn/subsup/combine.out_ascii +++ b/regress/usr.bin/mandoc/eqn/subsup/combine.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE ssuubbssuupp--ccoommbbiinnee - combination of subscripts and superscripts DDEESSCCRRIIPPTTIIOONN - initial text x_1^2 + e^x_2 final text + initial text _x_1^2 + _e^_x_2 final text OpenBSD October 10, 2014 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/subsup/combine.out_html b/regress/usr.bin/mandoc/eqn/subsup/combine.out_html index 6e2c7de2158..65b1e9e48e1 100644 --- a/regress/usr.bin/mandoc/eqn/subsup/combine.out_html +++ b/regress/usr.bin/mandoc/eqn/subsup/combine.out_html @@ -1 +1 @@ -<mrow><msubsup><mi>x</mi><mi>1</mi><mi>2</mi></msubsup><mi>+</mi><msup><mi>e</mi><msub><mi>x</mi><mi>2</mi></msub></msup></mrow> +<mrow><msubsup><mi>x</mi><mn>1</mn><mn>2</mn></msubsup><mo>+</mo><msup><mi>e</mi><msub><mi>x</mi><mn>2</mn></msub></msup></mrow> diff --git a/regress/usr.bin/mandoc/eqn/subsup/noarg.out_ascii b/regress/usr.bin/mandoc/eqn/subsup/noarg.out_ascii index ad99680b060..a0e8cbd102f 100644 --- a/regress/usr.bin/mandoc/eqn/subsup/noarg.out_ascii +++ b/regress/usr.bin/mandoc/eqn/subsup/noarg.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE ssuubbssuupp--nnooaarrgg - empty subscripts and superscripts DDEESSCCRRIIPPTTIIOONN - initial text x_1^^ final text + initial text _x_1^^ final text OpenBSD January 1, 2015 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/subsup/noarg.out_html b/regress/usr.bin/mandoc/eqn/subsup/noarg.out_html index 0741689120d..e5f4fd76d27 100644 --- a/regress/usr.bin/mandoc/eqn/subsup/noarg.out_html +++ b/regress/usr.bin/mandoc/eqn/subsup/noarg.out_html @@ -1 +1 @@ -<mrow><msubsup><mi>x</mi><msup><mi>1</mi></msup></msubsup></mrow> +<mrow><msubsup><mi>x</mi><msup><mn>1</mn></msup></msubsup></mrow> diff --git a/regress/usr.bin/mandoc/eqn/subsup/sub_group.out_ascii b/regress/usr.bin/mandoc/eqn/subsup/sub_group.out_ascii index 8de3c874d42..0ffd31c9c05 100644 --- a/regress/usr.bin/mandoc/eqn/subsup/sub_group.out_ascii +++ b/regress/usr.bin/mandoc/eqn/subsup/sub_group.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE ssuubbssuupp--ssuubb__ggrroouupp - grouping of subscripts DDEESSCCRRIIPPTTIIOONN - initial text x_i + x_j_1 + (M_i)_j final text + initial text _x__i + _x__j_1 + (_M__i)__j final text OpenBSD October 10, 2014 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/subsup/sub_group.out_html b/regress/usr.bin/mandoc/eqn/subsup/sub_group.out_html index dad7c4062f6..e74584eba1f 100644 --- a/regress/usr.bin/mandoc/eqn/subsup/sub_group.out_html +++ b/regress/usr.bin/mandoc/eqn/subsup/sub_group.out_html @@ -1 +1 @@ -<mrow><msub><mi>x</mi><mi>i</mi></msub><mi>+</mi><msub><mi>x</mi><msub><mi>j</mi><mi>1</mi></msub></msub><mi>+</mi><msub><mrow><msub><mi>M</mi><mi>i</mi></msub></mrow><mi>j</mi></msub></mrow> +<mrow><msub><mi>x</mi><mi>i</mi></msub><mo>+</mo><msub><mi>x</mi><msub><mi>j</mi><mn>1</mn></msub></msub><mo>+</mo><msub><mrow><msub><mi>M</mi><mi>i</mi></msub></mrow><mi>j</mi></msub></mrow> diff --git a/regress/usr.bin/mandoc/eqn/unary/Makefile b/regress/usr.bin/mandoc/eqn/unary/Makefile index c684a0673ba..2d4d2b94d0d 100644 --- a/regress/usr.bin/mandoc/eqn/unary/Makefile +++ b/regress/usr.bin/mandoc/eqn/unary/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.1 2015/01/01 12:53:46 schwarze Exp $ +# $OpenBSD: Makefile,v 1.2 2017/06/26 20:11:23 schwarze Exp $ -REGRESS_TARGETS = diacrit sqrt -HTML_TARGETS = diacrit sqrt +REGRESS_TARGETS = bold diacrit sqrt +HTML_TARGETS = bold diacrit sqrt .include <bsd.regress.mk> diff --git a/regress/usr.bin/mandoc/eqn/unary/bold.in b/regress/usr.bin/mandoc/eqn/unary/bold.in new file mode 100644 index 00000000000..d1d1686d98f --- /dev/null +++ b/regress/usr.bin/mandoc/eqn/unary/bold.in @@ -0,0 +1,12 @@ +.Dd June 26, 2017 +.Dt UNARY-BOLD 1 +.Os OpenBSD +.Sh NAME +.Nm unary-bold +.Nd font handling in bold boxes +.Sh DESCRIPTION +initial text +.EQ +bold { sin "sin" } +.EN +final text diff --git a/regress/usr.bin/mandoc/eqn/unary/bold.out_ascii b/regress/usr.bin/mandoc/eqn/unary/bold.out_ascii new file mode 100644 index 00000000000..01ef870a855 --- /dev/null +++ b/regress/usr.bin/mandoc/eqn/unary/bold.out_ascii @@ -0,0 +1,9 @@ +UNARY-BOLD(1) General Commands Manual UNARY-BOLD(1) + +NNAAMMEE + uunnaarryy--bboolldd - font handling in bold boxes + +DDEESSCCRRIIPPTTIIOONN + initial text ((sin ssiinn)) final text + +OpenBSD June 26, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/unary/bold.out_html b/regress/usr.bin/mandoc/eqn/unary/bold.out_html new file mode 100644 index 00000000000..56d6762f913 --- /dev/null +++ b/regress/usr.bin/mandoc/eqn/unary/bold.out_html @@ -0,0 +1 @@ +<mrow><mrow><mrow><mi>sin</mi><mi fontweight="bold">sin</mi></mrow></mrow></mrow> diff --git a/regress/usr.bin/mandoc/eqn/unary/diacrit.out_ascii b/regress/usr.bin/mandoc/eqn/unary/diacrit.out_ascii index 54a35c3c39a..1e35a8fcbfe 100644 --- a/regress/usr.bin/mandoc/eqn/unary/diacrit.out_ascii +++ b/regress/usr.bin/mandoc/eqn/unary/diacrit.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE uunnaarryy--ddiiaaccrriitt - diacritical marks in equations DDEESSCCRRIIPPTTIIOONN - initial text x. x" x^ x~ x-> x<-> (x + y) (x + y)_ final text + initial text _x. _x" _x^ _x~ _x-> _x<-> (_x + _y) (_x + _y)_ final text OpenBSD October 10, 2014 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/unary/diacrit.out_html b/regress/usr.bin/mandoc/eqn/unary/diacrit.out_html index 076c6663968..02dcc2f4911 100644 --- a/regress/usr.bin/mandoc/eqn/unary/diacrit.out_html +++ b/regress/usr.bin/mandoc/eqn/unary/diacrit.out_html @@ -1 +1 @@ -<mrow><mover><mi>x</mi><mo>˙</mo></mover><mover><mi>x</mi><mo>¨</mo></mover><mover><mi>x</mi><mo>^</mo></mover><mover><mi>x</mi><mo>~</mo></mover><mover><mi>x</mi><mo>→</mo></mover><mover><mi>x</mi><mo>↔</mo></mover><mover><mrow><mi>x</mi><mi>+</mi><mi>y</mi></mrow><mo></mo></mover><munder><mrow><mi>x</mi><mi>+</mi><mi>y</mi></mrow><mo>_</mo></munder></mrow> +<mrow><mover><mi>x</mi><mo>˙</mo></mover><mover><mi>x</mi><mo>¨</mo></mover><mover><mi>x</mi><mo>^</mo></mover><mover><mi>x</mi><mo>~</mo></mover><mover><mi>x</mi><mo>→</mo></mover><mover><mi>x</mi><mo>↔</mo></mover><mover><mrow><mi>x</mi><mo>+</mo><mi>y</mi></mrow><mo></mo></mover><munder><mrow><mi>x</mi><mo>+</mo><mi>y</mi></mrow><mo>_</mo></munder></mrow> diff --git a/regress/usr.bin/mandoc/eqn/unary/sqrt.in b/regress/usr.bin/mandoc/eqn/unary/sqrt.in index b416da7c2cf..2bd4a9f5088 100644 --- a/regress/usr.bin/mandoc/eqn/unary/sqrt.in +++ b/regress/usr.bin/mandoc/eqn/unary/sqrt.in @@ -7,6 +7,6 @@ .Sh DESCRIPTION initial text .EQ -r = sqrt { x sup 2 + y sup 2 } + sqrt { } + sqrt +r = sqrt { x sup 2 + y sup 2 } + sqrt a+b + sqrt { } + sqrt .EN final text diff --git a/regress/usr.bin/mandoc/eqn/unary/sqrt.out_ascii b/regress/usr.bin/mandoc/eqn/unary/sqrt.out_ascii index f109b77055a..7aa6778efc0 100644 --- a/regress/usr.bin/mandoc/eqn/unary/sqrt.out_ascii +++ b/regress/usr.bin/mandoc/eqn/unary/sqrt.out_ascii @@ -4,6 +4,6 @@ NNAAMMEE uunnaarryy--ssqqrrtt - square root DDEESSCCRRIIPPTTIIOONN - initial text r = sqrt(x^2 + y^2) + sqrt() + sqrt final text + initial text _r = sqrt(_x^2 + _y^2) + sqrt(_a + _b) + sqrt() + sqrt final text OpenBSD February 12, 2017 OpenBSD diff --git a/regress/usr.bin/mandoc/eqn/unary/sqrt.out_html b/regress/usr.bin/mandoc/eqn/unary/sqrt.out_html index a828ff1dc48..ca2de199e98 100644 --- a/regress/usr.bin/mandoc/eqn/unary/sqrt.out_html +++ b/regress/usr.bin/mandoc/eqn/unary/sqrt.out_html @@ -1 +1 @@ -<mrow><mi>r</mi><mi>=</mi><msqrt><mrow><msup><mi>x</mi><mi>2</mi></msup><mi>+</mi><msup><mi>y</mi><mi>2</mi></msup></mrow></msqrt><mi>+</mi><msqrt><mrow></mrow></msqrt><mi>+</mi><msqrt></msqrt></mrow> +<mrow><mi>r</mi><mo>=</mo><msqrt><mrow><msup><mi>x</mi><mn>2</mn></msup><mo>+</mo><msup><mi>y</mi><mn>2</mn></msup></mrow></msqrt><mo>+</mo><msqrt><mrow><mi>a</mi><mo>+</mo><mi>b</mi></mrow></msqrt><mo>+</mo><msqrt><mrow></mrow></msqrt><mo>+</mo><msqrt></msqrt></mrow> |