[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff/contrib/groffer ChangeLog Makefile.sub RE...
|
From: |
Bernd Warken |
|
Subject: |
[Groff-commit] groff/contrib/groffer ChangeLog Makefile.sub RE... |
|
Date: |
Tue, 07 Nov 2006 00:35:28 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Bernd Warken <bwarken> 06/11/07 00:35:28
Modified files:
contrib/groffer: ChangeLog Makefile.sub README version.sh
contrib/groffer/perl: func.pl groffer.man groffer.pl
contrib/groffer/shell: groffer.man groffer2.sh
Log message:
Update groffer-1.0.3
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/ChangeLog?cvsroot=groff&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/Makefile.sub?cvsroot=groff&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/README?cvsroot=groff&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/version.sh?cvsroot=groff&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/perl/func.pl?cvsroot=groff&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/perl/groffer.man?cvsroot=groff&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/perl/groffer.pl?cvsroot=groff&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/shell/groffer.man?cvsroot=groff&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/groffer/shell/groffer2.sh?cvsroot=groff&r1=1.2&r2=1.3
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- ChangeLog 23 Oct 2006 20:28:51 -0000 1.49
+++ ChangeLog 7 Nov 2006 00:35:27 -0000 1.50
@@ -1,3 +1,15 @@
+2006-11-04 Bernd Warken
+ ________________________________________________________________
+ * release of groffer 1.0.3
+
+ * Makefile.sub:
+ - Delete removing of $(CLEANADD) in `groffer'.
+ - Add $(MAN1) to `groffer'.
+
+ * perl/groffer.pl, perl/func.pl, shell/groffer2.sh:
+ - Add `groff' option with argument `-K'.
+ - Redesign the changed `grog'.
+
2006-10-23 Bernd Warken
________________________________________________________________
* release of groffer 1.0.2
@@ -36,7 +48,8 @@
* perl_test.pl: Moved to...
* perl/perl_test.pl: Here.
- * Makefile.sub: Rewritten.
+ * Makefile.sub: Rewritten. Change PERL to HAVE_PERL and SHELL to
+ HAVE_SHELL.
2006-10-14 Bernd Warken
________________________________________________________________
Index: Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/Makefile.sub,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- Makefile.sub 23 Oct 2006 20:28:51 -0000 1.22
+++ Makefile.sub 7 Nov 2006 00:35:27 -0000 1.23
@@ -52,8 +52,7 @@
# TODO: Add perl check to configure script.
groffer: $(GROFFER_PERL) $(GROFFER_SHELL) \
- $(GROFFER_REST) $(SH_DEPS_SED_SCRIPT)
- $(RM) $(CLEANADD)
+ $(GROFFER_REST) $(MAN1) $(SH_DEPS_SED_SCRIPT)
if perl $(srcdir)/perl/perl_test.pl 2>&1 >/dev/null; then \
: >HAVE_PERL; \
echo "Using perl version of groffer."; \
Index: README
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/README,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- README 14 Oct 2006 05:59:54 -0000 1.11
+++ README 7 Nov 2006 00:35:27 -0000 1.12
@@ -2,7 +2,8 @@
The `groffer' program is the easiest way to read documents written in
some `roff' language, such as the `man pages', the manual pages in
-many operating systems.
+many operating systems. All `roff' preprocessors, such as `chem', are
+detected and executed automatically.
Source files in this directory
@@ -39,9 +40,9 @@
Output
All input is first sent to `grog' to determine the necessary `groff'
-options and then to `groff'. So no special `groff' arguments must be
-given. But all `groff' options can be specified when this seems to be
-appropriate.
+command and then to `groff' together with all necessary preprocessors.
+So no special `groff' arguments must be given. But all `groff'
+options can be specified when this seems to be appropriate.
The following displaying modes for the output are available:
- Display formatted input with
@@ -59,9 +60,9 @@
as by option `-V' and the `man' like `whatis' and `apropos'
outputs.
-By default, the program tries to display with `gxditview' as graphical
-device in X; on non-X text terminals, the `tty' text mode with a pager
-is tried by default.
+By default, the program tries to display a graphical device in X; on
+non-X text terminals, the `tty' text mode with a pager is tried by
+default.
File access
Index: version.sh
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/version.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- version.sh 23 Oct 2006 20:28:51 -0000 1.11
+++ version.sh 7 Nov 2006 00:35:27 -0000 1.12
@@ -32,8 +32,8 @@
export _PROGRAM_VERSION;
export _LAST_UPDATE;
-_PROGRAM_VERSION='1.0.2';
-_LAST_UPDATE='23 Oct 2006';
+_PROGRAM_VERSION='1.0.3';
+_LAST_UPDATE='24 Oct 2006';
# this setting of the groff version is only used before make is run,
# otherwise @VERSION@ will set it, see groffer.sh.
Index: perl/func.pl
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/perl/func.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- perl/func.pl 23 Oct 2006 20:28:51 -0000 1.3
+++ perl/func.pl 7 Nov 2006 00:35:27 -0000 1.4
@@ -433,6 +433,7 @@
### to_tmp()
my $grog = `grog $tmp_file`;
+ die "to_tmp(): grog error on $tmp_file;" if $?;
chomp $grog;
if ($grog =~ /^.*\s-m.*$/) {
$grog =~ s/\s+/ /g;
Index: perl/groffer.man
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/perl/groffer.man,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- perl/groffer.man 23 Oct 2006 20:28:51 -0000 1.2
+++ perl/groffer.man 7 Nov 2006 00:35:27 -0000 1.3
@@ -97,10 +97,9 @@
.ds groffer:Shell_cmd.prompt address@hidden@t]\f[]\" needed
.ds groffer:Shell_cmd+.prompt address@hidden@t+]\f[]\" needed
.nr @w \w'\*[groffer:Shell_cmd.prompt]'\"
-.nr @w+ \w'\*[groffer:Shell_cmd+.prompt]'\"
.ft address@hidden
.\" Full prompt width is maximum of texts plus 1m
-.nr groffer:Shell_cmd_base.prompt_width (address@hidden>address@hidden)\"
needed
+.nr grog:Shell_cmd_base.prompt_width (address@hidden>address@hidden)\" needed
.ft
.rm @f
.rm @f+
@@ -697,6 +696,13 @@
.I \%troff
language.
.
+It finds and runs all necessary
+.I groff
+preprocessors, such as
+.BR @address@hidden .
+.
+.
+.P
The
.B \%groffer
program also includes many of the features for finding and displaying
@@ -4128,6 +4134,13 @@
.
.
.TP
+.BR address@hidden@chem (@MAN1EXT@)
+Preprocessor of
+.I groff
+that is run automatically.
+.
+.
+.TP
.BR groff_out (@MAN5EXT@)
Documentation on the
.I \%groff intermediate output
Index: perl/groffer.pl
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/perl/groffer.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- perl/groffer.pl 23 Oct 2006 20:28:51 -0000 1.3
+++ perl/groffer.pl 7 Nov 2006 00:35:27 -0000 1.4
@@ -273,7 +273,7 @@
my @opts_groff_short_na = ('a', 'b', 'c', 'C', 'e', 'E', 'g', 'G',
'i', 'k', 'l', 'N', 'p', 'R', 's', 'S', 't', 'U', 'z');
- my @opts_groff_short_arg = ('d', 'f', 'F', 'I', 'L', 'm', 'M', 'n',
+ my @opts_groff_short_arg = ('d', 'f', 'F', 'I', 'K', 'L', 'm', 'M', 'n',
'o', 'P', 'r', 'w', 'W');
my @opts_groff_long_na = ();
@@ -1884,6 +1884,7 @@
push @Addopts_Groff, "-T$Opt{'DEVICE'}" if $Opt{'DEVICE'};
$addopts = join ' ', @Addopts_Groff;
$groggy = `cat $tmp_cat | grog`;
+ die "main_display(): grog error;" if $?;
chomp $groggy;
&_do_opt_V();
unlink $modefile;
@@ -1905,6 +1906,7 @@
"$Opt{'DEVICE'}";
}
$groggy = `cat $tmp_cat | grog -T$device`;
+ die "main_display(): grog error;" if $?;
chomp $groggy;
if ($Display{'MODE'} eq 'text') {
&_do_opt_V();
@@ -1964,6 +1966,7 @@
}
$modefile .= '.dvi';
$groggy = `cat $tmp_cat | grog -Tdvi`;
+ die "main_display(): grog error;" if $?;
chomp $groggy;
&_do_display();
next SWITCH;
@@ -1976,6 +1979,7 @@
}
$modefile .= '.html';
$groggy = `cat $tmp_cat | grog -Thtml`;
+ die "main_display(): grog error;" if $?;
chomp $groggy;
&_do_display();
next SWITCH;
@@ -1988,6 +1992,7 @@
}
$modefile .= '.ps';
$groggy = `cat $tmp_cat | grog -Tps`;
+ die "main_display(): grog error;" if $?;
chomp $groggy;
&_do_display(\&_make_pdf);
next SWITCH;
@@ -2001,6 +2006,7 @@
}
$modefile .= '.ps';
$groggy = `cat $tmp_cat | grog -Tps`;
+ die "main_display(): grog error;" if $?;
chomp $groggy;
&_do_display();
next SWITCH;
@@ -2022,6 +2028,7 @@
} # if RESOLUTIOM
} # if DEVICE
$groggy = `cat $tmp_cat | grog -T$device -Z`;
+ die "main_display(): grog error;" if $?;
chomp $groggy;
&_do_display();
next SWITCH;
@@ -2031,13 +2038,16 @@
/^X$/ and do {
if (! $Opt{'DEVICE'}) {
$groggy = `cat $tmp_cat | grog -X`;
+ die "main_display(): grog error;" if $?;
} elsif ($Opt{'DEVICE'} =~ /^(X.*|dvi|html|lbp|lj4|ps)$/) {
# these devices work with
$groggy = `cat $tmp_cat | grog -T$Opt{'DEVICE'} -X`;
+ die "main_display(): grog error;" if $?;
} else {
warn "main_display(): wrong device for " .
"$Display{'MODE'} mode: $Opt{'DEVICE'};";
$groggy = `cat $tmp_cat | grog -Z`;
+ die "main_display(): grog error;" if $?;
} # if DEVICE
chomp $groggy;
&_do_display();
@@ -2178,5 +2188,8 @@
&clean_up();
1;
-
########################################################################
+### Emacs settings
+# Local Variables:
+# mode: CPerl
+# End:
Index: shell/groffer.man
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/shell/groffer.man,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- shell/groffer.man 23 Oct 2006 20:28:51 -0000 1.2
+++ shell/groffer.man 7 Nov 2006 00:35:27 -0000 1.3
@@ -697,6 +697,13 @@
.I \%troff
language.
.
+It finds and runs all necessary
+.I groff
+preprocessors, such as
+.BR @address@hidden .
+.
+.
+.P
The
.B \%groffer
program also includes many of the features for finding and displaying
@@ -4299,6 +4306,13 @@
.
.
.TP
+.BR address@hidden@chem (@MAN1EXT@)
+Preprocessor of
+.I groff
+that is run automatically.
+.
+.
+.TP
.BR groff_out (@MAN5EXT@)
Documentation on the
.I \%groff intermediate output
Index: shell/groffer2.sh
===================================================================
RCS file: /cvsroot/groff/groff/contrib/groffer/shell/groffer2.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- shell/groffer2.sh 23 Oct 2006 20:28:51 -0000 1.2
+++ shell/groffer2.sh 7 Nov 2006 00:35:27 -0000 1.3
@@ -12,7 +12,7 @@
# Free Software Foundation, Inc.
# Written by Bernd Warken
-# Last update: 22 Oct 2006
+# Last update: 4 Nov 2006
# This file is part of `groffer', which is part of `groff'.
@@ -545,7 +545,7 @@
_OPTS_GROFF_SHORT_NA="'a' 'b' 'c' 'C' 'e' 'E' 'g' 'G' 'i' 'k' 'l' 'N' 'p' \
'R' 's' 'S' 't' 'U' 'z'";
-_OPTS_GROFF_SHORT_ARG="'d' 'f' 'F' 'I' 'L' 'm' 'M' 'n' 'o' 'P' 'r' \
+_OPTS_GROFF_SHORT_ARG="'d' 'f' 'F' 'I' 'K' 'L' 'm' 'M' 'n' 'o' 'P' 'r' \
'w' 'W'";
_OPTS_GROFF_LONG_NA="";
_OPTS_GROFF_LONG_ARG="";
@@ -4399,6 +4399,10 @@
fi;
### to_tmp()
obj_from_output tt_grog grog "${tt_file}";
+ if is_not_equal "$?" 0
+ then
+ exit "${_ERROR}";
+ fi;
case " ${tt_grog} " in
*\ -m*)
eval set x "$(echo1 " ${tt_grog} " | sed '
@@ -6859,6 +6863,10 @@
_ADDOPTS_GROFF="${_ADDOPTS_GROFF} -T${_OPT_DEVICE}";
fi;
md_groggy="$(tmp_cat | eval grog)";
+ if is_not_equal "$?" 0
+ then
+ exit "${_ERROR}";
+ fi;
exit_test;
_do_opt_V;
@@ -6888,6 +6896,10 @@
esac;
md_addopts="${_ADDOPTS_GROFF}";
md_groggy="$(tmp_cat | grog -T${md_device})";
+ if is_not_equal "$?" 0
+ then
+ exit "${_ERROR}";
+ fi;
exit_test;
if obj _DISPLAY_MODE is_equal 'text'
then
@@ -6979,6 +6991,10 @@
esac;
md_modefile="${md_modefile}".dvi;
md_groggy="$(tmp_cat | grog -Tdvi)";
+ if is_not_equal "$?" 0
+ then
+ exit "${_ERROR}";
+ fi;
exit_test;
_do_display;
;;
@@ -6992,6 +7008,10 @@
esac;
md_modefile="${md_modefile}".html;
md_groggy="$(tmp_cat | grog -Thtml)";
+ if is_not_equal "$?" 0
+ then
+ exit "${_ERROR}";
+ fi;
exit_test;
_do_display;
;;
@@ -7007,6 +7027,10 @@
;;
esac;
md_groggy="$(tmp_cat | grog -Tps)";
+ if is_not_equal "$?" 0
+ then
+ exit "${_ERROR}";
+ fi;
exit_test;
_do_display _make_pdf;
;;
@@ -7022,6 +7046,10 @@
esac;
md_modefile="${md_modefile}".ps;
md_groggy="$(tmp_cat | grog -Tps)";
+ if is_not_equal "$?" 0
+ then
+ exit "${_ERROR}";
+ fi;
exit_test;
_do_display;
;;
@@ -7051,6 +7079,10 @@
esac
esac;
md_groggy="$(tmp_cat | grog -T${md_device} -Z)";
+ if is_not_equal "$?" 0
+ then
+ exit "${_ERROR}";
+ fi;
exit_test;
_do_display;
;;
@@ -7059,17 +7091,29 @@
case "${_OPT_DEVICE}" in
'')
md_groggy="$(tmp_cat | grog -X)";
+ if is_not_equal "$?" 0
+ then
+ exit "${_ERROR}";
+ fi;
exit_test;
;;
X*|dvi|html|lbp|lj4|ps)
# these devices work with
md_groggy="$(tmp_cat | grog -T"${_OPT_DEVICE}" -X)";
+ if is_not_equal "$?" 0
+ then
+ exit "${_ERROR}";
+ fi;
exit_test;
;;
*)
warning "main_display(): \
wrong device for ${_DISPLAY_MODE} mode: ${_OPT_DEVICE}";
md_groggy="$(tmp_cat | grog -Z)";
+ if is_not_equal "$?" 0
+ then
+ exit "${_ERROR}";
+ fi;
exit_test;
;;
esac;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff/contrib/groffer ChangeLog Makefile.sub RE...,
Bernd Warken <=