Merge with main repo.

10 files changed, 81 insertions, 32 deletions

diff --git a/NEWS b/NEWS
index e31c9c87..c76bce1f 100644
--- a/NEWS
+++ b/NEWS
@@ -38,6 +38,9 @@ Sep 2011
 
   dillo-3.0.1, a bugfix release for the new 3.x series is out.
 
+Mar 2013
+
+  dillo-3.0.3, a new release for the new 3.x series is out.
 
   Jorge.-
   jcid@dillo.org
diff --git a/README b/README
index 1bb34b38..e84432bd 100644
--- a/README
+++ b/README
@@ -41,8 +41,8 @@ FLTK-1.3
 
   and build it like:
 
-     tar zxvf fltk-1.3.1-source.tar.gz      [or latest 1.3.x version]
-     cd fltk-1.3.1
+     tar zxvf fltk-1.3.2-source.tar.gz      [or latest 1.3.x version]
+     cd fltk-1.3.2
      less README.Unix.txt
      make
      sudo make install
@@ -52,11 +52,17 @@ FLTK-1.3
 Dillo3
 ------
 
-     tar jxvf dillo-3.0.2.tar.bz2
-     cd dillo-3.0.2
+     tar jxvf dillo-3.0.3.tar.bz2
+     cd dillo-3.0.3
      ./configure; make
      sudo make install-strip
 
+  In order to use the hyphenation feature, pattern files from CTAN need
+  to be installed.
+  This can be done with the script dillo-install-hyphenation.
+  Call it with ISO-639-1 language codes as arguments, or without arguments
+  to get more help.
+
 
 ------------
 Dpi programs
diff --git a/configure.ac b/configure.ac
index 88b7cfc2..f8e21e9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl Process this file with aclocal, autoconf and automake.
 
-AC_INIT([dillo], [3.0.2])
+AC_INIT([dillo], [3.0.3])
 
 dnl Detect the canonical target build environment
 AC_CANONICAL_TARGET
diff --git a/dillorc b/dillorc
index ca5a7702..9ef8e382 100644
--- a/dillorc
+++ b/dillorc
@@ -85,7 +85,7 @@
 # broken here. "inf" means that breaking is prohibited, "-inf" means
 # that a line *must* be broken here. (The latter should not be used
 # here, however.) Normal spaces get a penalty of 0. The exact
-# definition can be fouund in doc/dw-line-breaking.doc.
+# definition can be found in doc/dw-line-breaking.doc.
 
 # Penalties for hyphenation breaks; this covers automatic hyphenation,
 # soft hyphens, and unconditional hyphens. Since hyphenation should
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 246b0ebd..591ede4c 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,6 @@
 dist_doc_DATA = user_help.html
 man_MANS = dillo.1
 EXTRA_DIST = \
-        $(man_MANS) \
 	index.doc \
 	lout.doc \
 	dw-map.doc \
@@ -28,18 +27,19 @@ EXTRA_DIST = \
 	dw-textblock-collapsing-spaces-2-1.png \
 	dw-textblock-collapsing-spaces-2-2.png \
 	dw-floats-01.png \
-        Cache.txt \
-        Cookies.txt \
-        Dillo.txt \
-        Dw.txt \
-        HtmlParser.txt \
-        IO.txt \
-        Images.txt \
-        Imgbuf.txt \
-        NC_design.txt \
-        Selection.txt \
-        Dpid.txt \
-        README
+	Cache.txt \
+	Cookies.txt \
+	Dillo.txt \
+	Dw.txt \
+	HtmlParser.txt \
+	IO.txt \
+	Images.txt \
+	Imgbuf.txt \
+	NC_design.txt \
+	Selection.txt \
+	Dpid.txt \
+	README \
+	dillo.1.in
 
 dillo.1: $(srcdir)/dillo.1.in Makefile
 	sed 's%/usr/local%${prefix}%g' < $(srcdir)/dillo.1.in > dillo.1
diff --git a/dw/hyphenator.cc b/dw/hyphenator.cc
index 00240bc0..9e5e2b29 100644
--- a/dw/hyphenator.cc
+++ b/dw/hyphenator.cc
@@ -1,3 +1,24 @@
+/*
+ * Dillo Widget
+ *
+ * Copyright 2012-2013 Sebastian Geerken <sgeerken@dillo.org>, 
+ *                     Johannes Hofmann <Johannes.Hofmann@gmx.de>
+ *
+ * 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 3 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #include "hyphenator.hh"
 
 #include "../lout/misc.hh"
diff --git a/dw/textblock.cc b/dw/textblock.cc
index 982dba16..0ee8f917 100644
--- a/dw/textblock.cc
+++ b/dw/textblock.cc
@@ -1,7 +1,7 @@
 /*
  * Dillo Widget
  *
- * Copyright 2005-2007 Sebastian Geerken <sgeerken@dillo.org>
+ * Copyright 2005-2007, 2012-2013 Sebastian Geerken <sgeerken@dillo.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/dw/textblock_iterator.cc b/dw/textblock_iterator.cc
index daf82c50..c26b7f6e 100644
--- a/dw/textblock_iterator.cc
+++ b/dw/textblock_iterator.cc
@@ -1,7 +1,9 @@
 /*
  * Dillo Widget
  *
- * Copyright 2005-2007 Sebastian Geerken <sgeerken@dillo.org>
+ * Copyright 2005-2007, 2012-2013 Sebastian Geerken <sgeerken@dillo.org>
+ *
+ * (Parts of this file were originally part of textblock.cc.)
  *
  * 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/dw/textblock_linebreaking.cc b/dw/textblock_linebreaking.cc
index 9044ccf6..2f6ac4df 100644
--- a/dw/textblock_linebreaking.cc
+++ b/dw/textblock_linebreaking.cc
@@ -1,3 +1,25 @@
+/*
+ * Dillo Widget
+ *
+ * Copyright 2005-2007, 2012-2013 Sebastian Geerken <sgeerken@dillo.org>
+ *
+ * (Parts of this file were originally part of textblock.cc.)
+ *
+ * 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 3 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
 #include "textblock.hh"
 #include "hyphenator.hh"
 #include "../lout/msg.h"
diff --git a/src/IO/about.c b/src/IO/about.c
index c76c2d9d..6734e704 100644
--- a/src/IO/about.c
+++ b/src/IO/about.c
@@ -230,18 +230,14 @@ const char *const AboutSplash=
 "<tr>\n"
 " <td bgcolor='#CCCCCC'>\n"
 "  <h4>Release overview</h4>\n"
-"  December 05, 2011\n"
+"  March 31, 2013\n"
 "<tr>\n"
 " <td bgcolor='#FFFFFF'>\n"
 "  <table border='0' cellspacing='0' cellpadding='5'>\n"
 "  <tr>\n"
 "   <td>\n"
 "<p>\n"
-"dillo-3.0.2 brings you some new bits and pieces, as listed below :)\n"
-"<p>\n"
-"After this release, the core team plans to focus on implementing the CSS\n"
-"feature of floating elements. This will <em>greatly</em> improve dillo's\n"
-"web page rendering since many sites have adopted floats instead of tables.\n"
+"dillo-3.0.3 adds some nice new features, as listed below.\n"
 "<p>\n"
 "Dillo3 uses the FLTK GUI toolkit's 1.3.x series. In June, fltk-1.3.0 was\n"
 "<a href='http://fltk.org/articles.php?L1086'>released</a>,\n"
@@ -270,11 +266,10 @@ const char *const AboutSplash=
 "  <tr>\n"
 "   <td>\n"
 "<ul>\n"
-"<li>Digest authentication.\n"
-"<li>Rework line breaking and fix white-space:nowrap handling.\n"
-"<li>text-transform property.\n"
-"<li>Locale-independent ASCII character case handling (fixes Turkic locales).\n"
-"<li>Bind Ctrl-{PageUp,PageDown} to tab-{previous,next}.\n"
+"<li>Automatic hyphenation (includes penalty_* preferences that control line-breaking).\n"
+"<li>Introduced the domainrc mechanism for finer-grained control than filter_auto_requests had provided.\n"
+"<li>Added user interface color preferences (ui_*).\n"
+"<li>Support for CSS display property.\n"
 "</ul>\n"
 "  </table>\n"
 "</table>\n"