[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Groff-commit] groff ./ChangeLog doc/pic.ms src/preproc/pic/pic.y
From: |
Werner LEMBERG |
Subject: |
[Groff-commit] groff ./ChangeLog doc/pic.ms src/preproc/pic/pic.y |
Date: |
Wed, 27 Apr 2005 16:52:35 -0400 |
CVSROOT: /cvsroot/groff
Module name: groff
Branch:
Changes by: Werner LEMBERG <address@hidden> 05/04/27 20:52:34
Modified files:
. : ChangeLog
doc : pic.ms
src/preproc/pic: pic.y
Log message:
Implement the rule
position: '(' position ')'
in pic.
* src/preproc/pic/pic.y (position, position_not_place): Handle
additional parentheses.
* doc/pic.ms: Updated.
CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/ChangeLog.diff?tr1=1.813&tr2=1.814&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/doc/pic.ms.diff?tr1=1.28&tr2=1.29&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/groff/groff/src/preproc/pic/pic.y.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.813 groff/ChangeLog:1.814
--- groff/ChangeLog:1.813 Sun Apr 24 06:10:55 2005
+++ groff/ChangeLog Wed Apr 27 20:52:33 2005
@@ -1,3 +1,16 @@
+2005-04-27 Werner LEMBERG <address@hidden>
+
+ Implement the rule
+
+ position: '(' position ')'
+
+ in pic.
+
+ * src/preproc/pic/pic.y (position, position_not_place): Handle
+ additional parentheses.
+
+ * doc/pic.ms: Updated.
+
2005-04-23 Larry Jones <address@hidden>
* src/utils/xtotroff/xtotroff.c (MapFont): Fix variable declaration.
Index: groff/doc/pic.ms
diff -u groff/doc/pic.ms:1.28 groff/doc/pic.ms:1.29
--- groff/doc/pic.ms:1.28 Sat Feb 19 04:23:40 2005
+++ groff/doc/pic.ms Wed Apr 27 20:52:34 2005
@@ -10,7 +10,7 @@
.\" This document was written for free use and redistribution by
.\" Eric S. Raymond <address@hidden> in August 1995.
.\"
-.\" $Id: pic.ms,v 1.28 2005/02/19 04:23:40 wl Exp $
+.\" $Id: pic.ms,v 1.29 2005/04/27 20:52:34 wl Exp $
.\"
.\" Set a proper TeX and LaTeX
.ie t \{\
@@ -2688,6 +2688,7 @@
<position> ::=
<position-not-place>
<place>
+ ( <position> )
.R
.DE
.DS
Index: groff/src/preproc/pic/pic.y
diff -u groff/src/preproc/pic/pic.y:1.16 groff/src/preproc/pic/pic.y:1.17
--- groff/src/preproc/pic/pic.y:1.16 Thu Apr 8 20:43:24 2004
+++ groff/src/preproc/pic/pic.y Wed Apr 27 20:52:34 2005
@@ -1,4 +1,4 @@
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003, 2004, 2005
Free Software Foundation, Inc.
Written by James Clark (address@hidden)
@@ -1135,6 +1135,12 @@
$$.x = pos.x;
$$.y = pos.y;
}
+ | '(' place ')'
+ {
+ position pos = $2;
+ $$.x = pos.x;
+ $$.y = pos.y;
+ }
;
position_not_place:
@@ -1145,11 +1151,21 @@
$$.x = $1.x + $3.x;
$$.y = $1.y + $3.y;
}
+ | '(' position '+' expr_pair ')'
+ {
+ $$.x = $2.x + $4.x;
+ $$.y = $2.y + $4.y;
+ }
| position '-' expr_pair
{
$$.x = $1.x - $3.x;
$$.y = $1.y - $3.y;
}
+ | '(' position '-' expr_pair ')'
+ {
+ $$.x = $2.x - $4.x;
+ $$.y = $2.y - $4.y;
+ }
| '(' position ',' position ')'
{
$$.x = $2.x;
@@ -1160,11 +1176,21 @@
$$.x = (1.0 - $1)*$3.x + $1*$5.x;
$$.y = (1.0 - $1)*$3.y + $1*$5.y;
}
+ | '(' expr between position AND position ')'
+ {
+ $$.x = (1.0 - $2)*$4.x + $2*$6.x;
+ $$.y = (1.0 - $2)*$4.y + $2*$6.y;
+ }
| expr '<' position ',' position '>'
{
$$.x = (1.0 - $1)*$3.x + $1*$5.x;
$$.y = (1.0 - $1)*$3.y + $1*$5.y;
}
+ | '(' expr '<' position ',' position '>' ')'
+ {
+ $$.x = (1.0 - $2)*$4.x + $2*$6.x;
+ $$.y = (1.0 - $2)*$4.y + $2*$6.y;
+ }
;
between:
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Groff-commit] groff ./ChangeLog doc/pic.ms src/preproc/pic/pic.y,
Werner LEMBERG <=