[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff/contrib/hdtbl ChangeLog Makefile.sub exam...
|
From: |
Werner LEMBERG |
|
Subject: |
[Groff-commit] groff/contrib/hdtbl ChangeLog Makefile.sub exam... |
|
Date: |
Tue, 09 Feb 2010 06:05:46 +0000 |
CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Werner LEMBERG <wl> 10/02/09 06:05:46
Modified files:
contrib/hdtbl : ChangeLog Makefile.sub
contrib/hdtbl/examples: chess_board.roff col_rowspan_colors.roff
color_boxes.roff
color_nested_tables.roff
color_table_cells.roff
color_transitions.roff fonts_n.in
fonts_x.in mixed_pickles.roff
rainbow.roff short_reference.roff
Log message:
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.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/ChangeLog?cvsroot=groff&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/Makefile.sub?cvsroot=groff&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/examples/chess_board.roff?cvsroot=groff&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/examples/col_rowspan_colors.roff?cvsroot=groff&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/examples/color_boxes.roff?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/examples/color_nested_tables.roff?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/examples/color_table_cells.roff?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/examples/color_transitions.roff?cvsroot=groff&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/examples/fonts_n.in?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/examples/fonts_x.in?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/examples/mixed_pickles.roff?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/examples/rainbow.roff?cvsroot=groff&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/groff/contrib/hdtbl/examples/short_reference.roff?cvsroot=groff&r1=1.6&r2=1.7
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- ChangeLog 9 Feb 2010 06:02:38 -0000 1.32
+++ ChangeLog 9 Feb 2010 06:05:45 -0000 1.33
@@ -1,3 +1,12 @@
+2010-02-09 Werner LEMBEARG <address@hidden>
+
+ 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 <address@hidden>
Fix handling of `common.roff'.
Index: Makefile.sub
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/Makefile.sub,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- Makefile.sub 9 Feb 2010 06:02:38 -0000 1.10
+++ Makefile.sub 9 Feb 2010 06:05:45 -0000 1.11
@@ -91,7 +91,8 @@
.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)|" $< >$@
Index: examples/chess_board.roff
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/examples/chess_board.roff,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- examples/chess_board.roff 23 Jan 2010 07:47:40 -0000 1.6
+++ examples/chess_board.roff 9 Feb 2010 06:05:45 -0000 1.7
@@ -22,9 +22,15 @@
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
Index: examples/col_rowspan_colors.roff
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/examples/col_rowspan_colors.roff,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- examples/col_rowspan_colors.roff 8 Feb 2010 16:42:52 -0000 1.7
+++ examples/col_rowspan_colors.roff 9 Feb 2010 06:05:46 -0000 1.8
@@ -22,9 +22,14 @@
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#
Index: examples/color_boxes.roff
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/examples/color_boxes.roff,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- examples/color_boxes.roff 23 Jan 2010 07:47:40 -0000 1.5
+++ examples/color_boxes.roff 9 Feb 2010 06:05:46 -0000 1.6
@@ -22,9 +22,14 @@
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
Index: examples/color_nested_tables.roff
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/examples/color_nested_tables.roff,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- examples/color_nested_tables.roff 23 Jan 2010 07:47:40 -0000 1.5
+++ examples/color_nested_tables.roff 9 Feb 2010 06:05:46 -0000 1.6
@@ -22,9 +22,15 @@
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
*****
Index: examples/color_table_cells.roff
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/examples/color_table_cells.roff,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- examples/color_table_cells.roff 23 Jan 2010 07:47:40 -0000 1.5
+++ examples/color_table_cells.roff 9 Feb 2010 06:05:46 -0000 1.6
@@ -22,9 +22,14 @@
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
Index: examples/color_transitions.roff
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/examples/color_transitions.roff,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- examples/color_transitions.roff 23 Jan 2010 07:47:40 -0000 1.7
+++ examples/color_transitions.roff 9 Feb 2010 06:05:46 -0000 1.8
@@ -22,9 +22,14 @@
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
Index: examples/fonts_n.in
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/examples/fonts_n.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- examples/fonts_n.in 8 Feb 2010 16:42:52 -0000 1.5
+++ examples/fonts_n.in 9 Feb 2010 06:05:46 -0000 1.6
@@ -5,7 +5,7 @@
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 <address@hidden>.
groff is free software; you can redistribute it and/or modify it under
@@ -34,7 +34,11 @@
.\" ** 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 \
Index: examples/fonts_x.in
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/examples/fonts_x.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- examples/fonts_x.in 8 Feb 2010 16:42:52 -0000 1.5
+++ examples/fonts_x.in 9 Feb 2010 06:05:46 -0000 1.6
@@ -5,7 +5,7 @@
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 <address@hidden>.
groff is free software; you can redistribute it and/or modify it under
@@ -34,7 +34,11 @@
.\" ** 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 \
Index: examples/mixed_pickles.roff
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/examples/mixed_pickles.roff,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- examples/mixed_pickles.roff 23 Jan 2010 07:47:40 -0000 1.5
+++ examples/mixed_pickles.roff 9 Feb 2010 06:05:46 -0000 1.6
@@ -22,7 +22,11 @@
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
.
Index: examples/rainbow.roff
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/examples/rainbow.roff,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- examples/rainbow.roff 8 Feb 2010 16:42:52 -0000 1.7
+++ examples/rainbow.roff 9 Feb 2010 06:05:46 -0000 1.8
@@ -22,7 +22,11 @@
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
.
Index: examples/short_reference.roff
===================================================================
RCS file: /cvsroot/groff/groff/contrib/hdtbl/examples/short_reference.roff,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- examples/short_reference.roff 23 Jan 2010 07:47:40 -0000 1.6
+++ examples/short_reference.roff 9 Feb 2010 06:05:46 -0000 1.7
@@ -22,9 +22,14 @@
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
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff/contrib/hdtbl ChangeLog Makefile.sub exam...,
Werner LEMBERG <=