summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcela Mašláňová <mmaslano@fedoraproject.org>2007-08-16 14:11:35 +0000
committerMarcela Mašláňová <mmaslano@fedoraproject.org>2007-08-16 14:11:35 +0000
commiteedfd3d8384c2d81b8598f461b2eebf06a2f6803 (patch)
treef251f47702a9d95785243f19c30b401ad450d122
parentbdc8a81a09382935d96c00828ce11f1414d410d5 (diff)
downloadgroff-eedfd3d8384c2d81b8598f461b2eebf06a2f6803.tar.gz
groff-eedfd3d8384c2d81b8598f461b2eebf06a2f6803.tar.xz
groff-eedfd3d8384c2d81b8598f461b2eebf06a2f6803.zip
Changed nroff script again.groff-1_18_1_4-7_fc8
-rw-r--r--groff.spec5
-rw-r--r--nroff9
2 files changed, 6 insertions, 8 deletions
diff --git a/groff.spec b/groff.spec
index a82e5c5..ce1dd8a 100644
--- a/groff.spec
+++ b/groff.spec
@@ -3,7 +3,7 @@
Summary: A document formatting system
Name: groff
Version: 1.18.1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
License: GPL
Group: Applications/Publishing
URL: http://groff.ffii.org
@@ -233,7 +233,8 @@ exit 0
%endif
%changelog
-* Thu Aug 16 2007 Marcela Maslanova <mmaslano@redhat.com> - 1.18.1.4-6
+* Thu Aug 16 2007 Marcela Maslanova <mmaslano@redhat.com> - 1.18.1.4-7
+- rebuild
- another encoding are print correct with nroff
- Resolves: rhbz#251064
diff --git a/nroff b/nroff
index 5588a4f..49a71bc 100644
--- a/nroff
+++ b/nroff
@@ -4,8 +4,7 @@
prog="$0"
charset_in=iso-8859-1
charset_out=`locale charmap 2>/dev/null`
-opts=
-othercoding=0
+opts="-mtty-char -Tutf8"
# Default device.
# First try the "locale charmap" command, because it's most reliable.
@@ -51,6 +50,7 @@ case "`locale charmap 2>/dev/null`" in
esac ;;
esac
+
for i
do
case $1 in
@@ -67,7 +67,7 @@ do
-[iptSUC] | -[mrno]*)
opts="$opts $1" ;;
-Tascii | -Tlatin1 | -Tutf8 | -Tcp1047 | -Tascii8 | -Tnippon | -Tkorean)
- othercoding=1
+ opts=
T=$1 ;;
-T*)
# ignore other devices
@@ -120,9 +120,6 @@ export LC_ALL=en_US.UTF-8
# This shell script is intended for use with man, so warnings are
# probably not wanted. Also load nroff-style character definitions.
-if [ "$othercoding" == 0 ]; then
- opts="-mtty-char -Tutf8"
-fi
if [ $charset_in = utf-8 -a $charset_out = UTF-8 ]; then
if [ $TMPFILE = buf ]; then