*: licence changes #39, whitespace/comment changes

A confusing situation where conflicting licences were used in several
files.  For this decision, we're referring to a conversation with GMRS
Software/original authors where they agree to relicence the code to GPL.
This conversion is included in the HISTORY file.  As such, all files are
stripped form previous licences and now licenced under the GPL-2
licence.

While at it, remove a lot of whitespace and comments that are redundant,
or kept in Git's logs.

Closes: https://github.com/grobian/html2text/issues/39
Signed-off-by: Fabian Groffen <[email protected]>

Author: grobian

Area.cpp

@@ -1,15 +1,11 @@
-
-/***************************************************************************/
-
 /*
  * Portions Copyright (c) 1999 GMRS Software GmbH
  * Carl-von-Linde-Str. 38, D-85716 Unterschleissheim, http://www.gmrs.de
  *      All rights reserved.
  *
  * Author: Arno Unkrig <[email protected]>
- */
-
-/* This program is free software; you can redistribute it and/or modify
+ *
+ * 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.
@@ -20,17 +16,6 @@
  * GNU General Public License in the file COPYING for more details.
  */
 
-/***************************************************************************/
-
-/*
- * Changes to version 1.2.2 were made by Martin Bayer <[email protected]>
- * Dates and reasons of modifications:
- * Wed Jul  2 21:56:45 CEST 2003: ported to g++ 3.3
- */
-
-/***************************************************************************/
-
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -40,8 +25,6 @@
 #include "string.h"
 #include "iconvstream.h"
 
-/* ------------------------------------------------------------------------- */
-
 static void *malloc_error(size_t size) {
 	void *ret = malloc(size);
 	if (ret == NULL) {
@@ -120,8 +103,6 @@ Line::~Line()
 	free(cells_);
 }
 
-/* ------------------------------------------------------------------------- */
-
 void
 Line::resize(size_type l)
 {
@@ -199,12 +180,8 @@ Line::add_attribute(char addition)
 		p++->attribute |= addition;
 }
 
-/* ------------------------------------------------------------------------- */
-
 bool Area::use_backspaces = true;
 
-/* ------------------------------------------------------------------------- */
-
 Area::Area() :
 	width_(0),
 	height_(0),
@@ -289,8 +266,6 @@ Area::~Area()
 	free(cells_);
 }
 
-/* ------------------------------------------------------------------------- */
-
 const Area &
 Area::operator>>=(size_type rs)
 {
@@ -525,8 +500,6 @@ Area::add_attribute(
 	}
 }
 
-/* ------------------------------------------------------------------------- */
-
 static char backspace = '\b';
 
 iconvstream &
@@ -594,6 +567,3 @@ operator<<(iconvstream& os, const Area &a)
 
 	return os;
 }
-
-/* ------------------------------------------------------------------------- */
-

Area.h

@@ -1,15 +1,11 @@
-
-/***************************************************************************/
-
 /*
  * Portions Copyright (c) 1999 GMRS Software GmbH
  * Carl-von-Linde-Str. 38, D-85716 Unterschleissheim, http://www.gmrs.de
  * All rights reserved.
  *
  * Author: Arno Unkrig <[email protected]>
- */
-
-/* This program is free software; you can redistribute it and/or modify
+ *
+ * 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.
@@ -20,24 +16,9 @@
  * GNU General Public License in the file COPYING for more details.
  */
 
-/***************************************************************************/
-
-/*
- * Changes to version 1.2.2 were made by Martin Bayer <[email protected]>
- * Dates and reasons of modifications:
- * Thu Oct  4 21:21:10 CEST 2001: ported to g++ 3.0
- * Wed Jul  2 21:59:41 CEST 2003: ported to g++ 3.3
- */
-
-/***************************************************************************/
-
-
 #ifndef __Area_h_INCLUDED__ /* { */
 #define __Area_h_INCLUDED__
 
-/* ------------------------------------------------------------------------- */
-
-
 #include <sys/types.h>
 #include <string>
 #include "iconvstream.h"
@@ -50,8 +31,6 @@ BOOL_DEFINITION
 
 using std::string;
 
-/* ------------------------------------------------------------------------- */
-
 struct Cell {
 	int character;
 	char attribute;
@@ -67,8 +46,6 @@ struct Cell {
 	}
 };
 
-/* ------------------------------------------------------------------------- */
-
 class Line {
 	public:
 		typedef size_t size_type;
@@ -144,8 +121,6 @@ class Line {
 		friend class Area;
 };
 
-/* ------------------------------------------------------------------------- */
-
 class Area {
 	public:
 		typedef size_t size_type;
@@ -240,9 +215,4 @@ class Area {
 		friend iconvstream &operator<<(iconvstream&, const Area &);
 };
 
-/* ------------------------------------------------------------------------- */
-
 #endif /* } */
-
-/* ------------------------------------------------------------------------- */
-

HTMLControl.cpp

@@ -1,15 +1,11 @@
-
-/***************************************************************************/
-
 /*
  * Portions Copyright (c) 1999 GMRS Software GmbH
  * Carl-von-Linde-Str. 38, D-85716 Unterschleissheim, http://www.gmrs.de
  * All rights reserved.
  *
  * Author: Arno Unkrig <[email protected]>
- */
-
-/* This program is free software; you can redistribute it and/or modify
+ *
+ * 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.
@@ -20,20 +16,6 @@
  * GNU General Public License in the file COPYING for more details.
  */
 
-/***************************************************************************/
-
-/*
- * Changes to version 1.2.2 were made by Martin Bayer <[email protected]>
- * Dates and reasons of modifications:
- * Fre Jun  8 17:20:38 CEST 2001: fixed coredump
- * Sun Apr  7 11:31:10 CEST 2002: fixed parser errors
- * Wed Jul  2 22:00:21 CEST 2003: ported to g++ 3.3
- * Sun Nov 16 22:13:50 CET 2003: better rendering of XHTML
- */
-
-/***************************************************************************/
-
-
 #include <iostream>
 #include <stdlib.h>
 #include <string.h>
@@ -58,8 +40,6 @@ enum {
 	NON_CONTAINER_TAG
 };
 
-/* ------------------------------------------------------------------------- */
-
 void
 HTMLControl::htmlparser_yyerror(const char *p)
 {
@@ -199,8 +179,6 @@ int HTMLControl::htmlparser_yylex(
 	}
 }
 
-/* ------------------------------------------------------------------------- */
-
 /*
  * Keep this array sorted alphabetically!
  */
@@ -288,8 +266,6 @@ tag_names[] = {
 #undef pack
 };
 
-/* ------------------------------------------------------------------------- */
-
 int
 HTMLControl::yylex2(html2text::HTMLParser::semantic_type *value_return,
 		int *tag_type_return)
@@ -615,8 +591,6 @@ HTMLControl::yylex2(html2text::HTMLParser::semantic_type *value_return,
 	}
 }
 
-/* ------------------------------------------------------------------------- */
-
 bool
 HTMLControl::read_cdata(const char *terminal, string *value_return)
 {
@@ -631,8 +605,9 @@ HTMLControl::read_cdata(const char *terminal, string *value_return)
 		if (toupper(c) == terminal[state]) {
 			state++;
 			if (terminal[state] == '\0') {
-// s.erase(s.length() - state);
-// caused core dump on empty STYLE and SCRIPT elements - Johannes Geiger
+				// s.erase(s.length() - state);
+				// caused core dump on empty STYLE and
+				// SCRIPT elements - Johannes Geiger
 				s.erase(s.length() - state + 1);
 				return true;
 			}
@@ -643,8 +618,6 @@ HTMLControl::read_cdata(const char *terminal, string *value_return)
 	}
 }
 
-/* ------------------------------------------------------------------------- */
-
 int
 HTMLControl::get_char()
 {
@@ -701,6 +674,3 @@ HTMLControl::unget_char(int c)
 	}
 	ungotten_chars[number_of_ungotten_chars++] = c;
 }
-
-/* ------------------------------------------------------------------------- */
-

HTMLControl.h

@@ -1,15 +1,11 @@
-
-/***************************************************************************/
-
 /*
  * Portions Copyright (c) 1999 GMRS Software GmbH
  * Carl-von-Linde-Str. 38, D-85716 Unterschleissheim, http://www.gmrs.de
  * All rights reserved.
  *
  * Author: Arno Unkrig <[email protected]>
- */
-
-/* This program is free software; you can redistribute it and/or modify
+ *
+ * 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.
@@ -20,32 +16,16 @@
  * GNU General Public License in the file COPYING for more details.
  */
 
-/***************************************************************************/
-
-/*
- * Changes to version 1.2.2 were made by Martin Bayer <[email protected]>
- * Dates and reasons of modifications:
- * Thu Oct  4 21:25:07 CEST 2001: ported to g++ 3.0
- * Wed Jul  2 22:01:12 CEST 2003: ported to g++ 3.3
- */
-
-/***************************************************************************/
-
-
 #ifndef __HTMLControl_h_INCLUDED__ /* { */
 #define __HTMLControl_h_INCLUDED__
 
-/* ------------------------------------------------------------------------- */
-
 #include "iconvstream.h"
 #include <istream>
 
 #include "HTMLParser.tab.hh"
 
 using std::istream;
 
-/* ------------------------------------------------------------------------- */
-
 class HTMLControl {
 	public:
 		HTMLControl(iconvstream& is_,
@@ -78,7 +58,8 @@ class HTMLControl {
 		/*
 		 * Helpers.
 		 */
-		int yylex2(html2text::HTMLParser::semantic_type *value_return, int *tag_type_return);
+		int yylex2(html2text::HTMLParser::semantic_type *value_return,
+				   int *tag_type_return);
 		bool literal_mode;
 		int next_token;
 		html2text::HTMLParser::semantic_type next_token_value;
@@ -94,9 +75,4 @@ class HTMLControl {
 		int number_of_ungotten_chars;
 };
 
-/* ------------------------------------------------------------------------- */
-
 #endif /* } */
-
-/* ------------------------------------------------------------------------- */
-

HTMLDriver.cpp

@@ -1,4 +1,4 @@
-/* Copyright 2020 Fabian Groffen <[email protected]>
+/* Copyright 2020-2022 Fabian Groffen <[email protected]>
  *
  * 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

HTMLDriver.h

@@ -1,4 +1,4 @@
-/* Copyright 2020 Fabian Groffen <[email protected]>
+/* Copyright 2020-2022 Fabian Groffen <[email protected]>
  *
  * 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