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.

diff --git a/TODO b/TODO
index d0421733a0b18b0b81ec664acb518826ba5d9742..25f8f10fcc87ade68b67583e7fcd90ee10b4f110 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,6 +1,6 @@
 ************************************************************************
 * Official mandoc TODO.
 ************************************************************************
 * Official mandoc TODO.

-* $Id: TODO,v 1.270 2018/09/23 05:34:58 schwarze Exp $
+* $Id: TODO,v 1.271 2018/10/02 12:18:33 schwarze Exp $

 ************************************************************************
 
 Many issues are annotated for difficulty as follows:
 ************************************************************************
 
 Many issues are annotated for difficulty as follows:


@@ -209,9 +209,6 @@ are mere guesses, and some may be wrong.
 
 --- missing eqn features -----------------------------------------------
 
 
 --- 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.
 - 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
 - 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
 
 - 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 669c3c56cff74a754917199aef62d21f5c778e16..b1a438d923987c6b903b9917f20333b0a3edcb97 100644 (file)
--- a/eqn_term.c
+++ b/eqn_term.c
@@ -1,4 +1,4 @@
-/*     $Id: eqn_term.c,v 1.17 2017/08/23 21:56:20 schwarze Exp $ */
+/*     $Id: eqn_term.c,v 1.18 2018/10/02 12:18:33 schwarze Exp $ */

 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>
 /*
  * Copyright (c) 2011 Kristaps Dzonsons <kristaps@bsd.lv>
  * Copyright (c) 2014, 2015, 2017 Ingo Schwarze <schwarze@openbsd.org>


@@ -106,7 +106,7 @@ eqn_box(struct termp *p, const struct eqn_box *bp)
        /* Special box types. */
 
        if (bp->pos == EQNPOS_SQRT) {
        /* 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);
                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 0dc9e747a1f036127a367f74f9b659207059fd3f..2a7f61be948c038048ac7e649e66a498b213ba0a 100644 (file)
--- a/regress/eqn/over/precedence.out_ascii
+++ b/regress/eqn/over/precedence.out_ascii
@@ -4,7 +4,7 @@ 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
      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 + _\bx + (_\bx^2)/2 + (_\bx^3)/(2 * 3); _\ba^/_\bc~; a\ba/c\bc; sqrt(_\ba)/sqrt(_\bc)
-     final text
+     initial text 1 + _\bx + (_\bx^2)/2 + (_\bx^3)/(2 * 3); _\ba^/_\bc~; a\ba/c\bc;
+     <sqrt>(_\ba)/<sqrt>(_\bc) final text

 
 OpenBSD                          July 6, 2017                          OpenBSD
 
 OpenBSD                          July 6, 2017                          OpenBSD

diff --git a/regress/eqn/unary/sqrt.out_ascii b/regress/eqn/unary/sqrt.out_ascii
index 72b7047debcd8a2cb1e5bf5e6ad44ccbb798288d..c6d19d207da5d6817168efa143cea9b0a787ac6e 100644 (file)
--- a/regress/eqn/unary/sqrt.out_ascii
+++ b/regress/eqn/unary/sqrt.out_ascii
@@ -4,7 +4,7 @@ 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
      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 _\br = sqrt(_\bx^2 + _\by^2) + sqrt(_\ba + _\bb) + sqrt(_\bx^) + sqrt() + sqrt
-     final text
+     initial text _\br = <sqrt>(_\bx^2 + _\by^2) + <sqrt>(_\ba + _\bb) + <sqrt>(_\bx^) +
+     <sqrt>() + <sqrt> final text

 
 OpenBSD                          July 6, 2017                          OpenBSD
 
 OpenBSD                          July 6, 2017                          OpenBSD