[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[6094] replace all (dir) references with TOP_NODE_UP_URL; add tests
|
From: |
karl |
|
Subject: |
[6094] replace all (dir) references with TOP_NODE_UP_URL; add tests |
|
Date: |
Mon, 02 Feb 2015 23:58:42 +0000 |
Revision: 6094
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6094
Author: karl
Date: 2015-02-02 23:58:41 +0000 (Mon, 02 Feb 2015)
Log Message:
-----------
replace all (dir) references with TOP_NODE_UP_URL; add tests
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/texinfo.texi
trunk/tp/Texinfo/Convert/HTML.pm
trunk/tp/maintain/regenerate_cmd_tests.sh
trunk/tp/tests/README
trunk/tp/tests/run_parser_all.sh
trunk/tp/tests/sectioning/Makefile.am
trunk/tp/tests/sectioning/tests-parser.txt
Added Paths:
-----------
trunk/tp/tests/sectioning/res_parser/top_node_up_explicit/
trunk/tp/tests/sectioning/res_parser/top_node_up_explicit/top_node_up_explicit.1
trunk/tp/tests/sectioning/res_parser/top_node_up_explicit/top_node_up_explicit.2
trunk/tp/tests/sectioning/res_parser/top_node_up_explicit/top_node_up_explicit.html
trunk/tp/tests/sectioning/res_parser/top_node_up_implicit/
trunk/tp/tests/sectioning/res_parser/top_node_up_implicit/top_node_up_implicit.1
trunk/tp/tests/sectioning/res_parser/top_node_up_implicit/top_node_up_implicit.2
trunk/tp/tests/sectioning/res_parser/top_node_up_implicit/top_node_up_implicit.html
trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/
trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/Chap.html
trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/index.html
trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/top_node_up_explicit.1
trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/top_node_up_explicit.2
trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/
trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/Chap.html
trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/index.html
trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/top_node_up_implicit.1
trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/top_node_up_implicit.2
trunk/tp/tests/sectioning/top_node_up_explicit.texi
trunk/tp/tests/sectioning/top_node_up_implicit.texi
trunk/tp/tests/test_scripts/sectioning_top_node_up_explicit.sh
trunk/tp/tests/test_scripts/sectioning_top_node_up_implicit.sh
Property Changed:
----------------
trunk/tp/tests/sectioning/Makefile.am
trunk/tp/tests/sectioning/tests-parser.txt
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2015-02-02 23:47:35 UTC (rev 6093)
+++ trunk/ChangeLog 2015-02-02 23:58:41 UTC (rev 6094)
@@ -1,3 +1,20 @@
+2015-02-02 Karl Berry <address@hidden>
+
+ * doc/texinfo.texi (First Node): mention TOP_NODE_UP_URL usage.
+ (HTML Customization Variables) <TOP_NODE_UP_URL>: say more.
+ (Other Customization Variables) <TOP_NODE_UP>: ref TOP_NODE_UP_URL.
+ * tp/Texinfo/Convert/HTML.pm (_external_node_href): replace all
+ (dir) links with TOP_NODE_UP_URL, not just the (dir) link
+ implicitly created as Top's Up.
+
+ * tp/tests/README: tersely describe creating a new test, best I can.
+ * tp/tests/run_parser_all.sh: more logging, use test -n/-z more.
+ * tp/tests/sectioning/tests-parser.txt: new tests,
+ top_node_up_implicit and top_node_up_explicit.
+ * tp/tests/sectioning/top_node_up_{im,ex}plicit.texi: new files.
+ * tp/tests/sectioning/res_parser{,_html}/top_node_up_{im,ex}plicit:
+ new result directories.
+
2015-01-31 Karl Berry <address@hidden>
* doc/texinfo.tex (\documentencoding): do not re-invoke
Modified: trunk/doc/texinfo.texi
===================================================================
--- trunk/doc/texinfo.texi 2015-02-02 23:47:35 UTC (rev 6093)
+++ trunk/doc/texinfo.texi 2015-02-02 23:58:41 UTC (rev 6094)
@@ -5280,13 +5280,32 @@
as its `Up' node the name of a node in another file, where there is a
menu that leads to this file. Specify the file name in parentheses.
-Usually, all Info files are installed in one system-wide Info tree
-(often constructed from multiple directories). In this case, use
+Usually, all Info files are available through a single virtual Info
+tree, constructed from multiple directories. In this case, use
@samp{(dir)} as the parent of the Top node; this specifies the
top-level node in the @file{dir} file, which contains the main menu
-for the Info system as a whole.
+for the Info system as a whole. (Each directory with Info files is
+intended to contain a file named @file{dir}.)
+That's fine for Info, but for HTML output, one might well want the Up
+link from the Top node to go somewhere other than @samp{dir.html}.
+For example, for GNU the natural place would be
address@hidden://www.gnu.org/manual/} (a web page collecting links to most
+GNU manuals). This can be specified with the @code{TOP_NODE_UP_URL}
+customization variable (@pxref{HTML Customization Variables}), as in
+
address@hidden
+$ @kbd{makeinfo --html -c TOP_NODE_UP_URL=http://www.gnu.org/manual/} ...
address@hidden example
+
+All links to @code{(dir)} will be replaced by the given url.
+
@item
address@hidden Prev node of Top node
+The `Prev' node of the Top node is usually either omitted or also set
+to @file{(dir)}. Either is fine.
+
address@hidden
@cindex Next node of Top node
The `Next' node of the Top node should be the first chapter in your
document.
@@ -18256,8 +18275,13 @@
default is @code{index}.
@item TOP_NODE_UP_URL
-For address@hidden The url used for the Up pointer of the Top node; default
address@hidden, meaning no link is generated.
+For address@hidden A url used for @code{(dir)} references; the default is
address@hidden, meaning that the normal rules apply, typically leading
+to a link to @samp{dir.html} from an implicit or explicit reference to
address@hidden(dir)} (@pxref{HTML Xref}). For more about the Top node
+pointers, @pxref{First Node}. For overriding the Up pointer in other
+formats, see @code{TOP_NODE_UP} in @ref{Other Customization
+Variables}.
@item USE_ACCESSKEY
@cindex @code{accesskey}, customization variable for
@@ -18565,7 +18589,9 @@
also output comments. Default false.
@item TOP_NODE_UP
-Up node for the Top node; default @samp{(dir)}.
+Up node for the Top node; default @samp{(dir)}. For overriding the
+url in HTML output, see @code{TOP_NODE_UP_URL} in @ref{HTML
+Customization Variables}.
@item TREE_TRANSFORMATIONS
The associated value is a comma separated list of transformations that
Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm 2015-02-02 23:47:35 UTC (rev 6093)
+++ trunk/tp/Texinfo/Convert/HTML.pm 2015-02-02 23:58:41 UTC (rev 6094)
@@ -1,7 +1,7 @@
# $Id$
# HTML.pm: output tree as HTML.
#
-# Copyright 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+# Copyright 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
#
# 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
@@ -5716,11 +5716,21 @@
my $filename = shift;
my $link_command = shift;
+ # This only overrides an implicit pointer to (dir) as the Top node's Up.
+ # It has no effect if a pointer is explicitly specified,
+ # or if implicit pointers aren't being created (e.g., just a Top node).
if ($external_node->{'top_node_up'}
and defined($self->get_conf('TOP_NODE_UP_URL'))) {
return $self->get_conf('TOP_NODE_UP_URL');
}
+ # In addition to that implicit (dir) as the Top node's Up, replace all
+ # other references to external file "dir" with the same TOP_NODE_UP_URL.
+ if (defined($self->get_conf('TOP_NODE_UP_URL'))
+ and $external_node->{'manual_content'}[0]->{'text'} eq "dir") {
+ return $self->get_conf('TOP_NODE_UP_URL');
+ }
+
#print STDERR "external_node: ".join('|', keys(%$external_node))."\n";
my ($target_filebase, $target, $id) = $self->_node_id_file($external_node);
Modified: trunk/tp/maintain/regenerate_cmd_tests.sh
===================================================================
--- trunk/tp/maintain/regenerate_cmd_tests.sh 2015-02-02 23:47:35 UTC (rev
6093)
+++ trunk/tp/maintain/regenerate_cmd_tests.sh 2015-02-02 23:58:41 UTC (rev
6094)
@@ -1,7 +1,7 @@
#! /bin/sh
# $Id$
# Use information from test driving files to regenerate test scripts
-# that run only one test, and file lists to be use in Makefiles.
+# that run only one test, and file lists to be used in Makefiles.
#
# Copyright 2015 Free Software Foundation, Inc.
#
Modified: trunk/tp/tests/README
===================================================================
--- trunk/tp/tests/README 2015-02-02 23:47:35 UTC (rev 6093)
+++ trunk/tp/tests/README 2015-02-02 23:58:41 UTC (rev 6094)
@@ -8,14 +8,14 @@
modification, are permitted in any medium without royalty provided the
copyright notice and this notice are preserved.
-Files anywhere within the tests/ subdirectory which have no other
-copyright notice are hereby placed in the public domain.
+Files anywhere within the texinfo/tp/tests/ subdirectory which have no
+other copyright notice are hereby placed in the public domain.
Prerequisites
=============
To run this testsuite, sed, awk, diff (with -u) are used.
-For LaTeX2HTML tests (not run in the default case) mktemp
+For LaTeX2HTML tests (not run by default), mktemp
understanding the -d option is also required.
Some tests may also require a case insensitive filesystem.
@@ -41,12 +41,12 @@
$ ../run_parser_all.sh cond
(see below for info on how test names are specified).
-The test results are in the out_parser directories; the reference results are
-in res_parser directories; there are one or two out and res directories,
-out_parser/ and res_parser/ for the html results in the texi2html style,
-out_parser_info and res_parser_info for the info output, out_parser_html
-and res_parser_html for html output with the default texi2any style.
-Diffs are put in diffs.
+The test results are in the out_parser directories; the reference
+results are in res_parser directories. There can be these pairs.
+- out_parser/ and res_parser/ for html output in texi2html style;
+- out_parser_html/ and res_parser_html/ for html output in texi2any style;
+- out_parser_info/ and res_parser_info/ for info results;
+and diffs are put in the diffs/ subdir.
If a test failed when run via parser_tests.sh or run_parser_all.sh, then
F: a_test_directory
@@ -83,7 +83,7 @@
TeX4ht and LaTeX2HTML tests
-===========================
+---------------------------
The tex4ht and latex2HTML related tests are not run automatically, as
some test results involving latex2HTML or tex4ht depend on the setup and
version of these tools.
@@ -98,20 +98,25 @@
Tests specification
===================
-Test runs are driven by the content of the tests-parser.txt file. It is
-a line oriented file. A # starts a comment. Each line describes a test.
-The first word on the line is the test name which corresponds also with the
+Test runs are driven by the content of the tests-parser.txt files in
+each subdirectory. This is a line oriented file. A # starts a
+comment, except that the very first line of the file can be, e.g.,
+# formats :html
+which says which formats to generate.
+
+Otherwise, each non-empty non-comment line describes a test. The first
+word on the line is the test name which corresponds also with the
resulting directory (what we called a_test above). It is followed by
the source manual name. The source manual name has to have the .texi
-extension. Optionnally additional arguments can be given on the
-remaining of the line.
+extension. Optionally, additional arguments can be given on the rest of
+the line.
So, for example, the line
a_test manual.texi
-specifies that for the a_test test, the file manual.texi is processed and
-results are put are put in the a_test directory. The line:
+specifies that for the test a_test, the file manual.texi is processed
+and results are put are put in the a_test directory. The line:
a_test_split_chapter manual.texi --split chapter
@@ -132,11 +137,40 @@
Common .texi
-============
+------------
A common .texi file should be in the top-level directory (there is such an
example with coverage_macro.texi).
Init files
-==========
+----------
Init files are searched for in ../t/init/.
+
+
+Creating a new test
+===================
+- choose the subdir here for the new test. Each subdir only generates
+output in one or two formats (according to the `formats' line in
+its tests-parser.txt), so if you want to test a particular output
+format, use the right place.
+
+- add the line to subdir/tests-parser.txt as described above.
+- most probably, create the needed subdir/*.texi file
+- cd subdir; ../run_parser_all.sh newtest
+
+This will create subdir/out_parser*/newtest/ with the test results
+(as explained above), as well as stdout in newtest.1 and stderr in newtest.2.
+Look carefully to be sure they are as they should be.
+
+When things look good, use the -copy option to create the
+subdir/res_parser*/newtest/ subdirs and copy the output files there.
+
+The test run will be logged in subdir/test_log/newtest.log,
+including the exact invocation of texi2any, which can alter anything.
+For even more, use sh -vx to show exactly what run_parser_all is doing.
+
+When satisfied, add the .texi in subdir/Makefile.am.
+And of course commit all the files and try a make check (or long-checks,
+as needed) afterward to verify it gets run, and passes.
+
+The regenerate_cmd_tests helper script that runs as part of the
Modified: trunk/tp/tests/run_parser_all.sh
===================================================================
--- trunk/tp/tests/run_parser_all.sh 2015-02-02 23:47:35 UTC (rev 6093)
+++ trunk/tp/tests/run_parser_all.sh 2015-02-02 23:58:41 UTC (rev 6094)
@@ -30,6 +30,7 @@
logfile=tests.log
main_command='texi2any.pl'
+# formats can be specified by first line of tests-parser.txt.
#commands='texi2any.pl:_html texi2any.pl:_info'
#commands=': texi2any.pl:_info'
commands=':'
@@ -72,17 +73,17 @@
fi
one_test=no
-if [ z"$1" != 'z' ]; then
+if test -n "$1"; then
one_test=yes
the_test=$1
test_name=$the_test
- if [ "z$the_test" = "ztexi" ]; then
+ if test "z$the_test" = "ztexi"; then
the_file=$2
- [ "z$the_file" != "z" ] && the_basename=`basename $the_file .texi`
+ test -n "$the_file" && the_basename=`basename $the_file .texi`
test_name="${test_name}_$the_basename"
fi
test -d $one_test_logs_dir || mkdir $one_test_logs_dir
- logfile="$one_test_logs_dir/$test_name.log"
+ logfile=$one_test_logs_dir/$test_name.log
fi
# The script is always run in a test directory. If srcdir_test is
@@ -101,15 +102,17 @@
#echo "testdir $testdir srcdir_test $srcdir_test" 1>&2
-base_results_dir="$testdir/$srcdir_test"
-#test_file='tests.txt'
-test_file='tests-parser.txt'
-driving_file="$testdir/$srcdir_test/$test_file"
+base_results_dir=$testdir/$srcdir_test
+test_file=tests-parser.txt
+driving_file=$testdir/$srcdir_test/$test_file
-if [ -f "$driving_file" ]; then
+echo "base_results_dir: $base_results_dir" >$logfile
+echo "driving_file: $driving_file" >>$logfile
+
+if test -f "$driving_file"; then
:
else
- echo "$0: Cannot find test driving file $driving_file" 1>&2
+ echo "$0: Cannot find test driver file $driving_file" 1>&2
exit 1
fi
@@ -117,12 +120,14 @@
if echo $first_line |grep -qs '^# formats'; then
formats=`echo $first_line |sed 's/^# formats //'`
commands="$commands $formats"
+ echo "found special first line, commands now: $commands" >>$logfile
fi
for command_dir in $commands; do
dir_suffix=`echo $command_dir | cut -d':' -f2`
- resdir="${res_dir}${dir_suffix}/"
- [ -d "$resdir" ] || mkdir "$resdir"
+ resdir=${res_dir}${dir_suffix}/
+ test -d "$resdir" || mkdir "$resdir"
+ echo "made result dir: $resdir" >>$logfile
done
if [ "z$clean" = 'zyes' -o "z$copy" = 'zyes' ]; then
@@ -160,7 +165,8 @@
fi
cp -r "${outdir}$dir/"* "${resdir}$dir/"
else
- echo "$0: No dir ${outdir}$dir" 1>&2
+ echo "$0: No dir ${outdir}$dir" >&2
+ exit 1
fi
done
fi
@@ -184,33 +190,37 @@
test -d "${outdir}" || mkdir "${outdir}"
done
-
-echo "base_result_dir $base_results_dir, driving_file $driving_file" > $logfile
-
return_code=0
-while read line
-do
+while read line; do
+ # skip comments.
if echo $line | grep -qs '^ *#'; then continue; fi
-# there are better ways
+
current=`echo $line | awk '{print $1}'`
file=`echo $line | awk '{print $2}'`
+ #
+ # skip empty lines.
(test "z$current" = 'z' || test "$zfile" = 'z') && continue
+ #
+ # if we're only doing one test, skip it unless this is the one.
+ if test $one_test = 'yes' && test "z$current" != "z$the_test" ; then
+ continue
+ fi
+
basename=`basename $file .texi`
remaining=`echo $line | sed 's/[a-zA-Z0-9_./-]* *[a-zA-Z0-9_./-]* *//' \
| sed 's,@PATH_SEPARATOR@,'"${PATH_SEPARATOR}$testdir/$srcdir_test/"',g'`
src_file="$testdir/$srcdir_test/$file"
- if test $one_test = 'yes' && test "z$current" != "z$the_test" ; then
- continue
- fi
+
for command_dir in $commands; do
format_option=
command=`echo $command_dir | cut -d':' -f1`
dir_suffix=`echo $command_dir | cut -d':' -f2`
format=`echo $dir_suffix |sed 's/^_//'`
- if [ z"$command" = 'z' ]; then
+ #
+ if test -z "$command"; then
command=$main_command
- if [ "z$format" != 'z' ]; then
+ if test -n "$format"; then
format_option="--$format"
else
format_option="--set-customization-variable=TEXI2HTML"
@@ -223,19 +233,28 @@
break
fi
done
- if [ z"$command_run" = 'z' ]; then
- echo "Command $command not found"
+ if test -n "$command_run"; then
+ # we're going to show the exact cmd below anyway, don't repeat here.
+ echo >>$logfile
+ echo "doing test $current, src_file $src_file" >>$logfile
+ echo "format_option: $format_option" >>$logfile
+ else
+ echo "$0: Command $command not found" >&2
exit 1
fi
+
outdir="${out_dir}${dir_suffix}/"
results_dir="$testdir/$srcdir_test/${res_dir}${dir_suffix}"
#results_dir_ref="$testdir/$srcdir_test/${res_dir_ref}${dir_suffix}"
if test "z$current" = 'ztexi' ; then
- if test $one_test = 'yes' && test "z$the_basename" != 'z' && test
"z$basename" != "z$the_basename" ; then
+ if test $one_test = 'yes' \
+ && test -n "$the_basename" \
+ && test "z$basename" != "z$the_basename"; then
continue 2
fi
one_test_done=yes
dir="texi_${basename}"
+ echo "doing special texi case, dir: $dir" >>$logfile
test -d "${outdir}$dir" && rm -rf "${outdir}$dir"
mkdir "${outdir}$dir"
@@ -243,12 +262,14 @@
command_file=
# -I $testdir/$srcdir_test/ is useful when file name is found using
# @setfilename
- echo "$command $dir" >> $logfile
+ echo "$command $dir" >>$logfile
#echo "$dir($format)"
- echo "$prepended_command $PERL -w -I $testdir/$srcdir_test/../../ -I
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/
--conf-dir $testdir/$srcdir_test/../../init --error-limit=1000
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0
--output ${outdir}$dir/ -I $testdir/$srcdir_test/ -I $testdir/$srcdir_test/../
--set-customization-variable=DUMP_TEXI=1
--macro-expand=${outdir}$dir/$basename.texi $remaining_out_dir $src_file
2>${outdir}$dir/$basename.2" >> $logfile
- eval "$prepended_command $PERL -w -I $testdir/$srcdir_test/../../ -I
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/
--conf-dir $testdir/$srcdir_test/../../init --error-limit=1000
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0
--output ${outdir}$dir/ -I $testdir/$srcdir_test/ -I $testdir/$srcdir_test/../
--set-customization-variable=DUMP_TEXI=1
--macro-expand=${outdir}$dir/$basename.texi $remaining_out_dir $src_file
2>${outdir}$dir/$basename.2"
+ cmd="$prepended_command $PERL -w -I $testdir/$srcdir_test/../../ -I
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/
--conf-dir $testdir/$srcdir_test/../../init --error-limit=1000
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0
--output ${outdir}$dir/ -I $testdir/$srcdir_test/ -I $testdir/$srcdir_test/../
--set-customization-variable=DUMP_TEXI=1
--macro-expand=${outdir}$dir/$basename.texi $remaining_out_dir $src_file
2>${outdir}$dir/$basename.2" >> $logfile
+ echo "$cmd" >>$logfile
+ eval $cmd
ret=$?
else
+ # non-"texi" case.
one_test_done=yes
use_latex2html=no
use_tex4ht=no
@@ -293,16 +314,18 @@
test -d "${outdir}$dir" && rm -rf "${outdir}$dir"
mkdir "${outdir}$dir"
remaining_out_dir=`echo $remaining | sed
's,@OUT_DIR@,'"${outdir}$dir/"',g'`
- echo "$command $dir" >> $logfile
- #echo "$dir($format)"
- echo "$prepended_command $PERL -w -I $testdir/$srcdir_test/../../ -I
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/
--conf-dir $testdir/$srcdir_test/../../init -I $testdir/$srcdir_test/ -I
$testdir/$srcdir_test/../ --set-customization-variable
L2H_FILE=$testdir/$srcdir_test/../../t/init/l2h.init --error-limit=1000
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0
$l2h_tmp_dir --output ${outdir}$dir/ $remaining_out_dir $src_file >
${outdir}$dir/$basename.1 2>${outdir}$dir/$basename.2" >> $logfile
- eval "$prepended_command $PERL -w -I $testdir/$srcdir_test/../../ -I
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/
--conf-dir $testdir/$srcdir_test/../../init -I $testdir/$srcdir_test/ -I
$testdir/$srcdir_test/../ --set-customization-variable
L2H_FILE=$testdir/$srcdir_test/../../t/init/l2h.init --error-limit=1000
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0
$l2h_tmp_dir --output ${outdir}$dir/ $remaining_out_dir $src_file >
${outdir}$dir/$basename.1 2>${outdir}$dir/$basename.2"
+ echo "$command $dir -> ${outdir}$dir" >> $logfile
+ cmd="$prepended_command $PERL -w -I $testdir/$srcdir_test/../../ -I
$testdir/$srcdir_test/../../maintain/lib/Unicode-EastAsianWidth/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/libintl-perl/lib/ -I
$testdir/$srcdir_test/../../maintain/lib/Text-Unidecode/lib/ $command_run
$format_option --force --conf-dir $testdir/$srcdir_test/../../t/init/
--conf-dir $testdir/$srcdir_test/../../init -I $testdir/$srcdir_test/ -I
$testdir/$srcdir_test/../ --set-customization-variable
L2H_FILE=$testdir/$srcdir_test/../../t/init/l2h.init --error-limit=1000
--set-customization-variable TEST=1 --set-customization-variable L2H_CLEAN=0
$l2h_tmp_dir --output ${outdir}$dir/ $remaining_out_dir $src_file >
${outdir}$dir/$basename.1 2>${outdir}$dir/$basename.2"
+ echo "$cmd" >>$logfile
+ eval $cmd
ret=$?
#rm -f ${outdir}$dir/*_l2h_images.log ${outdir}$dir/*_tex4ht_*.log \
# ${outdir}$dir/*_tex4ht_*.idv ${outdir}$dir/*_tex4ht_*.dvi \
# ${outdir}$dir/*_l2h.html.* \
# ${outdir}$dir/*_tex4ht_tex.html*
fi
+ #
+ # ran test, check results.
if test $ret = 0 ; then
diff_base="${dir}${dir_suffix}"
res_dir_used=
@@ -381,18 +404,21 @@
echo "no res($format): $dir"
fi
else
+ echo "failed with status $ret" >>$logfile
echo "F: ${outdir}$dir/$basename.2"
return_code=1
fi
done
-done < "$driving_file"
+done <"$driving_file"
-if test z"$tmp_dir" != 'z' ; then
- rm -rf $tmp_dir
-fi
+test -n "$tmp_dir" && rm -rf $tmp_dir
-if test "$one_test" = 'yes' && test "z$one_test_done" != "zyes" ; then
- echo "$the_test $the_file test not found"
+if test "$one_test" = 'yes' && test "z$one_test_done" != "zyes"; then
+ echo "$0: test not found: $the_test (file: $the_file) " >&2
+ return_code=2
fi
+echo >>$logfile
+echo "all done, exiting with status $return_code" >>$logfile
+
exit $return_code
Modified: trunk/tp/tests/sectioning/Makefile.am
===================================================================
--- trunk/tp/tests/sectioning/Makefile.am 2015-02-02 23:47:35 UTC (rev
6093)
+++ trunk/tp/tests/sectioning/Makefile.am 2015-02-02 23:58:41 UTC (rev
6094)
@@ -1,3 +1,6 @@
+# $Id$
+# sectioning/Makefile.am - public domain.
+
EXTRA_DIST = \
at_commands_in_refs.texi \
equivalent_nodes.texi \
@@ -13,7 +16,10 @@
sectioning.texi \
test_refs.texi \
test_two_include.texi \
+ top_node_up_implicit.texi \
+ top_node_up_explicit.texi \
two_footnotes_in_nodes.texi \
+ \
renamednodes.cnf-ref \
tests-parser.txt \
res_parser res_parser_html
Property changes on: trunk/tp/tests/sectioning/Makefile.am
___________________________________________________________________
Added: svn:keywords
+ Date Author Id
Property changes on:
trunk/tp/tests/sectioning/res_parser/top_node_up_explicit/top_node_up_explicit.1
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
trunk/tp/tests/sectioning/res_parser/top_node_up_explicit/top_node_up_explicit.2
___________________________________________________________________
Added: svn:eol-style
+ native
Added:
trunk/tp/tests/sectioning/res_parser/top_node_up_explicit/top_node_up_explicit.html
===================================================================
---
trunk/tp/tests/sectioning/res_parser/top_node_up_explicit/top_node_up_explicit.html
(rev 0)
+++
trunk/tp/tests/sectioning/res_parser/top_node_up_explicit/top_node_up_explicit.html
2015-02-02 23:58:41 UTC (rev 6094)
@@ -0,0 +1,206 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>The top</title>
+
+<meta name="description" content="The top">
+<meta name="keywords" content="The top">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space: nowrap}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: serif; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en>
+
+
+<a name="Top"></a>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[ < ]</td>
+<td valign="middle" align="left">[<a href="#Chap" title="Next section in
reading order"> > </a>]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left">[Contents]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<a name="The-top"></a>
+<h1 class="top">The top</h1>
+
+<p>Just a top node.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#Chap">1 A
chapter</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr size="6">
+<a name="Chap"></a>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this
chapter or previous chapter"> << </a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Previous section in
reading order"> < </a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Up section"> Up
</a>]</td>
+<td valign="middle" align="left">[ > ]</td>
+<td valign="middle" align="left">[ >> ]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
+<td valign="middle" align="left">[Contents]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<a name="A-chapter"></a>
+<h1 class="chapter">1 A chapter</h1>
+
+<p>Without the chapter, no up node from top is generated.
+</p>
+<hr size="6">
+<a name="SEC_About"></a>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
+<td valign="middle" align="left">[Contents]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<h1 class="about-heading">About This Document</h1>
+
+<p>
+ This document was generated on <em>a sunny day</em> using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
+</p>
+<p>
+ The buttons in the navigation panels have the following meaning:
+</p>
+<table border="1">
+ <tr>
+ <th> Button </th>
+ <th> Name </th>
+ <th> Go to </th>
+ <th> From 1.2.3 go to</th>
+ </tr>
+ <tr>
+ <td align="center"> [ << ] </td>
+ <td align="center">FastBack</td>
+ <td>Beginning of this chapter or previous chapter</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td align="center"> [ < ] </td>
+ <td align="center">Back</td>
+ <td>Previous section in reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ Up ] </td>
+ <td align="center">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ > ] </td>
+ <td align="center">Forward</td>
+ <td>Next section in reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td align="center"> [ >> ] </td>
+ <td align="center">FastForward</td>
+ <td>Next chapter</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td align="center"> [Top] </td>
+ <td align="center">Top</td>
+ <td>Cover (top) of document</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Contents] </td>
+ <td align="center">Contents</td>
+ <td>Table of contents</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Index] </td>
+ <td align="center">Index</td>
+ <td>Index</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [ ? ] </td>
+ <td align="center">About</td>
+ <td>About (help)</td>
+ <td> </td>
+ </tr>
+</table>
+
+<p>
+ where the <strong> Example </strong> assumes that the current position is at
<strong> Subsubsection One-Two-Three </strong> of a document of the following
structure:
+</p>
+
+<ul>
+ <li> 1. Section One
+ <ul>
+ <li>1.1 Subsection One-One
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.2 Subsection One-Two
+ <ul>
+ <li>1.2.1 Subsubsection One-Two-One</li>
+ <li>1.2.2 Subsubsection One-Two-Two</li>
+ <li>1.2.3 Subsubsection One-Two-Three
+ <strong><== Current Position </strong></li>
+ <li>1.2.4 Subsubsection One-Two-Four</li>
+ </ul>
+ </li>
+ <li>1.3 Subsection One-Three
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.4 Subsection One-Four</li>
+ </ul>
+ </li>
+</ul>
+
+<hr>
+<p><font size="-1">
+ This document was generated on <em>a sunny day</em> using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
+</font></p>
+
+
+</body>
+</html>
Property changes on:
trunk/tp/tests/sectioning/res_parser/top_node_up_explicit/top_node_up_explicit.html
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
trunk/tp/tests/sectioning/res_parser/top_node_up_implicit/top_node_up_implicit.1
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
trunk/tp/tests/sectioning/res_parser/top_node_up_implicit/top_node_up_implicit.2
___________________________________________________________________
Added: svn:eol-style
+ native
Added:
trunk/tp/tests/sectioning/res_parser/top_node_up_implicit/top_node_up_implicit.html
===================================================================
---
trunk/tp/tests/sectioning/res_parser/top_node_up_implicit/top_node_up_implicit.html
(rev 0)
+++
trunk/tp/tests/sectioning/res_parser/top_node_up_implicit/top_node_up_implicit.html
2015-02-02 23:58:41 UTC (rev 6094)
@@ -0,0 +1,206 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>The top</title>
+
+<meta name="description" content="The top">
+<meta name="keywords" content="The top">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space: nowrap}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: serif; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en>
+
+
+<a name="Top"></a>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[ < ]</td>
+<td valign="middle" align="left">[<a href="#Chap" title="Next section in
reading order"> > </a>]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left">[Contents]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<a name="The-top"></a>
+<h1 class="top">The top</h1>
+
+<p>Just a top node.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top"><a href="#Chap">1 A
chapter</a></td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr size="6">
+<a name="Chap"></a>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Beginning of this
chapter or previous chapter"> << </a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Previous section in
reading order"> < </a>]</td>
+<td valign="middle" align="left">[<a href="#Top" title="Up section"> Up
</a>]</td>
+<td valign="middle" align="left">[ > ]</td>
+<td valign="middle" align="left">[ >> ]</td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left"> </td>
+<td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
+<td valign="middle" align="left">[Contents]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<a name="A-chapter"></a>
+<h1 class="chapter">1 A chapter</h1>
+
+<p>Without the chapter, no up node from top is generated.
+</p>
+<hr size="6">
+<a name="SEC_About"></a>
+<table class="header" cellpadding="1" cellspacing="1" border="0">
+<tr><td valign="middle" align="left">[<a href="#Top" title="Cover (top) of
document">Top</a>]</td>
+<td valign="middle" align="left">[Contents]</td>
+<td valign="middle" align="left">[Index]</td>
+<td valign="middle" align="left">[<a href="#SEC_About" title="About (help)"> ?
</a>]</td>
+</tr></table>
+<h1 class="about-heading">About This Document</h1>
+
+<p>
+ This document was generated on <em>a sunny day</em> using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
+</p>
+<p>
+ The buttons in the navigation panels have the following meaning:
+</p>
+<table border="1">
+ <tr>
+ <th> Button </th>
+ <th> Name </th>
+ <th> Go to </th>
+ <th> From 1.2.3 go to</th>
+ </tr>
+ <tr>
+ <td align="center"> [ << ] </td>
+ <td align="center">FastBack</td>
+ <td>Beginning of this chapter or previous chapter</td>
+ <td>1</td>
+ </tr>
+ <tr>
+ <td align="center"> [ < ] </td>
+ <td align="center">Back</td>
+ <td>Previous section in reading order</td>
+ <td>1.2.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ Up ] </td>
+ <td align="center">Up</td>
+ <td>Up section</td>
+ <td>1.2</td>
+ </tr>
+ <tr>
+ <td align="center"> [ > ] </td>
+ <td align="center">Forward</td>
+ <td>Next section in reading order</td>
+ <td>1.2.4</td>
+ </tr>
+ <tr>
+ <td align="center"> [ >> ] </td>
+ <td align="center">FastForward</td>
+ <td>Next chapter</td>
+ <td>2</td>
+ </tr>
+ <tr>
+ <td align="center"> [Top] </td>
+ <td align="center">Top</td>
+ <td>Cover (top) of document</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Contents] </td>
+ <td align="center">Contents</td>
+ <td>Table of contents</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [Index] </td>
+ <td align="center">Index</td>
+ <td>Index</td>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align="center"> [ ? ] </td>
+ <td align="center">About</td>
+ <td>About (help)</td>
+ <td> </td>
+ </tr>
+</table>
+
+<p>
+ where the <strong> Example </strong> assumes that the current position is at
<strong> Subsubsection One-Two-Three </strong> of a document of the following
structure:
+</p>
+
+<ul>
+ <li> 1. Section One
+ <ul>
+ <li>1.1 Subsection One-One
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.2 Subsection One-Two
+ <ul>
+ <li>1.2.1 Subsubsection One-Two-One</li>
+ <li>1.2.2 Subsubsection One-Two-Two</li>
+ <li>1.2.3 Subsubsection One-Two-Three
+ <strong><== Current Position </strong></li>
+ <li>1.2.4 Subsubsection One-Two-Four</li>
+ </ul>
+ </li>
+ <li>1.3 Subsection One-Three
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+ <li>1.4 Subsection One-Four</li>
+ </ul>
+ </li>
+</ul>
+
+<hr>
+<p><font size="-1">
+ This document was generated on <em>a sunny day</em> using <a
href="http://www.gnu.org/software/texinfo/";><em>texi2any</em></a>.
+</font></p>
+
+
+</body>
+</html>
Property changes on:
trunk/tp/tests/sectioning/res_parser/top_node_up_implicit/top_node_up_implicit.html
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/Chap.html
===================================================================
--- trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/Chap.html
(rev 0)
+++ trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/Chap.html
2015-02-02 23:58:41 UTC (rev 6094)
@@ -0,0 +1,64 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>The top: Chap</title>
+
+<meta name="description" content="The top: Chap">
+<meta name="keywords" content="The top: Chap">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link href="index.html#Top" rel="start" title="Top">
+<link href="index.html#Top" rel="up" title="Top">
+<link href="index.html#Top" rel="prev" title="Top">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space: nowrap}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: serif; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en>
+<a name="Chap"></a>
+<div class="header">
+<p>
+Up: <a href="index.html#Top" accesskey="u" rel="up">Top</a> </p>
+</div>
+<hr>
+<a name="A-chapter"></a>
+<h2 class="chapter">1 A chapter</h2>
+
+<p>Without the chapter, no up node from top is generated.
+</p>
+
+
+
+</body>
+</html>
Property changes on:
trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/Chap.html
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/index.html
===================================================================
--- trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/index.html
(rev 0)
+++ trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/index.html
2015-02-02 23:58:41 UTC (rev 6094)
@@ -0,0 +1,76 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>The top: Top</title>
+
+<meta name="description" content="The top: Top">
+<meta name="keywords" content="The top: Top">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link href="#Top" rel="start" title="Top">
+<link href="http://etop.example.org"; rel="up" title="(dir)">
+<link href="Chap.html#Chap" rel="next" title="Chap">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space: nowrap}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: serif; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en>
+
+
+<a name="Top"></a>
+<div class="header">
+<p>
+Next: <a href="http://etop.example.org"; accesskey="n" rel="next">(dir)</a>,
Previous: <a href="../weird/index.html" accesskey="p" rel="prev">(weird)</a>,
Up: <a href="http://etop.example.org"; accesskey="u" rel="up">(dir)</a>
</p>
+</div>
+<hr>
+<a name="The-top"></a>
+<h1 class="top">The top</h1>
+
+<p>Just a top node.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">• <a href="Chap.html#Chap"
accesskey="1">Chap</a>:</td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr>
+<div class="header">
+<p>
+Next: <a href="http://etop.example.org"; accesskey="n" rel="next">(dir)</a>,
Previous: <a href="../weird/index.html" accesskey="p" rel="prev">(weird)</a>,
Up: <a href="http://etop.example.org"; accesskey="u" rel="up">(dir)</a>
</p>
+</div>
+
+
+
+</body>
+</html>
Property changes on:
trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/index.html
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/top_node_up_explicit.1
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
trunk/tp/tests/sectioning/res_parser_html/top_node_up_explicit/top_node_up_explicit.2
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/Chap.html
===================================================================
--- trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/Chap.html
(rev 0)
+++ trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/Chap.html
2015-02-02 23:58:41 UTC (rev 6094)
@@ -0,0 +1,64 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>The top: Chap</title>
+
+<meta name="description" content="The top: Chap">
+<meta name="keywords" content="The top: Chap">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link href="index.html#Top" rel="start" title="Top">
+<link href="index.html#Top" rel="up" title="Top">
+<link href="index.html#Top" rel="prev" title="Top">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space: nowrap}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: serif; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en>
+<a name="Chap"></a>
+<div class="header">
+<p>
+Previous: <a href="index.html#Top" accesskey="p" rel="prev">Top</a>, Up: <a
href="index.html#Top" accesskey="u" rel="up">Top</a> </p>
+</div>
+<hr>
+<a name="A-chapter"></a>
+<h2 class="chapter">1 A chapter</h2>
+
+<p>Without the chapter, no up node from top is generated.
+</p>
+
+
+
+</body>
+</html>
Property changes on:
trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/Chap.html
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/index.html
===================================================================
--- trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/index.html
(rev 0)
+++ trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/index.html
2015-02-02 23:58:41 UTC (rev 6094)
@@ -0,0 +1,76 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<title>The top: Top</title>
+
+<meta name="description" content="The top: Top">
+<meta name="keywords" content="The top: Top">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="texi2any">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link href="#Top" rel="start" title="Top">
+<link href="http://itop.example.org"; rel="up" title="(dir)">
+<link href="Chap.html#Chap" rel="next" title="Chap">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nocodebreak {white-space: nowrap}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: serif; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en>
+
+
+<a name="Top"></a>
+<div class="header">
+<p>
+Next: <a href="Chap.html#Chap" accesskey="n" rel="next">Chap</a>, Up: <a
href="http://itop.example.org"; accesskey="u" rel="up">(dir)</a> </p>
+</div>
+<hr>
+<a name="The-top"></a>
+<h1 class="top">The top</h1>
+
+<p>Just a top node.
+</p>
+<table class="menu" border="0" cellspacing="0">
+<tr><td align="left" valign="top">• <a href="Chap.html#Chap"
accesskey="1">Chap</a>:</td><td> </td><td align="left" valign="top">
+</td></tr>
+</table>
+
+<hr>
+<div class="header">
+<p>
+Next: <a href="Chap.html#Chap" accesskey="n" rel="next">Chap</a>, Up: <a
href="http://itop.example.org"; accesskey="u" rel="up">(dir)</a> </p>
+</div>
+
+
+
+</body>
+</html>
Property changes on:
trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/index.html
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/top_node_up_implicit.1
___________________________________________________________________
Added: svn:eol-style
+ native
Property changes on:
trunk/tp/tests/sectioning/res_parser_html/top_node_up_implicit/top_node_up_implicit.2
___________________________________________________________________
Added: svn:eol-style
+ native
Modified: trunk/tp/tests/sectioning/tests-parser.txt
===================================================================
--- trunk/tp/tests/sectioning/tests-parser.txt 2015-02-02 23:47:35 UTC (rev
6093)
+++ trunk/tp/tests/sectioning/tests-parser.txt 2015-02-02 23:58:41 UTC (rev
6094)
@@ -1,4 +1,7 @@
# formats :_html
+# $Id$
+# Public domain. Originally created by Patrice Dumas.
+
node_footnote_end node_footnote.texi --footnote-style=end
node_footnote_use_node node_footnote.texi --set-customization-variable
'USE_NODES 1' --node-files --footnote-style=end --split node
node_footnote_separated node_footnote.texi --footnote-style=separate
@@ -29,6 +32,5 @@
more_sections_than_nodes more_sections_than_nodes.texi
two_footnotes_in_nodes two_footnotes_in_nodes.texi
two_footnotes_in_nodes_separated two_footnotes_in_nodes.texi
--footnote-style=separate
-
-# FIXME
-#empty_top_node_up ?.texi --set-customization-variable TOP_NODE_UP
+top_node_up_implicit top_node_up_implicit.texi -c
TOP_NODE_UP_URL=http://itop.example.org
+top_node_up_explicit top_node_up_explicit.texi -c
TOP_NODE_UP_URL=http://etop.example.org
Property changes on: trunk/tp/tests/sectioning/tests-parser.txt
___________________________________________________________________
Modified: svn:keywords
- Author Date Id Revision
+ Date Author Id
Added: trunk/tp/tests/sectioning/top_node_up_explicit.texi
===================================================================
--- trunk/tp/tests/sectioning/top_node_up_explicit.texi
(rev 0)
+++ trunk/tp/tests/sectioning/top_node_up_explicit.texi 2015-02-02 23:58:41 UTC
(rev 6094)
@@ -0,0 +1,21 @@
+\input texinfo @c public domain
address@hidden top_node_up_explicit
+
address@hidden should replace all explicit (dir) pointers, but not
address@hidden pointers to other files.
+
address@hidden Top, (dir), (weird), (dir)
address@hidden The top
+
+Just a top node.
+
address@hidden
+* Chap::
address@hidden menu
+
address@hidden Chap
address@hidden A chapter
+
+Without the chapter, no up node from top is generated.
+
address@hidden
Property changes on: trunk/tp/tests/sectioning/top_node_up_explicit.texi
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/tp/tests/sectioning/top_node_up_implicit.texi
===================================================================
--- trunk/tp/tests/sectioning/top_node_up_implicit.texi
(rev 0)
+++ trunk/tp/tests/sectioning/top_node_up_implicit.texi 2015-02-02 23:58:41 UTC
(rev 6094)
@@ -0,0 +1,20 @@
+\input texinfo @c public domain
address@hidden top_node_up_implicit
+
address@hidden should replace implicit Up.
+
address@hidden Top
address@hidden The top
+
+Just a top node.
+
address@hidden
+* Chap::
address@hidden menu
+
address@hidden Chap
address@hidden A chapter
+
+Without the chapter, no up node from top is generated.
+
address@hidden
Property changes on: trunk/tp/tests/sectioning/top_node_up_implicit.texi
___________________________________________________________________
Added: svn:eol-style
+ native
Added: trunk/tp/tests/test_scripts/sectioning_top_node_up_explicit.sh
===================================================================
--- trunk/tp/tests/test_scripts/sectioning_top_node_up_explicit.sh
(rev 0)
+++ trunk/tp/tests/test_scripts/sectioning_top_node_up_explicit.sh
2015-02-02 23:58:41 UTC (rev 6094)
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+if test z"$srcdir" = "z"; then
+ srcdir=.
+fi
+
+command=run_parser_all.sh
+one_test_logs_dir=test_log
+diffs_dir=diffs
+
+
+
+if test "z$LONG_TESTS" != z"yes" && test "z$ALL_TESTS" != z"yes"; then
+ echo "Skipping long tests that take a lot of time to run"
+ exit 77
+fi
+
+if test "z$TEX_HTML_TESTS" = z"yes"; then
+ echo "Skipping long tests, only doing HTML TeX tests"
+ exit 77
+fi
+
+dir=sectioning
+arg='top_node_up_explicit'
+name='top_node_up_explicit'
+[ -d "$dir" ] || mkdir $dir
+
+srcdir_test=$dir; export srcdir_test;
+cd "$dir" || exit 99
+../"$srcdir"/"$command" -dir $dir $arg
+exit_status=$?
+cat $one_test_logs_dir/$name.log
+if test -f $diffs_dir/$name.diff; then
+ echo
+ cat $diffs_dir/$name.diff
+fi
+exit $exit_status
+
Property changes on:
trunk/tp/tests/test_scripts/sectioning_top_node_up_explicit.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ LF
Added: trunk/tp/tests/test_scripts/sectioning_top_node_up_implicit.sh
===================================================================
--- trunk/tp/tests/test_scripts/sectioning_top_node_up_implicit.sh
(rev 0)
+++ trunk/tp/tests/test_scripts/sectioning_top_node_up_implicit.sh
2015-02-02 23:58:41 UTC (rev 6094)
@@ -0,0 +1,38 @@
+#! /bin/sh
+
+if test z"$srcdir" = "z"; then
+ srcdir=.
+fi
+
+command=run_parser_all.sh
+one_test_logs_dir=test_log
+diffs_dir=diffs
+
+
+
+if test "z$LONG_TESTS" != z"yes" && test "z$ALL_TESTS" != z"yes"; then
+ echo "Skipping long tests that take a lot of time to run"
+ exit 77
+fi
+
+if test "z$TEX_HTML_TESTS" = z"yes"; then
+ echo "Skipping long tests, only doing HTML TeX tests"
+ exit 77
+fi
+
+dir=sectioning
+arg='top_node_up_implicit'
+name='top_node_up_implicit'
+[ -d "$dir" ] || mkdir $dir
+
+srcdir_test=$dir; export srcdir_test;
+cd "$dir" || exit 99
+../"$srcdir"/"$command" -dir $dir $arg
+exit_status=$?
+cat $one_test_logs_dir/$name.log
+if test -f $diffs_dir/$name.diff; then
+ echo
+ cat $diffs_dir/$name.diff
+fi
+exit $exit_status
+
Property changes on:
trunk/tp/tests/test_scripts/sectioning_top_node_up_implicit.sh
___________________________________________________________________
Added: svn:executable
+ *
Added: svn:eol-style
+ LF
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [6094] replace all (dir) references with TOP_NODE_UP_URL; add tests,
karl <=