[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 01/02: Fixed diacritic lowercase to caps. Moved control of \n[#K
From: |
Peter Schaffter |
Subject: |
[groff] 01/02: Fixed diacritic lowercase to caps. Moved control of \n[#KERN_UNIT] to macro space. Added COL_MARK. |
Date: |
Sun, 27 Apr 2014 23:29:28 +0000 |
PTPi pushed a commit to branch master
in repository groff.
commit 33f1287aa537d9f3e632e913c88b70b255212e5c
Author: Peter Schaffter <address@hidden>
Date: Sun Apr 27 19:19:49 2014 -0400
Fixed diacritic lowercase to caps. Moved control of \n[#KERN_UNIT] to macro
space. Added COL_MARK.
---
contrib/mom/BUGS | 3 +
contrib/mom/om.tmac | 290 +++++++++++++++++++++++++++------------------------
2 files changed, 157 insertions(+), 136 deletions(-)
diff --git a/contrib/mom/BUGS b/contrib/mom/BUGS
index 165c0d7..014af85 100644
--- a/contrib/mom/BUGS
+++ b/contrib/mom/BUGS
@@ -26,6 +26,9 @@ Also, please--no html email. That, too, gets nuked.
Version 2.0-c
=============
+Character translation of diacritics from lowercase to caps broken.
+---Fixed---
+
Spacing not being restored (.ns/.rs) after a HEADING that falls at
the top of the page.
---Fixed---
diff --git a/contrib/mom/om.tmac b/contrib/mom/om.tmac
index af7f8dd..dfed95a 100644
--- a/contrib/mom/om.tmac
+++ b/contrib/mom/om.tmac
@@ -745,17 +745,20 @@ end
\#
\# Inline kerning provides a simple way to adjust the amount of
\# space between any two letters. It's predicated on a unit of
-\# measure "U", which is 1/36 of the current point size as returned
-\# by \n[.ps]. E.g., if the current point size is 18, \n[.ps]
-\# returns 18000u, therefore U=500u. Since U remains proportional
-\# relative to the current point size, the amount of kerning
-\# between two letters as expressed in Us remains visually similar
-\# regardless of changes in point size.
-\#
-\# N.B.--the amount of inline kerning supplied by \*[BU<n>] or
-\# \*[FU<n>] is added to or subtracted from any kerning that already
-\# takes place between two characters when automatic kerning is
-\# turned on.
+\# measure "U", which, by default, is 1/36 of the current point
+\# size as returned by \n[.ps]; e.g., if the current point size is
+\# 18, \n[.ps] returns 18000u, therefore U=500u. Since U remains
+\# proportional relative to the current point size, the amount of
+\# kerning between two letters as expressed in Us remains visually
+\# similar regardless of changes in point size.
+\#
+\# The default value for U may be changed or reset with the
+\# KERN_UNIT macro.
+\#
+.MAC KERN_UNIT END
+. ie '\\$1'DEFAULT' .nr #KERN_UNIT 36
+. el .nr #KERN_UNIT \\$1
+.END
\#
.nr #KERN_UNIT 36
.ds BU \h'-(\En[#PT_SIZE]u/\n[#KERN_UNIT]u*\\$1u)'
@@ -3737,72 +3740,73 @@ end
.MAC CAPS END
. ie '\\$1'' \{\
. tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
-. tr �\[`A]
-. tr �\[^A]
-. tr �\['A]
-. tr �\[:A]
-. tr �\[oA]
-. tr �\[~A]
-. tr �\[AE]
-. tr �\[`E]
-. tr �\[^E]
-. tr �\['E]
-. tr �\[:E]
-. tr �\[`I]
-. tr �\[^I]
-. tr �\['I]
-. tr �\[:I]
-. tr �\[`O]
-. tr �\[^O]
-. tr �\['O]
-. tr �\[:O]
-. tr �\[~O]
-. tr �\[/O]
-. tr �\[`U]
-. tr �\[^U]
-. tr �\['U]
-. tr �\[:U]
-. tr �\[,C]
-. tr �\[-D]
-. tr �\[~N]
-. tr �\[TP]
-. tr �\['Y]
-. tr �\[:Y]
+. tr \[`a]\[`A]
+. tr \[^a]\[^A]
+. tr \['a]\['A]
+. tr \[:a]\[:A]
+. tr \[oa]\[oA]
+. tr \[~a]\[~A]
+. tr \[ae]\[AE]
+. tr \[`e]\[`E]
+. tr \[^e]\[^E]
+. tr \['e]\['E]
+. tr \[:e]\[:E]
+. tr \[`i]\[`I]
+. tr \[^i]\[^I]
+. tr \['i]\['I]
+. tr \[:i]\[:I]
+. tr \[`o]\[`O]
+. tr \[^o]\[^O]
+. tr \['o]\['O]
+. tr \[:o]\[:O]
+. tr \[~o]\[~O]
+. tr \[/o]\[/O]
+. tr \[`u]\[`U]
+. tr \[^u]\[^U]
+. tr \['u]\['U]
+. tr \[:u]\[:U]
+. tr \[,c]\[,C]
+. tr \[-d]\[-D]
+. tr \[~n]\[~N]
+. tr \[Sd]\[-D]
+. tr \[Tp]\[TP]
+. tr \['y]\['Y]
+. tr \[:y]\[:Y]
. nr #CAPS_ON 1
. \}
. el \{\
. tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
-. tr �\[`a]
-. tr �\[^a]
-. tr �\['a]
-. tr �\[:a]
-. tr �\[oa]
-. tr �\[~a]
-. tr �\[ae]
-. tr �\[`e]
-. tr �\[^e]
-. tr �\['e]
-. tr �\[:e]
-. tr �\[`i]
-. tr �\[^i]
-. tr �\['i]
-. tr �\[:i]
-. tr �\[`o]
-. tr �\[^o]
-. tr �\['o]
-. tr �\[:o]
-. tr �\[~o]
-. tr �\[/o]
-. tr �\[`u]
-. tr �\[^u]
-. tr �\['u]
-. tr �\[:u]
-. tr �\[,c]
-. tr �\[Sd]
-. tr �\[~n]
-. tr �\[Tp]
-. tr �\['y]
-. tr �\[:y]
+. tr \[`a]\[`a]
+. tr \[^a]\[^a]
+. tr \['a]\['a]
+. tr \[:a]\[:a]
+. tr \[oa]\[oa]
+. tr \[~a]\[~a]
+. tr \[ae]\[ae]
+. tr \[`e]\[`e]
+. tr \[^e]\[^e]
+. tr \['e]\['e]
+. tr \[:e]\[:e]
+. tr \[`i]\[`i]
+. tr \[^i]\[^i]
+. tr \['i]\['i]
+. tr \[:i]\[:i]
+. tr \[`o]\[`o]
+. tr \[^o]\[^o]
+. tr \['o]\['o]
+. tr \[:o]\[:o]
+. tr \[~o]\[~o]
+. tr \[/o]\[/o]
+. tr \[`u]\[`u]
+. tr \[^u]\[^u]
+. tr \['u]\['u]
+. tr \[:u]\[:u]
+. tr \[,c]\[,c]
+. tr \[Sd]\[Sd]
+. tr \[~n]\[~n]
+. tr \[Tp]\[Tp]
+. tr \['y]\['y]
+. tr \[:y]\[:y]
. rr #CAPS_ON
. \}
.END
@@ -3810,74 +3814,74 @@ end
.MAC UC END
\c
. tr aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ
-. tr �\[`A]
-. tr �\[^A]
-. tr �\['A]
-. tr �\[:A]
-. tr �\[oA]
-. tr �\[~A]
-. tr �\[AE]
-. tr �\[`E]
-. tr �\[^E]
-. tr �\['E]
-. tr �\[:E]
-. tr �\[`I]
-. tr �\[^I]
-. tr �\['I]
-. tr �\[:I]
-. tr �\[`O]
-. tr �\[^O]
-. tr �\['O]
-. tr �\[:O]
-. tr �\[~O]
-. tr �\[/O]
-. tr �\[`U]
-. tr �\[^U]
-. tr �\['U]
-. tr �\[:U]
-. tr �\[,C]
-. tr �\[-D]
-. tr �\[~N]
-. tr �\[TP]
-. tr �\['Y]
-. tr �\[:Y]
+. tr \[`a]\[`A]
+. tr \[^a]\[^A]
+. tr \['a]\['A]
+. tr \[:a]\[:A]
+. tr \[oa]\[oA]
+. tr \[~a]\[~A]
+. tr \[ae]\[AE]
+. tr \[`e]\[`E]
+. tr \[^e]\[^E]
+. tr \['e]\['E]
+. tr \[:e]\[:E]
+. tr \[`i]\[`I]
+. tr \[^i]\[^I]
+. tr \['i]\['I]
+. tr \[:i]\[:I]
+. tr \[`o]\[`O]
+. tr \[^o]\[^O]
+. tr \['o]\['O]
+. tr \[:o]\[:O]
+. tr \[~o]\[~O]
+. tr \[/o]\[/O]
+. tr \[`u]\[`U]
+. tr \[^u]\[^U]
+. tr \['u]\['U]
+. tr \[:u]\[:U]
+. tr \[,c]\[,C]
+. tr \[Sd]\[-D]
+. tr \[~n]\[~N]
+. tr \[Tp]\[TP]
+. tr \['y]\['Y]
+. tr \[:y]\[:Y]
. nr #CAPS_ON 1
.END
\#
.MAC LC END
\c
. tr aabbccddeeffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz
-. tr �\[`a]
-. tr �\[^a]
-. tr �\['a]
-. tr �\[:a]
-. tr �\[oa]
-. tr �\[~a]
-. tr �\[ae]
-. tr �\[`e]
-. tr �\[^e]
-. tr �\['e]
-. tr �\[:e]
-. tr �\[`i]
-. tr �\[^i]
-. tr �\['i]
-. tr �\[:i]
-. tr �\[`o]
-. tr �\[^o]
-. tr �\['o]
-. tr �\[:o]
-. tr �\[~o]
-. tr �\[/o]
-. tr �\[`u]
-. tr �\[^u]
-. tr �\['u]
-. tr �\[:u]
-. tr �\[,c]
-. tr �\[Sd]
-. tr �\[~n]
-. tr �\[Tp]
-. tr �\['y]
-. tr �\[:y]
+. tr \[`a]\[`a]
+. tr \[^a]\[^a]
+. tr \['a]\['a]
+. tr \[:a]\[:a]
+. tr \[oa]\[oa]
+. tr \[~a]\[~a]
+. tr \[ae]\[ae]
+. tr \[`e]\[`e]
+. tr \[^e]\[^e]
+. tr \['e]\['e]
+. tr \[:e]\[:e]
+. tr \[`i]\[`i]
+. tr \[^i]\[^i]
+. tr \['i]\['i]
+. tr \[:i]\[:i]
+. tr \[`o]\[`o]
+. tr \[^o]\[^o]
+. tr \['o]\['o]
+. tr \[:o]\[:o]
+. tr \[~o]\[~o]
+. tr \[/o]\[/o]
+. tr \[`u]\[`u]
+. tr \[^u]\[^u]
+. tr \['u]\['u]
+. tr \[:u]\[:u]
+. tr \[,c]\[,c]
+. tr \[Sd]\[Sd]
+. tr \[~n]\[~n]
+. tr \[Tp]\[Tp]
+. tr \['y]\['y]
+. tr \[:y]\[:y]
. rr #CAPS_ON
.END
\#
@@ -7838,7 +7842,7 @@ $DOC_COVER_TITLE_\\n+[#DOC_COVER_TITLE_NUM]
\\$\\n[#DOC_COVER_TITLE_NUM]
. el \{\
. nr #VALID_BASELINE \\n[#T_MARGIN]-\\n[#DOC_LEAD] \\n[#DOC_LEAD]
. if !r#CURRENT_V_POS .nr #CURRENT_V_POS \\n[.d]
-. ie r#ADVANCE_FROM_TOP \{\
+. ie \\n[#ADVANCE_FROM_TOP] \{\
. ie \\n[#CURRENT_V_POS]<(\\n[#T_MARGIN]-1v) \{\
. while \\n-[#VALID_BASELINE]>\\n[#CURRENT_V_POS] .
. nr #VALID_BASELINE +\\n[#DOC_LEAD]
@@ -14824,6 +14828,20 @@ E\\R'#CAP_HEIGHT \\n[.cht]'
. rr #COL_NUM
.END
\#
+\# MARK COL V-POSITION AFTER DOCHEADER
+\# -----------------------------------
+\# *Arguments:
+\# none
+\# *Function:
+\# Sets 1st page dc register.
+\# *Notes:
+\# Only required if manual spacing, positive or negative, precedes
+\# start of columns on first page of doc.
+\#
+.MAC COL_MARK END
+. mk dc
+.END
+\#
\# NEXT COLUMN
\# -----------
\# *Arguments:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 01/02: Fixed diacritic lowercase to caps. Moved control of \n[#KERN_UNIT] to macro space. Added COL_MARK.,
Peter Schaffter <=