[groff] 03/05: [ms]: Demote definition of \[yogh] to .AM only.

[G. Branden Robinson]

gbranden pushed a commit to branch master
in repository groff.

commit eaacb650da49e79c16aa6aec09b165b6dda7c8cd
Author: G. Branden Robinson <g.branden.robinson@gmail.com>
AuthorDate: Thu Feb 11 06:02:55 2021 +1100

    [ms]: Demote definition of \[yogh] to .AM only.
    
    Demote definition of \[yogh] special character escape from unconditional
    availability to be defined only if the output device defines it or if
    .AM macro is called to enable support for Berkeley-style accent marks.
    
    See https://lists.gnu.org/archive/html/groff/2021-01/msg00000.html and
    follow-ups for discussion.
    
    * tmac/s.tmac (initialization): Move definition of \[yogh] (only if the
      output device doesn't already define it) from here...
      (AM): ...to here.
---
 ChangeLog   | 15 +++++++++++++++
 tmac/s.tmac |  8 ++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eca3b08..e419a0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2021-02-11  G. Branden Robinson <g.branden.robinson@gmail.com>
+
+       [ms]: Demote definition of \[yogh] special character escape from
+       unconditional availability to be defined only if the output
+       device defines it or if .AM macro is called to enable support
+       for Berkeley-style accent marks.
+
+       See
+         https://lists.gnu.org/archive/html/groff/2021-01/msg00000.html
+       and follow-ups for discussion.
+
+       * tmac/s.tmac (initialization): Move definition of \[yogh] (only
+       if the output device doesn't already define it) from here...
+       (AM): ...to here.
+
 2021-02-08  G. Branden Robinson <g.branden.robinson@gmail.com>
 
        * doc/ms.ms: Use \[ps] special character instead of local
diff --git a/tmac/s.tmac b/tmac/s.tmac
index d0e360e..3f057f3 100644
--- a/tmac/s.tmac
+++ b/tmac/s.tmac
@@ -1908,10 +1908,6 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .ds U \(rq
 .ds - \(em
 .\" Characters
-.\" The idea of this definition is for the top of the 3 to be at the
-.\" x-height.
-.if !c\[yogh] .char \[yogh] \Z'\v'\w'x'*0-\En[rst]u'\s[\En[.s]*8u/10u]\
-\v'\w'3'*0+\En[rst]u'3\s0'\h'\w'\s[\En[.s]*8u/10u]3'u'
 .\" Accents
 .de acc*over-def
 .ds \\$1 \Z'\v'(u;\w'x'*0+\En[rst]-\En[.cht])'\
@@ -1949,6 +1945,10 @@ along with this program.  If not, see 
<http://www.gnu.org/licenses/>.
 .acc*slash-def / /
 .char \[hooko] o\E*[hook]
 .ds q \[hooko]
+.\" The idea of this definition is for the top of the 3 to be at the
+.\" x-height.
+.if !c\[yogh] .char \[yogh] \Z'\v'\w'x'*0-\En[rst]u'\s[\En[.s]*8u/10u]\
+\v'\w'3'*0+\En[rst]u'3\s0'\h'\w'\s[\En[.s]*8u/10u]3'u'
 .ds 3 \[yogh]
 .ds D- \(-D\"                  Icelandic uppercase eth
 .ds d- \(Sd\"                  Icelandic lowercase eth