gbranden pushed a commit to branch branden-2023-07-05 in repository groff. commit 1979764dee15a705c2f85413c9c500f4b97f6c63 Author: G. Branden Robinson <g.branden.robin...@gmail.com> AuthorDate: Fri Apr 28 13:09:50 2023 -0500
[ms]: Default vert spacing to 120% of type size. ...not 2 points larger. * tmac/s.tmac (par@load-init, par@init): Do it. * NEWS: Add item. --- ChangeLog | 8 ++++++++ NEWS | 13 +++++++++++++ tmac/s.tmac | 14 ++++++++------ 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 09eca215f..ac03e2318 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2023-04-28 G. Branden Robinson <g.branden.robin...@gmail.com> + + [ms]: Default vertical spacing to 120% of type size, not 2 + points larger. + + * tmac/s.tmac (par@load-init, par@init): Do it. + * NEWS: Add item. + 2023-04-26 G. Branden Robinson <g.branden.robin...@gmail.com> [pdfpic]: Refactor. diff --git a/NEWS b/NEWS index 85b034be3..cccf6fcc4 100644 --- a/NEWS +++ b/NEWS @@ -7,6 +7,19 @@ This file describes recent user-visible changes in groff. Bug fixes are not described. There are more details in the man and info pages. +VERSION next +============ + +Macro packages +-------------- + +o The s (ms) macro package now sets the vertical spacing register + defaults for normal (`VS`) and footnote (`FVS`) text to 120% of the + existing type size rather than 2 points larger to comport with + generally accepted typesetting principles. Thus, when formatting a + document with a type size of 20 points, the vertical spacing now + defaults to 24 points rather than 22. + VERSION 1.23.0 ============== diff --git a/tmac/s.tmac b/tmac/s.tmac index 5abccc567..e617b0bbc 100644 --- a/tmac/s.tmac +++ b/tmac/s.tmac @@ -1156,6 +1156,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. .el \ . ps \\n[PS] .\" don't set VS so that it can be defaulted from PS +.\" Set vertical spacing defaults to 120% of type size. .ie rVS \{\ . ie (\\n[VS] >= 1000) \ . par*vs "(\\n[VS]p / 1000u)" @@ -1164,9 +1165,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. .\} .el \{\ . ie (\\n[PS] >= 1000) \ -. par*vs "((\\n[PS]p / 1000u) + 2p)" +. par*vs "((\\n[PS]p / 1000u) * 120u / 100u)" . el \ -. par*vs "(\\n[PS] + 2)" +. par*vs "(\\n[PS] * 120u / 100u)" .\} .if dFAM .fam \\*[FAM] .if !rHY .nr HY 6 @@ -1199,11 +1200,12 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. .de par@init .if !rLT .nr LT \\n[LL] .if !rFL .nr FL \\n[LL]*\\*[FR] +.\" Set vertical spacing defaults to 120% of type size. .if !rVS \{\ . ie (\\n[PS] >= 1000) \ -. nr VS (\\n[PS] + 2000) +. nr VS (\\n[PS]p / 1000u * 120u / 100u) . el \ -. nr VS (\\n[PS] + 2) +. nr VS (\\n[PS] * 120u / 100u) .\} .if !rDI .nr DI .5i .if !rFPS \{\ @@ -1214,9 +1216,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. .\} .if !rFVS \{\ . ie (\\n[FPS] >= 1000) \ -. nr FVS (\\n[FPS] + 2000) +. nr FVS (\\n[FPS]p / 1000u * 120u / 100u) . el \ -. nr FVS (\\n[FPS] + 2) +. nr FVS (\\n[FPS] * 120u / 100u) .\} .\" don't change environment 0 .ev h _______________________________________________ Groff-commit mailing list Groff-commit@gnu.org https://lists.gnu.org/mailman/listinfo/groff-commit