diff options
| author | wl <wl> | 2006-03-28 17:54:16 +0000 |
|---|---|---|
| committer | wl <wl> | 2006-03-28 17:54:16 +0000 |
| commit | b6bc1aa9ca7c4127199a088c33b0bd80ee90d863 (patch) | |
| tree | 0ea2391f82aecd7a6835b2c441c9f31f23c6acb1 /src | |
| parent | 48aec1f008daad2e1e285defd2e4b536c3d15379 (diff) | |
| download | groff-b6bc1aa9ca7c4127199a088c33b0bd80ee90d863.tar.gz | |
* configure.ac: Call AC_PROG_EGREP.
* configure: Regenerated.
* Makefile.in (EGREP): New variable.
(MDEFINES): Add $(EGREP).
* src/roff/grog/grog.sh: Treat .TH between .TS and .TE properly
(bug reported by Robert Goulding <Goulding.2@nd.edu>).
Use @EGREP@.
* src/roff/grog/Makefile.sub (grog, grog.old): Use $(EGREP).
Diffstat (limited to 'src')
| -rw-r--r-- | src/roff/grog/Makefile.sub | 2 | ||||
| -rw-r--r-- | src/roff/grog/grog.sh | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/roff/grog/Makefile.sub b/src/roff/grog/Makefile.sub index 43dec8fb..765d9285 100644 --- a/src/roff/grog/Makefile.sub +++ b/src/roff/grog/Makefile.sub @@ -6,6 +6,7 @@ all: grog grog: grog.sh rm -f $@ sed -e "s|@g@|$(g)|g" \ + -e "s|@EGREP@|$(EGREP)|g" \ -e "s|@VERSION@|$(version)$(revision)|" \ -e $(SH_SCRIPT_SED_CMD) $(srcdir)/grog.sh >$@ chmod +x $@ @@ -18,6 +19,7 @@ grog.old: grog.pl grog.sh else \ rm -f $@; \ sed -e "s|@g@|$(g)|g" \ + -e "s|@EGREP@|$(EGREP)|g" \ -e "s|@VERSION@|$(version)$(revision)|" \ -e $(SH_SCRIPT_SED_CMD) $(srcdir)/grog.sh >$@; \ fi diff --git a/src/roff/grog/grog.sh b/src/roff/grog/grog.sh index 1a937cb1..3323763f 100644 --- a/src/roff/grog/grog.sh +++ b/src/roff/grog/grog.sh @@ -29,16 +29,19 @@ do esac done -egrep -h "^\.(\[|\])|((P|PS|[PLI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|.* Oo|Oc|.* Oc|TS|EQ|TH|SH|so|\[|R1|GS|G1|PH|SA)$sp)" $* \ +@EGREP@ -h \ + "^\.(\[|\])|((P|PS|[PLI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|.* Oo|Oc|.* Oc|TS|TE|EQ|TH|SH|so|\[|R1|GS|G1|PH|SA)$sp)" $* \ | sed -e '/^\.so/s/^.*$/.SO_START\ &\ .SO_END/' \ | $soelim \ -| egrep '^\.(P|PS|[PLI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|.* Oo|Oc|.* Oc|TS|EQ|TH|SH|\[|\]|R1|GS|G1|PH|SA|SO_START|SO_END)' \ +| @EGREP@ \ + '^\.(P|PS|[PLI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|.* Oo|Oc|.* Oc|TS|TE|EQ|TH|SH|\[|\]|R1|GS|G1|PH|SA|SO_START|SO_END)' \ | awk ' /^\.SO_START$/ { so = 1 } /^\.SO_END$/ { so = 0 } -/^\.TS/ { tbl++; 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++ } @@ -46,7 +49,7 @@ egrep -h "^\.(\[|\])|((P|PS|[PLI]P|[pnil]p|sh|Dd|Tp|Dp|De|Cx|Cl|Oo|.* Oo|Oc|.* O /^\.\]/ {refer_end++; if (so > 0) soelim++ } /^\.GS/ { grn++; if (so > 0) soelim++ } /^\.G1/ { grap++; pic++; if (so > 0) soelim++ } -/^\.TH/ { TH++ } +/^\.TH/ { if (in_tbl != 1) TH++ } /^\.[PLI]P/ { PP++ } /^\.P$/ { P++ } /^\.SH/ { SH++ } |