CVSROOT: /cvsroot/groff
Module name: groff
Changes by: Werner LEMBERG <wl> 07/03/21 13:30:59
Modified files:
. : ChangeLog
doc : pic.ms
src/preproc/eqn: box.cpp
tmac : trace.tmac
Log message:
* tmac/trace.tmac (rn): Added.
(nr, ds, ds1, as, as1, substring): Restore escape character while
executing the macro.
(nr): Remove dead code.
* src/preproc/eqn/box.cpp (box::top_level): Use \E in string
definitions to make them traceable.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1079&r2=1.1080
http://cvs.savannah.gnu.org/viewcvs/groff/doc/pic.ms?cvsroot=groff&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/eqn/box.cpp?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/tmac/trace.tmac?cvsroot=groff&r1=1.13&r2=1.14
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1079
retrieving revision 1.1080
diff -u -b -r1.1079 -r1.1080
--- ChangeLog 19 Mar 2007 08:04:29 -0000 1.1079
+++ ChangeLog 21 Mar 2007 13:30:59 -0000 1.1080
@@ -1,3 +1,13 @@
+2007-03-20 Werner LEMBERG <[EMAIL PROTECTED]>
+
+ * tmac/trace.tmac (rn): Added.
+ (nr, ds, ds1, as, as1, substring): Restore escape character while
+ executing the macro.
+ (nr): Remove dead code.
+
+ * src/preproc/eqn/box.cpp (box::top_level): Use \E in string
+ definitions to make them traceable.
+
2007-03-19 Werner LEMBERG <[EMAIL PROTECTED]>
* src/roff/troff/input.cpp (get_copy): Add third argument to control
Index: doc/pic.ms
===================================================================
RCS file: /cvsroot/groff/groff/doc/pic.ms,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- doc/pic.ms 11 Dec 2006 16:12:15 -0000 1.34
+++ doc/pic.ms 21 Mar 2007 13:30:59 -0000 1.35
@@ -1,4 +1,4 @@
-.\" Copyright (C) 2006
+.\" Copyright (C) 2006, 2007
.\" Free Software Foundation, Inc.
.\" Written by Eric S. Raymond <[EMAIL PROTECTED]>
.\"
@@ -31,7 +31,7 @@
.\" Eric S. Raymond <[EMAIL PROTECTED]> in August 1995. It has been put
.\" under the GPL in March 2006.
.\"
-.\" $Id: pic.ms,v 1.34 2006/12/11 16:12:15 wl Exp $
+.\" $Id: pic.ms,v 1.35 2007/03/21 13:30:59 wl Exp $
.
.
.\" Set a proper TeX and LaTeX
@@ -701,7 +701,7 @@
.PP
It is possible to fill boxes, circles, and ellipses. The
modifier \fBfill[ed]\fP accomplishes this. You can suffix it with a fill
-value; the default is given by the stule variable \fBfillval\fP.
+value; the default is given by the style variable \fBfillval\fP.
.PP
DWB \fBpic\fP and \fBgpic\fP have opposite conventions for fill values
and different defaults. DWB \fBfillval\fP defaults to 0.3 and smaller
Index: src/preproc/eqn/box.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/eqn/box.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/preproc/eqn/box.cpp 5 Feb 2007 15:24:56 -0000 1.5
+++ src/preproc/eqn/box.cpp 21 Mar 2007 13:30:59 -0000 1.6
@@ -315,23 +315,21 @@
SAVED_MARK_REG "]u-\\n[" MARK_REG "]u'\n");
else
assert(r == FOUND_NOTHING);
- // The problem here is that the argument to \f is read in copy mode,
- // so we cannot use \E there; so we hide it in a string instead.
- // Another problem is that if we use \R directly, then the space will
- // prevent it working in a macro argument.
+ // If we use \R directly, the space will prevent it working in a
+ // macro argument; so we hide it in a string instead.
printf(".ds " SAVE_FONT_STRING " "
- "\\R'" SAVED_INLINE_FONT_REG " \\\\n[.f]'"
+ "\\R'" SAVED_INLINE_FONT_REG " \\En[.f]'"
"\\fP"
- "\\R'" SAVED_INLINE_PREV_FONT_REG " \\\\n[.f]'"
- "\\R'" SAVED_INLINE_SIZE_REG " \\\\n[.ps]'"
+ "\\R'" SAVED_INLINE_PREV_FONT_REG " \\En[.f]'"
+ "\\R'" SAVED_INLINE_SIZE_REG " \\En[.ps]'"
"\\s0"
- "\\R'" SAVED_INLINE_PREV_SIZE_REG " \\\\n[.ps]'"
+ "\\R'" SAVED_INLINE_PREV_SIZE_REG " \\En[.ps]'"
"\n"
".ds " RESTORE_FONT_STRING " "
- "\\f[\\\\n[" SAVED_INLINE_PREV_FONT_REG "]]"
- "\\f[\\\\n[" SAVED_INLINE_FONT_REG "]]"
- "\\s'\\\\n[" SAVED_INLINE_PREV_SIZE_REG "]u'"
- "\\s'\\\\n[" SAVED_INLINE_SIZE_REG "]u'"
+ "\\f[\\En[" SAVED_INLINE_PREV_FONT_REG "]]"
+ "\\f[\\En[" SAVED_INLINE_FONT_REG "]]"
+ "\\s'\\En[" SAVED_INLINE_PREV_SIZE_REG "]u'"
+ "\\s'\\En[" SAVED_INLINE_SIZE_REG "]u'"
"\n");
printf(".as1 " LINE_STRING " \\&\\E*[" SAVE_FONT_STRING "]");
printf("\\f[%s]", get_gfont());
Index: tmac/trace.tmac
===================================================================
RCS file: /cvsroot/groff/groff/tmac/trace.tmac,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- tmac/trace.tmac 15 Mar 2007 20:29:44 -0000 1.13
+++ tmac/trace.tmac 21 Mar 2007 13:30:59 -0000 1.14
@@ -14,10 +14,11 @@
.rn nr !!nr
.
.de nr
-. do !!ds !!!inc \$2
-. do !!substring !!!inc 0 0
+. do ecs
+. ec
. do !!nr \$*
. do tm1 "\*[!!!sp]*** .nr \$* (-> \n[\$1])
+. do ecr
..
.
.rn ds !!ds
@@ -26,23 +27,35 @@
.rn as1 !!as1
.
.de ds
+. do ecs
+. ec
. do tm1 "\*[!!!sp]*** .ds \$^
. do !!ds \$^\"
+. do ecr
..
.
.de ds1
+. do ecs
+. ec
. do tm1 "\*[!!!sp]*** .ds1 \$^
. do !!ds1 \$^\"
+. do ecr
..
.
.de as
+. do ecs
+. ec
. do tm1 "\*[!!!sp]*** .as \$^
. do !!as \$^\"
+. do ecr
..
.
.de as1
+. do ecs
+. ec
. do tm1 "\*[!!!sp]*** .as1 \$^
. do !!as1 \$^\"
+. do ecr
..
.
.rn de !!de
@@ -161,8 +174,11 @@
.rn substring !!substring
.
.!!de1 substring
+. do ecs
+. ec
. !!substring \$*
. tm1 "\*[!!!sp]*** .substring \$* (-> `\*[\$1]')
+. do ecr
..
.
.rn als !!als
@@ -174,6 +190,15 @@
. tm1 "\*[!!!sp]*** .als \$1 \$2
..
.
+.rn rn !!rn
+.
+.!!de1 rn
+. !!rn \$1 \$2
+. if d !!\$1 \
+. !!rn !!\$1 !!\$2
+. tm1 "\*[!!!sp]*** .rn \$1 \$2
+..
+.
.ec
.
.cp \n(_C
_______________________________________________
Groff-commit mailing list
Groff-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/groff-commit
