texinfo ChangeLog texi2html/texi2html.init texi...

[Patrice Dumas]

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        10/08/12 23:12:50

Modified files:
        .              : ChangeLog 
        texi2html      : texi2html.init 
Added files:
        texi2html/test/htmlxref: htmlxref.cnf-ref 
        texi2html/test/htmlxref-only_mono: htmlxref.cnf-ref 
        texi2html/test/htmlxref-only_split: htmlxref.cnf-ref 

Log message:
                * texi2ht/texi2html.init (t2h_default_external_href): an
                empty entry in htmlxref causes the corresponding possibility
                being ignored.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/htmlxref/htmlxref.cnf-ref?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/htmlxref-only_mono/htmlxref.cnf-ref?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/htmlxref-only_split/htmlxref.cnf-ref?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1102&r2=1.1103
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/texi2html.init?cvsroot=texinfo&r1=1.287&r2=1.288

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1102
retrieving revision 1.1103
diff -u -b -r1.1102 -r1.1103
--- ChangeLog   12 Aug 2010 23:07:29 -0000      1.1102
+++ ChangeLog   12 Aug 2010 23:12:50 -0000      1.1103
@@ -5,6 +5,9 @@
        * texi2html/texi2html.pl (do_text): disable the warning about
        unlikely character in @var. It is too expensive (because do_text 
        is called often) for a warning which rather questionable anyway.
+       * texi2ht/texi2html.init (t2h_default_external_href): an
+       empty entry in htmlxref causes the corresponding possibility
+       being ignored.
 
 2010-08-12  Patrice Dumas  <address@hidden>
 

Index: texi2html/texi2html.init
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/texi2html.init,v
retrieving revision 1.287
retrieving revision 1.288
diff -u -b -r1.287 -r1.288
--- texi2html/texi2html.init    12 Aug 2010 22:05:18 -0000      1.287
+++ texi2html/texi2html.init    12 Aug 2010 23:12:50 -0000      1.288
@@ -21,7 +21,7 @@
 # Those values may be overrided by values set in $sysconfdir/texi2html/Config 
 # and then by values set in $HOME/texi2html/Config.
 #
-# $Id: texi2html.init,v 1.287 2010/08/12 22:05:18 pertusus Exp $
+# $Id: texi2html.init,v 1.288 2010/08/12 23:12:50 pertusus Exp $
 
 
 ##################################################################
@@ -5878,7 +5878,7 @@
              {
                   foreach my $split_ordered 
(@{$htmlxref_entries{$document_split}})
                   {
-                       if 
(exists($Texi2HTML::THISDOC{'htmlxref'}->{$file}->{$split_ordered}))
+                       if 
(defined($Texi2HTML::THISDOC{'htmlxref'}->{$file}->{$split_ordered}))
                        {
                             $split_found = $split_ordered;
                             $href = 
$Texi2HTML::THISDOC{'htmlxref'}->{$file}->{$split_ordered};

Index: texi2html/test/htmlxref/htmlxref.cnf-ref
===================================================================
RCS file: texi2html/test/htmlxref/htmlxref.cnf-ref
diff -N texi2html/test/htmlxref/htmlxref.cnf-ref
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ texi2html/test/htmlxref/htmlxref.cnf-ref    12 Aug 2010 23:12:48 -0000      
1.1
@@ -0,0 +1,16 @@
+# a comment
+  # a comment
+
+var = 
+R = split
+ _1A=dir-
+S = ${R}-${_1A}manu
+
+manual node ${S}al${var}/
+manual mono   mono-manual.html
+manual chapter nonono=!/
+manual section
+
+# bad entries
+texinfo         foo    http://whatever
+texinfo

Index: texi2html/test/htmlxref-only_mono/htmlxref.cnf-ref
===================================================================
RCS file: texi2html/test/htmlxref-only_mono/htmlxref.cnf-ref
diff -N texi2html/test/htmlxref-only_mono/htmlxref.cnf-ref
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ texi2html/test/htmlxref-only_mono/htmlxref.cnf-ref  12 Aug 2010 23:12:49 
-0000      1.1
@@ -0,0 +1 @@
+manual mono   mono-manual.html

Index: texi2html/test/htmlxref-only_split/htmlxref.cnf-ref
===================================================================
RCS file: texi2html/test/htmlxref-only_split/htmlxref.cnf-ref
diff -N texi2html/test/htmlxref-only_split/htmlxref.cnf-ref
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ texi2html/test/htmlxref-only_split/htmlxref.cnf-ref 12 Aug 2010 23:12:49 
-0000      1.1
@@ -0,0 +1,2 @@
+manual section 
+manual chapter split-dir-manual/