[Groff-commit] groff ChangeLog src/preproc/pic/common.cpp src/...

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Changes by:     Werner LEMBERG <wl>     07/04/10 08:13:42

Modified files:
        .              : ChangeLog 
        src/preproc/pic: common.cpp common.h object.cpp output.h 

Log message:
        In pic, make rounded boxes work with colors.  Reported by Urs Eggli
        <address@hidden>.
        
        * src/preproc/pic/common.h (common_output), src/preproc/pix/output.h
        (output): Add color parameter to `rounded_box' member function.
        
        * src/preproc/pic/common.cpp (common_output::rounded_box): Use it.
        
        * src/preproc/pic/object.cpp (box_object::print): Pass `color_fill'
        to `out->rounded_box'.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/ChangeLog?cvsroot=groff&r1=1.1083&r2=1.1084
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/pic/common.cpp?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/pic/common.h?cvsroot=groff&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/pic/object.cpp?cvsroot=groff&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/groff/src/preproc/pic/output.h?cvsroot=groff&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groff/groff/ChangeLog,v
retrieving revision 1.1083
retrieving revision 1.1084
diff -u -b -r1.1083 -r1.1084
--- ChangeLog   9 Apr 2007 08:00:40 -0000       1.1083
+++ ChangeLog   10 Apr 2007 08:13:41 -0000      1.1084
@@ -1,3 +1,16 @@
+2007-04-10  Werner LEMBERG  <address@hidden>
+
+       In pic, make rounded boxes work with colors.  Reported by Urs Eggli
+       <address@hidden>.
+
+       * src/preproc/pic/common.h (common_output), src/preproc/pix/output.h
+       (output): Add color parameter to `rounded_box' member function.
+
+       * src/preproc/pic/common.cpp (common_output::rounded_box): Use it.
+
+       * src/preproc/pic/object.cpp (box_object::print): Pass `color_fill'
+       to `out->rounded_box'.
+
 2007-04-09  Michail Vidiassov  <address@hidden>
 
        * font/devps/generate/textmap: Add Greek letters and some more.

Index: src/preproc/pic/common.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/pic/common.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/preproc/pic/common.cpp  26 May 2005 21:02:01 -0000      1.5
+++ src/preproc/pic/common.cpp  10 Apr 2007 08:13:42 -0000      1.6
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2003, 2007
+   Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
 This file is part of groff.
@@ -319,9 +320,10 @@
 
 
 void common_output::rounded_box(const position &cent, const distance &dim,
-                               double rad, const line_type &lt, double fill)
+                               double rad, const line_type &lt,
+                               double fill, char *color_fill)
 {
-  if (fill >= 0.0)
+  if (fill >= 0.0 || color_fill)
     filled_rounded_box(cent, dim, rad, fill);
   switch (lt.type) {
   case line_type::invisible:

Index: src/preproc/pic/common.h
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/pic/common.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/preproc/pic/common.h    26 May 2005 21:02:01 -0000      1.5
+++ src/preproc/pic/common.h    10 Apr 2007 08:13:42 -0000      1.6
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 1993, 2003
+/* Copyright (C) 1989, 1990, 1991, 1992, 1993, 2003, 2007
    Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -53,7 +53,8 @@
                          const line_type &);
   void solid_rounded_box(const position &, const distance &, double,
                         const line_type &);
-  void filled_rounded_box(const position &, const distance &, double, double);
+  void filled_rounded_box(const position &, const distance &, double,
+                         double);
 public:
   void start_picture(double sc, const position &ll, const position &ur) = 0;
   void finish_picture() = 0;
@@ -68,7 +69,7 @@
   void ellipse(const position &, const distance &,
               const line_type &, double) = 0;
   void rounded_box(const position &, const distance &, double,
-                  const line_type &, double);
+                  const line_type &, double, char *);
   void set_color(char *, char *) = 0;
   void reset_color() = 0;
   char *get_last_filled() = 0;

Index: src/preproc/pic/object.cpp
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/pic/object.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/preproc/pic/object.cpp  19 Mar 2006 14:56:52 -0000      1.7
+++ src/preproc/pic/object.cpp  10 Apr 2007 08:13:42 -0000      1.8
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 /* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004, 2005,
-                 2006
+                 2006, 2007
      Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
@@ -783,7 +783,7 @@
   }
   else {
     distance abs_dim(fabs(dim.x), fabs(dim.y));
-    out->rounded_box(cent, abs_dim, fabs(xrad), lt, fill);
+    out->rounded_box(cent, abs_dim, fabs(xrad), lt, fill, color_fill);
   }
   out->reset_color();
 }

Index: src/preproc/pic/output.h
===================================================================
RCS file: /cvsroot/groff/groff/src/preproc/pic/output.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/preproc/pic/output.h    26 May 2005 21:02:01 -0000      1.4
+++ src/preproc/pic/output.h    10 Apr 2007 08:13:42 -0000      1.5
@@ -1,5 +1,6 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2007
+     Free Software Foundation, Inc.
      Written by James Clark (address@hidden)
 
 This file is part of groff.
@@ -54,7 +55,7 @@
   virtual void ellipse(const position &, const distance &,
                       const line_type &, double) = 0;
   virtual void rounded_box(const position &, const distance &, double,
-                          const line_type &, double) = 0;
+                          const line_type &, double, char *) = 0;
   virtual void command(const char *, const char *, int) = 0;
   virtual void set_location(const char *, int) {}
   virtual void set_color(char *, char *) = 0;