wl pushed a commit to branch master
in repository groff.
commit f1e56d4987b5052e265a453ba33f0a570b2eabbc
Author: Werner Lemberg <[email protected]>
Date: Sat Apr 11 08:46:35 2015 +0200
Fix Savannah bug #44798.
* examples/fonts_n.in, examples/fonts_x.in: Use @EGREP@.
* hdtbl.am (.in.roff): Handle @EGREP@.
---
contrib/hdtbl/ChangeLog | 8 ++++++++
contrib/hdtbl/examples/fonts_n.in | 2 +-
contrib/hdtbl/examples/fonts_x.in | 2 +-
contrib/hdtbl/hdtbl.am | 3 ++-
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog
index d8495e7..c759ff7 100644
--- a/contrib/hdtbl/ChangeLog
+++ b/contrib/hdtbl/ChangeLog
@@ -1,5 +1,13 @@
2015-04-03 Werner LEMBERG <[email protected]>
+ Fix Savannah bug #44798.
+
+ * examples/fonts_n.in, examples/fonts_x.in: Use @EGREP@.
+
+ * hdtbl.am (.in.roff): Handle @EGREP@.
+
+2015-04-03 Werner LEMBERG <[email protected]>
+
* groff_hdtbl.man: Make it work in compatibility mode.
2013-09-03 Bernd Warken <[email protected]>
diff --git a/contrib/hdtbl/examples/fonts_n.in
b/contrib/hdtbl/examples/fonts_n.in
index e94ca72..3accc7f 100644
--- a/contrib/hdtbl/examples/fonts_n.in
+++ b/contrib/hdtbl/examples/fonts_n.in
@@ -102,7 +102,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
. TBL border=.1n bc=red cpd=0 csp=.1n bgc=
. CPTN groff font \\*[*$1] \
.br \
- val=b ".pso grep -e internalname \\*[fontpath]/dev\*[.T]/\\*[*$1]"
+ val=b ".pso @EGREP@ internalname \\*[fontpath]/dev\*[.T]/\\*[*$1]"
. TR
. TD
. TBL cols=12 border=.1n bc=red csp=.1n cpd=.2n fgc=red4 bgc=beige \
diff --git a/contrib/hdtbl/examples/fonts_x.in
b/contrib/hdtbl/examples/fonts_x.in
index 72e3f24..d7b2699 100644
--- a/contrib/hdtbl/examples/fonts_x.in
+++ b/contrib/hdtbl/examples/fonts_x.in
@@ -102,7 +102,7 @@ along with this program. If not, see
<http://www.gnu.org/licenses/>.
. TBL border=.1n bc=red cpd=0 csp=.1n bgc=
. CPTN groff font \\*[*$1] \
.br \
- val=b ".pso grep -e internalname \\*[fontpath]/dev\*[.T]/\\*[*$1]"
+ val=b ".pso @EGREP@ internalname \\*[fontpath]/dev\*[.T]/\\*[*$1]"
. TR
. TD
. TBL cols=18 border=.1n bc=red csp=.1n cpd=.2n fgc=red4 bgc=beige \
diff --git a/contrib/hdtbl/hdtbl.am b/contrib/hdtbl/hdtbl.am
index 608977f..ef2e1f1 100644
--- a/contrib/hdtbl/hdtbl.am
+++ b/contrib/hdtbl/hdtbl.am
@@ -108,7 +108,8 @@ SUFFIXES += .roff .in .ps
-mhdtbl $< >$@
.in.roff:
@$(MKDIR_P) `dirname $@`
- sed -e "s|[@]fontdir[@]|$(fontdir)|" $< >$@
+ sed -e "s|[@]fontdir[@]|$(fontdir)|" \
+ -e "s|[@]EGREP[@]|$(EGREP)|" $< >$@
$(HDTBLPROCESSEDEXAMPLEFILES): gnu.eps groff troff pic tbl \
_______________________________________________
Groff-commit mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/groff-commit
