[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[groff] 01/01: grog: add gpinyin, restructure SEE ALSO
|
From: |
Bernd Warken |
|
Subject: |
[groff] 01/01: grog: add gpinyin, restructure SEE ALSO |
|
Date: |
Thu, 28 Aug 2014 20:39:50 +0000 |
bwarken pushed a commit to branch master
in repository groff.
commit 69edef58517c63c763860ea1fa6d879847358d9e
Author: Bernd Warken <address@hidden>
Date: Thu Aug 28 22:39:42 2014 +0200
grog: add gpinyin, restructure SEE ALSO
---
ChangeLog | 6 ++
src/roff/grog/grog.man | 121 +++++++++++++++++++++++++++++------------------
src/roff/grog/grog.pl | 10 ++--
src/roff/grog/subs.pl | 16 +++++--
4 files changed, 99 insertions(+), 54 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 49ba2f2..9a4bd7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2014-08-28 Bernd Warken <address@hidden>
+ * src/roff/grog/grog.pl, src/roff/grog/subs.pl: Add `gpinyin'.
+
+ * src/roff/grog/grog.man: Restructure `SEE ALSO'.
+
+2014-08-28 Bernd Warken <address@hidden>
+
* contrib/gpinyin: Make it runnable, version 1.0.0.
2014-08-20 Bernd Warken <address@hidden>
diff --git a/src/roff/grog/grog.man b/src/roff/grog/grog.man
index 3c8118b..6954ca5 100644
--- a/src/roff/grog/grog.man
+++ b/src/roff/grog/grog.man
@@ -20,7 +20,7 @@ Installed position: <prefix>/share/man/man1/grog.1
Copyright (C) 1989-2003, 2006-2007, 2009-2012, 2014
Free Software Foundation, Inc.
-Last Update: 5 Jul 2014
+Last Update: 28 Aug 2014
Written by James Clark.
Maintained by Werner Lemberg <address@hidden>.
@@ -36,12 +36,8 @@ Software Foundation'.
`WITHOUT ANY WARRANTY'; without even the implied warranty of
`MERCHANTABILITY' or `FITNESS FOR A PARTICULAR PURPOSE'.
-See the `GNU General Public License version 2' for more details.
-
-You should have received a copy of this license along with this
-program.
-
-If not, see <http://\:www.gnu.org/\:licenses/\:gpl-2.0.html>.
+See the `GNU General Public License version 2' for more details, see
+<http://\:www.gnu.org/\:licenses/\:gpl-2.0.html>.
..
.
.\" --------------------------------------------------------------------
@@ -61,6 +57,7 @@ If not, see <http://\:www.gnu.org/\:licenses/\:gpl-2.0.html>.
.
.\" --------------------------------------------------------------------
.SH SYNOPSIS
+.\" --------------------------------------------------------------------
.
.SY grog
.OP \-C
@@ -79,6 +76,7 @@ If not, see <http://\:www.gnu.org/\:licenses/\:gpl-2.0.html>.
.
.\" --------------------------------------------------------------------
.SH DESCRIPTION
+.\" --------------------------------------------------------------------
.
.B grog
reads the input (file names or standard input) and guesses which of
@@ -106,6 +104,7 @@ command is run on the
.
.\" --------------------------------------------------------------------
.SH OPTIONS
+.\" --------------------------------------------------------------------
.
The option
.B \-v
@@ -189,6 +188,7 @@ is specified standard input is read automatically.
.
.\" --------------------------------------------------------------------
.SH DETAILS
+.\" --------------------------------------------------------------------
.
.B grog
reads all
@@ -334,9 +334,9 @@ grog.sh
is used instead.
.
.
-.\" ####################################################################
+.\" --------------------------------------------------------------------
.SH EXAMPLES
-.\" ####################################################################
+.\" --------------------------------------------------------------------
.
.IP \*(BU 2m
Calling
@@ -381,7 +381,7 @@ outputs
.RS
.IP
.EX
-groff \-pte \-ms pic.ms
+groff \-p \-t \-e \-ms pic.ms
.EE
.RE
.
@@ -408,7 +408,7 @@ for
.
.
.IP \*(BU 2m
-If both files are combined by the command
+If both of the former example files are combined by the command
.
.RS
.IP
@@ -475,7 +475,7 @@ The output is
.RS
.IP
.EX
-groff \-ksS \-Tdvi grnexmpl.g
+groff \-k \-s \-S \-Tdvi grnexmpl.g
.EE
.RE
.
@@ -490,7 +490,63 @@ this file does not use a macro package.
.
.
.\" --------------------------------------------------------------------
+.SH "SEE ALSO"
+.\" --------------------------------------------------------------------
+.
+.ad l
+.
+.BR groff (@MAN1EXT@),
+.BR groffer (@MAN1EXT@)
+.BR @address@hidden (@MAN1EXT@),
+.BR @address@hidden (@MAN1EXT@),
+.BR @address@hidden (@MAN1EXT@),
+.BR @address@hidden (@MAN1EXT@),
+.BR @address@hidden (@MAN1EXT@),
+.BR @address@hidden (@MAN1EXT@),
+.BR @address@hidden (@MAN1EXT@),
+.BR grap (1),
+.BR @address@hidden (@MAN1EXT@)
+.
+.RS
+Man-pages of section 1 can be viewed with either
+.RS
+\[Do]
+.BI man " name"
+.RE
+for text mode or
+.RS
+\[Do]
+.BI groffer " name"
+.RE
+for graphical mode (default is PDF mode).
+.RE
+.
+.
+.P
+.BR groff_me (@MAN7EXT@),
+.BR groff_ms (@MAN7EXT@),
+.BR groff_mm (@MAN7EXT@),
+.BR groff_mom (@MAN7EXT@),
+.BR groff_man (@MAN7EXT@)
+.
+.RS
+Man-pages of section 7 can be viewed with either with
+.RS
+\[Do]
+.BI "man 7 " name
+.RE
+for text mode or
+.RS
+\[Do]
+.BI "groffer 7 " name
+.RE
+for graphical mode (default is PDF mode).
+.RE
+.
+.
+.\" --------------------------------------------------------------------
.SH "AUTHORS"
+.\" --------------------------------------------------------------------
.
Written by James Clark.
Maintained by
@@ -506,6 +562,7 @@ Bernd Warken
.
.\" --------------------------------------------------------------------
.SH "COPYING"
+.\" --------------------------------------------------------------------
.
Copyright (C) 1989\(en2003, 2006\(en2007, 2009\(en2012, 2014
Free Software Foundation, Inc.
@@ -523,9 +580,13 @@ a free software project.
.I groff
is free software; you can redistribute it and/or modify it under the
terms of the
-.I GNU General Public License versioon 2
+.I GNU General Public License version 2
as published by the
-.IR "Free Software Foundation" .
+.IR "Free Software Foundation" ,
+see
+.UR http://\:www.gnu.org/\:licenses/\:gpl-2.0.html
+GPL2
+.UE .
.
.
.P
@@ -542,38 +603,6 @@ See the
for more details.
.
.
-.P
-You should have received a copy of the license along with this
-program.
-.
-If not, see
-.UR http://\:www.gnu.org/\:licenses/\:gpl-2.0.html
-GPL2
-.UE .
-.
-.
-.\" --------------------------------------------------------------------
-.SH "SEE ALSO"
-.ad l
-.
-.BR groff (@MAN1EXT@),
-.BR @address@hidden (@MAN1EXT@),
-.BR @address@hidden (@MAN1EXT@),
-.BR @address@hidden (@MAN1EXT@),
-.BR @address@hidden (@MAN1EXT@),
-.BR @address@hidden (@MAN1EXT@),
-.BR @address@hidden (@MAN1EXT@),
-.BR @address@hidden (@MAN1EXT@),
-.BR grap (1),
-.BR @address@hidden (@MAN1EXT@),
-.BR groff_me (@MAN7EXT@),
-.BR groff_ms (@MAN7EXT@),
-.BR groff_mm (@MAN7EXT@),
-.BR groff_mom (@MAN7EXT@),
-.BR groff_man (@MAN7EXT@),
-.BR groffer (@MAN1EXT@)
-.
-.
.\" --------------------------------------------------------------------
.\" Emacs settings
.\" --------------------------------------------------------------------
diff --git a/src/roff/grog/grog.pl b/src/roff/grog/grog.pl
index 672d0e6..f45cee6 100644
--- a/src/roff/grog/grog.pl
+++ b/src/roff/grog/grog.pl
@@ -30,7 +30,7 @@
# <http://www.gnu.org/licenses/gpl-2.0.html>.
########################################################################
-our $Last_Update = '5 Jul 2014';
+our $Last_Update = '28 Aug 2014';
########################################################################
require v5.6;
@@ -97,6 +97,7 @@ our %preprocs_tmacs = (
'chem' => 0,
'eqn' => 0,
'gideal' => 0,
+ 'gpinyin' => 0,
'grap' => 0,
'grn' => 0,
'pic' => 0,
@@ -107,7 +108,6 @@ our %preprocs_tmacs = (
'geqn' => 0,
'gpic' => 0,
'neqn' => 0,
- 'ideal' => 0,
'man' => 0,
'mandoc' => 0,
@@ -150,7 +150,7 @@ foreach my $file ( @filespec ) { # test for each file name
in the arguments
if ( $file =~ /\./ ) { # file name has a dot `.'
my $ext = $file;
- $ext =~ s/
+ $ext =~ s/^
.*
\.
([^.]*)
@@ -180,13 +180,15 @@ foreach my $file ( @filespec ) { # test for each file
name in the arguments
ref|
t|
tr|
+ g|
groff|
roff|
www|
hdtbl|
grap|
grn|
- pdfroff
+ pdfroff|
+ pinyin
)$/x ) {
# ignore
} else {
diff --git a/src/roff/grog/subs.pl b/src/roff/grog/subs.pl
index 694e60b..16e8cdc 100644
--- a/src/roff/grog/subs.pl
+++ b/src/roff/grog/subs.pl
@@ -30,7 +30,7 @@
# <http://www.gnu.org/licenses/gpl-2.0.html>.
########################################################################
-# Last_Update = '6 Jul 2014';
+# Last_Update = '28 Aug 2014';
########################################################################
require v5.6;
@@ -74,6 +74,7 @@ my %Groff = (
'grap' => 0,
'grn' => 0,
'gideal' => 0,
+ 'gpinyin' => 0,
'lilypond' => 0,
'pic' => 0,
@@ -261,7 +262,7 @@ sub handle_args {
########################################################################
# As documented for the `man' program, the first line can be
-# used as an groff option line. This is done by:
+# used as a groff option line. This is done by:
# - start the line with '\" (apostrophe, backslash, double quote)
# - add a space character
# - a word using the following characters can be appended: `egGjJpRst'.
@@ -317,7 +318,7 @@ sub do_first_line {
return 0 unless ( $1 ); # for empty comment
- # all following array members are either preprocs or 1 tmac, in
+ # all following array members are either preprocs or 1 tmac
my @words = split '\s+', $1;
my @in = ();
@@ -418,10 +419,14 @@ sub do_line {
$Groff{'grap'}++; # for grap
return;
}
- if ( $command =~ /^\.Perl$/ ) {
+ if ( $command =~ /^\.Perl/ ) {
$Groff{'gperl'}++; # for gperl
return;
}
+ if ( $command =~ /^\.pinyin/ ) {
+ $Groff{'gpinyin'}++; # for gperl
+ return;
+ }
if ( $command =~ /^\.GS$/ ) {
$Groff{'grn'}++; # for grn
return;
@@ -760,6 +765,9 @@ EOF
if ( $Groff{'gperl'} ) {
push @preprograms, 'gperl';
}
+ if ( $Groff{'gpinyin'} ) {
+ push @preprograms, 'gpinyin';
+ }
# preprocessors with `groff' option
if ( ( $Groff{'PS'} || $Groff{'PF'} ) && $Groff{'PE'} ) {
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [groff] 01/01: grog: add gpinyin, restructure SEE ALSO,
Bernd Warken <=