catch up with the recent eqn(7) improvements
authorschwarze <schwarze@openbsd.org>
Mon, 26 Jun 2017 20:11:23 +0000 (20:11 +0000)
committerschwarze <schwarze@openbsd.org>
Mon, 26 Jun 2017 20:11:23 +0000 (20:11 +0000)
42 files changed:
regress/usr.bin/mandoc/eqn/Makefile
regress/usr.bin/mandoc/eqn/define/Makefile
regress/usr.bin/mandoc/eqn/define/font.in [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/define/font.out_ascii [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/define/invalid.out_ascii
regress/usr.bin/mandoc/eqn/define/quoted.in [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/define/quoted.out_ascii [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/delim/Makefile [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/delim/basic.in [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/delim/basic.out_ascii [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/fromto/basic.out_ascii
regress/usr.bin/mandoc/eqn/fromto/basic.out_html
regress/usr.bin/mandoc/eqn/fromto/noarg.out_ascii
regress/usr.bin/mandoc/eqn/matrix/basic.in
regress/usr.bin/mandoc/eqn/matrix/basic.out_ascii
regress/usr.bin/mandoc/eqn/matrix/basic.out_html
regress/usr.bin/mandoc/eqn/nullary/Makefile
regress/usr.bin/mandoc/eqn/nullary/roman.in
regress/usr.bin/mandoc/eqn/nullary/roman.out_ascii
regress/usr.bin/mandoc/eqn/nullary/roman.out_html
regress/usr.bin/mandoc/eqn/nullary/symbol.in [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/nullary/symbol.out_ascii [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/nullary/symbol.out_html [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/nullary/symbol.out_utf8 [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/over/precedence.out_ascii
regress/usr.bin/mandoc/eqn/over/precedence.out_html
regress/usr.bin/mandoc/eqn/size/basic.out_ascii
regress/usr.bin/mandoc/eqn/subsup/combine.out_ascii
regress/usr.bin/mandoc/eqn/subsup/combine.out_html
regress/usr.bin/mandoc/eqn/subsup/noarg.out_ascii
regress/usr.bin/mandoc/eqn/subsup/noarg.out_html
regress/usr.bin/mandoc/eqn/subsup/sub_group.out_ascii
regress/usr.bin/mandoc/eqn/subsup/sub_group.out_html
regress/usr.bin/mandoc/eqn/unary/Makefile
regress/usr.bin/mandoc/eqn/unary/bold.in [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/unary/bold.out_ascii [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/unary/bold.out_html [new file with mode: 0644]
regress/usr.bin/mandoc/eqn/unary/diacrit.out_ascii
regress/usr.bin/mandoc/eqn/unary/diacrit.out_html
regress/usr.bin/mandoc/eqn/unary/sqrt.in
regress/usr.bin/mandoc/eqn/unary/sqrt.out_ascii
regress/usr.bin/mandoc/eqn/unary/sqrt.out_html

index ef5effd..e73dd86 100644 (file)
@@ -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>
index ea03b23..9112da8 100644 (file)
@@ -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 (file)
index 0000000..627c7e0
--- /dev/null
@@ -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 (file)
index 0000000..5719925
--- /dev/null
@@ -0,0 +1,9 @@
+DEFINE-FONT(1)              General Commands Manual             DEFINE-FONT(1)
+
+N\bNA\bAM\bME\bE
+     d\bde\bef\bfi\bin\bne\be-\b-f\bfo\bon\bnt\bt - font selection takes place after define resolution
+
+D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
+     initial text sin _\bx _\bv_\ba_\bl_\bu_\be final text
+
+OpenBSD                          June 25, 2017                         OpenBSD
index 0725dde..6249665 100644 (file)
@@ -4,11 +4,11 @@ N\bNA\bAM\bME\bE
      d\bde\bef\bfi\bin\bne\be-\b-i\bin\bnv\bva\bal\bli\bid\bd - invalid define and undef statements
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     define without variable name: 1/2 bruch eol
+     define without variable name: 1/2 _\bb_\br_\bu_\bc_\bh eol
 
-     define without value: 1/2 bruch eol
+     define without value: 1/2 _\bb_\br_\bu_\bc_\bh eol
 
-     define without value: 1/2 bruch eol
+     define without value: 1/2 _\bb_\br_\bu_\bc_\bh 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 (file)
index 0000000..a98733f
--- /dev/null
@@ -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 (file)
index 0000000..ed86222
--- /dev/null
@@ -0,0 +1,9 @@
+DEFINE-QUOTED(1)            General Commands Manual           DEFINE-QUOTED(1)
+
+N\bNA\bAM\bME\bE
+     d\bde\bef\bfi\bin\bne\be-\b-q\bqu\buo\bot\bte\bed\bd - interaction of the define control statement with quoting
+
+D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
+     initial text _\bu_\bn_\bq_\bu_\bo_\bt_\be_\bd sin _\bq_\bu_\bo_\bt_\be_\bd _\bs_\bi_\bn 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 (file)
index 0000000..cd0c4d3
--- /dev/null
@@ -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 (file)
index 0000000..60a0970
--- /dev/null
@@ -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 (file)
index 0000000..d139aab
--- /dev/null
@@ -0,0 +1,9 @@
+DELIM-BASIC(1)              General Commands Manual             DELIM-BASIC(1)
+
+N\bNA\bAM\bME\bE
+     d\bde\bel\bli\bim\bm-\b-b\bba\bas\bsi\bic\bc - inline eqn delimiters
+
+D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
+     initial text a inline B y inline <delta> e inline ,\bC final text
+
+OpenBSD                          June 26, 2017                         OpenBSD
index 1c3105d..f857257 100644 (file)
@@ -4,6 +4,6 @@ N\bNA\bAM\bME\bE
      f\bfr\bro\bom\bmt\bto\bo-\b-b\bba\bas\bsi\bic\bc - vertical stacking
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     initial text E_(i = 1)^oo 1/i^2 final text
+     initial text E_(_\bi = 1)^oo 1/_\bi^2 final text
 
 OpenBSD                         January 1, 2015                        OpenBSD
index 700edcc..a5789c1 100644 (file)
@@ -1 +1 @@
-<mrow><munderover><mi>&#8721;</mi><mrow><mi>i</mi><mi>=</mi><mi>1</mi></mrow><mi>&#8734;</mi></munderover><mfrac><mi>1</mi><msup><mi>i</mi><mi>2</mi></msup></mfrac></mrow>
+<mrow><munderover><mo>&#8721;</mo><mrow><mi>i</mi><mo>=</mo><mn>1</mn></mrow><mo>&#8734;</mo></munderover><mfrac><mn>1</mn><msup><mi>i</mi><mn>2</mn></msup></mfrac></mrow>
index 06d2ae8..312fc36 100644 (file)
@@ -4,6 +4,6 @@ N\bNA\bAM\bME\bE
      f\bfr\bro\bom\bmt\bto\bo-\b-n\bno\boa\bar\brg\bg - vertical stacking lacks final argument
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     initial text x_a^^ final text
+     initial text _\bx__\ba^^ final text
 
 OpenBSD                         January 1, 2015                        OpenBSD
index d7beea0..09e318b 100644 (file)
@@ -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
index b510090..a7a1ba2 100644 (file)
@@ -4,6 +4,6 @@ N\bNA\bAM\bME\bE
      m\bma\bat\btr\bri\bix\bx-\b-b\bba\bas\bsi\bic\bc - matrixes in equations
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     initial text ((a_11 a_21) (a_12 a_22)) (b_1 b_2) final text
+     initial text ((_\ba_11 _\ba_21) (_\ba_12 _\ba_22)) (_\bb_1 _\bb_2) [sin s\bsi\bin\bn] final text
 
 OpenBSD                        October 10, 2014                        OpenBSD
index d33b6b2..b02fe58 100644 (file)
@@ -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>
index ec5dfa0..ebed2c2 100644 (file)
@@ -1,6 +1,7 @@
-# $OpenBSD: Makefile,v 1.1.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>
index f4a081f..f808ba7 100644 (file)
@@ -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
index cc6ff3a..7b50dc4 100644 (file)
@@ -4,7 +4,11 @@ N\bNA\bAM\bME\bE
      n\bnu\bul\bll\bla\bar\bry\by-\b-r\bro\bom\bma\ban\bn - equation tokens set in roman font
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     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: _\bs_\bi_\bn _\bc_\bo_\bs _\bt_\ba_\bn _\bs_\be_\bc _\bc_\bs_\bc _\ba_\bs_\bi_\bn _\ba_\bc_\bo_\bs _\ba_\bt_\ba_\bn _\ba_\bs_\be_\bc _\ba_\bc_\bs_\bc _\bs_\bi_\bn_\bh _\bc_\bo_\bs_\bh
+     _\bt_\ba_\bn_\bh _\bc_\bo_\bt_\bh _\ba_\br_\bc _\bm_\ba_\bx _\bm_\bi_\bn _\bl_\bi_\bm _\bl_\bo_\bg _\bl_\bn _\be_\bx_\bp _\bR_\be _\bI_\bm _\ba_\bn_\bd _\bi_\bf _\bf_\bo_\br _\bd_\be_\bt -- font
+     operations: sin s\bsi\bin\bn -- superstring: _\bs_\bi_\bn_\bu_\bs -- composite word: tan = _\bs_\bi_\bn /
+     _\bc_\bo_\bs -- final text
 
-OpenBSD                        October 12, 2014                        OpenBSD
+OpenBSD                          June 25, 2017                         OpenBSD
index 115daa0..151c858 100644 (file)
@@ -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>&#8212;</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>&#8212;</mo><mrow><mi>font
+operations:</mi></mrow>
+<mrow><mi>sin</mi></mrow><mrow><mi fontweight="bold">sin</mi></mrow><mo>&#8212;</mo><mrow><mi>superstring:</mi></mrow><mi fontstyle="italic">sinus</mi><mo>&#8212;</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 (file)
index 0000000..f43e9e5
--- /dev/null
@@ -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 (file)
index 0000000..bbb7439
--- /dev/null
@@ -0,0 +1,10 @@
+NULLARY-SYMBOL(1)           General Commands Manual          NULLARY-SYMBOL(1)
+
+N\bNA\bAM\bME\bE
+     n\bnu\bul\bll\bla\bar\bry\by-\b-s\bsy\bym\bmb\bbo\bol\bl - equation tokens for symbols
+
+D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
+     initial text -- unquoted words: e ' -- quoted words: _\be_\bp_\bs_\bi_\bl_\bo_\bn _\bp_\br_\bi_\bm_\be --
+     composite word: _\be_\bp_\bs_\bi_\bl_\bo_\bn - _\bp_\br_\bi_\bm_\be -- 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 (file)
index 0000000..4e07edc
--- /dev/null
@@ -0,0 +1,6 @@
+<mrow><mrow><mi>unquoted
+words:</mi></mrow><mo>&#949;</mo><mo>&#8242;</mo><mo>&#8212;</mo>
+<mrow><mi>quoted words:</mi></mrow>
+<mi fontstyle="italic">epsilon</mi><mi fontstyle="italic">prime</mi><mo>&#8212;</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 (file)
index 0000000..7fae3b4
--- /dev/null
@@ -0,0 +1,10 @@
+NULLARY-SYMBOL(1)           General Commands Manual          NULLARY-SYMBOL(1)
+
+N\bNA\bAM\bME\bE
+     n\bnu\bul\bll\bla\bar\bry\by-\b-s\bsy\bym\bmb\bbo\bol\bl – equation tokens for symbols
+
+D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
+     initial text — unquoted words: ε ′ — quoted words: _\be_\bp_\bs_\bi_\bl_\bo_\bn _\bp_\br_\bi_\bm_\be —
+     composite word: _\be_\bp_\bs_\bi_\bl_\bo_\bn - _\bp_\br_\bi_\bm_\be — final text
+
+OpenBSD                          June 25, 2017                         OpenBSD
index 3e93001..80bec6c 100644 (file)
@@ -4,6 +4,6 @@ N\bNA\bAM\bME\bE
      o\bov\bve\ber\br-\b-p\bpr\bre\bec\bce\bed\bde\ben\bnc\bce\be - precedence of the fraction operator
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     initial text 1 + x + x^2/2 + x^3/(2 * 3) final text
+     initial text 1 + _\bx + _\bx^2/2 + _\bx^3/(2 * 3) final text
 
 OpenBSD                        October 10, 2014                        OpenBSD
index c012802..b7c4f36 100644 (file)
@@ -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>
index 3177a1b..2f825ea 100644 (file)
@@ -4,6 +4,6 @@ N\bNA\bAM\bME\bE
      s\bsi\biz\bze\be-\b-b\bba\bas\bsi\bic\bc - font sizes
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     initial text x x x x final text
+     initial text _\bx _\bx _\bx _\bx final text
 
 OpenBSD                        October 10, 2014                        OpenBSD
index 945a4ad..1eaeb50 100644 (file)
@@ -4,6 +4,6 @@ N\bNA\bAM\bME\bE
      s\bsu\bub\bbs\bsu\bup\bp-\b-c\bco\bom\bmb\bbi\bin\bne\be - combination of subscripts and superscripts
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     initial text x_1^2 + e^x_2 final text
+     initial text _\bx_1^2 + _\be^_\bx_2 final text
 
 OpenBSD                        October 10, 2014                        OpenBSD
index 6e2c7de..65b1e9e 100644 (file)
@@ -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>
index ad99680..a0e8cbd 100644 (file)
@@ -4,6 +4,6 @@ N\bNA\bAM\bME\bE
      s\bsu\bub\bbs\bsu\bup\bp-\b-n\bno\boa\bar\brg\bg - empty subscripts and superscripts
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     initial text x_1^^ final text
+     initial text _\bx_1^^ final text
 
 OpenBSD                         January 1, 2015                        OpenBSD
index 0741689..e5f4fd7 100644 (file)
@@ -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>
index 8de3c87..0ffd31c 100644 (file)
@@ -4,6 +4,6 @@ N\bNA\bAM\bME\bE
      s\bsu\bub\bbs\bsu\bup\bp-\b-s\bsu\bub\bb_\b_g\bgr\bro\bou\bup\bp - grouping of subscripts
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     initial text x_i + x_j_1 + (M_i)_j final text
+     initial text _\bx__\bi + _\bx__\bj_1 + (_\bM__\bi)__\bj final text
 
 OpenBSD                        October 10, 2014                        OpenBSD
index dad7c40..e74584e 100644 (file)
@@ -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>
index f68a5ce..2d4d2b9 100644 (file)
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.1.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 (file)
index 0000000..d1d1686
--- /dev/null
@@ -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 (file)
index 0000000..01ef870
--- /dev/null
@@ -0,0 +1,9 @@
+UNARY-BOLD(1)               General Commands Manual              UNARY-BOLD(1)
+
+N\bNA\bAM\bME\bE
+     u\bun\bna\bar\bry\by-\b-b\bbo\bol\bld\bd - font handling in bold boxes
+
+D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
+     initial text (\b(sin s\bsi\bin\bn)\b) 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 (file)
index 0000000..56d6762
--- /dev/null
@@ -0,0 +1 @@
+<mrow><mrow><mrow><mi>sin</mi><mi fontweight="bold">sin</mi></mrow></mrow></mrow>
index 54a35c3..1e35a8f 100644 (file)
@@ -4,6 +4,6 @@ N\bNA\bAM\bME\bE
      u\bun\bna\bar\bry\by-\b-d\bdi\bia\bac\bcr\bri\bit\bt - diacritical marks in equations
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     initial text x. x" x^ x~ x-> x<-> (x + y) (x + y)_ final text
+     initial text _\bx. _\bx" _\bx^ _\bx~ _\bx-> _\bx<-> (_\bx + _\by) (_\bx + _\by)_ final text
 
 OpenBSD                        October 10, 2014                        OpenBSD
index 076c666..02dcc2f 100644 (file)
@@ -1 +1 @@
-<mrow><mover><mi>x</mi><mo>&#729;</mo></mover><mover><mi>x</mi><mo>&#168;</mo></mover><mover><mi>x</mi><mo>^</mo></mover><mover><mi>x</mi><mo>~</mo></mover><mover><mi>x</mi><mo>&#8594;</mo></mover><mover><mi>x</mi><mo>&#8596;</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>&#729;</mo></mover><mover><mi>x</mi><mo>&#168;</mo></mover><mover><mi>x</mi><mo>^</mo></mover><mover><mi>x</mi><mo>~</mo></mover><mover><mi>x</mi><mo>&#8594;</mo></mover><mover><mi>x</mi><mo>&#8596;</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>
index b416da7..2bd4a9f 100644 (file)
@@ -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
index f109b77..7aa6778 100644 (file)
@@ -4,6 +4,6 @@ N\bNA\bAM\bME\bE
      u\bun\bna\bar\bry\by-\b-s\bsq\bqr\brt\bt - square root
 
 D\bDE\bES\bSC\bCR\bRI\bIP\bPT\bTI\bIO\bON\bN
-     initial text r = sqrt(x^2 + y^2) + sqrt() + sqrt final text
+     initial text _\br = sqrt(_\bx^2 + _\by^2) + sqrt(_\ba + _\bb) + sqrt() + sqrt final text
 
 OpenBSD                        February 12, 2017                       OpenBSD
index a828ff1..ca2de19 100644 (file)
@@ -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>