Merge branch 'elinks-0.12' into elinks-0.13

Conflicts:
	src/session/session.c: Kept the elinks-0.13 version.
		Bug 1077 did not occur in elinks-0.13 because
		setup_session here calls render_document_frames
		directly and that sets ses->doc_view->vs.

Makefile.config.in

@@ -49,8 +49,8 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 
 host = @host@
 
-ASCIIDOC = @ASCIIDOC@
+ASCIIDOC = @PYTHON@ $(top_srcdir)/doc/tools/asciidoc/asciidoc.py
-ASCIIDOC_FLAGS = @ASCIIDOC_FLAGS@
+ASCIIDOC_FLAGS = --unsafe
 AWK = @AWK@
 CATALOGS = @CATALOGS@
 CC = @CC@

NEWS

@@ -75,9 +75,12 @@ have already been considered.
 ELinks 0.12pre3.GIT now:
 ------------------------
 
-To be released as 0.12pre4, 0.12rc1, or even 0.12.0.
+To be released as 0.12pre4, 0.12rc1, or even 0.12.0.  This branch also
+includes the changes listed under ``ELinks 0.11.6.GIT now'' below.
 
 * critical bug 1071: Fix crash in get_dom_node_child.
+* Debian build bug 526349: Include asciidoc.py from AsciiDoc 7.1.2,
+  to remove all dependencies on the installed version.
 
 ELinks 0.12pre3:
 ----------------
@@ -341,6 +344,14 @@ Changes in the experimental SGML/DOM implementation:
 * enhancement: incremental parsing
 * and more.
 
+ELinks 0.11.6.GIT now:
+----------------------
+
+To be released as 0.11.7.
+
+* critical bug 1077: fix crash opening a ``javascript:'' link in a new
+  tab
+
 ELinks 0.11.6:
 --------------
 

configure.in

@@ -70,17 +70,11 @@ CONFIG_XMLTO="no"
 CONFIG_JW="no"
 
 if test "x$CONFIG_DOC" != xno; then
-	AC_PATH_PROGS(ASCIIDOC, "asciidoc")
+	AC_PATH_PROGS(PYTHON, "python")
-	if test "x$ASCIIDOC" != "x"; then
+	if test "x$PYTHON" != "x"; then
 		EL_CONFIG(CONFIG_ASCIIDOC, [AsciiDoc])
 		EL_CONFIG(MANUAL_ASCIIDOC, [HTML (one file)])
 		EL_CONFIG(MAN_ASCIIDOC, [HTML])
-
-		echo > config.asciidoc-unsafe.txt
-		if "$ASCIIDOC" --unsafe config.asciidoc-unsafe.txt >/dev/null 2>/dev/null; then
-			ASCIIDOC_FLAGS=--unsafe
-		fi
-		rm config.asciidoc-unsafe.*
 	fi
 
 	AC_PATH_PROGS(XMLTO, "xmlto")
@@ -109,7 +103,6 @@ if test "x$CONFIG_DOC" != xno; then
 	fi
 fi
 
-AC_SUBST(ASCIIDOC_FLAGS)
 AC_SUBST(CONFIG_ASCIIDOC)
 AC_SUBST(CONFIG_DOXYGEN)
 AC_SUBST(CONFIG_POD2HTML)

doc/Makefile

@@ -18,7 +18,6 @@ ASCIIDOC_FLAGS += --no-conf -f $(srcdir)tools/asciidoc/asciidoc.conf \
 		  -f $(srcdir)tools/asciidoc/$(call backend).conf \
 		  -f $(ASCIIDOC_CONF) \
 		  -a "builddir=$(CURDIR)/" \
-		  -a asciidoc7compatible \
 		  -a elinks_version=$(VERSION)
 
 #############################################################################

doc/README

@@ -73,7 +73,8 @@ Building documentation
 
 The following tools are used for generating documentation in various formats:
 
- - asciidoc: the basic tool for lifting the .txt files to other formats.
+ - python: interpreter for asciidoc, which is the basic tool for
+   lifting the .txt files to other formats.
  - xmlto: used for outputting chunked HTML and man pages. 
  - jw: used for pdf documents.
  - pod2html: used for perl docs.

doc/elinks.conf.5.txt

@@ -67,6 +67,27 @@ include1::{builddir}option-config.frag.xhtml[]
 endif::backend-xhtml11[]
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
+// The OpenSSL license requires the following acknowledgements in all
+// advertising materials that mention features of OpenSSL.  The web
+// pages at http://elinks.cz/ might be thought of as advertising, and
+// the documentation of the connection.ssl.cert_verify option mentions
+// a feature of OpenSSL.  So include the acknowledgements in the HTML
+// web page that documents the options.
+ifdef::man-webpage[]
+
+ACKNOWLEDGEMENTS
+----------------
+
+If ELinks was configured to use OpenSSL, then the following apply:
+
+- This product includes software developed by the OpenSSL Project
+  for use in the OpenSSL Toolkit. (http://www.openssl.org/)
+
+- This product includes cryptographic software written by
+  Eric Young (eay@cryptsoft.com)
+
+endif::man-webpage[]
+
 SEE ALSO
 --------
 man:elinks[1], man:elinkskeys[5]

doc/tools/asciidoc/README

@@ -7,8 +7,9 @@ with new versions of AsciiDoc:
 
 http://bugzilla.elinks.cz/show_bug.cgi?id=989
 http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=491820
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=526349
 
-So now we bundle the configuration files from a known good version
+So now we bundle the necessary files from a known good version
 to let ELinks documentation be built with them regardless of which
 version has been installed on the machine.  This should keep things
-working as long as the configuration file format remains compatible.
+working as long as the Python interpreter remains compatible.

doc/tools/help2doc

@@ -1,83 +0,0 @@
-#! /usr/bin/perl
-use strict;
-use warnings;
-
-my ($elinks, $option) = @ARGV;
-
-if ($option =~ /command/) {
-    open my $pipe, "-|", $elinks, "--long-help" or die;
-    my $version = <$pipe>;
-    chomp $version;
-    $version =~ s/^ELinks ([-.\w]+).*$/$1/ or die "unusual version: $version";
-    my $blank = 1;
-    while (<$pipe>) {
-	if (/^ {4}(-.*?) *$/) {
-	    # '    -anonymous [0|1] (default: 0)'
-	    # '    -config-dir <str> (default: "")'
-	    $_ = $1;
-	    s/ {2,}/ /g;
-	    print "${_}::\n";
-	} elsif (/^ {12}\t(-eval .*)$/) {
-	    print "\n\t$1\n";
-	} elsif (/^ {12}\t(\w+\(.*\)) +: (.*)$/) {
-	    # '            	openURL(URL, new-tab)     : open URL in new tab'
-	    print "\t- `$1`: $2\n";
-	} elsif (/^ {12}\t(\d+) (means .+)$/) {
-	    # '            	0 means only show serious errors'
-	    print "\t- $1:\t$2\n";
-	} elsif (s/^ {12}//) {
-	    s/'([^']+)'/\\'$1\\'/g;
-	    s((~/\.elinks|-dump|-default-mime-type|text/html|-touch-files|-no-connect|-session-ring))(`$1`)g;
-	    s/(ELinks|HOME)/'$1'/g;
-	    print "\t$_";
-	} else {
-	    print "\n" unless $blank;
-	    $blank = 2;
-	}
-	$blank = ($blank == 2);
-    }
-    print "Generated using output from ELinks version $version.\n";
-} elsif ($option =~ /config/) {
-    open my $pipe, "-|", $elinks, "--config-help" or die;
-    my $version = <$pipe>;
-    chomp $version;
-    $version =~ s/^ELinks ([-.\w]+).*$/$1/ or die "unusual version: $version";
-    my $blank = 1;
-    my $continued = 0;
-    while (<$pipe>) {
-	if (/^ {2}[^ ].*: \(([-.\w]+)\)$/) {
-	    # '  Active link: (document.browse.links.active_link)'
-	    print "$1::\n";
-	} elsif (/^ {4}([^ ].*?)$/) {
-	    # '    bookmarks.file_format <num> (default: 0)'
-	    print "$1::\n";
-	} elsif (/^ {12,}$/) {
-	    print "+\n";
-	    $continued = 1;
-	} elsif (s/^ {12,}//) {
-	    # escape things that might look like AsciiDoc markup
-	    s/'(.*?)'/\\'$1\\'/g;
-	    s/\{(.*?)\}/\\{$1\\}/g;
-	    # add the actual AsciiDoc markup
-	    s/(ELinks|WWW_HOME)/'$1'/g;
-	    s((~/\.elinks))(`$1`)g;
-	    if (/^(-?\d[-+\d]*?) +(.*)$/) {
-		# '            1+ is use cookie's expiration date, but limit age to the given'
-		print "\t- $1:\t$2\n";
-	    } elsif ($continued) {
-		print "$_";
-	    } else {
-		print "\t$_";
-	    }
-	} else {
-	    print "\n" unless $blank;
-	    $blank = 2;
-	    $continued = 0;
-	}
-	$blank = ($blank == 2);
-    }
-    print "Generated using output from ELinks version $version.\n";
-} else {
-    die "usage: $0 ELINKS-EXECUTABLE option-command.txt\n"
-      . "   or: $0 ELINKS-EXECUTABLE option-config.txt\n";
-}

doc/tools/help2xml

@@ -574,7 +574,7 @@ get the documentation.
 
 =item F<.../option-config.frag.xhtml>
 
-The output file to which B<help2docbook> writes the DocBook XML or
+The output file to which B<help2xml> writes the DocBook XML or
 XHTML fragment.  The basename of this file must include the word
 "command" for command-line options, or "config" for configuration
 options.  It must also include "xml" for Docbook XML, or "html" for