Sun Aug 24 09:20:38 PDT 2008

AUTHORS                                  |    4 +++-
 fofi/FoFiBase.cc                         |   11 +++++++++++
 fofi/FoFiTrueType.cc                     |   14 ++++++++++++++
 fofi/FoFiTrueType.h                      |   12 ++++++++++++
 fofi/FoFiType1.cc                        |   12 ++++++++++++
 fofi/FoFiType1C.h                        |   11 +++++++++++
 goo/GooString.cc                         |   13 +++++++++++++
 goo/GooString.h                          |   12 ++++++++++++
 goo/GooTimer.cc                          |    3 +++
 goo/GooTimer.h                           |    8 ++++++--
 goo/GooVector.h                          |   12 ++++++++++++
 goo/gfile.cc                             |   13 +++++++++++++
 goo/gfile.h                              |   11 +++++++++++
 goo/gmem.cc                              |   13 +++++++++++++
 goo/gmem.h                               |   13 +++++++++++++
 poppler/ABWOutputDev.cc                  |    3 ++-
 poppler/ABWOutputDev.h                   |    2 +-
 poppler/Annot.cc                         |   19 +++++++++++++++++++
 poppler/Annot.h                          |   17 +++++++++++++++++
 poppler/Array.cc                         |   11 +++++++++++
 poppler/Array.h                          |   11 +++++++++++
 poppler/ArthurOutputDev.cc               |   14 +++++++++++++-
 poppler/ArthurOutputDev.h                |   13 ++++++++++++-
 poppler/CMap.cc                          |   12 ++++++++++++
 poppler/CMap.h                           |   11 +++++++++++
 poppler/CairoFontEngine.cc               |   17 +++++++++++++++++
 poppler/CairoFontEngine.h                |   17 +++++++++++++++++
 poppler/CairoOutputDev.cc                |   19 +++++++++++++++++++
 poppler/CairoOutputDev.h                 |   16 ++++++++++++++++
 poppler/Catalog.cc                       |   19 +++++++++++++++++++
 poppler/Catalog.h                        |   16 ++++++++++++++++
 poppler/CharCodeToUnicode.cc             |   14 ++++++++++++++
 poppler/CharCodeToUnicode.h              |   13 +++++++++++++
 poppler/DCTStream.cc                     |    5 ++++-
 poppler/DCTStream.h                      |    6 +++++-
 poppler/Decrypt.cc                       |   12 ++++++++++++
 poppler/Decrypt.h                        |   11 +++++++++++
 poppler/Dict.cc                          |   13 +++++++++++++
 poppler/Dict.h                           |   13 +++++++++++++
 poppler/Error.cc                         |   13 +++++++++++++
 poppler/Error.h                          |   13 +++++++++++++
 poppler/FlateStream.cc                   |    2 ++
 poppler/FlateStream.h                    |    2 ++
 poppler/FontInfo.cc                      |   22 ++++++++++++++++++++++
 poppler/FontInfo.h                       |   21 +++++++++++++++++++++
 poppler/Form.cc                          |   10 +++++++++-
 poppler/Form.h                           |    6 +++++-
 poppler/Function.cc                      |   12 ++++++++++++
 poppler/Gfx.cc                           |   23 +++++++++++++++++++++++
 poppler/Gfx.h                            |   13 +++++++++++++
 poppler/GfxFont.cc                       |   19 +++++++++++++++++++
 poppler/GfxFont.h                        |   16 ++++++++++++++++
 poppler/GfxState.cc                      |   14 ++++++++++++++
 poppler/GfxState.h                       |   13 +++++++++++++
 poppler/GlobalParams.cc                  |   19 +++++++++++++++++++
 poppler/GlobalParams.h                   |   15 +++++++++++++++
 poppler/JBIG2Stream.cc                   |   13 +++++++++++++
 poppler/JPXStream.cc                     |   11 +++++++++++
 poppler/Lexer.cc                         |   12 ++++++++++++
 poppler/Lexer.h                          |   12 ++++++++++++
 poppler/Link.cc                          |   14 ++++++++++++++
 poppler/Link.h                           |   12 ++++++++++++
 poppler/Movie.cc                         |   17 ++++++++++++++++-
 poppler/Object.cc                        |   11 +++++++++++
 poppler/Object.h                         |   12 ++++++++++++
 poppler/OptionalContent.cc               |    5 ++++-
 poppler/Outline.cc                       |   11 +++++++++++
 poppler/Outline.h                        |   11 +++++++++++
 poppler/OutputDev.cc                     |   13 +++++++++++++
 poppler/OutputDev.h                      |   14 ++++++++++++++
 poppler/PDFDoc.cc                        |   15 +++++++++++++++
 poppler/PDFDoc.h                         |   15 +++++++++++++++
 poppler/PDFDocEncoding.cc                |   13 ++++++++++++-
 poppler/PDFDocEncoding.h                 |   11 +++++++++++
 poppler/PSOutputDev.cc                   |   15 +++++++++++++++
 poppler/PSOutputDev.h                    |   14 ++++++++++++++
 poppler/PSTokenizer.cc                   |   12 ++++++++++++
 poppler/PSTokenizer.h                    |   11 +++++++++++
 poppler/Page.cc                          |   20 ++++++++++++++++++++
 poppler/Page.h                           |   16 ++++++++++++++++
 poppler/PageLabelInfo.cc                 |   12 ++++++++++++
 poppler/PageLabelInfo.h                  |   12 ++++++++++++
 poppler/PageTransition.h                 |   18 ++++++++++++++++++
 poppler/Parser.cc                        |   12 ++++++++++++
 poppler/Parser.h                         |   11 +++++++++++
 poppler/SplashOutputDev.cc               |   16 ++++++++++++++++
 poppler/SplashOutputDev.h                |   11 +++++++++++
 poppler/Stream-CCITT.h                   |   11 +++++++++++
 poppler/Stream.cc                        |   14 ++++++++++++++
 poppler/Stream.h                         |   13 +++++++++++++
 poppler/TextOutputDev.cc                 |   18 ++++++++++++++++++
 poppler/TextOutputDev.h                  |   15 +++++++++++++++
 poppler/UTF8.h                           |   11 +++++++++++
 poppler/UnicodeTypeTable.cc              |   13 +++++++++++++
 poppler/UnicodeTypeTable.h               |   11 +++++++++++
 poppler/XRef.cc                          |   17 ++++++++++++++++-
 poppler/XRef.h                           |   14 ++++++++++++++
 qt/poppler-document.cc                   |    3 +++
 qt/poppler-fontinfo.cc                   |    3 +--
 qt/poppler-page.cc                       |    7 ++++++-
 qt/poppler-private.h                     |    4 ++++
 qt/poppler-qt.h                          |    5 ++++-
 qt4/src/poppler-annotation-helper.h      |    1 +
 qt4/src/poppler-annotation.cc            |    3 ++-
 qt4/src/poppler-annotation.h             |    4 +++-
 qt4/src/poppler-document.cc              |    4 +++-
 qt4/src/poppler-embeddedfile.cc          |    1 +
 qt4/src/poppler-fontinfo.cc              |    5 ++++-
 qt4/src/poppler-form.cc                  |    2 +-
 qt4/src/poppler-form.h                   |    2 +-
 qt4/src/poppler-link-extractor-private.h |    2 +-
 qt4/src/poppler-link-extractor.cc        |    2 +-
 qt4/src/poppler-link.cc                  |    3 ++-
 qt4/src/poppler-link.h                   |    1 +
 qt4/src/poppler-optcontent-private.h     |    1 +
 qt4/src/poppler-optcontent.cc            |    1 +
 qt4/src/poppler-optcontent.h             |    1 +
 qt4/src/poppler-page-private.h           |    2 ++
 qt4/src/poppler-page.cc                  |    4 ++++
 qt4/src/poppler-private.h                |    4 +++-
 qt4/src/poppler-ps-converter.cc          |    1 +
 qt4/src/poppler-qt4.h                    |    5 ++++-
 qt4/src/poppler-textbox.cc               |    2 ++
 splash/Splash.cc                         |   12 ++++++++++++
 splash/Splash.h                          |   12 ++++++++++++
 splash/SplashBitmap.cc                   |   12 ++++++++++++
 splash/SplashBitmap.h                    |   11 +++++++++++
 splash/SplashErrorCodes.h                |   11 +++++++++++
 splash/SplashFTFont.cc                   |   12 ++++++++++++
 splash/SplashFTFont.h                    |   11 +++++++++++
 splash/SplashFTFontEngine.cc             |   11 +++++++++++
 splash/SplashFTFontEngine.h              |   11 +++++++++++
 splash/SplashFTFontFile.cc               |   11 +++++++++++
 splash/SplashFTFontFile.h                |   11 +++++++++++
 splash/SplashFont.cc                     |   11 +++++++++++
 splash/SplashFont.h                      |   11 +++++++++++
 splash/SplashFontEngine.cc               |   11 +++++++++++
 splash/SplashFontEngine.h                |   11 +++++++++++
 splash/SplashFontFile.cc                 |   12 ++++++++++++
 splash/SplashFontFile.h                  |   12 ++++++++++++
 splash/SplashT1Font.cc                   |   11 +++++++++++
 splash/SplashT1Font.h                    |   11 +++++++++++
 splash/SplashT1FontEngine.cc             |   11 +++++++++++
 splash/SplashT1FontFile.cc               |   11 +++++++++++
 splash/SplashT1FontFile.h                |   11 +++++++++++
 splash/SplashTypes.h                     |   11 +++++++++++
 splash/SplashXPathScanner.cc             |   11 +++++++++++
 utils/HtmlFonts.cc                       |   24 ++++++++++++++++++++++++
 utils/HtmlFonts.h                        |   12 ++++++++++++
 utils/HtmlLinks.cc                       |   23 +++++++++++++++++++++++
 utils/HtmlLinks.h                        |   12 ++++++++++++
 utils/HtmlOutputDev.cc                   |   13 +++++++++++++
 utils/HtmlOutputDev.h                    |   11 +++++++++++
 utils/ImageOutputDev.cc                  |   13 +++++++++++++
 utils/ImageOutputDev.h                   |   12 ++++++++++++
 utils/parseargs.c                        |   13 +++++++++++++
 utils/parseargs.h                        |   11 +++++++++++
 utils/pdffonts.cc                        |   12 ++++++++++++
 utils/pdfimages.cc                       |   11 +++++++++++
 utils/pdfinfo.1                          |    2 +-
 utils/pdfinfo.cc                         |   12 ++++++++++++
 utils/pdftoabw.cc                        |   26 +++++++++++++++++++-------
 utils/pdftohtml.cc                       |   11 +++++++++++
 utils/pdftoppm.cc                        |   11 +++++++++++
 utils/pdftops.1                          |   20 ++++++++++----------
 utils/pdftops.cc                         |   12 ++++++++++++
 utils/pdftotext.cc                       |   12 ++++++++++++
 167 files changed, 1806 insertions(+), 48 deletions(-)

New commits:
commit 47f54ad4de111f62a5b8c25520ef6b2bca6026d2
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sun Aug 24 18:18:13 2008 +0200

    Add more correct copyright statements on fofi, goo, poppler and util directories to be more compliant with GPL that requires such modification statements to be present. Meanwhile i did that, i did qt and qt4 dirs too, glib is missing if someone wants to fix it, but it's not crucial as it's not a fork of some other GPL software

diff --git a/AUTHORS b/AUTHORS
index 03eae37..a785e40 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,5 @@
 xpdf is written by Derek Noonburg <derekn at foolabs.com>
 
-libpoppler is a fork of xpdf-3.00 by Kristian HÃ¸gsberg <krh at bitplanet.net>
+libpoppler is a fork of xpdf-3.00
+
+Current Maintainer: Albert Astals Cid <aacid at kde.org>
diff --git a/fofi/FoFiBase.cc b/fofi/FoFiBase.cc
index a83b57c..558b79a 100644
--- a/fofi/FoFiBase.cc
+++ b/fofi/FoFiBase.cc
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Ed Avis <eda at waniasset.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/fofi/FoFiTrueType.cc b/fofi/FoFiTrueType.cc
index fc64be8..78f030d 100644
--- a/fofi/FoFiTrueType.cc
+++ b/fofi/FoFiTrueType.cc
@@ -6,6 +6,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
+// Copyright (C) 2007 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/fofi/FoFiTrueType.h b/fofi/FoFiTrueType.h
index af6dac2..ed56d86 100644
--- a/fofi/FoFiTrueType.h
+++ b/fofi/FoFiTrueType.h
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef FOFITRUETYPE_H
 #define FOFITRUETYPE_H
 
diff --git a/fofi/FoFiType1.cc b/fofi/FoFiType1.cc
index cf5573f..0383db7 100644
--- a/fofi/FoFiType1.cc
+++ b/fofi/FoFiType1.cc
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/fofi/FoFiType1C.h b/fofi/FoFiType1C.h
index 4960e78..f0d81d2 100644
--- a/fofi/FoFiType1C.h
+++ b/fofi/FoFiType1C.h
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef FOFITYPE1C_H
 #define FOFITYPE1C_H
 
diff --git a/goo/GooString.cc b/goo/GooString.cc
index 6817df5..6605b00 100644
--- a/goo/GooString.cc
+++ b/goo/GooString.cc
@@ -8,6 +8,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+// Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/goo/GooString.h b/goo/GooString.h
index e0620bd..69203e2 100644
--- a/goo/GooString.h
+++ b/goo/GooString.h
@@ -8,6 +8,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef GooString_H
 #define GooString_H
 
diff --git a/goo/GooTimer.cc b/goo/GooTimer.cc
index 0f97480..769fd63 100644
--- a/goo/GooTimer.cc
+++ b/goo/GooTimer.cc
@@ -2,7 +2,10 @@
 //
 // GooTimer.cc
 //
+// This file is licensed under GPLv2 or later
+//
 // Copyright 2005 Jonathan Blandford <jrb at redhat.com>
+// Copyright 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
 // Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team
 //
 //========================================================================
diff --git a/goo/GooTimer.h b/goo/GooTimer.h
index f454e2a..f03413c 100755
--- a/goo/GooTimer.h
+++ b/goo/GooTimer.h
@@ -1,8 +1,12 @@
 //========================================================================
 //
-// GooTimer.h
+// GooTimer.cc
 //
-// Copyright 2001-2003 Glyph & Cog, LLC
+// This file is licensed under GPLv2 or later
+//
+// Copyright 2005 Jonathan Blandford <jrb at redhat.com>
+// Copyright 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+// Inspired by gtimer.c in glib, which is Copyright 2000 by the GLib Team
 //
 //========================================================================
 
diff --git a/goo/GooVector.h b/goo/GooVector.h
index 47be664..31a72e9 100644
--- a/goo/GooVector.h
+++ b/goo/GooVector.h
@@ -1,3 +1,15 @@
+//========================================================================
+//
+// This file comes from pdftohtml project
+// http://pdftohtml.sourceforge.net
+//
+// Copyright from:
+// Gueorgui Ovtcharov
+// Rainer Dorsch <http://www.ra.informatik.uni-stuttgart.de/~rainer/>
+// Mikhail Kruk <meshko at cs.brandeis.edu>
+//
+//========================================================================
+
 #ifndef GOO_VECTOR_H
 #define GOO_VECTOR_H
 #include "goo/gtypes.h"
diff --git a/goo/gfile.cc b/goo/gfile.cc
index 811ad14..2774e9f 100644
--- a/goo/gfile.cc
+++ b/goo/gfile.cc
@@ -8,6 +8,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2008 Adam Batkin <adam at batkin.net>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef WIN32
diff --git a/goo/gfile.h b/goo/gfile.h
index ce50562..125045d 100644
--- a/goo/gfile.h
+++ b/goo/gfile.h
@@ -8,6 +8,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef GFILE_H
 #define GFILE_H
 
diff --git a/goo/gmem.cc b/goo/gmem.cc
index b11f2f4..2eca6c4 100644
--- a/goo/gmem.cc
+++ b/goo/gmem.cc
@@ -6,6 +6,19 @@
  * Copyright 1996-2003 Glyph & Cog, LLC
  */
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2007 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008 Jonathan Kew <jonathan_kew at sil.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/goo/gmem.h b/goo/gmem.h
index b1d175d..d1d94b6 100644
--- a/goo/gmem.h
+++ b/goo/gmem.h
@@ -6,6 +6,19 @@
  * Copyright 1996-2003 Glyph & Cog, LLC
  */
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2007 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008 Jonathan Kew <jonathan_kew at sil.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef GMEM_H
 #define GMEM_H
 
diff --git a/poppler/ABWOutputDev.cc b/poppler/ABWOutputDev.cc
index ad0f6c8..ea309cf 100644
--- a/poppler/ABWOutputDev.cc
+++ b/poppler/ABWOutputDev.cc
@@ -2,7 +2,8 @@
 //
 // ABWOutputDev.cc
 //
-// Jauco Noordzij
+// Copyright 2006-2007 Jauco Noordzij
+// Copyright 2007 Dominic Lachowicz
 //
 // Based somewhat on HtmlOutputDev.cc
 //
diff --git a/poppler/ABWOutputDev.h b/poppler/ABWOutputDev.h
index 0ea8807..3d3addd 100644
--- a/poppler/ABWOutputDev.h
+++ b/poppler/ABWOutputDev.h
@@ -2,7 +2,7 @@
 //
 // ABWOutputDev.h
 //
-// Copyright 2006 Jauco Noordzij
+// Copyright 2006-2007 Jauco Noordzij
 //
 //========================================================================
 
diff --git a/poppler/Annot.cc b/poppler/Annot.cc
index c73fc9e..37ff0a1 100644
--- a/poppler/Annot.cc
+++ b/poppler/Annot.cc
@@ -6,6 +6,25 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
+// Copyright (C) 2007, 2008 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2007, 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007, 2008 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2007, 2008 IÃ±igo MartÃnez <inigomartinez at gmail.com>
+// Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2008 Pino Toscano <pino at kde.org>
+// Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
+// Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Annot.h b/poppler/Annot.h
index f34c2a0..34bad4b 100644
--- a/poppler/Annot.h
+++ b/poppler/Annot.h
@@ -6,6 +6,23 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
+// Copyright (C) 2007, 2008 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2007, 2008 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2007, 2008 IÃ±igo MartÃnez <inigomartinez at gmail.com>
+// Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
+// Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
+// Copyright (C) 2008 Pino Toscano <pino at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef ANNOT_H
 #define ANNOT_H
 
diff --git a/poppler/Array.cc b/poppler/Array.cc
index b31d6c5..3d21eb1 100644
--- a/poppler/Array.cc
+++ b/poppler/Array.cc
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Array.h b/poppler/Array.h
index a628330..a69bdec 100644
--- a/poppler/Array.h
+++ b/poppler/Array.h
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef ARRAY_H
 #define ARRAY_H
 
diff --git a/poppler/ArthurOutputDev.cc b/poppler/ArthurOutputDev.cc
index 16c17d9..9c2ea94 100644
--- a/poppler/ArthurOutputDev.cc
+++ b/poppler/ArthurOutputDev.cc
@@ -3,7 +3,19 @@
 // ArthurOutputDev.cc
 //
 // Copyright 2003 Glyph & Cog, LLC
-// Copyright 2004 Red Hat, Inc
+//
+//========================================================================
+
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Brad Hards <bradh at frogmouth.net>
+// Copyright (C) 2005-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008 Pino Toscano <pino at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
 //
 //========================================================================
 
diff --git a/poppler/ArthurOutputDev.h b/poppler/ArthurOutputDev.h
index f71806f..ca10ca9 100644
--- a/poppler/ArthurOutputDev.h
+++ b/poppler/ArthurOutputDev.h
@@ -3,7 +3,18 @@
 // ArthurOutputDev.h
 //
 // Copyright 2003 Glyph & Cog, LLC
-// Copyright 2004 Red Hat, INC
+//
+//========================================================================
+
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Brad Hards <bradh at frogmouth.net>
+// Copyright (C) 2005 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
 //
 //========================================================================
 
diff --git a/poppler/CMap.cc b/poppler/CMap.cc
index 87753ad..1d6426c 100644
--- a/poppler/CMap.cc
+++ b/poppler/CMap.cc
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Koji Otani <sho at bbr.jp>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/CMap.h b/poppler/CMap.h
index d65e434..7f0df00 100644
--- a/poppler/CMap.h
+++ b/poppler/CMap.h
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Koji Otani <sho at bbr.jp>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef CMAP_H
 #define CMAP_H
 
diff --git a/poppler/CairoFontEngine.cc b/poppler/CairoFontEngine.cc
index 5073252..6e2b9d7 100644
--- a/poppler/CairoFontEngine.cc
+++ b/poppler/CairoFontEngine.cc
@@ -7,6 +7,23 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005-2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2005, 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005 Martin Kretzschmar <martink at gnome.org>
+// Copyright (C) 2005 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006, 2007 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
+// Copyright (C) 2008 Chris Wilson <chris at chris-wilson.co.uk>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #include "config.h"
diff --git a/poppler/CairoFontEngine.h b/poppler/CairoFontEngine.h
index b8af716..a6b4f7b 100644
--- a/poppler/CairoFontEngine.h
+++ b/poppler/CairoFontEngine.h
@@ -2,6 +2,23 @@
 //
 // CairoFontEngine.h
 //
+// Copyright 2003 Glyph & Cog, LLC
+// Copyright 2004 Red Hat, Inc
+//
+//========================================================================
+
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005, 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2006 Carlos Garcia Campos <carlosgc at gnome.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
 //========================================================================
 
 #ifndef CAIROFONTENGINE_H
diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
index 907bac8..254dfd8 100644
--- a/poppler/CairoOutputDev.cc
+++ b/poppler/CairoOutputDev.cc
@@ -7,6 +7,25 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005-2008 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2005, 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev at yandex.ru>
+// Copyright (C) 2006-2008 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2008 Carl Worth <cworth at cworth.org>
+// Copyright (C) 2008 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
+// Copyright (C) 2008 Chris Wilson <chris at chris-wilson.co.uk>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/CairoOutputDev.h b/poppler/CairoOutputDev.h
index fad6765..ec4789a 100644
--- a/poppler/CairoOutputDev.h
+++ b/poppler/CairoOutputDev.h
@@ -7,6 +7,22 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005-2008 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2005, 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev at yandex.ru>
+// Copyright (C) 2006-2008 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2008 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef CAIROOUTPUTDEV_H
 #define CAIROOUTPUTDEV_H
 
diff --git a/poppler/Catalog.cc b/poppler/Catalog.cc
index 69480c0..aef2a15 100644
--- a/poppler/Catalog.cc
+++ b/poppler/Catalog.cc
@@ -6,6 +6,25 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005-2007 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005 Jeff Muizelaar <jrmuizel at nit.ca>
+// Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
+// Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
+// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh at frogmouth.net>
+// Copyright (C) 2006, 2008 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2007 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2008 Pino Toscano <pino at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Catalog.h b/poppler/Catalog.h
index 295264b..041c032 100644
--- a/poppler/Catalog.h
+++ b/poppler/Catalog.h
@@ -6,6 +6,22 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005, 2007 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
+// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh at frogmouth.net>
+// Copyright (C) 2007 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2008 Pino Toscano <pino at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef CATALOG_H
 #define CATALOG_H
 
diff --git a/poppler/CharCodeToUnicode.cc b/poppler/CharCodeToUnicode.cc
index de2617a..40d33a4 100644
--- a/poppler/CharCodeToUnicode.cc
+++ b/poppler/CharCodeToUnicode.cc
@@ -6,6 +6,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006, 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
+// Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/CharCodeToUnicode.h b/poppler/CharCodeToUnicode.h
index 08e5d75..d8866bd 100644
--- a/poppler/CharCodeToUnicode.h
+++ b/poppler/CharCodeToUnicode.h
@@ -8,6 +8,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef CHARCODETOUNICODE_H
 #define CHARCODETOUNICODE_H
 
diff --git a/poppler/DCTStream.cc b/poppler/DCTStream.cc
index 99f1aeb..62ef36a 100644
--- a/poppler/DCTStream.cc
+++ b/poppler/DCTStream.cc
@@ -2,7 +2,10 @@
 //
 // DCTStream.cc
 //
-// Copyright 1996-2003 Glyph & Cog, LLC
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2005 Jeff Muizelaar Jeff Muizelaar <jeff at infidigm.net>
+// Copyright 2005-2008 Albert Astals Cid <aacid at kde.org>
 //
 //========================================================================
 
diff --git a/poppler/DCTStream.h b/poppler/DCTStream.h
index dbab9b7..088cad1 100644
--- a/poppler/DCTStream.h
+++ b/poppler/DCTStream.h
@@ -2,7 +2,11 @@
 //
 // DCTStream.h
 //
-// Copyright 1996-2003 Glyph & Cog, LLC
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2005 Jeff Muizelaar Jeff Muizelaar <jeff at infidigm.net>
+// Copyright 2005 Martin Kretzschmar <martink at gnome.org>
+// Copyright 2005-2007 Albert Astals Cid <aacid at kde.org>
 //
 //========================================================================
 
diff --git a/poppler/Decrypt.cc b/poppler/Decrypt.cc
index 4c89ae4..3bc4f7d 100644
--- a/poppler/Decrypt.cc
+++ b/poppler/Decrypt.cc
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Julien Rebetez <julien at fhtagn.net>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Decrypt.h b/poppler/Decrypt.h
index b861968..eed3789 100644
--- a/poppler/Decrypt.h
+++ b/poppler/Decrypt.h
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Julien Rebetez <julien at fhtagn.net>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef DECRYPT_H
 #define DECRYPT_H
 
diff --git a/poppler/Dict.cc b/poppler/Dict.cc
index df79cca..19089f6 100644
--- a/poppler/Dict.cc
+++ b/poppler/Dict.cc
@@ -6,6 +6,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+// Copyright (C) 2007-2008 Julien Rebetez <julienr at svn.gnome.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Dict.h b/poppler/Dict.h
index badb6b5..2cb811f 100644
--- a/poppler/Dict.h
+++ b/poppler/Dict.h
@@ -6,6 +6,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+// Copyright (C) 2007-2008 Julien Rebetez <julienr at svn.gnome.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef DICT_H
 #define DICT_H
 
diff --git a/poppler/Error.cc b/poppler/Error.cc
index 80e45aa..d6ea651 100644
--- a/poppler/Error.cc
+++ b/poppler/Error.cc
@@ -6,6 +6,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005, 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2005 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Error.h b/poppler/Error.h
index 0f780c9..dc62682 100644
--- a/poppler/Error.h
+++ b/poppler/Error.h
@@ -6,6 +6,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005, 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2005 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef ERROR_H
 #define ERROR_H
 
diff --git a/poppler/FlateStream.cc b/poppler/FlateStream.cc
index da17c68..18686d7 100644
--- a/poppler/FlateStream.cc
+++ b/poppler/FlateStream.cc
@@ -4,6 +4,8 @@
 //
 // Copyright (C) 2005, Jeff Muizelaar
 //
+// This file is under the GPLv2 or later license
+//
 //========================================================================
 #include "FlateStream.h"
 FlateStream::FlateStream(Stream *strA, int predictor, int columns, int colors, int bits) :
diff --git a/poppler/FlateStream.h b/poppler/FlateStream.h
index ede7984..3768c84 100644
--- a/poppler/FlateStream.h
+++ b/poppler/FlateStream.h
@@ -4,6 +4,8 @@
 //
 // Copyright (C) 2005, Jeff Muizelaar
 //
+// This file is under the GPLv2 or later license
+//
 //========================================================================
 
 #ifndef FLATESTREAM_H
diff --git a/poppler/FontInfo.cc b/poppler/FontInfo.cc
index fa011d8..060e2c3 100644
--- a/poppler/FontInfo.cc
+++ b/poppler/FontInfo.cc
@@ -1,3 +1,25 @@
+//========================================================================
+//
+// FontInfo.cc
+//
+// Copyright (C) 2005, 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005 Brad Hards <bradh at frogmouth.net>
+// Copyright (C) 2006 Kouhei Sutou <kou at cozmixng.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
+//========================================================================
+//
+// Based on code from pdffonts.cc
+//
+// Copyright 2001-2007 Glyph & Cog, LLC
+//
+//========================================================================
+
 #include "config.h"
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/poppler/FontInfo.h b/poppler/FontInfo.h
index aec51bb..49ad645 100644
--- a/poppler/FontInfo.h
+++ b/poppler/FontInfo.h
@@ -1,3 +1,24 @@
+//========================================================================
+//
+// FontInfo.cc
+//
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005 Brad Hards <bradh at frogmouth.net>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
+//========================================================================
+//
+// Based on code from pdffonts.cc
+//
+// Copyright 2001-2007 Glyph & Cog, LLC
+//
+//========================================================================
+
 #ifndef FONT_INFO_H
 #define FONT_INFO_H
 
diff --git a/poppler/Form.cc b/poppler/Form.cc
index 83f9024..27a4d16 100644
--- a/poppler/Form.cc
+++ b/poppler/Form.cc
@@ -2,7 +2,15 @@
 //
 // Form.cc
 //
-// Copyright 2006 Julien Rebetez
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2006-2008 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright 2007 Albert Astals Cid <aacid at kde.org>
+// Copyright 2007-2008 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright 2007 Adrian Johnson <ajohnson at redneon.com>
+// Copyright 2007 IÃ±igo MartÃnez <inigomartinez at gmail.com>
+// Copyright 2008 Pino Toscano <pino at kde.org>
+// Copyright 2008 Michael Vrable <mvrable at cs.ucsd.edu>
 //
 //========================================================================
 
diff --git a/poppler/Form.h b/poppler/Form.h
index 64df280..07d3277 100644
--- a/poppler/Form.h
+++ b/poppler/Form.h
@@ -2,7 +2,11 @@
 //
 // Form.h
 //
-// Copyright 2006 Julien Rebetez
+// This file is licensed under the GPLv2 or later
+//
+// Copyright 2006 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright 2007, 2008 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright 2007 Albert Astals Cid <aacid at kde.org>
 //
 //========================================================================
 
diff --git a/poppler/Function.cc b/poppler/Function.cc
index f852e01..6c693f0 100644
--- a/poppler/Function.cc
+++ b/poppler/Function.cc
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006, 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006 Jeff Muizelaar <jeff at infidigm.net>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
index 41ccdb7..d47514c 100644
--- a/poppler/Gfx.cc
+++ b/poppler/Gfx.cc
@@ -6,6 +6,29 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
+// Copyright (C) 2005-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006 Thorkild Stray <thorkild at ifi.uio.no>
+// Copyright (C) 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2006-2008 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2007, 2008 Brad Hards <bradh at kde.org>
+// Copyright (C) 2007 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2007, 2008 IÃ±igo MartÃnez <inigomartinez at gmail.com>
+// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
+// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+// Copyright (C) 2008 Pino Toscano <pino at kde.org>
+// Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Gfx.h b/poppler/Gfx.h
index 10be638..7e2c49f 100644
--- a/poppler/Gfx.h
+++ b/poppler/Gfx.h
@@ -6,6 +6,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
+// Copyright (C) 2007 IÃ±igo MartÃnez <inigomartinez at gmail.com>
+// Copyright (C) 2008 Brad Hards <bradh at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef GFX_H
 #define GFX_H
 
diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
index 5c66da9..5d536b7 100644
--- a/poppler/GfxFont.cc
+++ b/poppler/GfxFont.cc
@@ -6,6 +6,25 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005, 2006, 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005, 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2007 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
+// Copyright (C) 2007 Ed Catmur <ed at catmur.co.uk>
+// Copyright (C) 2008 Jonathan Kew <jonathan_kew at sil.org>
+// Copyright (C) 2008 Ed Avis <eda at waniasset.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/GfxFont.h b/poppler/GfxFont.h
index 72cc71f..f40724b 100644
--- a/poppler/GfxFont.h
+++ b/poppler/GfxFont.h
@@ -6,6 +6,22 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005, 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2007 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef GFXFONT_H
 #define GFXFONT_H
 
diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
index 98628bf..ecc9572 100644
--- a/poppler/GfxState.cc
+++ b/poppler/GfxState.cc
@@ -6,6 +6,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2006 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2006-2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/GfxState.h b/poppler/GfxState.h
index c766858..883fd67 100644
--- a/poppler/GfxState.h
+++ b/poppler/GfxState.h
@@ -6,6 +6,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2006 Carlos Garcia Campos <carlosgc at gnome.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef GFXSTATE_H
 #define GFXSTATE_H
 
diff --git a/poppler/GlobalParams.cc b/poppler/GlobalParams.cc
index 15a052d..ee7bb12 100644
--- a/poppler/GlobalParams.cc
+++ b/poppler/GlobalParams.cc
@@ -6,6 +6,25 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Martin Kretzschmar <martink at gnome.org>
+// Copyright (C) 2005, 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005, 2007, 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
+// Copyright (C) 2006, 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2006 Ed Catmur <ed at catmur.co.uk>
+// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+// Copyright (C) 2007 Jonathan Kew <jonathan_kew at sil.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/GlobalParams.h b/poppler/GlobalParams.h
index 9e85a72..735cbfe 100644
--- a/poppler/GlobalParams.h
+++ b/poppler/GlobalParams.h
@@ -6,6 +6,21 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005, 2007, 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef GLOBALPARAMS_H
 #define GLOBALPARAMS_H
 
diff --git a/poppler/JBIG2Stream.cc b/poppler/JBIG2Stream.cc
index 1328d40..8a5c736 100644
--- a/poppler/JBIG2Stream.cc
+++ b/poppler/JBIG2Stream.cc
@@ -6,6 +6,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Raj Kumar <rkumar at archive.org>
+// Copyright (C) 2006 Paul Walmsley <paul at booyaka.com>
+// Copyright (C) 2006-2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/JPXStream.cc b/poppler/JPXStream.cc
index 1068a78..7637da3 100644
--- a/poppler/JPXStream.cc
+++ b/poppler/JPXStream.cc
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 #include <limits.h>
 
diff --git a/poppler/Lexer.cc b/poppler/Lexer.cc
index 83ebb05..eb3774d 100644
--- a/poppler/Lexer.cc
+++ b/poppler/Lexer.cc
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Lexer.h b/poppler/Lexer.h
index a07b4f7..8894cc0 100644
--- a/poppler/Lexer.h
+++ b/poppler/Lexer.h
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006, 2007 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef LEXER_H
 #define LEXER_H
 
diff --git a/poppler/Link.cc b/poppler/Link.cc
index 60e2b35..5775765 100644
--- a/poppler/Link.cc
+++ b/poppler/Link.cc
@@ -6,6 +6,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006, 2008 Pino Toscano <pino at kde.org>
+// Copyright (C) 2007 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Link.h b/poppler/Link.h
index 98e1c91..9728a91 100644
--- a/poppler/Link.h
+++ b/poppler/Link.h
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006, 2008 Pino Toscano <pino at kde.org>
+// Copyright (C) 2008 Hugo Mercier <hmercier31 at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef LINK_H
 #define LINK_H
 
diff --git a/poppler/Movie.cc b/poppler/Movie.cc
index f0a4796..e29c64e 100644
--- a/poppler/Movie.cc
+++ b/poppler/Movie.cc
@@ -1,9 +1,24 @@
 //*********************************************************************************
 //                               Movie.cc
 //---------------------------------------------------------------------------------
+// 
+//---------------------------------------------------------------------------------
 // Hugo Mercier <hmercier31[at]gmail.com> (c) 2008
+// Pino Toscano <pino at kde.org> (c) 2008
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 //
-// GNU GENERAL PUBLIC LICENSE - See COPYING.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //*********************************************************************************
 
 #include "Movie.h"
diff --git a/poppler/Object.cc b/poppler/Object.cc
index b5c0d51..4e5f9d6 100644
--- a/poppler/Object.cc
+++ b/poppler/Object.cc
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Object.h b/poppler/Object.h
index c73d010..3471d76 100644
--- a/poppler/Object.h
+++ b/poppler/Object.h
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2008 Kees Cook <kees at outflux.net>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef OBJECT_H
 #define OBJECT_H
 
diff --git a/poppler/OptionalContent.cc b/poppler/OptionalContent.cc
index 181fef0..5e94c24 100644
--- a/poppler/OptionalContent.cc
+++ b/poppler/OptionalContent.cc
@@ -1,8 +1,11 @@
 //========================================================================
 //
-// OptionalContent.h
+// OptionalContent.cc
 //
 // Copyright 2007 Brad Hards <bradh at kde.org>
+// Copyright 2008 Pino Toscano <pino at kde.org>
+// Copyright 2008 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright 2008 Albert Astals Cid <aacid at kde.org>
 //
 // Released under the GPL (version 2, or later, at your option)
 //
diff --git a/poppler/Outline.cc b/poppler/Outline.cc
index 38cfd90..32b3bda 100644
--- a/poppler/Outline.cc
+++ b/poppler/Outline.cc
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Outline.h b/poppler/Outline.h
index 999c21e..90f9823 100644
--- a/poppler/Outline.h
+++ b/poppler/Outline.h
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef OUTLINE_H
 #define OUTLINE_H
 
diff --git a/poppler/OutputDev.cc b/poppler/OutputDev.cc
index dedffd3..f45a076 100644
--- a/poppler/OutputDev.cc
+++ b/poppler/OutputDev.cc
@@ -6,6 +6,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
+// Copyright (C) 2006 Thorkild Stray <thorkild at ifi.uio.no>
+// Copyright (C) 2007 Adrian Johnson <ajohnson at redneon.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/OutputDev.h b/poppler/OutputDev.h
index af042c6..bb17128 100644
--- a/poppler/OutputDev.h
+++ b/poppler/OutputDev.h
@@ -6,6 +6,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Jonathan Blandford <jrb at redhat.com>
+// Copyright (C) 2006 Thorkild Stray <thorkild at ifi.uio.no>
+// Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2007 Adrian Johnson <ajohnson at redneon.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef OUTPUTDEV_H
 #define OUTPUTDEV_H
 
diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
index c5abe30..9e107c9 100644
--- a/poppler/PDFDoc.cc
+++ b/poppler/PDFDoc.cc
@@ -6,6 +6,21 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh at frogmouth.net>
+// Copyright (C) 2005, 2007, 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2008 Pino Toscano <pino at kde.org>
+// Copyright (C) 2008 Carlos Garcia Campos <carlosgc at gnome.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/PDFDoc.h b/poppler/PDFDoc.h
index 07fea34..a3cd981 100644
--- a/poppler/PDFDoc.h
+++ b/poppler/PDFDoc.h
@@ -6,6 +6,21 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005, 2006, 2008 Brad Hards <bradh at frogmouth.net>
+// Copyright (C) 2005 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2008 Pino Toscano <pino at kde.org>
+// Copyright (C) 2008 Carlos Garcia Campos <carlosgc at gnome.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef PDFDOC_H
 #define PDFDOC_H
 
diff --git a/poppler/PDFDocEncoding.cc b/poppler/PDFDocEncoding.cc
index 1d3ea74..8a0e30b 100644
--- a/poppler/PDFDocEncoding.cc
+++ b/poppler/PDFDocEncoding.cc
@@ -1,11 +1,22 @@
 //========================================================================
 //
-// PDFDocEncoding.h
+// PDFDocEncoding.cc
 //
 // Copyright 2002-2003 Glyph & Cog, LLC
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Michael Vrable <mvrable at cs.ucsd.edu>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include "PDFDocEncoding.h"
 
 // Mapping of PDFDocEncoding (used to represent text values such as document
diff --git a/poppler/PDFDocEncoding.h b/poppler/PDFDocEncoding.h
index 7e5f17d..9a2b54f 100644
--- a/poppler/PDFDocEncoding.h
+++ b/poppler/PDFDocEncoding.h
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007 Adrian Johnson <ajohnson at redneon.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef PDFDOCENCODING_H
 #define PDFDOCENCODING_H
 
diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
index 46224df..c187271 100644
--- a/poppler/PSOutputDev.cc
+++ b/poppler/PSOutputDev.cc
@@ -6,6 +6,21 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Martin Kretzschmar <martink at gnome.org>
+// Copyright (C) 2005, 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2006-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2007, 2008 Brad Hards <bradh at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/PSOutputDev.h b/poppler/PSOutputDev.h
index 06b633e..c377e53 100644
--- a/poppler/PSOutputDev.h
+++ b/poppler/PSOutputDev.h
@@ -6,6 +6,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Martin Kretzschmar <martink at gnome.org>
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2006, 2007 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007 Brad Hards <bradh at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef PSOUTPUTDEV_H
 #define PSOUTPUTDEV_H
 
diff --git a/poppler/PSTokenizer.cc b/poppler/PSTokenizer.cc
index 0e70df5..3c590c3 100644
--- a/poppler/PSTokenizer.cc
+++ b/poppler/PSTokenizer.cc
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/PSTokenizer.h b/poppler/PSTokenizer.h
index fa6d4c2..5046409 100644
--- a/poppler/PSTokenizer.h
+++ b/poppler/PSTokenizer.h
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef PSTOKENIZER_H
 #define PSTOKENIZER_H
 
diff --git a/poppler/Page.cc b/poppler/Page.cc
index c25f97b..c6a6018 100644
--- a/poppler/Page.cc
+++ b/poppler/Page.cc
@@ -6,6 +6,26 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2005-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006-2008 Pino Toscano <pino at kde.org>
+// Copyright (C) 2006 Nickolay V. Shmyrev <nshmyrev at yandex.ru>
+// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
+// Copyright (C) 2006-2008 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2007 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2008 IÃ±igo MartÃnez <inigomartinez at gmail.com>
+// Copyright (C) 2008 Brad Hards <bradh at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Page.h b/poppler/Page.h
index 864a21e..4a66cf5 100644
--- a/poppler/Page.h
+++ b/poppler/Page.h
@@ -6,6 +6,22 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2006 Pino Toscano <pino at kde.org>
+// Copyright (C) 2006 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2007 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2008 IÃ±igo MartÃnez <inigomartinez at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef PAGE_H
 #define PAGE_H
 
diff --git a/poppler/PageLabelInfo.cc b/poppler/PageLabelInfo.cc
index 6ca65e9..8856881 100644
--- a/poppler/PageLabelInfo.cc
+++ b/poppler/PageLabelInfo.cc
@@ -1,3 +1,15 @@
+//========================================================================
+//
+// This file is under the GPLv2 or later license
+//
+// Copyright (C) 2005-2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 #include <limits.h>
 #include <stdlib.h>
diff --git a/poppler/PageLabelInfo.h b/poppler/PageLabelInfo.h
index 506f157..8ca0c0e 100644
--- a/poppler/PageLabelInfo.h
+++ b/poppler/PageLabelInfo.h
@@ -1,3 +1,15 @@
+//========================================================================
+//
+// This file is under the GPLv2 or later license
+//
+// Copyright (C) 2005-2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/poppler/PageTransition.h b/poppler/PageTransition.h
index 83ab669..e892c6c 100644
--- a/poppler/PageTransition.h
+++ b/poppler/PageTransition.h
@@ -1,3 +1,21 @@
+/* PageTransition.cc
+ * Copyright (C) 2005, Net Integration Technologies, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
 #ifndef PAGE_TRANSITION_H
 #define PAGE_TRANSITION_H
 
diff --git a/poppler/Parser.cc b/poppler/Parser.cc
index 8b65bb7..5d0274d 100644
--- a/poppler/Parser.cc
+++ b/poppler/Parser.cc
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Parser.h b/poppler/Parser.h
index 0422b26..1616199 100644
--- a/poppler/Parser.h
+++ b/poppler/Parser.h
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef PARSER_H
 #define PARSER_H
 
diff --git a/poppler/SplashOutputDev.cc b/poppler/SplashOutputDev.cc
index a2f28b2..b03f61f 100644
--- a/poppler/SplashOutputDev.cc
+++ b/poppler/SplashOutputDev.cc
@@ -6,6 +6,22 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2006 Stefan Schweizer <genstef at gentoo.org>
+// Copyright (C) 2006-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+// Copyright (C) 2006 Scott Turner <scotty1024 at mac.com>
+// Copyright (C) 2007 Koji Otani <sho at bbr.jp>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/SplashOutputDev.h b/poppler/SplashOutputDev.h
index 12b4d94..593f237 100644
--- a/poppler/SplashOutputDev.h
+++ b/poppler/SplashOutputDev.h
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Takashi Iwai <tiwai at suse.de>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHOUTPUTDEV_H
 #define SPLASHOUTPUTDEV_H
 
diff --git a/poppler/Stream-CCITT.h b/poppler/Stream-CCITT.h
index 492fdad..2469c1b 100644
--- a/poppler/Stream-CCITT.h
+++ b/poppler/Stream-CCITT.h
@@ -8,6 +8,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 struct CCITTCode {
   short bits;
   short n;
diff --git a/poppler/Stream.cc b/poppler/Stream.cc
index b8dd39a..38b6f7a 100644
--- a/poppler/Stream.cc
+++ b/poppler/Stream.cc
@@ -6,6 +6,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2006-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007 Krzysztof Kowalczyk <kkowalczyk at gmail.com>
+// Copyright (C) 2008 Julien Rebetez <julien at fhtagn.net>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/Stream.h b/poppler/Stream.h
index 3c463e2..ef778c6 100644
--- a/poppler/Stream.h
+++ b/poppler/Stream.h
@@ -6,6 +6,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2008 Julien Rebetez <julien at fhtagn.net>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef STREAM_H
 #define STREAM_H
 
diff --git a/poppler/TextOutputDev.cc b/poppler/TextOutputDev.cc
index c3d7bb3..e5ce643 100644
--- a/poppler/TextOutputDev.cc
+++ b/poppler/TextOutputDev.cc
@@ -6,6 +6,24 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005-2007 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2005 Nickolay V. Shmyrev <nshmyrev at yandex.ru>
+// Copyright (C) 2006, 2007 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2006, 2007 Ed Catmur <ed at catmur.co.uk>
+// Copyright (C) 2006 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2007, 2008 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2008 Koji Otani <sho at bbr.jp>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/TextOutputDev.h b/poppler/TextOutputDev.h
index 711aee3..3dc5f6f 100644
--- a/poppler/TextOutputDev.h
+++ b/poppler/TextOutputDev.h
@@ -6,6 +6,21 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005-2007 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2006 Ed Catmur <ed at catmur.co.uk>
+// Copyright (C) 2007 Carlos Garcia Campos <carlosgc at gnome.org>
+// Copyright (C) 2007 Adrian Johnson <ajohnson at redneon.com>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef TEXTOUTPUTDEV_H
 #define TEXTOUTPUTDEV_H
 
diff --git a/poppler/UTF8.h b/poppler/UTF8.h
index 11fb864..9e5527a 100644
--- a/poppler/UTF8.h
+++ b/poppler/UTF8.h
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Koji Otani <sho at bbr.jp>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 static int mapUTF8(Unicode u, char *buf, int bufSize) {
   if        (u <= 0x0000007f) {
     if (bufSize < 1) {
diff --git a/poppler/UnicodeTypeTable.cc b/poppler/UnicodeTypeTable.cc
index 2aade77..3300f21 100644
--- a/poppler/UnicodeTypeTable.cc
+++ b/poppler/UnicodeTypeTable.cc
@@ -6,6 +6,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006, 2007 Ed Catmur <ed at catmur.co.uk>
+// Copyright (C) 2007 Jeff Muizelaar <jeff at infidigm.net>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <stdlib.h>
 #include "CharTypes.h"
 #include "UnicodeTypeTable.h"
diff --git a/poppler/UnicodeTypeTable.h b/poppler/UnicodeTypeTable.h
index 9330051..939e916 100644
--- a/poppler/UnicodeTypeTable.h
+++ b/poppler/UnicodeTypeTable.h
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Ed Catmur <ed at catmur.co.uk>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef UNICODETYPETABLE_H
 #define UNICODETYPETABLE_H
 
diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index 3a5aeaa..394781d 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -1,4 +1,4 @@
- //========================================================================
+//========================================================================
 //
 // XRef.cc
 //
@@ -6,6 +6,21 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Dan Sheridan <dan.sheridan at postman.org.uk>
+// Copyright (C) 2005 Brad Hards <bradh at frogmouth.net>
+// Copyright (C) 2006, 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007-2008 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2007 Carlos Garcia Campos <carlosgc at gnome.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/poppler/XRef.h b/poppler/XRef.h
index 2081db5..727187c 100644
--- a/poppler/XRef.h
+++ b/poppler/XRef.h
@@ -6,6 +6,20 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Brad Hards <bradh at frogmouth.net>
+// Copyright (C) 2006, 2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007-2008 Julien Rebetez <julienr at svn.gnome.org>
+// Copyright (C) 2007 Carlos Garcia Campos <carlosgc at gnome.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef XREF_H
 #define XREF_H
 
diff --git a/qt/poppler-document.cc b/qt/poppler-document.cc
index acecc36..cf47e19 100644
--- a/qt/poppler-document.cc
+++ b/qt/poppler-document.cc
@@ -1,5 +1,8 @@
 /* poppler-document.cc: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2005-2008, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2006, Stefan Kebekus <stefan.kebekus at math.uni-koeln.de>
+ * Copyright (C) 2006, Wilfried Huss <Wilfried.Huss at gmx.at>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt/poppler-fontinfo.cc b/qt/poppler-fontinfo.cc
index 228385c..6eb9d26 100644
--- a/qt/poppler-fontinfo.cc
+++ b/qt/poppler-fontinfo.cc
@@ -1,6 +1,5 @@
 /* poppler-qt.h: qt interface to poppler
- * Copyright (C) 2005, Net Integration Technologies, Inc.
- * Copyright (C) 2005, Tobias Koening
+ * Copyright (C) 2005, Albert Astals Cid <aacid at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt/poppler-page.cc b/qt/poppler-page.cc
index 0f65df1..67a8aa7 100644
--- a/qt/poppler-page.cc
+++ b/qt/poppler-page.cc
@@ -1,6 +1,11 @@
 /* poppler-page.cc: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
- * Copyright (C) 2005, Tobias Koening
+ * Copyright (C) 2005-2006, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2005, Tobias Koening <tokoe at kde.org>
+ * Copyright (C) 2005, Stefan Kebekus <stefan.kebekus at math.uni-koeln.de>
+ * Copyright (C) 2006, Wilfried Huss <Wilfried.Huss at gmx.at>
+ * Copyright (C) 2006, Jerry Epplin <jepplin at globalvelocity.com>
+ * Copyright (C) 2007, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt/poppler-private.h b/qt/poppler-private.h
index 899f2bf..21a147f 100644
--- a/qt/poppler-private.h
+++ b/qt/poppler-private.h
@@ -1,5 +1,9 @@
 /* poppler-private.h: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2005-2008, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2006, Kristian HÃ¸gsberg <krh at bitplanet.net>
+ * Copyright (C) 2006, Wilfried Huss <Wilfried.Huss at gmx.at>
+ * Copyright (C) 2007, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt/poppler-qt.h b/qt/poppler-qt.h
index 0aae37c..e649d79 100644
--- a/qt/poppler-qt.h
+++ b/qt/poppler-qt.h
@@ -1,6 +1,9 @@
 /* poppler-qt.h: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
- * Copyright (C) 2005, Tobias Koening
+ * Copyright (C) 2005, Tobias Koening <tokoe at kde.org>
+ * Copyright (C) 2005-2007, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2005-2006, Stefan Kebekus <stefan.kebekus at math.uni-koeln.de>
+ * Copyright (C) 2006, Wilfried Huss <Wilfried.Huss at gmx.at>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-annotation-helper.h b/qt4/src/poppler-annotation-helper.h
index 5874958..eccb2b5 100644
--- a/qt4/src/poppler-annotation-helper.h
+++ b/qt4/src/poppler-annotation-helper.h
@@ -1,5 +1,6 @@
 /* poppler-annotation-helper.h: qt interface to poppler
  * Copyright (C) 2006, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  * Adapting code from
  *   Copyright (C) 2004 by Enrico Ros <eros.kde at email.it>
  *
diff --git a/qt4/src/poppler-annotation.cc b/qt4/src/poppler-annotation.cc
index c30edd5..8e75813 100644
--- a/qt4/src/poppler-annotation.cc
+++ b/qt4/src/poppler-annotation.cc
@@ -1,5 +1,6 @@
 /* poppler-annotation.cc: qt interface to poppler
- * Copyright (C) 2006, Albert Astals Cid
+ * Copyright (C) 2006, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2006, 2008 Pino Toscano <pino at kde.org>
  * Adapting code from
  *   Copyright (C) 2004 by Enrico Ros <eros.kde at email.it>
  *
diff --git a/qt4/src/poppler-annotation.h b/qt4/src/poppler-annotation.h
index b993476..e83b7a3 100644
--- a/qt4/src/poppler-annotation.h
+++ b/qt4/src/poppler-annotation.h
@@ -1,5 +1,7 @@
 /* poppler-annotation.h: qt interface to poppler
- * Copyright (C) 2006, Albert Astals Cid
+ * Copyright (C) 2006-2008, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2006, 2008 Pino Toscano <pino at kde.org>
+ * Copyright (C) 2007, Brad Hards <bradh at frogmouth.net>
  * Adapting code from
  *   Copyright (C) 2004 by Enrico Ros <eros.kde at email.it>
  *
diff --git a/qt4/src/poppler-document.cc b/qt4/src/poppler-document.cc
index a6f6af8..13012f2 100644
--- a/qt4/src/poppler-document.cc
+++ b/qt4/src/poppler-document.cc
@@ -1,6 +1,8 @@
 /* poppler-document.cc: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
- * Copyright (C) 2005, Brad Hards <bradh at frogmouth.net>
+ * Copyright (C) 2005, 2008, Brad Hards <bradh at frogmouth.net>
+ * Copyright (C) 2005-2008, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2006-2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-embeddedfile.cc b/qt4/src/poppler-embeddedfile.cc
index 3eb2bcd..aa98b22 100644
--- a/qt4/src/poppler-embeddedfile.cc
+++ b/qt4/src/poppler-embeddedfile.cc
@@ -1,6 +1,7 @@
 /* poppler-document.cc: qt interface to poppler
  * Copyright (C) 2005, Albert Astals Cid <aacid at kde.org>
  * Copyright (C) 2005, Brad Hards <bradh at frogmouth.net>
+ * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-fontinfo.cc b/qt4/src/poppler-fontinfo.cc
index b87f386..08a80a2 100644
--- a/qt4/src/poppler-fontinfo.cc
+++ b/qt4/src/poppler-fontinfo.cc
@@ -1,6 +1,9 @@
 /* poppler-qt.h: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
- * Copyright (C) 2005, Tobias Koening
+ * Copyright (C) 2005, Tobias Koening <tokoe at kde.org>
+ * Copyright (C) 2005, Brad Hards <bradh at frogmouth.net>
+ * Copyright (C) 2005-2008, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-form.cc b/qt4/src/poppler-form.cc
index bfd6d26..772cdd9 100644
--- a/qt4/src/poppler-form.cc
+++ b/qt4/src/poppler-form.cc
@@ -1,5 +1,5 @@
 /* poppler-form.h: qt4 interface to poppler
- * Copyright (C) 2007, Pino Toscano <pino at kde.org>
+ * Copyright (C) 2007-2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-form.h b/qt4/src/poppler-form.h
index 315ea65..7307fd0 100644
--- a/qt4/src/poppler-form.h
+++ b/qt4/src/poppler-form.h
@@ -1,5 +1,5 @@
 /* poppler-form.h: qt4 interface to poppler
- * Copyright (C) 2007, Pino Toscano <pino at kde.org>
+ * Copyright (C) 2007-2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-link-extractor-private.h b/qt4/src/poppler-link-extractor-private.h
index 03d93e0..284f33c 100644
--- a/qt4/src/poppler-link-extractor-private.h
+++ b/qt4/src/poppler-link-extractor-private.h
@@ -1,5 +1,5 @@
 /* poppler-link-extractor_p.h: qt interface to poppler
- * Copyright (C) 2007, Pino Toscano <pino at kde.org>
+ * Copyright (C) 2007-2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-link-extractor.cc b/qt4/src/poppler-link-extractor.cc
index bcce8cd..2a9bce6 100644
--- a/qt4/src/poppler-link-extractor.cc
+++ b/qt4/src/poppler-link-extractor.cc
@@ -1,5 +1,5 @@
 /* poppler-link-extractor_p.h: qt interface to poppler
- * Copyright (C) 2007, Pino Toscano <pino at kde.org>
+ * Copyright (C) 2007-2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-link.cc b/qt4/src/poppler-link.cc
index fb9df21..1b986a3 100644
--- a/qt4/src/poppler-link.cc
+++ b/qt4/src/poppler-link.cc
@@ -1,5 +1,6 @@
 /* poppler-link.cc: qt interface to poppler
- * Copyright (C) 2006, Albert Astals Cid
+ * Copyright (C) 2006-2007, Albert Astals Cid
+ * Copyright (C) 2007-2008, Pino Toscano <pino at kde.org>
  * Adapting code from
  *   Copyright (C) 2004 by Enrico Ros <eros.kde at email.it>
  *
diff --git a/qt4/src/poppler-link.h b/qt4/src/poppler-link.h
index 5102d06..c088ea8 100644
--- a/qt4/src/poppler-link.h
+++ b/qt4/src/poppler-link.h
@@ -1,5 +1,6 @@
 /* poppler-link.h: qt interface to poppler
  * Copyright (C) 2006, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2007-2008, Pino Toscano <pino at kde.org>
  * Adapting code from
  *   Copyright (C) 2004 by Enrico Ros <eros.kde at email.it>
  *
diff --git a/qt4/src/poppler-optcontent-private.h b/qt4/src/poppler-optcontent-private.h
index 3a995f0..98eda07 100644
--- a/qt4/src/poppler-optcontent-private.h
+++ b/qt4/src/poppler-optcontent-private.h
@@ -1,6 +1,7 @@
 /* poppler-optcontent-private.h: qt interface to poppler
  *
  * Copyright (C) 2007, Brad Hards <bradh at kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-optcontent.cc b/qt4/src/poppler-optcontent.cc
index 7e9cf7d..af916ab 100644
--- a/qt4/src/poppler-optcontent.cc
+++ b/qt4/src/poppler-optcontent.cc
@@ -1,6 +1,7 @@
 /* poppler-optcontent.cc: qt interface to poppler
  *
  * Copyright (C) 2007, Brad Hards <bradh at kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-optcontent.h b/qt4/src/poppler-optcontent.h
index 2b0c5ec..99471a0 100644
--- a/qt4/src/poppler-optcontent.h
+++ b/qt4/src/poppler-optcontent.h
@@ -1,6 +1,7 @@
 /* poppler-optcontent.h: qt interface to poppler
  *
  * Copyright (C) 2007, Brad Hards <bradh at kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-page-private.h b/qt4/src/poppler-page-private.h
index 012eed4..ecdca17 100644
--- a/qt4/src/poppler-page-private.h
+++ b/qt4/src/poppler-page-private.h
@@ -1,5 +1,7 @@
 /* poppler-page.cc: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2007, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
index 2710ab5..368be48 100644
--- a/qt4/src/poppler-page.cc
+++ b/qt4/src/poppler-page.cc
@@ -1,5 +1,9 @@
 /* poppler-page.cc: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
+ * Copyright (C) 2005, Brad Hards <bradh at frogmouth.net>
+ * Copyright (C) 2005-2008, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2005, Stefan Kebekus <stefan.kebekus at math.uni-koeln.de>
+ * Copyright (C) 2006-2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-private.h b/qt4/src/poppler-private.h
index 81699d0..4ac9094 100644
--- a/qt4/src/poppler-private.h
+++ b/qt4/src/poppler-private.h
@@ -1,6 +1,8 @@
 /* poppler-private.h: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
- * Copyright (C) 2006 by Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2005, 2008, Brad Hards <bradh at frogmouth.net>
+ * Copyright (C) 2006-2008 by Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2007-2008 by Pino Toscano <pino at kde.org>
  * Inspired on code by
  * Copyright (C) 2004 by Albert Astals Cid <tsdgeos at terra.es>
  * Copyright (C) 2004 by Enrico Ros <eros.kde at email.it>
diff --git a/qt4/src/poppler-ps-converter.cc b/qt4/src/poppler-ps-converter.cc
index 1598308..cc449cb 100644
--- a/qt4/src/poppler-ps-converter.cc
+++ b/qt4/src/poppler-ps-converter.cc
@@ -1,5 +1,6 @@
 /* poppler-document.cc: qt interface to poppler
  * Copyright (C) 2007, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
index a8e57a1..cb8d074 100644
--- a/qt4/src/poppler-qt4.h
+++ b/qt4/src/poppler-qt4.h
@@ -1,6 +1,9 @@
 /* poppler-qt.h: qt interface to poppler
  * Copyright (C) 2005, Net Integration Technologies, Inc.
- * Copyright (C) 2005, Brad Hards <bradh at frogmouth.net>
+ * Copyright (C) 2005, 2007, Brad Hards <bradh at frogmouth.net>
+ * Copyright (C) 2005-2008, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2005, Stefan Kebekus <stefan.kebekus at math.uni-koeln.de>
+ * Copyright (C) 2006-2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/qt4/src/poppler-textbox.cc b/qt4/src/poppler-textbox.cc
index a17ab62..7d2fb3c 100644
--- a/qt4/src/poppler-textbox.cc
+++ b/qt4/src/poppler-textbox.cc
@@ -1,5 +1,7 @@
 /* poppler-qt.h: qt interface to poppler
  * Copyright (C) 2005, Brad Hards <bradh at frogmouth.net>
+ * Copyright (C) 2006-2008, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2008, Pino Toscano <pino at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/splash/Splash.cc b/splash/Splash.cc
index 8209d88..4af39bf 100644
--- a/splash/Splash.cc
+++ b/splash/Splash.cc
@@ -4,6 +4,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/splash/Splash.h b/splash/Splash.h
index 58de95a..19e31f3 100644
--- a/splash/Splash.h
+++ b/splash/Splash.h
@@ -4,6 +4,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005 Marco Pesenti Gritti <mpg at redhat.com>
+// Copyright (C) 2007 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASH_H
 #define SPLASH_H
 
diff --git a/splash/SplashBitmap.cc b/splash/SplashBitmap.cc
index e51893c..539780e 100644
--- a/splash/SplashBitmap.cc
+++ b/splash/SplashBitmap.cc
@@ -4,6 +4,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2007 Ilmari Heikkinen <ilmari.heikkinen at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/splash/SplashBitmap.h b/splash/SplashBitmap.h
index 01e217b..f76365a 100644
--- a/splash/SplashBitmap.h
+++ b/splash/SplashBitmap.h
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007 Ilmari Heikkinen <ilmari.heikkinen at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHBITMAP_H
 #define SPLASHBITMAP_H
 
diff --git a/splash/SplashErrorCodes.h b/splash/SplashErrorCodes.h
index 1db95a1..10561c5 100644
--- a/splash/SplashErrorCodes.h
+++ b/splash/SplashErrorCodes.h
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHERRORCODES_H
 #define SPLASHERRORCODES_H
 
diff --git a/splash/SplashFTFont.cc b/splash/SplashFTFont.cc
index 28e48d7..e7a0909 100644
--- a/splash/SplashFTFont.cc
+++ b/splash/SplashFTFont.cc
@@ -4,6 +4,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005, 2007-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006 Kristian HÃ¸gsberg <krh at bitplanet.net>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
diff --git a/splash/SplashFTFont.h b/splash/SplashFTFont.h
index 4e22026..8c3cd2c 100644
--- a/splash/SplashFTFont.h
+++ b/splash/SplashFTFont.h
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007-2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHFTFONT_H
 #define SPLASHFTFONT_H
 
diff --git a/splash/SplashFTFontEngine.cc b/splash/SplashFTFontEngine.cc
index 98de374..600a728 100644
--- a/splash/SplashFTFontEngine.cc
+++ b/splash/SplashFTFontEngine.cc
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
diff --git a/splash/SplashFTFontEngine.h b/splash/SplashFTFontEngine.h
index a0c0b7c..91b09a6 100644
--- a/splash/SplashFTFontEngine.h
+++ b/splash/SplashFTFontEngine.h
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHFTFONTENGINE_H
 #define SPLASHFTFONTENGINE_H
 
diff --git a/splash/SplashFTFontFile.cc b/splash/SplashFTFontFile.cc
index c6d0659..1531baf 100644
--- a/splash/SplashFTFontFile.cc
+++ b/splash/SplashFTFontFile.cc
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #if HAVE_FREETYPE_FREETYPE_H || HAVE_FREETYPE_H
diff --git a/splash/SplashFTFontFile.h b/splash/SplashFTFontFile.h
index 19ff2de..270923d 100644
--- a/splash/SplashFTFontFile.h
+++ b/splash/SplashFTFontFile.h
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHFTFONTFILE_H
 #define SPLASHFTFONTFILE_H
 
diff --git a/splash/SplashFont.cc b/splash/SplashFont.cc
index 490de3b..1ac6670 100644
--- a/splash/SplashFont.cc
+++ b/splash/SplashFont.cc
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007-2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/splash/SplashFont.h b/splash/SplashFont.h
index f59b3a1..d5d9ff6 100644
--- a/splash/SplashFont.h
+++ b/splash/SplashFont.h
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007-2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHFONT_H
 #define SPLASHFONT_H
 
diff --git a/splash/SplashFontEngine.cc b/splash/SplashFontEngine.cc
index 4930eef..6cd8937 100644
--- a/splash/SplashFontEngine.cc
+++ b/splash/SplashFontEngine.cc
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/splash/SplashFontEngine.h b/splash/SplashFontEngine.h
index b87d667..daa4c50 100644
--- a/splash/SplashFontEngine.h
+++ b/splash/SplashFontEngine.h
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHFONTENGINE_H
 #define SPLASHFONTENGINE_H
 
diff --git a/splash/SplashFontFile.cc b/splash/SplashFontFile.cc
index 80c99ae..da46923 100644
--- a/splash/SplashFontFile.cc
+++ b/splash/SplashFontFile.cc
@@ -4,6 +4,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/splash/SplashFontFile.h b/splash/SplashFontFile.h
index e04e28c..94e8738 100644
--- a/splash/SplashFontFile.h
+++ b/splash/SplashFontFile.h
@@ -4,6 +4,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHFONTFILE_H
 #define SPLASHFONTFILE_H
 
diff --git a/splash/SplashT1Font.cc b/splash/SplashT1Font.cc
index 87a51a7..3577462 100644
--- a/splash/SplashT1Font.cc
+++ b/splash/SplashT1Font.cc
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #if HAVE_T1LIB_H
diff --git a/splash/SplashT1Font.h b/splash/SplashT1Font.h
index d6816b8..5c8f2e6 100644
--- a/splash/SplashT1Font.h
+++ b/splash/SplashT1Font.h
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHT1FONT_H
 #define SPLASHT1FONT_H
 
diff --git a/splash/SplashT1FontEngine.cc b/splash/SplashT1FontEngine.cc
index be75e03..bd502db 100644
--- a/splash/SplashT1FontEngine.cc
+++ b/splash/SplashT1FontEngine.cc
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #if HAVE_T1LIB_H
diff --git a/splash/SplashT1FontFile.cc b/splash/SplashT1FontFile.cc
index d384e2e..9df1580 100644
--- a/splash/SplashT1FontFile.cc
+++ b/splash/SplashT1FontFile.cc
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #if HAVE_T1LIB_H
diff --git a/splash/SplashT1FontFile.h b/splash/SplashT1FontFile.h
index 465d896..0398f2f 100644
--- a/splash/SplashT1FontFile.h
+++ b/splash/SplashT1FontFile.h
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Takashi Iwai <tiwai at suse.de>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHT1FONTFILE_H
 #define SPLASHT1FONTFILE_H
 
diff --git a/splash/SplashTypes.h b/splash/SplashTypes.h
index 1dcec38..6a76f77 100644
--- a/splash/SplashTypes.h
+++ b/splash/SplashTypes.h
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef SPLASHTYPES_H
 #define SPLASHTYPES_H
 
diff --git a/splash/SplashXPathScanner.cc b/splash/SplashXPathScanner.cc
index 6fc7ce7..0a51305 100644
--- a/splash/SplashXPathScanner.cc
+++ b/splash/SplashXPathScanner.cc
@@ -4,6 +4,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <config.h>
 
 #ifdef USE_GCC_PRAGMAS
diff --git a/utils/HtmlFonts.cc b/utils/HtmlFonts.cc
index fcac855..1c73e0b 100644
--- a/utils/HtmlFonts.cc
+++ b/utils/HtmlFonts.cc
@@ -1,3 +1,27 @@
+//========================================================================
+//
+// This file comes from pdftohtml project
+// http://pdftohtml.sourceforge.net
+//
+// Copyright from:
+// Gueorgui Ovtcharov
+// Rainer Dorsch <http://www.ra.informatik.uni-stuttgart.de/~rainer/>
+// Mikhail Kruk <meshko at cs.brandeis.edu>
+//
+//========================================================================
+
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008 Boris Toloknov <tlknv at yandex.ru>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include "HtmlFonts.h"
 #include "GlobalParams.h"
 #include "UnicodeMap.h"
diff --git a/utils/HtmlFonts.h b/utils/HtmlFonts.h
index 3ff5b81..df2b570 100644
--- a/utils/HtmlFonts.h
+++ b/utils/HtmlFonts.h
@@ -1,3 +1,15 @@
+//========================================================================
+//
+// This file comes from pdftohtml project
+// http://pdftohtml.sourceforge.net
+//
+// Copyright from:
+// Gueorgui Ovtcharov
+// Rainer Dorsch <http://www.ra.informatik.uni-stuttgart.de/~rainer/>
+// Mikhail Kruk <meshko at cs.brandeis.edu>
+//
+//========================================================================
+
 #ifndef _HTML_FONTS_H
 #define _HTML_FONTS_H
 #include "goo/GooVector.h"
diff --git a/utils/HtmlLinks.cc b/utils/HtmlLinks.cc
index 136e5e1..c0e4c43 100644
--- a/utils/HtmlLinks.cc
+++ b/utils/HtmlLinks.cc
@@ -1,3 +1,26 @@
+//========================================================================
+//
+// This file comes from pdftohtml project
+// http://pdftohtml.sourceforge.net
+//
+// Copyright from:
+// Gueorgui Ovtcharov
+// Rainer Dorsch <http://www.ra.informatik.uni-stuttgart.de/~rainer/>
+// Mikhail Kruk <meshko at cs.brandeis.edu>
+//
+//========================================================================
+
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Boris Toloknov <tlknv at yandex.ru>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include "HtmlLinks.h"
 
 extern GBool xml;
diff --git a/utils/HtmlLinks.h b/utils/HtmlLinks.h
index 71f8065..571c2a7 100644
--- a/utils/HtmlLinks.h
+++ b/utils/HtmlLinks.h
@@ -1,3 +1,15 @@
+//========================================================================
+//
+// This file comes from pdftohtml project
+// http://pdftohtml.sourceforge.net
+//
+// Copyright from:
+// Gueorgui Ovtcharov
+// Rainer Dorsch <http://www.ra.informatik.uni-stuttgart.de/~rainer/>
+// Mikhail Kruk <meshko at cs.brandeis.edu>
+//
+//========================================================================
+
 #ifndef _HTML_LINKS
 #define _HTML_LINKS
 
diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
index d819a05..bcae8d8 100644
--- a/utils/HtmlOutputDev.cc
+++ b/utils/HtmlOutputDev.cc
@@ -10,6 +10,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005-2008 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2008 Kjartan Maraas <kmaraas at gnome.org>
+// Copyright (C) 2008 Boris Toloknov <tlknv at yandex.ru>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifdef __GNUC__
 #pragma implementation
 #endif
diff --git a/utils/HtmlOutputDev.h b/utils/HtmlOutputDev.h
index 4c4cf63..d8dce7c 100644
--- a/utils/HtmlOutputDev.h
+++ b/utils/HtmlOutputDev.h
@@ -7,6 +7,17 @@
 // Changed 1999 by G.Ovtcharov
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006-2007 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef HTMLOUTPUTDEV_H
 #define HTMLOUTPUTDEV_H
 
diff --git a/utils/ImageOutputDev.cc b/utils/ImageOutputDev.cc
index a6af146..9655679 100644
--- a/utils/ImageOutputDev.cc
+++ b/utils/ImageOutputDev.cc
@@ -6,6 +6,19 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2005, 2007 Albert Astals Cid <aacid at kde.org>
+// Copyright (C) 2006 Rainer Keller <class321 at gmx.de>
+// Copyright (C) 2008 Timothy Lee <timothy.lee at siriushk.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include "config.h"
 #include <poppler-config.h>
 
diff --git a/utils/ImageOutputDev.h b/utils/ImageOutputDev.h
index 56c97a5..b267756 100644
--- a/utils/ImageOutputDev.h
+++ b/utils/ImageOutputDev.h
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Rainer Keller <class321 at gmx.de>
+// Copyright (C) 2008 Timothy Lee <timothy.lee at siriushk.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef IMAGEOUTPUTDEV_H
 #define IMAGEOUTPUTDEV_H
 
diff --git a/utils/parseargs.c b/utils/parseargs.c
index 465c2cb..d10cbe7 100644
--- a/utils/parseargs.c
+++ b/utils/parseargs.c
@@ -6,6 +6,19 @@
  * Copyright 1996-2003 Glyph & Cog, LLC
  */
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Poppler project changes to this file are under the GPLv2 or later license
+//
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include <stdio.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/utils/parseargs.h b/utils/parseargs.h
index 983a425..aa20a9f 100644
--- a/utils/parseargs.h
+++ b/utils/parseargs.h
@@ -6,6 +6,17 @@
  * Copyright 1996-2003 Glyph & Cog, LLC
  */
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #ifndef PARSEARGS_H
 #define PARSEARGS_H
 
diff --git a/utils/pdffonts.cc b/utils/pdffonts.cc
index 39fcf24..3fc9036 100644
--- a/utils/pdffonts.cc
+++ b/utils/pdffonts.cc
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Dominic Lachowicz <cinamod at hotmail.com>
+// Copyright (C) 2007-2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include "config.h"
 #include <poppler-config.h>
 #include <stdio.h>
diff --git a/utils/pdfimages.cc b/utils/pdfimages.cc
index 3d5ac8d..6f6cbe9 100644
--- a/utils/pdfimages.cc
+++ b/utils/pdfimages.cc
@@ -8,6 +8,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007-2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include "config.h"
 #include <poppler-config.h>
 #include <stdio.h>
diff --git a/utils/pdfinfo.cc b/utils/pdfinfo.cc
index 9e924fd..a7f81d3 100644
--- a/utils/pdfinfo.cc
+++ b/utils/pdfinfo.cc
@@ -6,6 +6,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Dom Lachowicz <cinamod at hotmail.com>
+// Copyright (C) 2007-2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include "config.h"
 #include <poppler-config.h>
 #include <stdio.h>
diff --git a/utils/pdftoabw.cc b/utils/pdftoabw.cc
index 10e9bb3..3ce15be 100644
--- a/utils/pdftoabw.cc
+++ b/utils/pdftoabw.cc
@@ -1,10 +1,22 @@
-//========================================================================
-//
-// pdftohtml.cc
-//
-//
-// Copyright 1999-2000 G. Ovtcharov
-//========================================================================
+/*
+ * Copyright (C) 2007 Jauco Noordzij <jauco at jauco.nl>
+ * Copyright (C) 2007 Dominic Lachowicz <cinamod at hotmail.com>
+ * Copyright (C) 2007 Kouhei Sutou <kou at cozmixng.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ */
 
 #include "config.h"
 #include <poppler-config.h>
diff --git a/utils/pdftohtml.cc b/utils/pdftohtml.cc
index 6a78366..ede4c81 100644
--- a/utils/pdftohtml.cc
+++ b/utils/pdftohtml.cc
@@ -6,6 +6,17 @@
 // Copyright 1999-2000 G. Ovtcharov
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007-2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include "config.h"
 #include <poppler-config.h>
 #include <stdio.h>
diff --git a/utils/pdftoppm.cc b/utils/pdftoppm.cc
index 34602f7..0168cf5 100644
--- a/utils/pdftoppm.cc
+++ b/utils/pdftoppm.cc
@@ -6,6 +6,17 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2007 Ilmari Heikkinen <ilmari.heikkinen at gmail.com>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include "config.h"
 #include <poppler-config.h>
 #include <stdio.h>
diff --git a/utils/pdftops.cc b/utils/pdftops.cc
index a1af9aa..e0a09a1 100644
--- a/utils/pdftops.cc
+++ b/utils/pdftops.cc
@@ -8,6 +8,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Kristian HÃ¸gsberg <krh at redhat.com>
+// Copyright (C) 2007-2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include "config.h"
 #include <poppler-config.h>
 #include <stdio.h>
diff --git a/utils/pdftotext.cc b/utils/pdftotext.cc
index 6731b9b..6955317 100644
--- a/utils/pdftotext.cc
+++ b/utils/pdftotext.cc
@@ -8,6 +8,18 @@
 //
 //========================================================================
 
+//========================================================================
+//
+// Modified under the Poppler project - http://poppler.freedesktop.org
+//
+// Copyright (C) 2006 Dominic Lachowicz <cinamod at hotmail.com>
+// Copyright (C) 2007-2008 Albert Astals Cid <aacid at kde.org>
+//
+// To see a description of the changes please see the Changelog file that
+// came with your tarball or type make ChangeLog if you are building from git
+//
+//========================================================================
+
 #include "config.h"
 #include <poppler-config.h>
 #include <stdio.h>
commit 0dfbb8996ee91aa044eb2bdf2859ef64005116f8
Author: LoÃ¯c Minier <lool at dooz.org>
Date:   Wed Aug 20 22:10:07 2008 +0200

    Fixes escaping of hyphens in man pages

diff --git a/utils/pdfinfo.1 b/utils/pdfinfo.1
index 0b72f56..1f5528a 100644
--- a/utils/pdfinfo.1
+++ b/utils/pdfinfo.1
@@ -72,7 +72,7 @@ metadata (only if requested)
 .TP
 .BI \-f " number"
 Specifies the first page to examine.  If multiple pages are requested
-using the "-f" and "-l" options, the size of each requested page (and,
+using the "\-f" and "\-l" options, the size of each requested page (and,
 optionally, the bounding boxes for each requested page) are printed.
 Otherwise, only page one is examined.
 .TP
diff --git a/utils/pdftops.1 b/utils/pdftops.1
index 1382496..dfa07b3 100644
--- a/utils/pdftops.1
+++ b/utils/pdftops.1
@@ -25,7 +25,7 @@ to
 .I file.ps
 (or
 .I file.eps
-with the -eps option).  If 
+with the \-eps option).  If
 .I PS-file
 is \'-', the PostScript is sent to stdout.
 .SH OPTIONS
@@ -40,8 +40,8 @@ Specifies the last page to print.
 Generate Level 1 PostScript.  The resulting PostScript files will be
 significantly larger (if they contain images), but will print on Level
 1 printers.  This also converts all images to black and white.  No
-more than one of the PostScript level options (-level1, -level1sep,
--level2, -level2sep, -level3, -level3Sep) may be given.
+more than one of the PostScript level options (\-level1, \-level1sep,
+\-level2, \-level2sep, \-level3, \-level3Sep) may be given.
 .TP
 .B \-level1sep
 Generate Level 1 separable PostScript.  All colors are converted to
@@ -63,19 +63,19 @@ CID font embedding.
 .TP
 .B \-level3Sep
 Generate Level 3 separable PostScript.  The separation handling is the
-same as for -level2Sep.
+same as for \-level2Sep.
 .TP
 .B \-eps
 Generate an Encapsulated PostScript (EPS) file.  An EPS file contains
 a single image, so if you use this option with a multi-page PDF file,
-you must use -f and -l to specify a single page.  No more than one of
-the mode options (-eps, -form) may be given.
+you must use \-f and \-l to specify a single page.  No more than one of
+the mode options (\-eps, \-form) may be given.
 .TP
 .B \-form
 Generate a PostScript form which can be imported by software that
 understands forms.  A form contains a single page, so if you use this
-option with a multi-page PDF file, you must use -f and -l to specify a
-single page.  The -level1 option cannot be used with -form.
+option with a multi-page PDF file, you must use \-f and \-l to specify a
+single page.  The \-level1 option cannot be used with \-form.
 .TP
 .B \-opi
 Generate OPI comments for all images and forms which have OPI
commit 6cfa0e598a81460e5d0a7d60d8584366d2a70165
Author: LoÃ¯c Minier <lool at dooz.org>
Date:   Wed Aug 20 19:57:42 2008 +0200

    Fix synopsis of pdftops in man page to clarify that a PDF file is required in all cases

diff --git a/utils/pdftops.1 b/utils/pdftops.1
index e5482ab..1382496 100644
--- a/utils/pdftops.1
+++ b/utils/pdftops.1
@@ -6,8 +6,8 @@ pdftops \- Portable Document Format (PDF) to PostScript converter
 .SH SYNOPSIS
 .B pdftops
 [options]
-.RI [ PDF-file
-.RI [ PS-file ]]
+.RI <PDF-file>
+.RI [<PS-file>]
 .SH DESCRIPTION
 .B Pdftops
 converts Portable Document Format (PDF) files to PostScript so they
