summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Schwarze <schwarze@openbsd.org>2018-10-02 12:18:33 +0000
committerIngo Schwarze <schwarze@openbsd.org>2018-10-02 12:18:33 +0000
commit2b5f7b1a9ecbfb46e4d111a73e873c9ac394f261 (patch)
treef1523d3465fd5b3851ee1ff6237509e825119646
parentc014e3db0177151bf2e089be74d2703fb2b846d4 (diff)
downloadmandoc-2b5f7b1a9ecbfb46e4d111a73e873c9ac394f261.tar.gz
Render the eqn(7) "sqrt" function as U+221A in UTF-8 output.
This also agrees with what groff does. Suggested by an attendee of EuroBSDCon 2018 in Bucuresti. Written on the plane Bucuresti-Frankfurt returning from EuroBSDCon.
-rw-r--r--TODO5
-rw-r--r--eqn_term.c2
-rw-r--r--regress/eqn/over/precedence.out_ascii4
-rw-r--r--regress/eqn/unary/sqrt.out_ascii4
4 files changed, 6 insertions, 9 deletions
diff --git a/TODO b/TODO
index 8143d0ca..a66c5bd3 100644
--- a/TODO
+++ b/TODO
@@ -209,9 +209,6 @@ are mere guesses, and some may be wrong.
--- missing eqn features -----------------------------------------------
-- Use a Unicode character for sqrt() in eqn output?
- Suggested by an attendee during EuroBSDCon 2018.
-
- In a matrix, break the output line after each matrix line.
Found in the discussion at CDBUG 2015.
Suggested by Avi Weinstock.
@@ -396,7 +393,7 @@ are mere guesses, and some may be wrong.
- table of content at the top of HTML (and perhaps ps/pdf) pages
only if there are at least two (or three?) non-standard sections
only if the new option -O toc is given
- suggested by an attendee during EuroBSDCon 2018
+ suggested by Adam Kalisz during EuroBSDCon 2018
- support -O man with two arguments, typically using the first for
a local tree (like the release pages on mandoc.bsd.lv) and the
diff --git a/eqn_term.c b/eqn_term.c
index 095b82a7..37770618 100644
--- a/eqn_term.c
+++ b/eqn_term.c
@@ -106,7 +106,7 @@ eqn_box(struct termp *p, const struct eqn_box *bp)
/* Special box types. */
if (bp->pos == EQNPOS_SQRT) {
- term_word(p, "sqrt");
+ term_word(p, "\\(sr");
if (bp->first != NULL) {
p->flags |= TERMP_NOSPACE;
eqn_box(p, bp->first);
diff --git a/regress/eqn/over/precedence.out_ascii b/regress/eqn/over/precedence.out_ascii
index 0dc9e747..2a7f61be 100644
--- a/regress/eqn/over/precedence.out_ascii
+++ b/regress/eqn/over/precedence.out_ascii
@@ -4,7 +4,7 @@ NNAAMMEE
oovveerr--pprreecceeddeennccee - precedence of the fraction operator
DDEESSCCRRIIPPTTIIOONN
- initial text 1 + _x + (_x^2)/2 + (_x^3)/(2 * 3); _a^/_c~; aa/cc; sqrt(_a)/sqrt(_c)
- final text
+ initial text 1 + _x + (_x^2)/2 + (_x^3)/(2 * 3); _a^/_c~; aa/cc;
+ <sqrt>(_a)/<sqrt>(_c) final text
OpenBSD July 6, 2017 OpenBSD
diff --git a/regress/eqn/unary/sqrt.out_ascii b/regress/eqn/unary/sqrt.out_ascii
index 72b7047d..c6d19d20 100644
--- a/regress/eqn/unary/sqrt.out_ascii
+++ b/regress/eqn/unary/sqrt.out_ascii
@@ -4,7 +4,7 @@ NNAAMMEE
uunnaarryy--ssqqrrtt - square root
DDEESSCCRRIIPPTTIIOONN
- initial text _r = sqrt(_x^2 + _y^2) + sqrt(_a + _b) + sqrt(_x^) + sqrt() + sqrt
- final text
+ initial text _r = <sqrt>(_x^2 + _y^2) + <sqrt>(_a + _b) + <sqrt>(_x^) +
+ <sqrt>() + <sqrt> final text
OpenBSD July 6, 2017 OpenBSD