diff options
author | wl <wl> | 2010-02-09 06:05:45 +0000 |
---|---|---|
committer | wl <wl> | 2010-02-09 06:05:45 +0000 |
commit | 8a7aece2fe09577336e531f1c51cd738339685e9 (patch) | |
tree | 3562a3420a829ced4d7d39befeefdfecc292f4e1 /contrib/hdtbl | |
parent | 4cb4b267ea295d0f5aa45eaeaf1a6a056e90c5e6 (diff) | |
download | groff-8a7aece2fe09577336e531f1c51cd738339685e9.tar.gz |
Make example compilation work again if srcdir != builddir.
* Makefile.sub (.roff.ps): Define `sopath' groff string.
* examples/*.roff, examples/*.in: Use it so that .so finds its input
file.
Diffstat (limited to 'contrib/hdtbl')
-rw-r--r-- | contrib/hdtbl/ChangeLog | 9 | ||||
-rw-r--r-- | contrib/hdtbl/Makefile.sub | 3 | ||||
-rw-r--r-- | contrib/hdtbl/examples/chess_board.roff | 8 | ||||
-rw-r--r-- | contrib/hdtbl/examples/col_rowspan_colors.roff | 7 | ||||
-rw-r--r-- | contrib/hdtbl/examples/color_boxes.roff | 7 | ||||
-rw-r--r-- | contrib/hdtbl/examples/color_nested_tables.roff | 8 | ||||
-rw-r--r-- | contrib/hdtbl/examples/color_table_cells.roff | 7 | ||||
-rw-r--r-- | contrib/hdtbl/examples/color_transitions.roff | 7 | ||||
-rw-r--r-- | contrib/hdtbl/examples/fonts_n.in | 8 | ||||
-rw-r--r-- | contrib/hdtbl/examples/fonts_x.in | 8 | ||||
-rw-r--r-- | contrib/hdtbl/examples/mixed_pickles.roff | 6 | ||||
-rw-r--r-- | contrib/hdtbl/examples/rainbow.roff | 6 | ||||
-rw-r--r-- | contrib/hdtbl/examples/short_reference.roff | 7 |
13 files changed, 77 insertions, 14 deletions
diff --git a/contrib/hdtbl/ChangeLog b/contrib/hdtbl/ChangeLog index 5c4abda2..e280f7f6 100644 --- a/contrib/hdtbl/ChangeLog +++ b/contrib/hdtbl/ChangeLog @@ -1,3 +1,12 @@ +2010-02-09 Werner LEMBEARG <wl@gnu.org> + + Make example compilation work again if srcdir != builddir. + + * Makefile.sub (.roff.ps): Define `sopath' groff string. + + * examples/*.roff, examples/*.in: Use it so that .so finds its input + file. + 2010-02-08 Werner LEMBEARG <wl@gnu.org> Fix handling of `common.roff'. diff --git a/contrib/hdtbl/Makefile.sub b/contrib/hdtbl/Makefile.sub index 3ec11912..a580b14f 100644 --- a/contrib/hdtbl/Makefile.sub +++ b/contrib/hdtbl/Makefile.sub @@ -91,7 +91,8 @@ MOSTLYCLEANADD=\ .SUFFIXES: .roff .in .ps .roff.ps: - $(GROFF) -Tps -dfontpath=$(top_srcdir)/font -mhdtbl $< >$@ + $(GROFF) -Tps -dfontpath=$(top_srcdir)/font -dsopath=$(srcdir)/ \ + -mhdtbl $< >$@ .in.roff: sed -e "s|@fontdir@|$(fontdir)|" $< >$@ diff --git a/contrib/hdtbl/examples/chess_board.roff b/contrib/hdtbl/examples/chess_board.roff index f5bd0b10..0a43cc60 100644 --- a/contrib/hdtbl/examples/chess_board.roff +++ b/contrib/hdtbl/examples/chess_board.roff @@ -22,9 +22,15 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. .. -.so examples/common.roff +. +.if !d sopath \ +. ds sopath +. +.so \*[sopath]examples/common.roff +. . .time start +. .nr *x 8 .de r1 .TR height=1.6c diff --git a/contrib/hdtbl/examples/col_rowspan_colors.roff b/contrib/hdtbl/examples/col_rowspan_colors.roff index 2d892083..5f74f836 100644 --- a/contrib/hdtbl/examples/col_rowspan_colors.roff +++ b/contrib/hdtbl/examples/col_rowspan_colors.roff @@ -22,9 +22,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. .. -.so examples/common.roff +. +.if !d sopath \ +. ds sopath +. +.so \*[sopath]examples/common.roff . .time start +. .de color# .nr # +1 .random# diff --git a/contrib/hdtbl/examples/color_boxes.roff b/contrib/hdtbl/examples/color_boxes.roff index da5b272b..22045d1d 100644 --- a/contrib/hdtbl/examples/color_boxes.roff +++ b/contrib/hdtbl/examples/color_boxes.roff @@ -22,9 +22,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. .. -.so examples/common.roff +. +.if !d sopath \ +. ds sopath +. +.so \*[sopath]examples/common.roff . .time start +. .H Horizontal Rules and Boxes .br with Randomly Colored Border and Background .PN 25 Text before horizontal rule. .TBL border=.5n bc=green bgc=red width=7c tal=c csp=.2n cpd=.3n .TR .TD .ETB diff --git a/contrib/hdtbl/examples/color_nested_tables.roff b/contrib/hdtbl/examples/color_nested_tables.roff index 9e75cf58..e16d209a 100644 --- a/contrib/hdtbl/examples/color_nested_tables.roff +++ b/contrib/hdtbl/examples/color_nested_tables.roff @@ -22,9 +22,15 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. .. -.so examples/common.roff +. +.if !d sopath \ +. ds sopath +. +.so \*[sopath]examples/common.roff +. . .time start +. .PN 15 Text before first table. .nr # 0 1 ***** diff --git a/contrib/hdtbl/examples/color_table_cells.roff b/contrib/hdtbl/examples/color_table_cells.roff index 7ae35f45..04edbae2 100644 --- a/contrib/hdtbl/examples/color_table_cells.roff +++ b/contrib/hdtbl/examples/color_table_cells.roff @@ -22,9 +22,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. .. -.so examples/common.roff +. +.if !d sopath \ +. ds sopath +. +.so \*[sopath]examples/common.roff . .time start +. .H Horizontal Rules and Randomly Colored Table Cells .PN 15 Text before HR. .TBL border=.5n bc=green bgc=red width=7c tal=c csp=.2n cpd=.3n .TR .TD .ETB diff --git a/contrib/hdtbl/examples/color_transitions.roff b/contrib/hdtbl/examples/color_transitions.roff index 43cc5296..de3ae23c 100644 --- a/contrib/hdtbl/examples/color_transitions.roff +++ b/contrib/hdtbl/examples/color_transitions.roff @@ -22,9 +22,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. .. -.so examples/common.roff +. +.if !d sopath \ +. ds sopath +. +.so \*[sopath]examples/common.roff . .time start +. .de ctab .nr #cc 0 .PN 21 ".nr #cc +.05f" ".defcolor \En[t*#] rgb \\$1 \\$2 \\$3" ".TBL border= csp=0 cpd=.5n bgc=\\\\n[t*#] bc=" .TR .TD diff --git a/contrib/hdtbl/examples/fonts_n.in b/contrib/hdtbl/examples/fonts_n.in index 0daa599b..709ffb25 100644 --- a/contrib/hdtbl/examples/fonts_n.in +++ b/contrib/hdtbl/examples/fonts_n.in @@ -5,7 +5,7 @@ font_n.roff This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc. written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>. groff is free software; you can redistribute it and/or modify it under @@ -34,7 +34,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. .\" ** without arg: glyphs and codes of active font. ** .\" ****************************************************************** . -.so examples/common.roff +.if !d sopath \ +. ds sopath +. +.so \*[sopath]examples/common.roff +. .time start . .if !d fontpath \ diff --git a/contrib/hdtbl/examples/fonts_x.in b/contrib/hdtbl/examples/fonts_x.in index 4360cc2d..77b5ac37 100644 --- a/contrib/hdtbl/examples/fonts_x.in +++ b/contrib/hdtbl/examples/fonts_x.in @@ -5,7 +5,7 @@ font_x.roff This file is part of groff, the GNU roff type-setting system. -Copyright (C) 2005, 2006, 2009 Free Software Foundation, Inc. +Copyright (C) 2005, 2006, 2009, 2010 Free Software Foundation, Inc. written by Joachim Walsdorff <Joachim.Walsdorff@urz.uni-heidelberg.de>. groff is free software; you can redistribute it and/or modify it under @@ -34,7 +34,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. .\" ** without arg: glyphs and codes of active font. ** .\" ****************************************************************** . -.so examples/common.roff +.if !d sopath \ +. ds sopath +. +.so \*[sopath]examples/common.roff +. .time start . .if !d fontpath \ diff --git a/contrib/hdtbl/examples/mixed_pickles.roff b/contrib/hdtbl/examples/mixed_pickles.roff index 6e0935f2..6a8d34f6 100644 --- a/contrib/hdtbl/examples/mixed_pickles.roff +++ b/contrib/hdtbl/examples/mixed_pickles.roff @@ -22,7 +22,11 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. .. -.so examples/common.roff +. +.if !d sopath \ +. ds sopath +. +.so \*[sopath]examples/common.roff . .time start . diff --git a/contrib/hdtbl/examples/rainbow.roff b/contrib/hdtbl/examples/rainbow.roff index af795471..f8adbe47 100644 --- a/contrib/hdtbl/examples/rainbow.roff +++ b/contrib/hdtbl/examples/rainbow.roff @@ -22,7 +22,11 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. .. -.so examples/common.roff +. +.if !d sopath \ +. ds sopath +. +.so \*[sopath]examples/common.roff . .time start . diff --git a/contrib/hdtbl/examples/short_reference.roff b/contrib/hdtbl/examples/short_reference.roff index efc6c7df..4935d1ac 100644 --- a/contrib/hdtbl/examples/short_reference.roff +++ b/contrib/hdtbl/examples/short_reference.roff @@ -22,9 +22,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. .. -.so examples/common.roff +. +.if !d sopath \ +. ds sopath +. +.so \*[sopath]examples/common.roff . .time start +. .pv 1.2 1.2 "" x .H Short Reference for the HDtbl-Macros This Short Reference describes the Heidelberger Table Macros |