diff options
author | wl <wl> | 2011-01-22 15:18:53 +0000 |
---|---|---|
committer | wl <wl> | 2011-01-22 15:18:53 +0000 |
commit | fafe6211f3b9b72bd0ab5c846e3d6e642aea2bd9 (patch) | |
tree | b11341034cd0ebcd757cb4534653153a2cdc8094 /src | |
parent | 7fbd842c2b8e391930068a3b5c883cffa34014d7 (diff) | |
download | groff-fafe6211f3b9b72bd0ab5c846e3d6e642aea2bd9.tar.gz |
Update `grog'.
* src/roff/grog/{groff.sh,groff.pl}: `groff' now calls `pic'
automatically if `grap' or `chem' is used.
`chem' has been folded into `groff'.
* src/roff/grog/grog.man: Updated.
Diffstat (limited to 'src')
-rw-r--r-- | src/roff/grog/grog.man | 49 | ||||
-rw-r--r-- | src/roff/grog/grog.pl | 21 | ||||
-rw-r--r-- | src/roff/grog/grog.sh | 21 |
3 files changed, 20 insertions, 71 deletions
diff --git a/src/roff/grog/grog.man b/src/roff/grog/grog.man index 0cbd4c42..49d00f2a 100644 --- a/src/roff/grog/grog.man +++ b/src/roff/grog/grog.man @@ -10,10 +10,10 @@ grog.1 - man page for grog (section 1) Source file position: <groff_source_top>/src/roff/grog/grog.man Installed position: $prefix/share/man/man1/grog.1 -Last Update: 2 Jun 2010 +Last Update: 22 Jan 2011 .. .de co -Copyright (C) 1989-2000, 2001, 2002, 2003, 2006, 2007, 2009, 2010 +Copyright (C) 1989-2003, 2006, 2007, 2009-2011 Free Software Foundation, Inc. . Written by James Clark. @@ -466,50 +466,6 @@ was found by this file does not use a macro package. . . -.IP \(bu -.B grog -can also handle files using the -.I chem -language. -. -The example -. -.RS -.IP -.EX -grog chAh_brackets.chem -.EE -.RE -. -.IP -outputs -. -.RS -.IP -.EX -chem chAh_brackets.chem | groff \-pe -.EE -.RE -. -.IP -So -.B chem -is run first and -.B groff -is appended. -. -The option -.B \-p -for -.B pic -is implied automatically by -.BR chem . -Additionally, the file uses -.I eqn -with -.BR \-e . -. -. .\" -------------------------------------------------------------------- .SH "SEE ALSO" . @@ -517,6 +473,7 @@ with .BR @g@troff (@MAN1EXT@), .BR @g@tbl (@MAN1EXT@), .BR @g@pic (@MAN1EXT@), +.BR @g@chem (@MAN1EXT@), .BR @g@eqn (@MAN1EXT@), .BR @g@refer (@MAN1EXT@), .BR @g@grn (@MAN1EXT@), diff --git a/src/roff/grog/grog.pl b/src/roff/grog/grog.pl index 24a4090f..ff830153 100644 --- a/src/roff/grog/grog.pl +++ b/src/roff/grog/grog.pl @@ -6,7 +6,7 @@ # Source file position: <groff-source>/src/roff/grog/grog.pl # Installed position: <prefix>/bin/grog -# Copyright (C) 1993, 2006, 2009 Free Software Foundation, Inc. +# Copyright (C) 1993, 2006, 2009, 2011 Free Software Foundation, Inc. # Written by James Clark, maintained by Werner Lemberg. # Rewritten and put under GPL by Bernd Warken. @@ -26,7 +26,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ######################################################################## -my $Last_Update = '5 Jan 2009'; +my $Last_Update = '22 Jan 2011'; ######################################################################## require v5.6; @@ -128,7 +128,7 @@ sub process { if (/^(.cstart)|(begin\s+chem)$/) { $Groff{'chem'}++; - $Groff{'pic'}++; + $Groff{'soelim'}++ if $level; } elsif (/^\.TS$Sp/) { $_ = <FILE>; if (!/^\./) { @@ -151,7 +151,6 @@ sub process { $_ = <FILE>; if (!/^\./) { $Groff{'grap'}++; - $Groff{'pic'}++; $Groff{'soelim'}++ if $level; } # } elsif (/^\.PS\Sp([ 0-9.<].*)?$/) { @@ -286,12 +285,13 @@ sub version { $Groff{'refer'} ||= $Groff{'refer_open'} && $Groff{'refer_close'}; if ( $Groff{'pic'} || $Groff{'tbl'} || $Groff{'eqn'} || - $Groff{'grn'} || $Groff{'grap'} || $Groff{'refer'} ) { + $Groff{'grn'} || $Groff{'grap'} || $Groff{'refer'} || + $Groff{'chem'} ) { my $s = "-"; $s .= "s" if $Groff{'soelim'}; $s .= "R" if $Groff{'refer'}; - # grap must be run before pic $s .= "G" if $Groff{'grap'}; + $s .= "j" if $Groff{'chem'}; $s .= "p" if $Groff{'pic'}; $s .= "g" if $Groff{'grn'}; $s .= "t" if $Groff{'tbl'}; @@ -331,13 +331,8 @@ sub version { push(@Command, $s); } - if ($Groff{'chem'}) { - my @chem = ('chem', @ARGV, '|', 'groff'); - unshift(@Command, @chem); - } else { - unshift @Command, 'groff'; - push(@Command, @ARGV); - } + unshift @Command, 'groff'; + push(@Command, @ARGV); foreach (@Command) { next unless /\s/; diff --git a/src/roff/grog/grog.sh b/src/roff/grog/grog.sh index 8f17078d..d4763b54 100644 --- a/src/roff/grog/grog.sh +++ b/src/roff/grog/grog.sh @@ -5,7 +5,7 @@ # Source file position: <groff-source>/src/roff/grog/grog.sh # Installed position: <prefix>/bin/grog -# Copyright (C) 1993, 2006, 2009 Free Software Foundation, Inc. +# Copyright (C) 1993, 2006, 2009, 2011 Free Software Foundation, Inc. # Written by James Clark, maintained by Werner Lemberg. # Rewritten by and put under GPL Bernd Warken. @@ -25,7 +25,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ######################################################################## -Last_Update='5 Jan 2009' +Last_Update='22 Jan 2011' ######################################################################## soelim=@g@soelim @@ -161,16 +161,16 @@ eval sed "'s/[ ]*$//'" '--' "${filespec}" \ | awk ' /^\.SO_START$/ { so = 1 } /^\.SO_END$/ { so = 0 } -/^\.cstart$/ { chem++ } +/^\.cstart$/ { chem++; if (so > 0) soelim++ } /^\.TS/ { tbl++; in_tbl = 1; if (so > 0) soelim++; } /^\.TE/ { in_tbl = 0 } /^\.PS([ 0-9.<].*)?$/ { pic++; if (so > 0) soelim++ } /^\.EQ/ { eqn++; if (so > 0) soelim++ } /^\.R1/ { refer++; if (so > 0) soelim++ } -/^\.\[/ {refer_start++; if (so > 0) soelim++ } -/^\.\]/ {refer_end++; if (so > 0) soelim++ } +/^\.\[/ { refer_start++; if (so > 0) soelim++ } +/^\.\]/ { refer_end++; if (so > 0) soelim++ } /^\.GS/ { grn++; if (so > 0) soelim++ } -/^\.G1/ { grap++; pic++; if (so > 0) soelim++ } +/^\.G1/ { grap++; if (so > 0) soelim++ } /^\.TH/ { if (in_tbl != 1) TH++ } /^\.PP/ { PP++ } /^\.TL/ { TL++ } @@ -202,18 +202,15 @@ eval sed "'s/[ ]*$//'" '--' "${filespec}" \ /^\.(PRINTSTYLE|START)/ { mom++ } END { - if (chem > 0) { - printf "chem %s | ", files - pic++ - files = "" - } printf "groff" refer = refer || (refer_start && refer_end) - if (pic > 0 || tbl > 0 || grn > 0 || grap > 0 || eqn > 0 || refer > 0) { + if (pic > 0 || tbl > 0 || grn > 0 || grap > 0 || + eqn > 0 || refer > 0 || chem > 0) { printf " -" if (soelim > 0) printf "s" if (refer > 0) printf "R" if (grn > 0) printf "g" + if (chem > 0) printf "j" if (grap > 0) printf "G" if (pic > 0) printf "p" if (tbl > 0) printf "t" |