23 files changed, 101 insertions, 296 deletions
diff --git a/Makefile.am b/Makefile.am
index 5434b23..6df2a02 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,8 +9,6 @@ SUBDIRS = inc src build docs
 EXTRA_DIST = \
 	autogen.sh \
 	libsdw.pc.in \
-	libsdw-zip.in \
-	COPYING.LGPL \
 	COPYING.MPL \
 	INSTALL \
 	NEWS \
@@ -19,9 +17,6 @@ EXTRA_DIST = \
 distclean-local:
 	rm -rf *.cache *~ *.pc
 
-zip: install
-	sh libsdw-zip
-
 dist-hook:
 	git log --date=short --pretty="format:@%cd  %an  <%ae>  [%H]%n%n%s%n%n%e%b" | sed -e "s|^\([^@]\)|\t\1|" -e "s|^@||" >$(distdir)/ChangeLog
 
diff --git a/configure.ac b/configure.ac
index 7e1d641..e11e1bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -44,6 +44,28 @@ PKG_CHECK_MODULES([REVENGE],[
 AC_SUBST(REVENGE_CFLAGS)
 AC_SUBST(REVENGE_LIBS)
 
+# =====
+# Tools
+# =====
+AC_ARG_ENABLE([tools],
+	[AS_HELP_STRING([--disable-tools], [Build conversion tools])],
+	[enable_tools="$enableval"],
+	[enable_tools=yes]
+)
+AS_IF([test "x$enable_tools" = "xyes"], [
+	PKG_CHECK_MODULES([REVENGE_GENERATORS],[
+		librevenge-generators-0.0
+	])
+	PKG_CHECK_MODULES([REVENGE_STREAM],[
+		librevenge-stream-0.0
+	])
+])
+AC_SUBST([REVENGE_GENERATORS_CFLAGS])
+AC_SUBST([REVENGE_GENERATORS_LIBS])
+AC_SUBST([REVENGE_STREAM_CFLAGS])
+AC_SUBST([REVENGE_STREAM_LIBS])
+AM_CONDITIONAL(BUILD_TOOLS, [test "x$enable_tools" = "xyes"])
+
 # =================================
 # Libtool/Version Makefile settings
 # =================================
@@ -199,21 +221,6 @@ AS_IF([test "x$enable_full_debug" = "xyes"],
 )
 AC_SUBST(DEBUG_CXXFLAGS)
 
-# ============
-# Static tools
-# ============
-AC_ARG_ENABLE([static-tools],
-	[AS_HELP_STRING([--enable-static-tools], [Link tools (binaries) statically])],
-	[enable_static_tools="$enableval"],
-	[enable_static_tools=no]
-)
-AS_IF([test "x$enable_static_tools" = "xyes"], [
-	enable_static="yes"
-], [
-	AC_DISABLE_STATIC
-])
-AM_CONDITIONAL(STATIC_TOOLS, [test "x$enable_static_tools" = "xyes"])
-
 # =============
 # Documentation
 # =============
@@ -232,17 +239,6 @@ AS_IF([test "x$with_docs" != "xno"], [
 ], [build_docs=no])
 AM_CONDITIONAL([WITH_LIBSDW_DOCS], [test "x$build_docs" != "xno"])
 
-PKG_CHECK_MODULES([REVENGE_GENERATORS],[
-    librevenge-generators-0.0
-])
-PKG_CHECK_MODULES([REVENGE_STREAM],[
-    librevenge-stream-0.0
-])
-AC_SUBST([REVENGE_GENERATORS_CFLAGS])
-AC_SUBST([REVENGE_GENERATORS_LIBS])
-AC_SUBST([REVENGE_STREAM_CFLAGS])
-AC_SUBST([REVENGE_STREAM_LIBS])
-
 # =====================
 # Prepare all .in files
 # =====================
@@ -278,7 +274,7 @@ Build configuration:
 	debug:           ${enable_debug}
 	full-debug:      ${enable_full_debug}
 	docs:            ${build_docs}
-	static-tools:    ${enable_static_tools}
+	tools:           ${enable_tools}
 	werror:          ${enable_werror}
 ==============================================================================
 ])
diff --git a/inc/libsdw/SDWDocument.h b/inc/libsdw/SDWDocument.h
index dc327c1..a30509b 100644
--- a/inc/libsdw/SDWDocument.h
+++ b/inc/libsdw/SDWDocument.h
@@ -1,26 +1,12 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* libsdw
- * Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Major Contributor(s):
- * Copyright (C) 2003-2005 William Lachance (william.lachance@sympatico.ca)
- * Copyright (C) 2003 Marc Maurer (uwog@uwog.net)
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
- *
- * For further information visit http://libsdw.sourceforge.net
  */
 
-
 #ifndef SDWDOCUMENT_H
 #define SDWDOCUMENT_H
 
@@ -52,4 +38,4 @@ public:
 } // namespace libsdw
 
 #endif /* SDWDOCUMENT_H */
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/inc/libsdw/libsdw.h b/inc/libsdw/libsdw.h
index ff90802..72af567 100644
--- a/inc/libsdw/libsdw.h
+++ b/inc/libsdw/libsdw.h
@@ -1,23 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* libsdw
- * Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Major Contributor(s):
- * Copyright (C) 2002 William Lachance (william.lachance@sympatico.ca)
- * Copyright (C) 2002 Marc Maurer (uwog@uwog.net)
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
- *
- * For further information visit http://libsdw.sourceforge.net
  */
 
 #ifndef LIBSDW_H
@@ -26,4 +13,4 @@
 #include "SDWDocument.h"
 
 #endif /* LIBSDW_H */
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/libsdw-zip.in b/libsdw-zip.in
deleted file mode 100644
index 2de0e88..0000000
--- a/libsdw-zip.in
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-# Build runtime and developer zipfiles for libsdw on Win32.
-
-ZIP=libsdw-@SDW_VERSION@-MinGW.zip
-DEVZIP=libsdw-devel-@SDW_VERSION@-MinGW.zip
-TOOLSZIP=libsdw-tools-@SDW_VERSION@.zip
-
-cd $DESTDIR@prefix@
-
-DLLDIR=lib
-[ -f bin/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.dll ] && \
-DLLDIR=bin
-
-@STRIP@ --strip-all \
-$DLLDIR/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.dll \
-bin/sdw2html.exe \
-bin/sdw2raw.exe \
-bin/sdw2text.exe
-
-upx -qqq --best \
-$DLLDIR/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.dll \
-bin/sdw2html.exe \
-bin/sdw2raw.exe \
-bin/sdw2text.exe
-
-rm $ZIP
-zip -q $ZIP -@ <<EOF
-$DLLDIR/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.dll
-EOF
-
-rm $DEVZIP
-zip -q -r $DEVZIP -@ <<EOF
-include/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@
-lib/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.dll.a
-lib/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.a
-lib/pkgconfig/libsdw-@SDW_MAJOR_VERSION@.@SDW_MINOR_VERSION@.pc
-EOF
-
-rm $TOOLSZIP
-zip -q -j $TOOLSZIP -@ <<EOF
-bin/sdw2html.exe
-bin/sdw2raw.exe
-bin/sdw2text.exe
-EOF
diff --git a/src/Makefile.am b/src/Makefile.am
index 4796627..64fd45e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1 +1,5 @@
-SUBDIRS = lib conv
+SUBDIRS = lib
+
+if BUILD_TOOLS
+SUBDIRS += conv
+endif
diff --git a/src/conv/Makefile.am b/src/conv/Makefile.am
index 6f3276d..8503a80 100644
--- a/src/conv/Makefile.am
+++ b/src/conv/Makefile.am
@@ -1 +1,5 @@
+if BUILD_TOOLS
+
 SUBDIRS = raw html text
+
+endif
diff --git a/src/conv/html/Makefile.am b/src/conv/html/Makefile.am
index 4fde480..8c13ff3 100644
--- a/src/conv/html/Makefile.am
+++ b/src/conv/html/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_TOOLS
+
 bin_PROGRAMS = sdw2html
 
 AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(REVENGE_GENERATORS_CFLAGS) $(REVENGE_STREAM_CFLAGS) $(DEBUG_CXXFLAGS)
@@ -36,3 +38,4 @@ EXTRA_DIST = \
 BUILD_EXTRA_DIST = \
 	sdw2html.rc	 
 
+endif # BUILD_TOOLS
diff --git a/src/conv/html/sdw2html.cpp b/src/conv/html/sdw2html.cpp
index 84089b4..e39d39e 100644
--- a/src/conv/html/sdw2html.cpp
+++ b/src/conv/html/sdw2html.cpp
@@ -1,22 +1,10 @@
-/* libsdw
- * Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Major Contributor(s):
- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
- * Copyright (C) 2002-2004 Marc Maurer (uwog@uwog.net)
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
- *
- * For further information visit http://libsdw.sourceforge.net
  */
 
 #include <stdio.h>
@@ -120,4 +108,4 @@ int main(int argc, char *argv[])
   return 0;
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/conv/raw/Makefile.am b/src/conv/raw/Makefile.am
index 3faeceb..b177132 100644
--- a/src/conv/raw/Makefile.am
+++ b/src/conv/raw/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_TOOLS
+
 bin_PROGRAMS = sdw2raw
 
 AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(REVENGE_GENERATORS_CFLAGS) $(REVENGE_STREAM_CFLAGS) $(DEBUG_CXXFLAGS)
@@ -37,3 +39,4 @@ EXTRA_DIST = \
 BUILD_EXTRA_DIST = \
 	sdw2raw.rc	 
  
+endif # BUILD_TOOLS
diff --git a/src/conv/raw/sdw2raw.cpp b/src/conv/raw/sdw2raw.cpp
index 52eacb4..ecad2c8 100644
--- a/src/conv/raw/sdw2raw.cpp
+++ b/src/conv/raw/sdw2raw.cpp
@@ -1,22 +1,10 @@
-/* libsdw
- * Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Major Contributor(s):
- * Copyright (C) 2002 William Lachance (william.lachance@sympatico.ca)
- * Copyright (C) 2002,2004 Marc Maurer (uwog@uwog.net)
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
- *
- * For further information visit http://libsdw.sourceforge.net
  */
 
 #include <stdio.h>
@@ -117,4 +105,4 @@ int main(int argc, char *argv[])
 
   return 0;
 }
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/conv/text/Makefile.am b/src/conv/text/Makefile.am
index 7f0b6e8..941468a 100644
--- a/src/conv/text/Makefile.am
+++ b/src/conv/text/Makefile.am
@@ -1,3 +1,5 @@
+if BUILD_TOOLS
+
 bin_PROGRAMS = sdw2text
 
 AM_CXXFLAGS = -I$(top_srcdir)/inc $(REVENGE_CFLAGS) $(REVENGE_GENERATORS_CFLAGS) $(REVENGE_STREAM_CFLAGS) $(DEBUG_CXXFLAGS)
@@ -37,3 +39,4 @@ EXTRA_DIST = \
 BUILD_EXTRA_DIST = \
 	sdw2text.rc	 
  
+endif # BUILD_TOOLS
diff --git a/src/conv/text/sdw2text.cpp b/src/conv/text/sdw2text.cpp
index 49cf0f5..c53848c 100644
--- a/src/conv/text/sdw2text.cpp
+++ b/src/conv/text/sdw2text.cpp
@@ -1,22 +1,10 @@
-/* libsdw
- * Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Major Contributor(s):
- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
- * Copyright (C) 2002-2004 Marc Maurer (uwog@uwog.net)
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
- *
- * For further information visit http://libsdw.sourceforge.net
  */
 
 #include <stdio.h>
@@ -123,4 +111,4 @@ int main(int argc, char *argv[])
 
   return 0;
 }
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/SDWDocument.cpp b/src/lib/SDWDocument.cpp
index f968343..e66b09b 100644
--- a/src/lib/SDWDocument.cpp
+++ b/src/lib/SDWDocument.cpp
@@ -1,25 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* libsdw
- * Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Major Contributor(s):
- * Copyright (C) 2003 William Lachance (william.lachance@sympatico.ca)
- * Copyright (C) 2003-2004 Marc Maurer (uwog@uwog.net)
- * Copyright (C) 2004-2006 Fridrich Strba (fridrich.strba@bluewin.ch)
- * Copyright (C) 2006, 2007 Andrew Ziem (andrewziem users sourceforge net)
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
- *
- * For further information visit http://libsdw.sourceforge.net
  */
 
 #include <libsdw/libsdw.h>
@@ -107,4 +92,4 @@ bool libsdw::SDWDocument::parse(librevenge::RVNGInputStream *input, librevenge::
   return false;
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/SDWEncryption.cpp b/src/lib/SDWEncryption.cpp
index 84ee16c..ebac52a 100644
--- a/src/lib/SDWEncryption.cpp
+++ b/src/lib/SDWEncryption.cpp
@@ -1,22 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* libsdw
- * Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Major Contributor(s):
- * Copyright (C) 2007 Fridrich Strba (fridrich.strba@bluewin.ch)
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
- *
- * For further information visit http://libsdw.sourceforge.net
  */
 
 #include "SDWEncryption.h"
@@ -49,4 +37,4 @@ const unsigned char *libsdw::SDWEncryption::decrypt(const unsigned char *cryptBu
 
   return 0;
 }
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/SDWEncryption.h b/src/lib/SDWEncryption.h
index f3375af..1a3dc26 100644
--- a/src/lib/SDWEncryption.h
+++ b/src/lib/SDWEncryption.h
@@ -1,14 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
  */
 
 #ifndef SDWENCRYPTION_H
@@ -39,4 +35,4 @@ private:
 } // namespace libsdw
 
 #endif /* SDWENCRYPTION_H */
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/SDWFileStructure.h b/src/lib/SDWFileStructure.h
index 3fead57..586815a 100644
--- a/src/lib/SDWFileStructure.h
+++ b/src/lib/SDWFileStructure.h
@@ -1,14 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
  */
 
 #ifndef SDWFILESTRUCTURE_H
@@ -23,4 +19,4 @@
 
 
 #endif /* SDWFILESTRUCTURE_H */
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/SDWHeader.cpp b/src/lib/SDWHeader.cpp
index a164b4d..0530315 100644
--- a/src/lib/SDWHeader.cpp
+++ b/src/lib/SDWHeader.cpp
@@ -1,14 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
  */
 
 #include "SDWHeader.h"
@@ -87,4 +83,4 @@ bool libsdw::SDWHeader::loadHeader(librevenge::RVNGInputStream *input, const cha
   }
   return true;
 }
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/SDWHeader.h b/src/lib/SDWHeader.h
index 4519f4d..40b8ae5 100644
--- a/src/lib/SDWHeader.h
+++ b/src/lib/SDWHeader.h
@@ -1,14 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
  */
 
 #ifndef SDWHEADER_H
@@ -59,4 +55,4 @@ private:
 } // namespace libsdw
 
 #endif /* SDWHEADER_H */
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/SDWParser.cpp b/src/lib/SDWParser.cpp
index 5d7cc13..879e32f 100644
--- a/src/lib/SDWParser.cpp
+++ b/src/lib/SDWParser.cpp
@@ -1,23 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* libsdw
- * Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Major Contributor(s):
- * Copyright (C) 2002 William Lachance (william.lachance@sympatico.ca)
- * Copyright (C) 2002 Marc Maurer (uwog@uwog.net)
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
- *
- * For further information visit http://libsdw.sourceforge.net
  */
 
 #include "libsdw_internal.h"
@@ -35,4 +22,4 @@ libsdw::SDWParser::SDWParser(librevenge::RVNGInputStream *input, SDWHeader *head
 libsdw::SDWParser::~SDWParser()
 {
 }
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/SDWParser.h b/src/lib/SDWParser.h
index 877df3b..4eb067d 100644
--- a/src/lib/SDWParser.h
+++ b/src/lib/SDWParser.h
@@ -1,23 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* libsdw
- * Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Major Contributor(s):
- * Copyright (C) 2002 William Lachance (william.lachance@sympatico.ca)
- * Copyright (C) 2002 Marc Maurer (uwog@uwog.net)
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
- *
- * For further information visit http://libsdw.sourceforge.net
  */
 
 #ifndef SDWPARSER_H
@@ -65,4 +52,4 @@ private:
 } // namespace libsdw
 
 #endif /* SDWPARSER_H */
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/libsdw_internal.cpp b/src/lib/libsdw_internal.cpp
index 2875260..173ea58 100644
--- a/src/lib/libsdw_internal.cpp
+++ b/src/lib/libsdw_internal.cpp
@@ -1,23 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* libsdw
- * Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Major Contributor(s):
- * Copyright (C) 2002, 2005 William Lachance (william.lachance@sympatico.ca)
- * Copyright (C) 2002, 2004 Marc Maurer (uwog@uwog.net)
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
- *
- * For further information visit http://libsdw.sourceforge.net
  */
 
 #include "libsdw_internal.h"
@@ -94,4 +81,4 @@ librevenge::RVNGString libsdw::readString(librevenge::RVNGInputStream *input)
   return text;
 }
 
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */
diff --git a/src/lib/libsdw_internal.h b/src/lib/libsdw_internal.h
index 679e74c..ef72153 100644
--- a/src/lib/libsdw_internal.h
+++ b/src/lib/libsdw_internal.h
@@ -1,23 +1,10 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: t; c-basic-offset: 4 -*- */
-/* libsdw
- * Version: MPL 2.0 / LGPLv2.1+
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * This file is part of the libsdw project.
  *
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Major Contributor(s):
- * Copyright (C) 2002 William Lachance (william.lachance@sympatico.ca)
- * Copyright (C) 2002,2004 Marc Maurer (uwog@uwog.net)
- *
- * For minor contributions see the git repository.
- *
- * Alternatively, the contents of this file may be used under the terms
- * of the GNU Lesser General Public License Version 2.1 or later
- * (LGPLv2.1+), in which case the provisions of the LGPLv2.1+ are
- * applicable instead of those above.
- *
- * For further information visit http://libsdw.sourceforge.net
  */
 
 #ifndef LIBSDW_INTERNAL_H
@@ -116,4 +103,4 @@ librevenge::RVNGString readString(librevenge::RVNGInputStream *input);
 } // namespace libsdw
 
 #endif /* LIBSDW_INTERNAL_H */
-/* vim:set shiftwidth=4 softtabstop=4 noexpandtab: */
+/* vim:set shiftwidth=2 softtabstop=2 expandtab: */