catch up with the recent eqn(7) improvements

9 files changed, 30 insertions, 8 deletions

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>&#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>
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>