Renamed all `*.cc' files to `*.cpp'.

Updated all configuration files, makefiles, and documentation.

149 files changed, 185 insertions, 176 deletions

diff --git a/ChangeLog b/ChangeLog
index a9b42486..1da009ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
+2003-04-15  Werner LEMBERG  <wl@gnu.org>
+
+	Renamed all `*.cc' files to `*.cpp'.
+	Updated all configuration files, makefiles, and documentation.
+
 2003-04-14  Werner LEMBERG  <wl@gnu.org>
 
+	* tmac/hyphenex.sh: Slight improvements.
+
+2003-04-13  Werner LEMBERG  <wl@gnu.org>
+
 	* font/devascii/R.proto, font/devcp1037/R.proto,
 	font/devlatin1/R.proto, font/devutf8/R.proto: Fill up remaining
 	character slots with unnamed glyphs.
diff --git a/INSTALL b/INSTALL
index 4ac29c3d..c009b6de 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ This file contains information that supplements those instructions.
 MS-Windows, see the file arch/djgpp/README.)
 
 groff is written in C++, so you will need a C++ compiler.  The C++
-source files use a suffix of `.cc', so your C++ compiler must be able
+source files use a suffix of `.cpp', so your C++ compiler must be able
 to handle this.  If you don't already have a C++ compiler, I suggest
 gcc 2.7.1 or later (gcc version 2 includes GNU C++ as well as GNU C).
 From gcc 2.5, it is no longer necessary to install libg++: the C++
diff --git a/MANIFEST b/MANIFEST
index 72325da4..c0ce12e7 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,6 +1,6 @@
 MANIFEST 
 
-Last update: 11 Mar 2003
+Last update: 13 Apr 2003
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -144,12 +144,12 @@ The groff documentation is scattered upon several places.
 4) The roff parser
 
 The parsing of the roff language is done by troff.  The input is converted
-to tokens in `src/roff/troff/input.cc' and transformed into `nodes' by
-`src/roff/troff/env.cc' and `src/roff/troff/node.cc'.  From these, the
-intermediate output is generated (also in `node.cc').
+to tokens in `src/roff/troff/input.cpp' and transformed into `nodes' by
+`src/roff/troff/env.cpp' and `src/roff/troff/node.cpp'.  From these, the
+intermediate output is generated (also in `node.cpp').
 
 
 5) Postprocessing
 
 The parser for the intermediate output and the postprocessing is in
-`src/libs/libdriver/input.cc'.  This is used by all postprocessors.
+`src/libs/libdriver/input.cpp'.  This is used by all postprocessors.
diff --git a/Makefile.ccpg b/Makefile.ccpg
index b89fab1f..ec46a94e 100644
--- a/Makefile.ccpg
+++ b/Makefile.ccpg
@@ -9,7 +9,7 @@ MAKEFILEPARTS=\
 all: $(PROG) $(MANPAGES)
 
 $(PROG): $(OBJS) $(XLIBS)
-	$(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
+	$(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
 
 install_bin: install_prog
 install_prog: $(PROG)
@@ -30,4 +30,4 @@ pure: $(PROG).pure
 
 $(PROG).pure: $(OBJS) $(XLIBS)
 	$(PURIFY) $(PURIFYCCFLAGS) \
-	  $(LINK.cc) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
+	  $(LINK.cpp) -o $@ $(OBJS) $(XLIBS) $(LIBS) $(MLIB)
diff --git a/Makefile.comm b/Makefile.comm
index 58017fbb..fd27b8ec 100644
--- a/Makefile.comm
+++ b/Makefile.comm
@@ -23,10 +23,10 @@ SHELL=/bin/sh
 INCLUDES=-I. -I$(srcdir) \
   -I$(top_builddir)/src/include -I$(top_srcdir)/src/include
 ALL_CCFLAGS=$(INCLUDES) $(CCDEFINES) $(CCFLAGS) $(CPPFLAGS)
-COMPILE.cc=$(CCC) $(ALL_CCFLAGS) -c
+COMPILE.cpp=$(CCC) $(ALL_CCFLAGS) -c
 ALL_CFLAGS=$(INCLUDES) $(CDEFINES) $(CFLAGS) $(CPPFLAGS)
 COMPILE.c=$(CC) $(ALL_CFLAGS) -c
-LINK.cc=$(CCC) $(CCFLAGS) $(LDFLAGS)
+LINK.cpp=$(CCC) $(CCFLAGS) $(LDFLAGS)
 LINK.c=$(CC) $(CFLAGS) $(LDFLAGS)
 LIBGROFF=$(top_builddir)/src/libs/libgroff/libgroff.$(LIBEXT)
 LIBBIB=$(top_builddir)/src/libs/libbib/libbib.$(LIBEXT)
@@ -96,21 +96,21 @@ extraclean: distclean
 	-rm -f \#* *~ =* core junk grot old temp tmp tem
 
 .SUFFIXES:
-.SUFFIXES: .o .obj .cc .c .y .man .n
+.SUFFIXES: .o .obj .cpp .c .y .man .n
 
-.cc.o:
-	$(COMPILE.cc) $<
+.cpp.o:
+	$(COMPILE.cpp) $<
 
 .c.o:
 	$(COMPILE.c) $<
 
-.cc.obj:
-	$(COMPILE.cc) $<
+.cpp.obj:
+	$(COMPILE.cpp) $<
 
 .c.obj:
 	$(COMPILE.c) $<
 
-.y.cc:
+.y.cpp:
 	if test -n "$(YTABH)"; then \
 	  $(YACC) $(YACCFLAGS) -d $<; \
 	else \
@@ -122,7 +122,7 @@ extraclean: distclean
 	if test -n "$(YTABH)"; then mv y_tab.h $(YTABH); fi
 
 # The next rule is needed for make of Solaris 2.5.1 to override its
-# built-in .y.o rule (which takes precedence over the .y.cc rule above).
+# built-in .y.o rule (which takes precedence over the .y.cpp rule above).
 .y.o:
 	if test -n "$(YTABH)"; then \
 	  $(YACC) $(YACCFLAGS) -d $<; \
@@ -133,7 +133,7 @@ extraclean: distclean
 	-test -f y.tab.c && mv y.tab.c y_tab.c
 	mv y_tab.c $(YTABC)
 	if test -n "$(YTABH)"; then mv y_tab.h $(YTABH); fi
-	$(COMPILE.cc) $(YTABC)
+	$(COMPILE.cpp) $(YTABC)
 
 .man.n:
 	@echo Making $@ from $<
diff --git a/Makefile.in b/Makefile.in
index 795f633f..14c525e6 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -280,7 +280,7 @@ DEFINES=@DEFS@
 # in LIBOBJS if your C library is missing the corresponding function.
 LIBOBJS=@LIBOBJS@
 
-# `CCC' is the compiler for C++ (.cc) files.
+# `CCC' is the compiler for C++ (.cpp) files.
 CCC=@CXX@
 CC=@CC@
 # CCDEFINES are definitions for C++ compilations.
diff --git a/aclocal.m4 b/aclocal.m4
index 2457c75c..ef8cd404 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -571,12 +571,12 @@ fi
 AC_LANG_POP(C++)])dnl
 dnl
 dnl
-dnl If mkstemp() isn't available, use our own mkstemp.cc file.
+dnl If mkstemp() isn't available, use our own mkstemp.cpp file.
 dnl
 AC_DEFUN(GROFF_MKSTEMP,
 [AC_MSG_CHECKING([for mkstemp])
 AC_LANG_PUSH(C++)
-AC_LIBSOURCE(mkstemp.cc)
+AC_LIBSOURCE(mkstemp.cpp)
 AC_TRY_LINK([#include <stdlib.h>
 #include <unistd.h>
 int (*f) (char *);],
diff --git a/configure b/configure
index 8dfc37a9..7372b5d8 100755
--- a/configure
+++ b/configure
@@ -267,7 +267,7 @@ PACKAGE_VERSION=
 PACKAGE_STRING=
 PACKAGE_BUGREPORT=
 
-ac_unique_file="src/roff/groff/groff.cc"
+ac_unique_file="src/roff/groff/groff.cpp"
 # Factoring default headers for most tests.
 ac_includes_default="\
 #include <stdio.h>
diff --git a/configure.ac b/configure.ac
index d849198a..d86a3e64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Process this file with autoconf to produce a configure script.
 AC_INIT
 AC_CONFIG_HEADERS(src/include/config.h:src/include/config.hin)
-AC_CONFIG_SRCDIR([src/roff/groff/groff.cc])
+AC_CONFIG_SRCDIR([src/roff/groff/groff.cpp])
 dnl checks for programs
 GROFF_SRCDIR
 GROFF_BUILDDIR
diff --git a/doc/groff.texinfo b/doc/groff.texinfo
index a0460ec3..85e589bc 100644
--- a/doc/groff.texinfo
+++ b/doc/groff.texinfo
@@ -13830,7 +13830,7 @@ postprocessors.  This parser is smarter on whitespace and implements
 obsolete elements for compatibility, otherwise both formats are the
 same.@footnote{The parser and postprocessor for intermediate output
 can be found in the file@*
-@file{@var{groff-source-dir}/src/libs/libdriver/input.cc}.}
+@file{@var{groff-source-dir}/src/libs/libdriver/input.cpp}.}
 
 The main purpose of the intermediate output concept is to facilitate
 the development of postprocessors by providing a common programming
diff --git a/man/groff_out.man b/man/groff_out.man
index d9283d68..b45e82f2 100644
--- a/man/groff_out.man
+++ b/man/groff_out.man
@@ -3,7 +3,7 @@
 .ig
 groff_out.5
 
-Last update: 12 Apr 2003
+Last update: 13 Apr 2003
 
 This file is part of groff, the GNU roff type-setting system.
 
@@ -1735,7 +1735,7 @@ Device description file for device
 .IR name .
 .
 .TP
-.IB \[la]groff_source_dir\[ra] /src/libs/libdriver/input.cc
+.IB \[la]groff_source_dir\[ra] /src/libs/libdriver/input.cpp
 Defines the parser and postprocessor for the intermediate output.
 .
 It is located relative to the top directory of the
diff --git a/src/devices/grodvi/Makefile.sub b/src/devices/grodvi/Makefile.sub
index 74e627db..16dc24ce 100644
--- a/src/devices/grodvi/Makefile.sub
+++ b/src/devices/grodvi/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=grodvi.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=dvi.$(OBJEXT)
-CCSRCS=$(srcdir)/dvi.cc
+CCSRCS=$(srcdir)/dvi.cpp
diff --git a/src/devices/grodvi/dvi.cc b/src/devices/grodvi/dvi.cpp
index df169390..df169390 100644
--- a/src/devices/grodvi/dvi.cc
+++ b/src/devices/grodvi/dvi.cpp
diff --git a/src/devices/grohtml/Makefile.sub b/src/devices/grohtml/Makefile.sub
index 33e41f8f..ad673cf5 100644
--- a/src/devices/grohtml/Makefile.sub
+++ b/src/devices/grohtml/Makefile.sub
@@ -8,10 +8,10 @@ OBJS=\
   html-text.$(OBJEXT) \
   output.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/post-html.cc \
-  $(srcdir)/html-table.cc \
-  $(srcdir)/html-text.cc \
-  $(srcdir)/output.cc
+  $(srcdir)/post-html.cpp \
+  $(srcdir)/html-table.cpp \
+  $(srcdir)/html-text.cpp \
+  $(srcdir)/output.cpp
 HDRS=\
   $(srcdir)/html.h \
   $(srcdir)/html-table.h \
diff --git a/src/devices/grohtml/html-table.cc b/src/devices/grohtml/html-table.cpp
index 9ff41fe9..3585cd31 100644
--- a/src/devices/grohtml/html-table.cc
+++ b/src/devices/grohtml/html-table.cpp
@@ -1,7 +1,7 @@
 // -*- C++ -*-
 /* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
  *
- *  Gaius Mulley (gaius@glam.ac.uk) wrote html-table.cc
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote html-table.cpp
  *
  *  html-table.h
  *
diff --git a/src/devices/grohtml/html-table.h b/src/devices/grohtml/html-table.h
index 3152060c..c26eb6d7 100644
--- a/src/devices/grohtml/html-table.h
+++ b/src/devices/grohtml/html-table.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
-/* Copyright (C) 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
  *
- *  Gaius Mulley (gaius@glam.ac.uk) wrote html-table.cc
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote html-table.h
  *
  *  html-table.h
  *
diff --git a/src/devices/grohtml/html-text.cc b/src/devices/grohtml/html-text.cpp
index 8087dd22..ec805331 100644
--- a/src/devices/grohtml/html-text.cc
+++ b/src/devices/grohtml/html-text.cpp
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 /* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  *
- *  Gaius Mulley (gaius@glam.ac.uk) wrote html-text.cc
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote html-text.cpp
  *
- *  html-text.cc
+ *  html-text.cpp
  *
  *  provide a troff like state machine interface which
  *  generates html text.
diff --git a/src/devices/grohtml/html-text.h b/src/devices/grohtml/html-text.h
index c43cbda1..ba23671e 100644
--- a/src/devices/grohtml/html-text.h
+++ b/src/devices/grohtml/html-text.h
@@ -1,7 +1,7 @@
 // -*- C++ -*-
-/* Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  *
- *  Gaius Mulley (gaius@glam.ac.uk) wrote html-text.cc
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote html-text.h
  *
  *  html-text.h
  *
@@ -47,7 +47,7 @@ typedef struct tag_definition {
 
 /*
  *  the state of the current paragraph.
- *  It allows post-html.cc to request font changes, paragraph start/end
+ *  It allows post-html.cpp to request font changes, paragraph start/end
  *  and emits balanced tags with a small amount of peephole optimization.
  */
 
diff --git a/src/devices/grohtml/output.cc b/src/devices/grohtml/output.cpp
index 7bc27310..2705b9e4 100644
--- a/src/devices/grohtml/output.cc
+++ b/src/devices/grohtml/output.cpp
@@ -1,13 +1,13 @@
 // -*- C++ -*-
 /* Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
  *
- *  Gaius Mulley (gaius@glam.ac.uk) wrote output.cc
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote output.cpp
  *  but it owes a huge amount of ideas and raw code from
- *  James Clark (jjc@jclark.com) grops/ps.cc.
+ *  James Clark (jjc@jclark.com) grops/ps.cpp.
  *
- *  output.cc
+ *  output.cpp
  *
- *  provide the simple low level output routines needed by html.cc
+ *  provide the simple low level output routines needed by html.cpp
  */
 
 /*
diff --git a/src/devices/grohtml/post-html.cc b/src/devices/grohtml/post-html.cpp
index 3445d4e4..f403f324 100644
--- a/src/devices/grohtml/post-html.cc
+++ b/src/devices/grohtml/post-html.cpp
@@ -1,9 +1,9 @@
 // -*- C++ -*-
 /* Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
  *
- *  Gaius Mulley (gaius@glam.ac.uk) wrote post-html.cc
+ *  Gaius Mulley (gaius@glam.ac.uk) wrote post-html.cpp
  *  but it owes a huge amount of ideas and raw code from
- *  James Clark (jjc@jclark.com) grops/ps.cc.
+ *  James Clark (jjc@jclark.com) grops/ps.cpp.
  */
 
 /*
diff --git a/src/devices/grolbp/Makefile.sub b/src/devices/grolbp/Makefile.sub
index d8000d16..a2372933 100644
--- a/src/devices/grolbp/Makefile.sub
+++ b/src/devices/grolbp/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=grolbp.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=lbp.$(OBJEXT)
-CCSRCS=$(srcdir)/lbp.cc
+CCSRCS=$(srcdir)/lbp.cpp
diff --git a/src/devices/grolbp/lbp.cc b/src/devices/grolbp/lbp.cpp
index b34a1e08..b34a1e08 100644
--- a/src/devices/grolbp/lbp.cc
+++ b/src/devices/grolbp/lbp.cpp
diff --git a/src/devices/grolj4/Makefile.sub b/src/devices/grolj4/Makefile.sub
index 21c37805..9899b7a5 100644
--- a/src/devices/grolj4/Makefile.sub
+++ b/src/devices/grolj4/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=grolj4.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=lj4.$(OBJEXT)
-CCSRCS=$(srcdir)/lj4.cc
+CCSRCS=$(srcdir)/lj4.cpp
diff --git a/src/devices/grolj4/lj4.cc b/src/devices/grolj4/lj4.cpp
index 1332e198..1332e198 100644
--- a/src/devices/grolj4/lj4.cc
+++ b/src/devices/grolj4/lj4.cpp
diff --git a/src/devices/grops/Makefile.sub b/src/devices/grops/Makefile.sub
index ee2e6d1c..e1595cb5 100644
--- a/src/devices/grops/Makefile.sub
+++ b/src/devices/grops/Makefile.sub
@@ -6,7 +6,7 @@ OBJS=\
   ps.$(OBJEXT) \
   psrm.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/ps.cc \
-  $(srcdir)/psrm.cc
+  $(srcdir)/ps.cpp \
+  $(srcdir)/psrm.cpp
 HDRS=\
   $(srcdir)/ps.h
diff --git a/src/devices/grops/ps.cc b/src/devices/grops/ps.cpp
index f1c094b4..f1c094b4 100644
--- a/src/devices/grops/ps.cc
+++ b/src/devices/grops/ps.cpp
diff --git a/src/devices/grops/psrm.cc b/src/devices/grops/psrm.cpp
index ab94ffee..ab94ffee 100644
--- a/src/devices/grops/psrm.cc
+++ b/src/devices/grops/psrm.cpp
diff --git a/src/devices/grotty/Makefile.sub b/src/devices/grotty/Makefile.sub
index 8802674c..2ec77a54 100644
--- a/src/devices/grotty/Makefile.sub
+++ b/src/devices/grotty/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=grotty.n
 XLIBS=$(LIBDRIVER) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=tty.$(OBJEXT)
-CCSRCS=$(srcdir)/tty.cc
+CCSRCS=$(srcdir)/tty.cpp
diff --git a/src/devices/grotty/tty.cc b/src/devices/grotty/tty.cpp
index c44f627c..c44f627c 100644
--- a/src/devices/grotty/tty.cc
+++ b/src/devices/grotty/tty.cpp
diff --git a/src/include/html-strings.h b/src/include/html-strings.h
index 23a36d16..fd757c3f 100644
--- a/src/include/html-strings.h
+++ b/src/include/html-strings.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/* Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
      Written by Gaius Mulley (gaius@glam.ac.uk).
 
 This file is part of groff.
@@ -20,7 +20,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 /*
  *  defines the image tags issued by the pre-processors (tbl, pic, eqn)
- *  and later detected by pre-html.cc
+ *  and later detected by pre-html.cpp
  */
 
 #define HTML_IMAGE_INLINE_BEGIN	"\\O[HTML-IMAGE-INLINE-BEGIN]"
diff --git a/src/include/lib.h b/src/include/lib.h
index de4c9cd9..3e6cb231 100644
--- a/src/include/lib.h
+++ b/src/include/lib.h
@@ -69,7 +69,7 @@ extern "C" {
 
 #ifndef HAVE_MKSTEMP
 /* since mkstemp() is defined as a real C++ function if taken from
-   groff's mkstemp.cc we need a declaration */
+   groff's mkstemp.cpp we need a declaration */
 int mkstemp(char *tmpl);
 #endif /* HAVE_MKSTEMP */
 
diff --git a/src/include/printer.h b/src/include/printer.h
index a0fe4ea2..3976215b 100644
--- a/src/include/printer.h
+++ b/src/include/printer.h
@@ -33,7 +33,7 @@
    postprocessor only needs to implement a derived class of `printer' and
    a suitable function `make_printer' for the device-dependent tasks.
    Then the methods of class `printer' are called automatically by
-   `do_file()' in `input.cc'.
+   `do_file()' in `input.cpp'.
 */
 
 #include "color.h"
diff --git a/src/libs/libbib/Makefile.sub b/src/libs/libbib/Makefile.sub
index 6e59d64a..19dd4391 100644
--- a/src/libs/libbib/Makefile.sub
+++ b/src/libs/libbib/Makefile.sub
@@ -6,9 +6,9 @@ OBJS=\
   search.$(OBJEXT) \
   map.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/common.cc \
-  $(srcdir)/index.cc \
-  $(srcdir)/linear.cc \
-  $(srcdir)/search.cc
+  $(srcdir)/common.cpp \
+  $(srcdir)/index.cpp \
+  $(srcdir)/linear.cpp \
+  $(srcdir)/search.cpp
 CSRCS=\
   $(srcdir)/map.c
diff --git a/src/libs/libbib/common.cc b/src/libs/libbib/common.cpp
index 4b2bcca2..4b2bcca2 100644
--- a/src/libs/libbib/common.cc
+++ b/src/libs/libbib/common.cpp
diff --git a/src/libs/libbib/index.cc b/src/libs/libbib/index.cpp
index 3633df1c..3633df1c 100644
--- a/src/libs/libbib/index.cc
+++ b/src/libs/libbib/index.cpp
diff --git a/src/libs/libbib/linear.cc b/src/libs/libbib/linear.cpp
index 1dd902b8..1dd902b8 100644
--- a/src/libs/libbib/linear.cc
+++ b/src/libs/libbib/linear.cpp
diff --git a/src/libs/libbib/search.cc b/src/libs/libbib/search.cpp
index 2223fb64..2223fb64 100644
--- a/src/libs/libbib/search.cc
+++ b/src/libs/libbib/search.cpp
diff --git a/src/libs/libdriver/Makefile.sub b/src/libs/libdriver/Makefile.sub
index 547b8c09..5d37e2a4 100644
--- a/src/libs/libdriver/Makefile.sub
+++ b/src/libs/libdriver/Makefile.sub
@@ -3,5 +3,5 @@ OBJS=\
   input.$(OBJEXT) \
   printer.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/input.cc \
-  $(srcdir)/printer.cc
+  $(srcdir)/input.cpp \
+  $(srcdir)/printer.cpp
diff --git a/src/libs/libdriver/input.cc b/src/libs/libdriver/input.cpp
index abe2e20e..acb6f137 100644
--- a/src/libs/libdriver/input.cc
+++ b/src/libs/libdriver/input.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-// <groff_src_dir>/src/libs/libdriver/input.cc
+// <groff_src_dir>/src/libs/libdriver/input.cpp
 
 /* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003
    Free Software Foundation, Inc.
@@ -337,7 +337,7 @@ public:
  **********************************************************************/
 
 // exported as extern by error.h (called from driver.h)
-// needed for error messages (see ../libgroff/error.cc)
+// needed for error messages (see ../libgroff/error.cpp)
 const char *current_filename = 0; // printable name of the current file
 				  // printable name of current source file
 const char *current_source_filename = 0;
@@ -351,7 +351,7 @@ printer *pr;
 // Note:
 //
 //   We rely on an implementation of the `new' operator which aborts
-//   gracefully if it can't allocate memory (e.g. from libgroff/new.cc).
+//   gracefully if it can't allocate memory (e.g. from libgroff/new.cpp).
 
 
 /**********************************************************************
diff --git a/src/libs/libdriver/printer.cc b/src/libs/libdriver/printer.cpp
index bc7eb86f..179daf17 100644
--- a/src/libs/libdriver/printer.cc
+++ b/src/libs/libdriver/printer.cpp
@@ -1,6 +1,6 @@
 // -*- C++ -*-
 
-// <groff_src_dir>/src/libs/libdriver/printer.cc
+// <groff_src_dir>/src/libs/libdriver/printer.cpp
 
 /* Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003
    Free Software Foundation, Inc.
diff --git a/src/libs/libgroff/.cvsignore b/src/libs/libgroff/.cvsignore
index 7176c228..337b855a 100644
--- a/src/libs/libgroff/.cvsignore
+++ b/src/libs/libgroff/.cvsignore
@@ -1,2 +1,2 @@
 Makefile.dep
-version.cc
+version.cpp
diff --git a/src/libs/libgroff/Makefile.sub b/src/libs/libgroff/Makefile.sub
index 5ef258fc..30277ab5 100644
--- a/src/libs/libgroff/Makefile.sub
+++ b/src/libs/libgroff/Makefile.sub
@@ -39,39 +39,39 @@ OBJS=\
   version.$(OBJEXT) \
   $(LIBOBJS)
 CCSRCS=\
-  $(srcdir)/assert.cc \
-  $(srcdir)/change_lf.cc \
-  $(srcdir)/cmap.cc \
-  $(srcdir)/color.cc \
-  $(srcdir)/cset.cc \
-  $(srcdir)/device.cc \
-  $(srcdir)/errarg.cc \
-  $(srcdir)/error.cc \
-  $(srcdir)/fatal.cc \
-  $(srcdir)/filename.cc \
-  $(srcdir)/font.cc \
-  $(srcdir)/fontfile.cc \
-  $(srcdir)/geometry.cc \
-  $(srcdir)/htmlhint.cc \
-  $(srcdir)/invalid.cc \
-  $(srcdir)/lf.cc \
-  $(srcdir)/lineno.cc \
-  $(srcdir)/macropath.cc \
-  $(srcdir)/maxfilename.cc \
-  $(srcdir)/mksdir.cc \
-  $(srcdir)/mkstemp.cc \
-  $(srcdir)/nametoindex.cc \
-  $(srcdir)/new.cc \
-  $(srcdir)/paper.cc \
-  $(srcdir)/prime.cc \
-  $(srcdir)/progname.cc \
-  $(srcdir)/ptable.cc \
-  $(srcdir)/searchpath.cc \
-  $(srcdir)/string.cc \
-  $(srcdir)/strsave.cc \
-  $(srcdir)/tmpfile.cc \
-  $(srcdir)/tmpname.cc \
-  version.cc
+  $(srcdir)/assert.cpp \
+  $(srcdir)/change_lf.cpp \
+  $(srcdir)/cmap.cpp \
+  $(srcdir)/color.cpp \
+  $(srcdir)/cset.cpp \
+  $(srcdir)/device.cpp \
+  $(srcdir)/errarg.cpp \
+  $(srcdir)/error.cpp \
+  $(srcdir)/fatal.cpp \
+  $(srcdir)/filename.cpp \
+  $(srcdir)/font.cpp \
+  $(srcdir)/fontfile.cpp \
+  $(srcdir)/geometry.cpp \
+  $(srcdir)/htmlhint.cpp \
+  $(srcdir)/invalid.cpp \
+  $(srcdir)/lf.cpp \
+  $(srcdir)/lineno.cpp \
+  $(srcdir)/macropath.cpp \
+  $(srcdir)/maxfilename.cpp \
+  $(srcdir)/mksdir.cpp \
+  $(srcdir)/mkstemp.cpp \
+  $(srcdir)/nametoindex.cpp \
+  $(srcdir)/new.cpp \
+  $(srcdir)/paper.cpp \
+  $(srcdir)/prime.cpp \
+  $(srcdir)/progname.cpp \
+  $(srcdir)/ptable.cpp \
+  $(srcdir)/searchpath.cpp \
+  $(srcdir)/string.cpp \
+  $(srcdir)/strsave.cpp \
+  $(srcdir)/tmpfile.cpp \
+  $(srcdir)/tmpname.cpp \
+  version.cpp
 CSRCS=\
   $(srcdir)/fmod.c \
   $(srcdir)/getcwd.c \
@@ -87,13 +87,13 @@ CSRCS=\
   $(srcdir)/strtol.c \
   $(srcdir)/../snprintf/snprintf.c
 GENSRCS=\
-  version.cc
+  version.cpp
 
 src_version=`cat $(top_srcdir)/VERSION`
 src_revision=`cat $(top_srcdir)/REVISION`
 
-version.cc: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
-	@echo Making version.cc
+version.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
+	@echo Making version.cpp
 	@echo const char \*version_string = \"$(src_version)\"\; >$@
 	@echo const char \*revision_string = \"$(src_revision)\"\; >>$@
 	@echo extern \"C\" const char \*Version_string = \"$(src_version).$(src_revision)\"\; | \
diff --git a/src/libs/libgroff/assert.cc b/src/libs/libgroff/assert.cpp
index 89742e32..89742e32 100644
--- a/src/libs/libgroff/assert.cc
+++ b/src/libs/libgroff/assert.cpp
diff --git a/src/libs/libgroff/change_lf.cc b/src/libs/libgroff/change_lf.cpp
index 2e44af1d..2e44af1d 100644
--- a/src/libs/libgroff/change_lf.cc
+++ b/src/libs/libgroff/change_lf.cpp
diff --git a/src/libs/libgroff/cmap.cc b/src/libs/libgroff/cmap.cpp
index 4b75d06f..4b75d06f 100644
--- a/src/libs/libgroff/cmap.cc
+++ b/src/libs/libgroff/cmap.cpp
diff --git a/src/libs/libgroff/color.cc b/src/libs/libgroff/color.cpp
index 0d01554b..da138dc4 100644
--- a/src/libs/libgroff/color.cc
+++ b/src/libs/libgroff/color.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
 
-/* <groff_src_dir>/src/libs/libgroff/color.cc
+/* <groff_src_dir>/src/libs/libgroff/color.cpp
 
-Last update: 15 Feb 2003
+Last update: 13 Apr 2003
 
 Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
     Written by Gaius Mulley <gaius@glam.ac.uk>
diff --git a/src/libs/libgroff/cset.cc b/src/libs/libgroff/cset.cpp
index e4845c11..e4845c11 100644
--- a/src/libs/libgroff/cset.cc
+++ b/src/libs/libgroff/cset.cpp
diff --git a/src/libs/libgroff/device.cc b/src/libs/libgroff/device.cpp
index 7efbfef2..7efbfef2 100644
--- a/src/libs/libgroff/device.cc
+++ b/src/libs/libgroff/device.cpp
diff --git a/src/libs/libgroff/errarg.cc b/src/libs/libgroff/errarg.cpp
index 2ddc0cc5..2ddc0cc5 100644
--- a/src/libs/libgroff/errarg.cc
+++ b/src/libs/libgroff/errarg.cpp
diff --git a/src/libs/libgroff/error.cc b/src/libs/libgroff/error.cpp
index f7d3ec0f..f7d3ec0f 100644
--- a/src/libs/libgroff/error.cc
+++ b/src/libs/libgroff/error.cpp
diff --git a/src/libs/libgroff/fatal.cc b/src/libs/libgroff/fatal.cpp
index 42560dca..42560dca 100644
--- a/src/libs/libgroff/fatal.cc
+++ b/src/libs/libgroff/fatal.cpp
diff --git a/src/libs/libgroff/filename.cc b/src/libs/libgroff/filename.cpp
index 6212705d..6212705d 100644
--- a/src/libs/libgroff/filename.cc
+++ b/src/libs/libgroff/filename.cpp
diff --git a/src/libs/libgroff/font.cc b/src/libs/libgroff/font.cpp
index c633cc82..c633cc82 100644
--- a/src/libs/libgroff/font.cc
+++ b/src/libs/libgroff/font.cpp
diff --git a/src/libs/libgroff/fontfile.cc b/src/libs/libgroff/fontfile.cpp
index 8502d12f..8502d12f 100644
--- a/src/libs/libgroff/fontfile.cc
+++ b/src/libs/libgroff/fontfile.cpp
diff --git a/src/libs/libgroff/geometry.cc b/src/libs/libgroff/geometry.cpp
index 58a94a4a..256d266a 100644
--- a/src/libs/libgroff/geometry.cc
+++ b/src/libs/libgroff/geometry.cpp
@@ -1,8 +1,8 @@
 // -*- C++ -*-
-/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002
+/* Copyright (C) 1989, 1990, 1991, 1992, 2000, 2001, 2002, 2003
    Free Software Foundation, Inc.
      Written by Gaius Mulley <gaius@glam.ac.uk>
-     using adjust_arc_center() from printer.cc, written by James Clark.
+     using adjust_arc_center() from printer.cpp, written by James Clark.
 
 This file is part of groff.
 
diff --git a/src/libs/libgroff/htmlhint.cc b/src/libs/libgroff/htmlhint.cpp
index 3015767d..3015767d 100644
--- a/src/libs/libgroff/htmlhint.cc
+++ b/src/libs/libgroff/htmlhint.cpp
diff --git a/src/libs/libgroff/invalid.cc b/src/libs/libgroff/invalid.cpp
index f36894a8..f36894a8 100644
--- a/src/libs/libgroff/invalid.cc
+++ b/src/libs/libgroff/invalid.cpp
diff --git a/src/libs/libgroff/lf.cc b/src/libs/libgroff/lf.cpp
index 34272c7d..34272c7d 100644
--- a/src/libs/libgroff/lf.cc
+++ b/src/libs/libgroff/lf.cpp
diff --git a/src/libs/libgroff/lineno.cc b/src/libs/libgroff/lineno.cpp
index f7138dba..f7138dba 100644
--- a/src/libs/libgroff/lineno.cc
+++ b/src/libs/libgroff/lineno.cpp
diff --git a/src/libs/libgroff/macropath.cc b/src/libs/libgroff/macropath.cpp
index 03c04cba..03c04cba 100644
--- a/src/libs/libgroff/macropath.cc
+++ b/src/libs/libgroff/macropath.cpp
diff --git a/src/libs/libgroff/maxfilename.cc b/src/libs/libgroff/maxfilename.cpp
index 25f55499..25f55499 100644
--- a/src/libs/libgroff/maxfilename.cc
+++ b/src/libs/libgroff/maxfilename.cpp
diff --git a/src/libs/libgroff/mksdir.cc b/src/libs/libgroff/mksdir.cpp
index bf4d300b..bf4d300b 100644
--- a/src/libs/libgroff/mksdir.cc
+++ b/src/libs/libgroff/mksdir.cpp
diff --git a/src/libs/libgroff/mkstemp.cc b/src/libs/libgroff/mkstemp.cpp
index cd2717c3..cd2717c3 100644
--- a/src/libs/libgroff/mkstemp.cc
+++ b/src/libs/libgroff/mkstemp.cpp
diff --git a/src/libs/libgroff/nametoindex.cc b/src/libs/libgroff/nametoindex.cpp
index def26b32..def26b32 100644
--- a/src/libs/libgroff/nametoindex.cc
+++ b/src/libs/libgroff/nametoindex.cpp
diff --git a/src/libs/libgroff/new.cc b/src/libs/libgroff/new.cpp
index 739cffa3..739cffa3 100644
--- a/src/libs/libgroff/new.cc
+++ b/src/libs/libgroff/new.cpp
diff --git a/src/libs/libgroff/paper.cc b/src/libs/libgroff/paper.cpp
index db8f5bcf..db8f5bcf 100644
--- a/src/libs/libgroff/paper.cc
+++ b/src/libs/libgroff/paper.cpp
diff --git a/src/libs/libgroff/prime.cc b/src/libs/libgroff/prime.cpp
index f0b1eadc..f0b1eadc 100644
--- a/src/libs/libgroff/prime.cc
+++ b/src/libs/libgroff/prime.cpp
diff --git a/src/libs/libgroff/progname.cc b/src/libs/libgroff/progname.cpp
index a70e3419..a70e3419 100644
--- a/src/libs/libgroff/progname.cc
+++ b/src/libs/libgroff/progname.cpp
diff --git a/src/libs/libgroff/ptable.cc b/src/libs/libgroff/ptable.cpp
index 76735c24..76735c24 100644
--- a/src/libs/libgroff/ptable.cc
+++ b/src/libs/libgroff/ptable.cpp
diff --git a/src/libs/libgroff/searchpath.cc b/src/libs/libgroff/searchpath.cpp
index 1f8b233c..1f8b233c 100644
--- a/src/libs/libgroff/searchpath.cc
+++ b/src/libs/libgroff/searchpath.cpp
diff --git a/src/libs/libgroff/string.cc b/src/libs/libgroff/string.cpp
index 2ef547e4..2ef547e4 100644
--- a/src/libs/libgroff/string.cc
+++ b/src/libs/libgroff/string.cpp
diff --git a/src/libs/libgroff/strsave.cc b/src/libs/libgroff/strsave.cpp
index dfd2b6f4..dfd2b6f4 100644
--- a/src/libs/libgroff/strsave.cc
+++ b/src/libs/libgroff/strsave.cpp
diff --git a/src/libs/libgroff/tmpfile.cc b/src/libs/libgroff/tmpfile.cpp
index 41b7f064..41b7f064 100644
--- a/src/libs/libgroff/tmpfile.cc
+++ b/src/libs/libgroff/tmpfile.cpp
diff --git a/src/libs/libgroff/tmpname.cc b/src/libs/libgroff/tmpname.cpp
index f867fe06..f867fe06 100644
--- a/src/libs/libgroff/tmpname.cc
+++ b/src/libs/libgroff/tmpname.cpp
diff --git a/src/preproc/eqn/.cvsignore b/src/preproc/eqn/.cvsignore
index 8f8f92fc..7f82ddb8 100644
--- a/src/preproc/eqn/.cvsignore
+++ b/src/preproc/eqn/.cvsignore
@@ -3,5 +3,5 @@ eqn
 eqn.n
 neqn
 neqn.n
-eqn.cc
+eqn.cpp
 eqn_tab.h
diff --git a/src/preproc/eqn/Makefile.sub b/src/preproc/eqn/Makefile.sub
index 6721c2c7..75546456 100644
--- a/src/preproc/eqn/Makefile.sub
+++ b/src/preproc/eqn/Makefile.sub
@@ -18,26 +18,26 @@ OBJS=\
   pile.$(OBJEXT) \
   special.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/main.cc \
-  $(srcdir)/lex.cc \
-  $(srcdir)/box.cc \
-  $(srcdir)/limit.cc \
-  $(srcdir)/list.cc \
-  $(srcdir)/over.cc \
-  $(srcdir)/text.cc \
-  $(srcdir)/script.cc \
-  $(srcdir)/mark.cc \
-  $(srcdir)/other.cc \
-  $(srcdir)/delim.cc \
-  $(srcdir)/sqrt.cc \
-  $(srcdir)/pile.cc \
-  $(srcdir)/special.cc
+  $(srcdir)/main.cpp \
+  $(srcdir)/lex.cpp \
+  $(srcdir)/box.cpp \
+  $(srcdir)/limit.cpp \
+  $(srcdir)/list.cpp \
+  $(srcdir)/over.cpp \
+  $(srcdir)/text.cpp \
+  $(srcdir)/script.cpp \
+  $(srcdir)/mark.cpp \
+  $(srcdir)/other.cpp \
+  $(srcdir)/delim.cpp \
+  $(srcdir)/sqrt.cpp \
+  $(srcdir)/pile.cpp \
+  $(srcdir)/special.cpp
 HDRS=\
   $(srcdir)/box.h \
   $(srcdir)/eqn.h \
   $(srcdir)/pbox.h
 GRAM=$(srcdir)/eqn.y
-YTABC=eqn.cc
+YTABC=eqn.cpp
 YTABH=eqn_tab.h
 NAMEPREFIX=$(g)
 CLEANADD=neqn
diff --git a/src/preproc/eqn/box.cc b/src/preproc/eqn/box.cpp
index 41d8dff4..41d8dff4 100644
--- a/src/preproc/eqn/box.cc
+++ b/src/preproc/eqn/box.cpp
diff --git a/src/preproc/eqn/delim.cc b/src/preproc/eqn/delim.cpp
index b7241802..b7241802 100644
--- a/src/preproc/eqn/delim.cc
+++ b/src/preproc/eqn/delim.cpp
diff --git a/src/preproc/eqn/lex.cc b/src/preproc/eqn/lex.cpp
index abc07c9c..abc07c9c 100644
--- a/src/preproc/eqn/lex.cc
+++ b/src/preproc/eqn/lex.cpp
diff --git a/src/preproc/eqn/limit.cc b/src/preproc/eqn/limit.cpp
index c8b55877..c8b55877 100644
--- a/src/preproc/eqn/limit.cc
+++ b/src/preproc/eqn/limit.cpp
diff --git a/src/preproc/eqn/list.cc b/src/preproc/eqn/list.cpp
index 1118fa1b..1118fa1b 100644
--- a/src/preproc/eqn/list.cc
+++ b/src/preproc/eqn/list.cpp
diff --git a/src/preproc/eqn/main.cc b/src/preproc/eqn/main.cpp
index dabac5fd..dabac5fd 100644
--- a/src/preproc/eqn/main.cc
+++ b/src/preproc/eqn/main.cpp
diff --git a/src/preproc/eqn/mark.cc b/src/preproc/eqn/mark.cpp
index 99d1b75f..99d1b75f 100644
--- a/src/preproc/eqn/mark.cc
+++ b/src/preproc/eqn/mark.cpp
diff --git a/src/preproc/eqn/other.cc b/src/preproc/eqn/other.cpp
index c052f523..c052f523 100644
--- a/src/preproc/eqn/other.cc
+++ b/src/preproc/eqn/other.cpp
diff --git a/src/preproc/eqn/over.cc b/src/preproc/eqn/over.cpp
index 279efc8b..279efc8b 100644
--- a/src/preproc/eqn/over.cc
+++ b/src/preproc/eqn/over.cpp
diff --git a/src/preproc/eqn/pile.cc b/src/preproc/eqn/pile.cpp
index 0df5241f..0df5241f 100644
--- a/src/preproc/eqn/pile.cc
+++ b/src/preproc/eqn/pile.cpp
diff --git a/src/preproc/eqn/script.cc b/src/preproc/eqn/script.cpp
index 62a05b4f..62a05b4f 100644
--- a/src/preproc/eqn/script.cc
+++ b/src/preproc/eqn/script.cpp
diff --git a/src/preproc/eqn/special.cc b/src/preproc/eqn/special.cpp
index 310261ae..310261ae 100644
--- a/src/preproc/eqn/special.cc
+++ b/src/preproc/eqn/special.cpp
diff --git a/src/preproc/eqn/sqrt.cc b/src/preproc/eqn/sqrt.cpp
index f998ff33..f998ff33 100644
--- a/src/preproc/eqn/sqrt.cc
+++ b/src/preproc/eqn/sqrt.cpp
diff --git a/src/preproc/eqn/text.cc b/src/preproc/eqn/text.cpp
index 83e4a764..83e4a764 100644
--- a/src/preproc/eqn/text.cc
+++ b/src/preproc/eqn/text.cpp
diff --git a/src/preproc/grn/Makefile.sub b/src/preproc/grn/Makefile.sub
index d180803e..c28db477 100644
--- a/src/preproc/grn/Makefile.sub
+++ b/src/preproc/grn/Makefile.sub
@@ -8,10 +8,10 @@ OBJS=\
   hgraph.$(OBJEXT) \
   main.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/hdb.cc \
-  $(srcdir)/hpoint.cc \
-  $(srcdir)/hgraph.cc \
-  $(srcdir)/main.cc
+  $(srcdir)/hdb.cpp \
+  $(srcdir)/hpoint.cpp \
+  $(srcdir)/hgraph.cpp \
+  $(srcdir)/main.cpp
 HDRS=\
   $(srcdir)/gprint.h
 NAMEPREFIX=$(g)
diff --git a/src/preproc/grn/README b/src/preproc/grn/README
index 7ac685e2..124103ba 100644
--- a/src/preproc/grn/README
+++ b/src/preproc/grn/README
@@ -40,10 +40,10 @@ better into the groff package.
 
   . Used error() and fatal() from libgroff for all source files.
 
-  . Renamed *.c to *.cc; updates as needed for C++ (prototypes, proper
+  . Renamed *.c to *.cpp; updates as needed for C++ (prototypes, proper
     casts, standard header files etc).  Heavy formatting.
 
-  . main.cc:
+  . main.cpp:
 
       Using groff's default values instead of DEVDIR, DEFAULTDEV, PRINTER,
       TYPESETTER, and GREMLIB.
diff --git a/src/preproc/grn/hdb.cc b/src/preproc/grn/hdb.cpp
index 648a5358..c9fbb7dc 100644
--- a/src/preproc/grn/hdb.cc
+++ b/src/preproc/grn/hdb.cpp
@@ -17,14 +17,14 @@
 #define MAXSTRING 128
 #define MAXSTRING_S "127"
 
-/* imports from main.cc */
+/* imports from main.cpp */
 
 extern int linenum;		/* current line number in input file */
 extern char gremlinfile[];	/* name of file currently reading */
 extern int SUNFILE;		/* TRUE if SUN gremlin file */
 extern void savebounds(float x, float y);
 
-/* imports from hpoint.cc */
+/* imports from hpoint.cpp */
 
 extern POINT *PTInit();
 extern POINT *PTMakePoint(float x, float y, POINT ** pplist);
diff --git a/src/preproc/grn/hgraph.cc b/src/preproc/grn/hgraph.cpp
index d124c6c0..d124c6c0 100644
--- a/src/preproc/grn/hgraph.cc
+++ b/src/preproc/grn/hgraph.cpp
diff --git a/src/preproc/grn/hpoint.cc b/src/preproc/grn/hpoint.cpp
index f4e1ca82..f4e1ca82 100644
--- a/src/preproc/grn/hpoint.cc
+++ b/src/preproc/grn/hpoint.cpp
diff --git a/src/preproc/grn/main.cc b/src/preproc/grn/main.cpp
index 63a5c9b3..150b78f5 100644
--- a/src/preproc/grn/main.cc
+++ b/src/preproc/grn/main.cpp
@@ -1,4 +1,4 @@
-/* Last non-groff version: main.cc 1.23  (Berkeley)  85/08/05
+/* Last non-groff version: main.c 1.23  (Berkeley)  85/08/05
  *
  * Adapted to GNU troff by Daniel Senderowicz 99/12/29.
  *
diff --git a/src/preproc/html/Makefile.sub b/src/preproc/html/Makefile.sub
index 5da6d43b..6a9a7570 100644
--- a/src/preproc/html/Makefile.sub
+++ b/src/preproc/html/Makefile.sub
@@ -3,4 +3,4 @@ PROG=pre-grohtml$(EXEEXT)
 MAN1=
 XLIBS=$(LIBGROFF)
 OBJS=pre-html.$(OBJEXT) pushback.$(OBJEXT)
-CCSRCS=$(srcdir)/pre-html.cc $(srcdir)/pushback.cc
+CCSRCS=$(srcdir)/pre-html.cpp $(srcdir)/pushback.cpp
diff --git a/src/preproc/html/pre-html.cc b/src/preproc/html/pre-html.cpp
index 38cb6075..38cb6075 100644
--- a/src/preproc/html/pre-html.cc
+++ b/src/preproc/html/pre-html.cpp
diff --git a/src/preproc/html/pushback.cc b/src/preproc/html/pushback.cpp
index d18c5e2e..d18c5e2e 100644
--- a/src/preproc/html/pushback.cc
+++ b/src/preproc/html/pushback.cpp
diff --git a/src/preproc/html/pushback.h b/src/preproc/html/pushback.h
index 93cb3f1a..55b4b920 100644
--- a/src/preproc/html/pushback.h
+++ b/src/preproc/html/pushback.h
@@ -1,5 +1,5 @@
 // -*- C -*-
-/* Copyright (C) 2000, 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2000, 2001, 2003 Free Software Foundation, Inc.
      Written by Gaius Mulley (gaius@glam.ac.uk).
 
 This file is part of groff.
@@ -23,7 +23,7 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
 
 
 /*
- *  defines the class and methods implemented within pushbackbuffer.cc
+ *  defines the class and methods implemented within pushback.cpp
  */
 
 class pushBackBuffer
diff --git a/src/preproc/pic/.cvsignore b/src/preproc/pic/.cvsignore
index f63b15ae..af6bbfe6 100644
--- a/src/preproc/pic/.cvsignore
+++ b/src/preproc/pic/.cvsignore
@@ -1,6 +1,6 @@
 Makefile.dep
 pic
 pic.n
-pic.cc
+pic.cpp
 pic_tab.h
 y.output
diff --git a/src/preproc/pic/Makefile.sub b/src/preproc/pic/Makefile.sub
index 05c47a17..94b41fee 100644
--- a/src/preproc/pic/Makefile.sub
+++ b/src/preproc/pic/Makefile.sub
@@ -12,12 +12,12 @@ OBJS=\
   tex.$(OBJEXT)
   # fig.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/lex.cc \
-  $(srcdir)/main.cc \
-  $(srcdir)/object.cc \
-  $(srcdir)/common.cc \
-  $(srcdir)/troff.cc \
-  $(srcdir)/tex.cc
+  $(srcdir)/lex.cpp \
+  $(srcdir)/main.cpp \
+  $(srcdir)/object.cpp \
+  $(srcdir)/common.cpp \
+  $(srcdir)/troff.cpp \
+  $(srcdir)/tex.cpp
 HDRS=\
   $(srcdir)/common.h \
   $(srcdir)/object.h \
@@ -26,6 +26,6 @@ HDRS=\
   $(srcdir)/position.h \
   $(srcdir)/text.h
 GRAM=$(srcdir)/pic.y
-YTABC=pic.cc
+YTABC=pic.cpp
 YTABH=pic_tab.h
 NAMEPREFIX=$(g)
diff --git a/src/preproc/pic/common.cc b/src/preproc/pic/common.cpp
index 5075e936..5075e936 100644
--- a/src/preproc/pic/common.cc
+++ b/src/preproc/pic/common.cpp
diff --git a/src/preproc/pic/lex.cc b/src/preproc/pic/lex.cpp
index 14a4cc31..14a4cc31 100644
--- a/src/preproc/pic/lex.cc
+++ b/src/preproc/pic/lex.cpp
diff --git a/src/preproc/pic/main.cc b/src/preproc/pic/main.cpp
index eb6db525..eb6db525 100644
--- a/src/preproc/pic/main.cc
+++ b/src/preproc/pic/main.cpp
diff --git a/src/preproc/pic/object.cc b/src/preproc/pic/object.cpp
index 21bce3e4..21bce3e4 100644
--- a/src/preproc/pic/object.cc
+++ b/src/preproc/pic/object.cpp
diff --git a/src/preproc/pic/tex.cc b/src/preproc/pic/tex.cpp
index a9192acd..a9192acd 100644
--- a/src/preproc/pic/tex.cc
+++ b/src/preproc/pic/tex.cpp
diff --git a/src/preproc/pic/troff.cc b/src/preproc/pic/troff.cpp
index cf8f5eee..cf8f5eee 100644
--- a/src/preproc/pic/troff.cc
+++ b/src/preproc/pic/troff.cpp
diff --git a/src/preproc/refer/.cvsignore b/src/preproc/refer/.cvsignore
index dcada9c2..0ac2df58 100644
--- a/src/preproc/refer/.cvsignore
+++ b/src/preproc/refer/.cvsignore
@@ -2,4 +2,4 @@ Makefile.dep
 refer
 refer.n
 y.output
-label.cc
+label.cpp
diff --git a/src/preproc/refer/Makefile.sub b/src/preproc/refer/Makefile.sub
index 9f4a53be..2e22a3a7 100644
--- a/src/preproc/refer/Makefile.sub
+++ b/src/preproc/refer/Makefile.sub
@@ -9,15 +9,15 @@ OBJS=\
   refer.$(OBJEXT) \
   token.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/command.cc \
-  $(srcdir)/ref.cc \
-  $(srcdir)/refer.cc \
-  $(srcdir)/token.cc
+  $(srcdir)/command.cpp \
+  $(srcdir)/ref.cpp \
+  $(srcdir)/refer.cpp \
+  $(srcdir)/token.cpp
 HDRS=\
   $(srcdir)/refer.h \
   $(srcdir)/token.h \
   $(srcdir)/command.h \
   $(srcdir)/ref.h
 GRAM=$(srcdir)/label.y
-YTABC=label.cc
+YTABC=label.cpp
 NAMEPREFIX=$(g)
diff --git a/src/preproc/refer/command.cc b/src/preproc/refer/command.cpp
index a7c6bfb8..a7c6bfb8 100644
--- a/src/preproc/refer/command.cc
+++ b/src/preproc/refer/command.cpp
diff --git a/src/preproc/refer/ref.cc b/src/preproc/refer/ref.cpp
index 9c040789..9c040789 100644
--- a/src/preproc/refer/ref.cc
+++ b/src/preproc/refer/ref.cpp
diff --git a/src/preproc/refer/refer.cc b/src/preproc/refer/refer.cpp
index 33df35ca..33df35ca 100644
--- a/src/preproc/refer/refer.cc
+++ b/src/preproc/refer/refer.cpp
diff --git a/src/preproc/refer/token.cc b/src/preproc/refer/token.cpp
index e9fac5df..e9fac5df 100644
--- a/src/preproc/refer/token.cc
+++ b/src/preproc/refer/token.cpp
diff --git a/src/preproc/soelim/Makefile.sub b/src/preproc/soelim/Makefile.sub
index 4b59ab60..a43dfc28 100644
--- a/src/preproc/soelim/Makefile.sub
+++ b/src/preproc/soelim/Makefile.sub
@@ -2,5 +2,5 @@ PROG=soelim$(EXEEXT)
 MAN1=soelim.n
 XLIBS=$(LIBGROFF)
 OBJS=soelim.$(OBJEXT)
-CCSRCS=$(srcdir)/soelim.cc
+CCSRCS=$(srcdir)/soelim.cpp
 NAMEPREFIX=$(g)
diff --git a/src/preproc/soelim/soelim.cc b/src/preproc/soelim/soelim.cpp
index 006b04ae..006b04ae 100644
--- a/src/preproc/soelim/soelim.cc
+++ b/src/preproc/soelim/soelim.cpp
diff --git a/src/preproc/tbl/Makefile.sub b/src/preproc/tbl/Makefile.sub
index fb148186..8decd310 100644
--- a/src/preproc/tbl/Makefile.sub
+++ b/src/preproc/tbl/Makefile.sub
@@ -5,8 +5,8 @@ OBJS=\
   main.$(OBJEXT) \
   table.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/main.cc \
-  $(srcdir)/table.cc
+  $(srcdir)/main.cpp \
+  $(srcdir)/table.cpp
 HDRS=\
   $(srcdir)/table.h
 NAMEPREFIX=$(g)
diff --git a/src/preproc/tbl/main.cc b/src/preproc/tbl/main.cpp
index fe3aabf9..fe3aabf9 100644
--- a/src/preproc/tbl/main.cc
+++ b/src/preproc/tbl/main.cpp
diff --git a/src/preproc/tbl/table.cc b/src/preproc/tbl/table.cpp
index 32068c36..32068c36 100644
--- a/src/preproc/tbl/table.cc
+++ b/src/preproc/tbl/table.cpp
diff --git a/src/roff/groff/Makefile.sub b/src/roff/groff/Makefile.sub
index 3b26caac..798f2d8a 100644
--- a/src/roff/groff/Makefile.sub
+++ b/src/roff/groff/Makefile.sub
@@ -3,6 +3,6 @@ MAN1=groff.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=groff.$(OBJEXT) pipeline.$(OBJEXT)
-CCSRCS=$(srcdir)/groff.cc
+CCSRCS=$(srcdir)/groff.cpp
 CSRCS=$(srcdir)/pipeline.c
 HDRS=$(srcdir)/pipeline.h
diff --git a/src/roff/groff/groff.cc b/src/roff/groff/groff.cpp
index 49104b2f..49104b2f 100644
--- a/src/roff/groff/groff.cc
+++ b/src/roff/groff/groff.cpp
diff --git a/src/roff/troff/.cvsignore b/src/roff/troff/.cvsignore
index 39e20fa7..8d70a47d 100644
--- a/src/roff/troff/.cvsignore
+++ b/src/roff/troff/.cvsignore
@@ -1,4 +1,4 @@
 Makefile.dep
-majorminor.cc
+majorminor.cpp
 troff
 troff.n
diff --git a/src/roff/troff/Makefile.sub b/src/roff/troff/Makefile.sub
index 85b41228..7fa80247 100644
--- a/src/roff/troff/Makefile.sub
+++ b/src/roff/troff/Makefile.sub
@@ -17,19 +17,19 @@ OBJS=\
   uniglyph.$(OBJEXT) \
   uniuni.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/dictionary.cc \
-  $(srcdir)/div.cc \
-  $(srcdir)/env.cc \
-  $(srcdir)/glyphuni.cc \
-  $(srcdir)/input.cc \
-  majorminor.cc \
-  $(srcdir)/node.cc \
-  $(srcdir)/number.cc \
-  $(srcdir)/reg.cc \
-  $(srcdir)/symbol.cc \
-  $(srcdir)/unicode.cc \
-  $(srcdir)/uniglyph.cc \
-  $(srcdir)/uniuni.cc
+  $(srcdir)/dictionary.cpp \
+  $(srcdir)/div.cpp \
+  $(srcdir)/env.cpp \
+  $(srcdir)/glyphuni.cpp \
+  $(srcdir)/input.cpp \
+  majorminor.cpp \
+  $(srcdir)/node.cpp \
+  $(srcdir)/number.cpp \
+  $(srcdir)/reg.cpp \
+  $(srcdir)/symbol.cpp \
+  $(srcdir)/unicode.cpp \
+  $(srcdir)/uniglyph.cpp \
+  $(srcdir)/uniuni.cpp
 HDRS=\
   $(srcdir)/charinfo.h \
   $(srcdir)/dictionary.h \
@@ -44,10 +44,10 @@ HDRS=\
   $(srcdir)/token.h \
   $(srcdir)/troff.h \
   $(srcdir)/unicode.h
-GENSRCS=majorminor.cc
+GENSRCS=majorminor.cpp
 NAMEPREFIX=$(g)
 
-majorminor.cc: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
+majorminor.cpp: $(top_srcdir)/VERSION $(top_srcdir)/REVISION
 	@echo Making $@
 	@-rm -f $@
 	@echo const char \*major_version = \
diff --git a/src/roff/troff/column.cc b/src/roff/troff/column.cpp
index 8d6a6ebe..8d6a6ebe 100644
--- a/src/roff/troff/column.cc
+++ b/src/roff/troff/column.cpp
diff --git a/src/roff/troff/dictionary.cc b/src/roff/troff/dictionary.cpp
index a70ebb0e..a70ebb0e 100644
--- a/src/roff/troff/dictionary.cc
+++ b/src/roff/troff/dictionary.cpp
diff --git a/src/roff/troff/div.cc b/src/roff/troff/div.cpp
index 1bbbe450..1bbbe450 100644
--- a/src/roff/troff/div.cc
+++ b/src/roff/troff/div.cpp
diff --git a/src/roff/troff/env.cc b/src/roff/troff/env.cpp
index 264b441b..264b441b 100644
--- a/src/roff/troff/env.cc
+++ b/src/roff/troff/env.cpp
diff --git a/src/roff/troff/glyphuni.cc b/src/roff/troff/glyphuni.cpp
index 8ce0a52c..8ce0a52c 100644
--- a/src/roff/troff/glyphuni.cc
+++ b/src/roff/troff/glyphuni.cpp
diff --git a/src/roff/troff/input.cc b/src/roff/troff/input.cpp
index 65b6c364..877bd39e 100644
--- a/src/roff/troff/input.cc
+++ b/src/roff/troff/input.cpp
@@ -5020,7 +5020,7 @@ void output_request()
   tok.next();
 }
 
-extern int image_no;		// from node.cc
+extern int image_no;		// from node.cpp
 
 static node *do_suppress(symbol nm)
 {
@@ -5526,7 +5526,7 @@ int parse_bounding_box(char *p, bounding_box *bb)
   return 0;
 }
 
-// This version is taken from psrm.cc
+// This version is taken from psrm.cpp
 
 #define PS_LINE_MAX 255
 cset white_space("\n\r \t");
diff --git a/src/roff/troff/node.cc b/src/roff/troff/node.cpp
index 73776b1b..73776b1b 100644
--- a/src/roff/troff/node.cc
+++ b/src/roff/troff/node.cpp
diff --git a/src/roff/troff/number.cc b/src/roff/troff/number.cpp
index 8fed342e..8fed342e 100644
--- a/src/roff/troff/number.cc
+++ b/src/roff/troff/number.cpp
diff --git a/src/roff/troff/reg.cc b/src/roff/troff/reg.cpp
index 8ac20c9b..8ac20c9b 100644
--- a/src/roff/troff/reg.cc
+++ b/src/roff/troff/reg.cpp
diff --git a/src/roff/troff/symbol.cc b/src/roff/troff/symbol.cpp
index 09f4c98c..09f4c98c 100644
--- a/src/roff/troff/symbol.cc
+++ b/src/roff/troff/symbol.cpp
diff --git a/src/roff/troff/unicode.cc b/src/roff/troff/unicode.cpp
index 21174634..21174634 100644
--- a/src/roff/troff/unicode.cc
+++ b/src/roff/troff/unicode.cpp
diff --git a/src/roff/troff/uniglyph.cc b/src/roff/troff/uniglyph.cpp
index 7122d03f..7122d03f 100644
--- a/src/roff/troff/uniglyph.cc
+++ b/src/roff/troff/uniglyph.cpp
diff --git a/src/roff/troff/uniuni.cc b/src/roff/troff/uniuni.cpp
index d3a63146..d3a63146 100644
--- a/src/roff/troff/uniuni.cc
+++ b/src/roff/troff/uniuni.cpp
diff --git a/src/utils/addftinfo/Makefile.sub b/src/utils/addftinfo/Makefile.sub
index af5bf708..096af0d8 100644
--- a/src/utils/addftinfo/Makefile.sub
+++ b/src/utils/addftinfo/Makefile.sub
@@ -5,7 +5,7 @@ OBJS=\
   addftinfo.$(OBJEXT) \
   guess.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/addftinfo.cc \
-  $(srcdir)/guess.cc
+  $(srcdir)/addftinfo.cpp \
+  $(srcdir)/guess.cpp
 HDRS=\
   $(srcdir)/guess.h
diff --git a/src/utils/addftinfo/addftinfo.cc b/src/utils/addftinfo/addftinfo.cpp
index 931d8365..931d8365 100644
--- a/src/utils/addftinfo/addftinfo.cc
+++ b/src/utils/addftinfo/addftinfo.cpp
diff --git a/src/utils/addftinfo/guess.cc b/src/utils/addftinfo/guess.cpp
index dcfd4c92..dcfd4c92 100644
--- a/src/utils/addftinfo/guess.cc
+++ b/src/utils/addftinfo/guess.cpp
diff --git a/src/utils/hpftodit/Makefile.sub b/src/utils/hpftodit/Makefile.sub
index 7a165311..d83188c5 100644
--- a/src/utils/hpftodit/Makefile.sub
+++ b/src/utils/hpftodit/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=hpftodit.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=hpftodit.$(OBJEXT)
-CCSRCS=$(srcdir)/hpftodit.cc
+CCSRCS=$(srcdir)/hpftodit.cpp
diff --git a/src/utils/hpftodit/hpftodit.cc b/src/utils/hpftodit/hpftodit.cpp
index fe512b61..fe512b61 100644
--- a/src/utils/hpftodit/hpftodit.cc
+++ b/src/utils/hpftodit/hpftodit.cpp
diff --git a/src/utils/indxbib/Makefile.sub b/src/utils/indxbib/Makefile.sub
index 01e43b22..7736e487 100644
--- a/src/utils/indxbib/Makefile.sub
+++ b/src/utils/indxbib/Makefile.sub
@@ -6,7 +6,7 @@ OBJS=\
   indxbib.$(OBJEXT) \
   signal.$(OBJEXT)
 CCSRCS=\
-  $(srcdir)/indxbib.cc
+  $(srcdir)/indxbib.cpp
 CSRCS=\
   $(srcdir)/signal.c
 NAMEPREFIX=$(g)
diff --git a/src/utils/indxbib/indxbib.cc b/src/utils/indxbib/indxbib.cpp
index 2a60c156..2a60c156 100644
--- a/src/utils/indxbib/indxbib.cc
+++ b/src/utils/indxbib/indxbib.cpp
diff --git a/src/utils/lkbib/Makefile.sub b/src/utils/lkbib/Makefile.sub
index 899236ab..4964ee05 100644
--- a/src/utils/lkbib/Makefile.sub
+++ b/src/utils/lkbib/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=lkbib.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=lkbib.$(OBJEXT)
-CCSRCS=$(srcdir)/lkbib.cc
+CCSRCS=$(srcdir)/lkbib.cpp
diff --git a/src/utils/lkbib/lkbib.cc b/src/utils/lkbib/lkbib.cpp
index 42156eaa..42156eaa 100644
--- a/src/utils/lkbib/lkbib.cc
+++ b/src/utils/lkbib/lkbib.cpp
diff --git a/src/utils/lookbib/Makefile.sub b/src/utils/lookbib/Makefile.sub
index 7a08f0ae..9ca2d88f 100644
--- a/src/utils/lookbib/Makefile.sub
+++ b/src/utils/lookbib/Makefile.sub
@@ -3,5 +3,5 @@ MAN1=lookbib.n
 XLIBS=$(LIBBIB) $(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=lookbib.$(OBJEXT)
-CCSRCS=$(srcdir)/lookbib.cc
+CCSRCS=$(srcdir)/lookbib.cpp
 NAMEPREFIX=$(g)
diff --git a/src/utils/lookbib/lookbib.cc b/src/utils/lookbib/lookbib.cpp
index 65e89bcf..65e89bcf 100644
--- a/src/utils/lookbib/lookbib.cc
+++ b/src/utils/lookbib/lookbib.cpp
diff --git a/src/utils/tfmtodit/Makefile.sub b/src/utils/tfmtodit/Makefile.sub
index ee56ce6e..16121048 100644
--- a/src/utils/tfmtodit/Makefile.sub
+++ b/src/utils/tfmtodit/Makefile.sub
@@ -3,4 +3,4 @@ MAN1=tfmtodit.n
 XLIBS=$(LIBGROFF)
 MLIB=$(LIBM)
 OBJS=tfmtodit.$(OBJEXT)
-CCSRCS=$(srcdir)/tfmtodit.cc
+CCSRCS=$(srcdir)/tfmtodit.cpp
diff --git a/src/utils/tfmtodit/tfmtodit.cc b/src/utils/tfmtodit/tfmtodit.cpp
index 9fbbe25f..9fbbe25f 100644
--- a/src/utils/tfmtodit/tfmtodit.cc
+++ b/src/utils/tfmtodit/tfmtodit.cpp