PTPi pushed a commit to branch master
in repository groff.
commit ac1fbe277660750e8caaf3f2b38a1149cf79aabc
Author: Peter Schaffter <pe...@schaffter.ca>
AuthorDate: Wed Nov 16 11:39:27 2022 -0500
[mom]: Adjust PAPER to work with papersize.tmac
---
contrib/mom/ChangeLog | 4 ++++
contrib/mom/om.tmac | 7 +++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/contrib/mom/ChangeLog b/contrib/mom/ChangeLog
index 13485cdc4..0701464a8 100644
--- a/contrib/mom/ChangeLog
+++ b/contrib/mom/ChangeLog
@@ -1,3 +1,7 @@
+2022-11-16
+
+ * om.tmac (PAPER): Adjust #R_MARGIN to work with papersize.tmac.
+
2022-10-23 G. Branden Robinson <g.branden.robin...@gmail.com>
* om.tmac (FORCE_RECTO): Use backslash before newline when
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index a9365ff18..6cb69b2df 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -295,7 +295,7 @@ end
. br
. nr #PAGE_WIDTH \\$1
. if !r#L_MARGIN .L_MARGIN \\n[.o]
-. if !r#R_MARGIN .R_MARGIN 1i
+. R_MARGIN 1i
. if '\\*[.T]'pdf' \X'papersize=\\n[#PAGE_WIDTH]z,\\n[#PAGE_LENGTH]z'\c
.END
\#
@@ -4166,6 +4166,7 @@ y\R'#DESCENDER \\n[.cdp]'
\# LANDSCAPE may be given after papersize arg.
\#
.MAC PAPER END
+. vs 0
. ds $PAPER \\$1
. if '\\*[$PAPER]'LETTER' \{\
. PAGEWIDTH 8.5i
@@ -4230,7 +4231,9 @@ y\R'#DESCENDER \\n[.cdp]'
. as $PAPER " LANDSCAPE\"
. \}
. if !r#L_MARGIN .L_MARGIN \\n[.o]
-. if !r#R_MARGIN .R_MARGIN 1i
+. if !r#R_MARGIN .R_MARGIN \\n[#PAGE_WIDTH]u-\\n[#L_MARGIN]u-1i
+. if '\\*[.T]'pdf' .br
+. vs
.END
\#
\# ====================================================================
_______________________________________________
Groff-commit mailing list
Groff-commit@gnu.org
https://lists.gnu.org/mailman/listinfo/groff-commit
