groff-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[groff] 01/01: Fix SMALLCAPS indenting slightly when called after PP. Up


From: Peter Schaffter
Subject: [groff] 01/01: Fix SMALLCAPS indenting slightly when called after PP. Update BUGS and version number in html docs.
Date: Tue, 9 Jun 2020 14:09:51 -0400 (EDT)

PTPi pushed a commit to branch master
in repository groff.

commit e73226432845a4694bcd7fdd10a373b24bb223ed
Author: Peter Schaffter <peter@schaffter.ca>
AuthorDate: Tue Jun 9 14:04:32 2020 -0400

    Fix SMALLCAPS indenting slightly when called after PP.
    Update BUGS and version number in html docs.
---
 contrib/mom/BUGS            |  6 ++++++
 contrib/mom/momdoc/toc.html |  4 ++--
 contrib/mom/om.tmac         | 44 +++++++++++++++++++++++---------------------
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 9d72dd3..85b9679 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -21,6 +21,12 @@ the Subject line or you risk my spam filters nuking your 
message.
 
 ====================================================================
 
+Version 2.4-4_b
+===============
+SMALLCAPS introducing a small indent equal to a wordspace when
+called after PP.
+---Fixed---
+
 Version 2.4-4_a
 ===============
 BIBLIOGRAPHY_SPACING not being respected.
diff --git a/contrib/mom/momdoc/toc.html b/contrib/mom/momdoc/toc.html
index 7f63e30..b136ff9 100644
--- a/contrib/mom/momdoc/toc.html
+++ b/contrib/mom/momdoc/toc.html
@@ -20,7 +20,7 @@ FDL in the main directory of the groff source package.
 
 <head>
   <meta http-equiv="content-type" content="text/html;charset=utf-8"/>
-  <title>Mom, version 2.4-4_b -- Table of Contents</title>
+  <title>Mom, version 2.4-4_c -- Table of Contents</title>
   <link rel="stylesheet" type="text/css" href="stylesheet.css" />
 </head>
 
@@ -31,7 +31,7 @@ FDL in the main directory of the groff source package.
 <div class="page">
 
   <div class="version">
-    mom, version 2.4-4_b
+    mom, version 2.4-4_c
   </div>
 
 <h1 class="toc" style="margin-top: 9px;">Table of Contents</h1>
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index c8e6a69..ad9fcad 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -20,7 +20,7 @@ for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
-Version 2.4-4_b
+Version 2.4-4_c
 ---------------
 Antoine de St-Exupéry asserted that elegance in engineering is
 achieved not when there is nothing left to add, but when there is
@@ -54,7 +54,7 @@ extensions, and float management).
 .if (\n[.x]\n[.y] < 118) \
 .   ab [mom]: You need GNU troff version 1.18 or higher to run this version of 
mom.
 \# Mom version
-.ds version 2.4-4_b
+.ds version 2.4-4_c
 .if dVERSION \{\
 .   ab [mom]: Version \*[version]
 .\}
@@ -1973,7 +1973,6 @@ end
 .END
 \#
 .MAC UNDERLINE END
-\c
 .    ds $SAVED_SS_VAR \\*[$SS_VAR]
 .    ie '\\$1'' \{\
 .       nr #UNDERLINE_ON 1
@@ -3940,28 +3939,31 @@ end
 \#   SMALLCAPS has no inline escape eqiv. to \*[UC].
 \#
 .MAC SMALLCAPS END
-.    if \\n[.int] .nop \& \c
-.    nr sc*size \\n[.ps]*\\n[sc*factor]/1000
-.    if \\n[sc*wt-adj] .nr sc*wt-adj-factor \\n[sc*size]*\\n[sc*wt-adj]/1000
-.    if \\n[sc*extend] .nr sc*extend-factor \\n[sc*size]*\\n[sc*extend]/1000
-.    ie '\\$1'' \{\
-.       nr #SMALLCAPS_ON 1
-.       nr #LOOP 0 1
-.       while \\n+[#LOOP]<=58 \{\
-.          char \\*[$c\\n[#LOOP]] \
+.    if \\n[#PRINT_STYLE]=2 \{\
+.       if !\\n[.u] \
+.          if \\n[.int] .nop \& \c
+.       nr sc*size \\n[.ps]*\\n[sc*factor]/1000
+.       if \\n[sc*wt-adj] .nr sc*wt-adj-factor \\n[sc*size]*\\n[sc*wt-adj]/1000
+.       if \\n[sc*extend] .nr sc*extend-factor \\n[sc*size]*\\n[sc*extend]/1000
+.       ie '\\$1'' \{\
+.          nr #SMALLCAPS_ON 1
+.          nr #LOOP 0 1
+.          while \\n+[#LOOP]<=58 \{\
+.             char \\*[$c\\n[#LOOP]] \
 \Z'\s[\\n[sc*size]u+\\n[sc*extend-factor]u]\H'-\\n[sc*extend-factor]u'\
 \\*[$C\\n[#LOOP]]'\
 \h'\\n[sc*wt-adj-factor]u'\\*[$C\\n[#LOOP]]\s[0]
+.          \}
+.       \}
+.       el \{\
+.          nr #LOOP 0 1
+.          while \\n+[#LOOP]<=58 \{\
+.             rchar \\*[$c\\n[#LOOP]]
+.         \}
+.         rr sc*wt-adj-factor
+.         rr sc*extend-factor
+.         rr #SMALLCAPS_ON
 .       \}
-.    \}
-.    el \{\
-.       nr #LOOP 0 1
-.       while \\n+[#LOOP]<=58 \{\
-.          rchar \\*[$c\\n[#LOOP]]
-.      \}
-.      rr sc*wt-adj-factor
-.      rr sc*extend-factor
-.      rr #SMALLCAPS_ON
 .    \}
 .END
 \#



reply via email to

[Prev in Thread] Current Thread [Next in Thread]