| author | Jiri Sasek <Jiri.Sasek@Oracle.COM> |
| Wed, 04 May 2016 14:21:51 -0700 | |
| changeset 5920 | 1e847165fde2 |
| parent 4121 | 3e66a10136ab |
| permissions | -rw-r--r-- |
|
4121
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
1 |
This patch comes from in-house and has been submitted upstream: |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
2 |
https://savannah.gnu.org/bugs/?44289 |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
3 |
|
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
4 |
--- groff-1.22.2/src/roff/nroff/nroff.sh.org 2015-02-07 19:56:25.275467577 +0900 |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
5 |
+++ groff-1.22.2/src/roff/nroff/nroff.sh 2015-02-07 20:11:22.308246071 +0900 |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
6 |
@@ -39,7 +39,7 @@ |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
7 |
IBM-1047) |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
8 |
Tloc=cp1047 ;; |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
9 |
*) |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
10 |
- case "${LC_ALL-${LC_CTYPE-${LANG}}}" in
|
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
11 |
+ case "${LC_ALL:-${LC_CTYPE:-${LANG}}}" in
|
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
12 |
*.UTF-8) |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
13 |
Tloc=utf8 ;; |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
14 |
iso_8859_1 | *.ISO-8859-1 | *.ISO8859-1 | \ |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
15 |
@@ -65,6 +65,7 @@ |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
16 |
|
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
17 |
Topt= |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
18 |
opts= |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
19 |
+disable_error= |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
20 |
for i |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
21 |
do |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
22 |
case $1 in |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
23 |
@@ -72,6 +73,9 @@ |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
24 |
opts="$opts -P-c" ;; |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
25 |
-h) |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
26 |
opts="$opts -P-h" ;; |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
27 |
+ -E) |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
28 |
+ opts="$opts -E" |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
29 |
+ disable_error="2> /dev/null" ;; |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
30 |
-[eq] | -s*) |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
31 |
# ignore these options |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
32 |
;; |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
33 |
@@ -133,6 +137,6 @@ |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
34 |
|
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
35 |
# Load nroff-style character definitions too. |
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
36 |
|
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
37 |
-PATH="$GROFF_RUNTIME$PATH" groff -mtty-char $T $opts ${1+"$@"}
|
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
38 |
+PATH="$GROFF_RUNTIME$PATH" eval groff -mtty-char $T $opts ${1+"$@"} $disable_error
|
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
39 |
|
|
3e66a10136ab
PSARC/2014/407 Replace roff family of commands with GNU versions
osayama <osamu.sayama@oracle.com>
parents:
diff
changeset
|
40 |
# eof |