components/groff/patches/an-old.tmac-long-TH.patch
author pkidd <patrick.kidd@oracle.com>
Fri, 14 Oct 2016 09:29:30 -0700
branchs11u3-sru
changeset 7110 eef24b4f8a52
parent 3706 bd45826ad92c
permissions -rw-r--r--
Added tag 0.175.3.14.0.2.0, S11.3SRU14.2 for changeset 698485941206
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
3706
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
     1
Fix for handling long .TH as overlaping in header and foot (CD #19873798)
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
     2
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
     3
Fix has been submitted upstream:
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
     4
http://savannah.gnu.org/bugs/?43532
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
     5
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
     6
--- groff-1.22.2/tmac/an-old.tmac.orig	2013-02-07 21:06:08.000000000 +0900
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
     7
+++ groff-1.22.2/tmac/an-old.tmac	2014-12-01 13:32:30.713605080 +0900
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
     8
@@ -253,19 +253,111 @@
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
     9
 .
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    10
 .\" Redefine these to customize the header & footer
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    11
 .
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    12
+.de1 TLPT
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    13
+.  ds str1 "\\$1\"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    14
+.  ds str2 "\\$2\"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    15
+.\"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    16
+.\" Based on .lt, the following 3 formats are used.
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    17
+.\"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    18
+.\"     (str1 < 1/3) and (str2 < 1/3)
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    19
+.\"             str1, str2, str1
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    20
+.\"     ((str1 < 2/3) and (str2 < 1/3)) or ((str1 < 1/3) and (str2 < 2/3))
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    21
+.\"             str1,       str2,
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    22
+.\"     else
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    23
+.\"             str1,
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    24
+.\"                         str2
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    25
+.\"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    26
+.  nr lt_13 (\\n[.lt] / 3)
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    27
+.  nr lt_23 (\\n[.lt] * 2 / 3)
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    28
+.  ie ((\\w'\\*[str1]'u < \\n[lt_13]u) & (\\w'\\*[str2]'u < \\n[lt_13]u)) \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    29
+.    tl '\\*[str1]'\\*[str2]'\\*[str1]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    30
+.  \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    31
+.  el \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    32
+.    ie (((\\w'\\*[str1]'u < \\n[lt_23]u) & (\\w'\\*[str2]'u < \\n[lt_13]u)) : ((\\w'\\*[str1]'u < \\n[lt_13]u) & (\\w'\\*[str2]'u < \\n[lt_23]u))) \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    33
+.      tl '\\*[str2]''\\*[str1]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    34
+.    \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    35
+.    el \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    36
+.      tl '\\*[str2]'''
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    37
+.      tl '''\\*[str1]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    38
+.    \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    39
+.  \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    40
+..
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    41
+.
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    42
+.de1 TLBT
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    43
+.  ds str1 "\\$1\"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    44
+.  ds str2 "\\$2\"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    45
+.  ds str3 "\\$3\"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    46
+.\"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    47
+.\" Based on .lt, the following 6 formats are used.
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    48
+.\"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    49
+.\"     (str1 < 1/3) and (str2 < 1/3), str3 < 1/3)
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    50
+.\"             str1, str2, str3
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    51
+.\"     (str1 < 1/3) and (str2 < 1/3)
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    52
+.\"             str1, str2,
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    53
+.\"                         str3
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    54
+.\"     (str2 < 1/3) and (str3 < 1/3)
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    55
+.\"             str1, 
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    56
+.\"                   str2, str3
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    57
+.\"     ((str1 < 2/3) and (str2 < 1/3)) or ((str1 < 1/3) and (str2 < 2/3))
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    58
+.\"             str1,       str2,
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    59
+.\"                         str3
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    60
+.\"     ((str2 < 2/3) and (str3 < 1/3)) or ((str2 < 1/3) and (str3 < 2/3))
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    61
+.\"             str1,
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    62
+.\"             str2,       str3
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    63
+.\"     else
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    64
+.\"             str1,
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    65
+.\"                   str2,
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    66
+.\"                         str3
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    67
+.\"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    68
+.  nr lt_13 (\\n[.lt] / 3)
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    69
+.  nr lt_23 (\\n[.lt] * 2 / 3)
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    70
+.  ie ((\\w'\\*[str1]'u < \\n[lt_13]u) & (\\w'\\*[str2]'u < \\n[lt_13]u) & (\\w'\\*[str3]'u < \\n[lt_13]u)) \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    71
+.    tl '\\*[str1]'\\*[str2]'\\*[str3]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    72
+.  \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    73
+.  el \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    74
+.    ie ((\\w'\\*[str1]'u < \\n[lt_13]u) & (\\w'\\*[str2]'u < \\n[lt_13]u)) \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    75
+.      tl '\\*[str1]'\\*[str2]''
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    76
+.      tl '''\\*[str3]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    77
+.    \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    78
+.    el \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    79
+.      ie ((\\w'\\*[str2]'u < \\n[lt_13]u) & (\\w'\\*[str3]'u < \\n[lt_13]u)) \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    80
+.        tl '\\*[str1]'''
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    81
+.        tl ''\\*[str2]'\\*[str3]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    82
+.      \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    83
+.      el \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    84
+.        ie (((\\w'\\*[str1]'u < \\n[lt_23]u) & (\\w'\\*[str2]'u < \\n[lt_13]u)) : ((\\w'\\*[str1]'u < \\n[lt_13]u) & (\\w'\\*[str2]'u < \\n[lt_23]u))) \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    85
+.          tl '\\*[str1]''\\*[str2]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    86
+.          tl '''\\*[str3]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    87
+.        \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    88
+.        el \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    89
+.          ie (((\\w'\\*[str2]'u < \\n[lt_23]u) & (\\w'\\*[str3]'u < \\n[lt_13]u)) : ((\\w'\\*[str2]'u < \\n[lt_13]u) & (\\w'\\*[str3]'u < \\n[lt_23]u))) \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    90
+.            tl '\\*[str1]'''
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    91
+.            tl '\\*[str2]''\\*[str3]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    92
+.          \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    93
+.          el \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    94
+.            tl '\\*[str1]'''
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    95
+.            tl ''\\*[str2]''
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    96
+.            tl '''\\*[str3]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    97
+.          \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    98
+.        \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
    99
+.      \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   100
+.    \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   101
+.  \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   102
+..
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   103
+.
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   104
 .de1 PT
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   105
-.  tl '\\*[an-title](\\*[an-section])'\\*[an-extra3]'\\*[an-title](\\*[an-section])'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   106
+.  TLPT "\\*[an-title](\\*[an-section])" "\\*[an-extra3]"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   107
 ..
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   108
 .
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   109
 .de1 BT
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   110
 .  if r ps4html \
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   111
 .    return
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   112
 .  ie \\n[D] \{\
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   113
-.    if o .tl '\\*[an-extra2]'\\*[an-extra1]'\\*[an-page-string]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   114
-.    if e .tl '\\*[an-page-string]'\\*[an-extra1]'\\*[an-extra2]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   115
+.    if o .TLBT "\\*[an-extra2]" "\\*[an-extra1]" "\\*[an-page-string]"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   116
+.    if e .TLBT "\\*[an-page-string]" "\\*[an-extra1]" "\\*[an-extra2]"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   117
 .  \}
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   118
 .  el \
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   119
-.    tl '\\*[an-extra2]'\\*[an-extra1]'\\*[an-page-string]'
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   120
+.    TLBT "\\*[an-extra2]" "\\*[an-extra1]" "\\*[an-page-string]"
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   121
 ..
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   122
 .
bd45826ad92c PSARC 2013/394 groff version 1.22.2
osayama <osamu.sayama@oracle.com>
parents:
diff changeset
   123
 .de1 an-header