[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/Makefile.am (test_files), tp/Makefile.tres,
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/55conditionals.t, tp/t/92formatting.t, tp/tests/formatting/Makefile.am (EXTRA_DIST), tp/tests/formatting/list-of-tests: move defcondx_Dbar and defcondx_Ubar tests to tp/t/55conditionals.t. Add also similar tests in tp/tests/formatting/list-of-tests to test the command line. Move defxcond.texi to tp/tests/formatting/. |
|
Date: |
Mon, 02 Jan 2023 17:15:54 -0500 |
This is an automated email from the git hooks/post-receive script.
pertusus pushed a commit to branch master
in repository texinfo.
The following commit(s) were added to refs/heads/master by this push:
new 3e42d1d70f * tp/Makefile.am (test_files), tp/Makefile.tres,
tp/t/55conditionals.t, tp/t/92formatting.t, tp/tests/formatting/Makefile.am
(EXTRA_DIST), tp/tests/formatting/list-of-tests: move defcondx_Dbar and
defcondx_Ubar tests to tp/t/55conditionals.t. Add also similar tests in
tp/tests/formatting/list-of-tests to test the command line. Move defxcond.texi
to tp/tests/formatting/.
3e42d1d70f is described below
commit 3e42d1d70fefecc6d6df9a19017e0b83a9462820
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jan 2 23:14:09 2023 +0100
* tp/Makefile.am (test_files), tp/Makefile.tres,
tp/t/55conditionals.t, tp/t/92formatting.t,
tp/tests/formatting/Makefile.am (EXTRA_DIST),
tp/tests/formatting/list-of-tests: move defcondx_Dbar and
defcondx_Ubar tests to tp/t/55conditionals.t. Add also similar tests
in tp/tests/formatting/list-of-tests to test the command line. Move
defxcond.texi to tp/tests/formatting/.
* tp/Makefile.tres, tp/t/60macro.t, tp/t/92formatting.t:
move glossary and texi_bib_example tests to 60macro.t, renaming
texi_bib_example as bib_example.
---
ChangeLog | 14 +
tp/Makefile.am | 1 -
tp/Makefile.tres | 12 +-
tp/t/55conditionals.t | 11 +
tp/t/60macro.t | 7 +-
tp/t/92formatting.t | 18 --
.../{formatting => conditionals}/defcondx_Dbar.pl | 102 +++---
.../defcondx_Dbar/res_html/defxcond.html | 21 +-
.../{formatting => conditionals}/defcondx_Ubar.pl | 96 ++++--
.../defcondx_Ubar/res_html/defxcond.html | 21 +-
.../texi_bib_example.pl => macro/bib_example.pl} | 360 +++------------------
tp/t/results/{formatting => macro}/glossary.pl | 197 -----------
tp/tests/formatting/Makefile.am | 1 +
.../input_files => tests/formatting}/defxcond.texi | 3 +-
tp/tests/formatting/list-of-tests | 4 +
.../formatting/res_parser/defcondx_Dbar/defxcond.1 | 0
.../formatting/res_parser/defcondx_Dbar/defxcond.2 | 2 +
.../res_parser/defcondx_Dbar}/defxcond.html | 20 +-
.../formatting/res_parser/defcondx_Ubar/defxcond.1 | 0
.../formatting/res_parser/defcondx_Ubar/defxcond.2 | 1 +
.../res_parser/defcondx_Ubar}/defxcond.html | 20 +-
tp/tests/test_scripts/formatting_defcondx_Dbar.sh | 19 ++
tp/tests/test_scripts/formatting_defcondx_Ubar.sh | 19 ++
23 files changed, 283 insertions(+), 666 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 34578497f1..979b67b132 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -11,6 +11,20 @@
instead of "man --where" to work on FreeBSD and macOS.
Disable this code if __sun is defined. From Bruno Haible.
+2023-01-02 Patrice Dumas <pertusus@free.fr>
+
+ * tp/Makefile.am (test_files), tp/Makefile.tres,
+ tp/t/55conditionals.t, tp/t/92formatting.t,
+ tp/tests/formatting/Makefile.am (EXTRA_DIST),
+ tp/tests/formatting/list-of-tests: move defcondx_Dbar and
+ defcondx_Ubar tests to tp/t/55conditionals.t. Add also similar tests
+ in tp/tests/formatting/list-of-tests to test the command line. Move
+ defxcond.texi to tp/tests/formatting/.
+
+ * tp/Makefile.tres, tp/t/60macro.t, tp/t/92formatting.t:
+ move glossary and texi_bib_example tests to 60macro.t, renaming
+ texi_bib_example as bib_example.
+
2023-01-02 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/ParserNonXS.pm (_process_remaining_on_line),
diff --git a/tp/Makefile.am b/tp/Makefile.am
index e8d78c2794..2754940a59 100644
--- a/tp/Makefile.am
+++ b/tp/Makefile.am
@@ -193,7 +193,6 @@ test_files = \
t/input_files/cpp_line_before_first_node.texi \
t/input_files/cpp_lines.texi \
t/input_files/cpp_line_latin1.texi \
- t/input_files/defxcond.texi \
t/input_files/delcomment.texi \
t/input_files/direntry_dircategory.texi \
t/input_files/documentlanguage_set.texi \
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index 73977312b5..3b3d8e60c1 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -86,6 +86,10 @@ test_files_generated_list = $(test_tap_files_generated_list)
\
t/results/conditionals/comment_on_ifset_line.pl \
t/results/conditionals/conditional_not_closed.pl \
t/results/conditionals/consecutive_conditionals.pl \
+ t/results/conditionals/defcondx_Dbar.pl \
+ t/results/conditionals/defcondx_Dbar/res_html/defxcond.html \
+ t/results/conditionals/defcondx_Ubar.pl \
+ t/results/conditionals/defcondx_Ubar/res_html/defxcond.html \
t/results/conditionals/empty_ifclear.pl \
t/results/conditionals/empty_ifset.pl \
t/results/conditionals/empty_ifset_in_ifset_no_set.pl \
@@ -552,10 +556,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/formatting/cond_info_no-ifhtml_no-ifinfo_no-iftex.pl \
t/results/formatting/cond_no-ifhtml_no-ifinfo_no-iftex.pl \
t/results/formatting/cond_xml.pl \
- t/results/formatting/defcondx_Dbar.pl \
- t/results/formatting/defcondx_Dbar/res_html/defxcond.html \
- t/results/formatting/defcondx_Ubar.pl \
- t/results/formatting/defcondx_Ubar/res_html/defxcond.html \
t/results/formatting/direntry_dircategory.pl \
t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info
\
t/results/formatting/direntry_dircategory/res_info/direntry_dircategory.info-1 \
@@ -574,7 +574,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/formatting/float_copying/res_html/index.html \
t/results/formatting/float_copying/res_html/public-domain-anchor.html \
t/results/formatting/float_copying/res_html/public-domain.html \
- t/results/formatting/glossary.pl \
t/results/formatting/one_line.pl \
t/results/formatting/one_line_no_content.pl \
t/results/formatting/simplest_test_date_in_header.pl \
@@ -591,7 +590,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/formatting/split_nocopying_split/res_info/split_nocopying.info \
t/results/formatting/split_nocopying_split/res_info/split_nocopying.info-1 \
t/results/formatting/split_nocopying_split/res_info/split_nocopying.info-2 \
- t/results/formatting/texi_bib_example.pl \
t/results/formatting/texi_cond.pl \
t/results/heading/heading_in_copying.pl \
t/results/heading/heading_in_example.pl \
@@ -1428,6 +1426,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/macro/bad_argument.pl \
t/results/macro/bad_formal_arg.pl \
t/results/macro/bad_macro_name_with_underscore.pl \
+ t/results/macro/bib_example.pl \
t/results/macro/complete_macro_for_end.pl \
t/results/macro/complex_argument.pl \
t/results/macro/double_macro_definition.pl \
@@ -1439,6 +1438,7 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/macro/expand_two_same.pl \
t/results/macro/expansion_order.pl \
t/results/macro/form_feeds.pl \
+ t/results/macro/glossary.pl \
t/results/macro/ifclear_in_macro.pl \
t/results/macro/ifset_and_end_isef_in_macro.pl \
t/results/macro/ifset_in_macro.pl \
diff --git a/tp/t/55conditionals.t b/tp/t/55conditionals.t
index 06a71d9580..619d63dda4 100644
--- a/tp/t/55conditionals.t
+++ b/tp/t/55conditionals.t
@@ -551,6 +551,17 @@ user internalvalue
'@ifset A/B
@end ifset
'],
+# there is a similar test of the command line in tests/formatting
+['defcondx_Dbar',
+ undef, {'test_file' => '../../tests/formatting/defxcond.texi',
+ 'test_formats' => ['file_html'],
+ 'values' => {'bar' => 1}}, {'SPLIT' => ''},
+],
+['defcondx_Ubar',
+ undef, {'test_file' => '../../tests/formatting/defxcond.texi',
+ 'test_formats' => ['file_html'],
+ 'values' => {}}, {'SPLIT' => ''},
+],
);
for my $test (@test_cases) {
diff --git a/tp/t/60macro.t b/tp/t/60macro.t
index 7965ea8b42..0364cdbafe 100644
--- a/tp/t/60macro.t
+++ b/tp/t/60macro.t
@@ -1030,8 +1030,11 @@ X\arg\X
@mymacro
@include inc_file.texi
'],
-);
-my @todo = (
+['bib_example',
+ undef, {'test_file' => 'bib-example.texi',},
+],
+# The result is not not really anything that could be expected by a user, but
+# it can still help catch regressions
['glossary',
undef, {'test_file' => 'glossary.texi'},
],
diff --git a/tp/t/92formatting.t b/tp/t/92formatting.t
index 28d7f691d8..f2fb13e549 100644
--- a/tp/t/92formatting.t
+++ b/tp/t/92formatting.t
@@ -9,14 +9,6 @@ require 't/test_utils.pl';
# under tp/tests did, but to be faster, as we are avoiding the
# start-up time of perl for every one.
my @test_cases = (
-['glossary',
- undef, {'test_file' => 'glossary.texi',
- },
-],
-['texi_bib_example',
- undef, {'test_file' => 'bib-example.texi',
- },
-],
['texi_cond',
undef, {'test_file' => 'cond.texi',
'EXPANDED_FORMATS' => ['html', 'info'],
@@ -63,16 +55,6 @@ my @test_cases = (
},
{'EXPANDED_FORMATS' => ['info', 'html', 'tex'],}
],
-['defcondx_Dbar',
- undef, {'test_file' => 'defxcond.texi',
- 'test_formats' => ['file_html'],
- 'values' => {'bar' => 1}}
-],
-['defcondx_Ubar',
- undef, {'test_file' => 'defxcond.texi',
- 'test_formats' => ['file_html'],
- 'values' => {}}
-],
['one_line_no_content',
undef, {'test_file' => 'one_line_no_content.texi',
},
diff --git a/tp/t/results/formatting/defcondx_Dbar.pl
b/tp/t/results/conditionals/defcondx_Dbar.pl
similarity index 81%
rename from tp/t/results/formatting/defcondx_Dbar.pl
rename to tp/t/results/conditionals/defcondx_Dbar.pl
index 81f66b9738..da80c4806e 100644
--- a/tp/t/results/formatting/defcondx_Dbar.pl
+++ b/tp/t/results/conditionals/defcondx_Dbar.pl
@@ -83,25 +83,34 @@ $result_trees{'defcondx_Dbar'} = {
'text' => '
',
'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'text' => ' deffnx inside conditional.
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' deffnx inside conditional.
-'
- ]
- }
}
],
'type' => 'preamble_before_content'
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'deffnx inside conditional'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'cmdname' => 'deffn',
@@ -133,7 +142,7 @@ $result_trees{'defcondx_Dbar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 10,
'macro' => ''
},
'type' => 'def_line'
@@ -179,7 +188,7 @@ $result_trees{'defcondx_Dbar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 12,
+ 'line_nr' => 13,
'macro' => ''
},
'type' => 'def_line'
@@ -232,7 +241,7 @@ $result_trees{'defcondx_Dbar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 17,
+ 'line_nr' => 18,
'macro' => ''
}
}
@@ -242,7 +251,7 @@ $result_trees{'defcondx_Dbar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -252,7 +261,15 @@ $result_trees{'defcondx_Dbar'} = {
'type' => 'empty_line'
}
],
- 'type' => 'before_node_section'
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'defxcond.texi',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
},
{
'args' => [
@@ -267,8 +284,8 @@ $result_trees{'defcondx_Dbar'} = {
],
'type' => 'document_root'
};
-$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
-$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'defcondx_Dbar'}{'contents'}[0]{'contents'}[2]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'defcondx_Dbar'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'defcondx_Dbar'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'defcondx_Dbar'}{'contents'}[1]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0];
$result_texis{'defcondx_Dbar'} = '\\input texinfo
@@ -277,7 +294,8 @@ $result_texis{'defcondx_Dbar'} = '\\input texinfo
@c set this from the command line.
@c set bar
-@c deffnx inside conditional.
+@top deffnx inside conditional
+
@deffn foo
@deffnx bar
@@ -292,6 +310,9 @@ Documentation.
$result_texts{'defcondx_Dbar'} = '
+deffnx inside conditional
+*************************
+
foo:
bar:
@@ -301,12 +322,30 @@ Documentation.
';
+$result_sectioning{'defcondx_Dbar'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'defcondx_Dbar'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'defcondx_Dbar'};
+
$result_errors{'defcondx_Dbar'} = [
{
'error_line' => 'warning: missing name for @deffn
',
'file_name' => 'defxcond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 10,
'macro' => '',
'text' => 'missing name for @deffn',
'type' => 'warning'
@@ -315,7 +354,7 @@ $result_errors{'defcondx_Dbar'} = [
'error_line' => 'warning: missing name for @deffnx
',
'file_name' => 'defxcond.texi',
- 'line_nr' => 12,
+ 'line_nr' => 13,
'macro' => '',
'text' => 'missing name for @deffnx',
'type' => 'warning'
@@ -326,15 +365,4 @@ $result_errors{'defcondx_Dbar'} = [
$result_floats{'defcondx_Dbar'} = {};
-$result_converted_errors{'file_html'}->{'defcondx_Dbar'} = [
- {
- 'error_line' => 'warning: must specify a title with a title command or @top
-',
- 'file_name' => 'defxcond.texi',
- 'text' => 'must specify a title with a title command or @top',
- 'type' => 'warning'
- }
-];
-
-
1;
diff --git a/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html
b/tp/t/results/conditionals/defcondx_Dbar/res_html/defxcond.html
similarity index 54%
copy from tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html
copy to tp/t/results/conditionals/defcondx_Dbar/res_html/defxcond.html
index 562a8398c0..b711ad1265 100644
--- a/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html
+++ b/tp/t/results/conditionals/defcondx_Dbar/res_html/defxcond.html
@@ -3,20 +3,14 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
+<title>deffnx inside conditional</title>
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
+<meta name="description" content="deffnx inside conditional">
+<meta name="keywords" content="deffnx inside conditional">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
<meta name="viewport" content="width=device-width,initial-scale=1">
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
</head>
@@ -24,6 +18,9 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
+<div class="top-level-extent" id="deffnx-inside-conditional">
+<h1 class="top">deffnx inside conditional</h1>
+
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">foo: </span></dt>
<dt class="deffnx def-cmd-deffn"><span class="category-def">bar: </span></dt>
@@ -32,10 +29,8 @@ span.program-in-footer {font-size: smaller}
</p>
</dd></dl>
-<hr>
-<p>
- <span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
-</p>
+</div>
+
</body>
diff --git a/tp/t/results/formatting/defcondx_Ubar.pl
b/tp/t/results/conditionals/defcondx_Ubar.pl
similarity index 80%
rename from tp/t/results/formatting/defcondx_Ubar.pl
rename to tp/t/results/conditionals/defcondx_Ubar.pl
index bf066f947c..4ad33e663f 100644
--- a/tp/t/results/formatting/defcondx_Ubar.pl
+++ b/tp/t/results/conditionals/defcondx_Ubar.pl
@@ -83,25 +83,34 @@ $result_trees{'defcondx_Ubar'} = {
'text' => '
',
'type' => 'empty_line'
- },
- {
- 'args' => [
- {
- 'text' => ' deffnx inside conditional.
-',
- 'type' => 'misc_arg'
- }
- ],
- 'cmdname' => 'c',
- 'extra' => {
- 'misc_args' => [
- ' deffnx inside conditional.
-'
- ]
- }
}
],
'type' => 'preamble_before_content'
+ }
+ ],
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'text' => 'deffnx inside conditional'
+ }
+ ],
+ 'info' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'text' => '
+',
+ 'type' => 'empty_line'
},
{
'cmdname' => 'deffn',
@@ -133,7 +142,7 @@ $result_trees{'defcondx_Ubar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 10,
'macro' => ''
},
'type' => 'def_line'
@@ -191,7 +200,7 @@ $result_trees{'defcondx_Ubar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 17,
+ 'line_nr' => 18,
'macro' => ''
}
}
@@ -201,7 +210,7 @@ $result_trees{'defcondx_Ubar'} = {
},
'source_info' => {
'file_name' => 'defxcond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 10,
'macro' => ''
}
},
@@ -211,7 +220,15 @@ $result_trees{'defcondx_Ubar'} = {
'type' => 'empty_line'
}
],
- 'type' => 'before_node_section'
+ 'extra' => {},
+ 'info' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'source_info' => {
+ 'file_name' => 'defxcond.texi',
+ 'line_nr' => 8,
+ 'macro' => ''
+ }
},
{
'args' => [
@@ -226,7 +243,7 @@ $result_trees{'defcondx_Ubar'} = {
],
'type' => 'document_root'
};
-$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'defcondx_Ubar'}{'contents'}[0]{'contents'}[2]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'defcondx_Ubar'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'extra'}{'def_parsed_hash'}{'category'}
=
$result_trees{'defcondx_Ubar'}{'contents'}[1]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0];
$result_texis{'defcondx_Ubar'} = '\\input texinfo
@@ -235,7 +252,8 @@ $result_texis{'defcondx_Ubar'} = '\\input texinfo
@c set this from the command line.
@c set bar
-@c deffnx inside conditional.
+@top deffnx inside conditional
+
@deffn foo
@@ -249,6 +267,9 @@ Documentation.
$result_texts{'defcondx_Ubar'} = '
+deffnx inside conditional
+*************************
+
foo:
@@ -257,12 +278,30 @@ Documentation.
';
+$result_sectioning{'defcondx_Ubar'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'info' => {},
+ 'structure' => {
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'defcondx_Ubar'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'defcondx_Ubar'};
+
$result_errors{'defcondx_Ubar'} = [
{
'error_line' => 'warning: missing name for @deffn
',
'file_name' => 'defxcond.texi',
- 'line_nr' => 9,
+ 'line_nr' => 10,
'macro' => '',
'text' => 'missing name for @deffn',
'type' => 'warning'
@@ -273,15 +312,4 @@ $result_errors{'defcondx_Ubar'} = [
$result_floats{'defcondx_Ubar'} = {};
-$result_converted_errors{'file_html'}->{'defcondx_Ubar'} = [
- {
- 'error_line' => 'warning: must specify a title with a title command or @top
-',
- 'file_name' => 'defxcond.texi',
- 'text' => 'must specify a title with a title command or @top',
- 'type' => 'warning'
- }
-];
-
-
1;
diff --git a/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html
b/tp/t/results/conditionals/defcondx_Ubar/res_html/defxcond.html
similarity index 50%
copy from tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html
copy to tp/t/results/conditionals/defcondx_Ubar/res_html/defxcond.html
index 37c9fecf95..dda79424cc 100644
--- a/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html
+++ b/tp/t/results/conditionals/defcondx_Ubar/res_html/defxcond.html
@@ -3,20 +3,14 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
+<title>deffnx inside conditional</title>
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
+<meta name="description" content="deffnx inside conditional">
+<meta name="keywords" content="deffnx inside conditional">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
<meta name="viewport" content="width=device-width,initial-scale=1">
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
</head>
@@ -24,6 +18,9 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
+<div class="top-level-extent" id="deffnx-inside-conditional">
+<h1 class="top">deffnx inside conditional</h1>
+
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">foo: </span></dt>
<dd>
@@ -32,10 +29,8 @@ span.program-in-footer {font-size: smaller}
</p>
</dd></dl>
-<hr>
-<p>
- <span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
-</p>
+</div>
+
</body>
diff --git a/tp/t/results/formatting/texi_bib_example.pl
b/tp/t/results/macro/bib_example.pl
similarity index 89%
rename from tp/t/results/formatting/texi_bib_example.pl
rename to tp/t/results/macro/bib_example.pl
index 16a390f58d..2e80d076d2 100644
--- a/tp/t/results/formatting/texi_bib_example.pl
+++ b/tp/t/results/macro/bib_example.pl
@@ -5,7 +5,7 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'texi_bib_example'} = {
+$result_trees{'bib_example'} = {
'contents' => [
{
'contents' => [
@@ -318,7 +318,6 @@ $result_trees{'texi_bib_example'} = {
}
],
'cmdname' => 'settitle',
- 'extra' => {},
'info' => {
'spaces_before_argument' => ' '
},
@@ -4063,22 +4062,22 @@ $result_trees{'texi_bib_example'} = {
],
'type' => 'document_root'
};
-$result_trees{'texi_bib_example'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'texi_bib_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'texi_bib_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
-$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
-$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'texi_bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[3]{'extra'}{'node_content'}[0] =
$result_trees{'texi_bib_example'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'texi_bib_example'}{'contents'}[3]{'args'}[0]{'contents'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'extra'}{'node_content'}[0]
=
$result_trees{'texi_bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'texi_bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'texi_bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[5] =
$result_trees{'texi_bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'};
-$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
-$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'texi_bib_example'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
-
-$result_texis{'texi_bib_example'} = '\\input texinfo @c -*-texinfo-*-
+$result_trees{'bib_example'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'bib_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'bib_example'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_description'}
=
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[3];
+$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[0]{'args'}[1]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_description'}
=
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[3];
+$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'extra'}{'menu_entry_node'}{'node_content'}[0]
=
$result_trees{'bib_example'}{'contents'}[2]{'contents'}[1]{'contents'}[1]{'args'}[1]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[3]{'extra'}{'node_content'}[0] =
$result_trees{'bib_example'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'bib_example'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'extra'}{'node_content'}[0]
=
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
=
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'}{'args'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'node_argument'}{'node_content'}[0]
=
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[5] =
$result_trees{'bib_example'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'extra'}{'label'};
+$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'contents'}[1]{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'extra'}{'command_as_argument'}
=
$result_trees{'bib_example'}{'contents'}[6]{'contents'}[1]{'args'}[0]{'contents'}[0];
+
+$result_texis{'bib_example'} = '\\input texinfo @c -*-texinfo-*-
@c % Copyright (C) 2004 Aaron S. Hawley
@c % Author: Aaron S. Hawley <ashawley@gnu.uvm.edu>
@@ -4376,7 +4375,7 @@ Massachusetts, 1994.
';
-$result_texts{'texi_bib_example'} = '
+$result_texts{'bib_example'} = '
@@ -4454,7 +4453,7 @@ Massachusetts, 1994.
';
-$result_sectioning{'texi_bib_example'} = {
+$result_sectioning{'bib_example'} = {
'structure' => {
'section_childs' => [
{
@@ -4524,16 +4523,16 @@ $result_sectioning{'texi_bib_example'} = {
'section_level' => -1
}
};
-$result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
= $result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
= $result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'section_prev'}
=
$result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
-$result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'section_up'}
= $result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'toplevel_prev'}
=
$result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
-$result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'toplevel_up'}
= $result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'texi_bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'texi_bib_example'};
-
-$result_nodes{'texi_bib_example'} = {
+$result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
= $result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
= $result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'section_prev'}
=
$result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
+$result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'section_up'}
= $result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'toplevel_prev'}
=
$result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0];
+$result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[1]{'structure'}{'toplevel_up'}
= $result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'bib_example'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'bib_example'};
+
+$result_nodes{'bib_example'} = {
'cmdname' => 'node',
'extra' => {
'associated_section' => {
@@ -4592,13 +4591,13 @@ $result_nodes{'texi_bib_example'} = {
'node_next' => {}
}
};
-$result_nodes{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'texi_bib_example'}{'structure'}{'menu_child'};
-$result_nodes{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'texi_bib_example'};
-$result_nodes{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'texi_bib_example'};
-$result_nodes{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'texi_bib_example'};
-$result_nodes{'texi_bib_example'}{'structure'}{'node_next'} =
$result_nodes{'texi_bib_example'}{'structure'}{'menu_child'};
+$result_nodes{'bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'bib_example'}{'structure'}{'menu_child'};
+$result_nodes{'bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'bib_example'};
+$result_nodes{'bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_prev'}
= $result_nodes{'bib_example'};
+$result_nodes{'bib_example'}{'structure'}{'menu_child'}{'structure'}{'node_up'}
= $result_nodes{'bib_example'};
+$result_nodes{'bib_example'}{'structure'}{'node_next'} =
$result_nodes{'bib_example'}{'structure'}{'menu_child'};
-$result_menus{'texi_bib_example'} = {
+$result_menus{'bib_example'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
@@ -4634,11 +4633,11 @@ $result_menus{'texi_bib_example'} = {
}
}
};
-$result_menus{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
= $result_menus{'texi_bib_example'}{'structure'}{'menu_child'};
-$result_menus{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'texi_bib_example'};
-$result_menus{'texi_bib_example'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'texi_bib_example'};
+$result_menus{'bib_example'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_prev'}
= $result_menus{'bib_example'}{'structure'}{'menu_child'};
+$result_menus{'bib_example'}{'structure'}{'menu_child'}{'structure'}{'menu_next'}{'structure'}{'menu_up'}
= $result_menus{'bib_example'};
+$result_menus{'bib_example'}{'structure'}{'menu_child'}{'structure'}{'menu_up'}
= $result_menus{'bib_example'};
-$result_errors{'texi_bib_example'} = [
+$result_errors{'bib_example'} = [
{
'error_line' => 'warning: @ifclear should only appear at the beginning of
a line (possibly involving @mybibcite)
',
@@ -4651,286 +4650,7 @@ $result_errors{'texi_bib_example'} = [
];
-$result_floats{'texi_bib_example'} = {};
-
-
-
-$result_converted{'html'}->{'texi_bib_example'} = '<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Texinfo with a Bibliography and References</title>
-
-<meta name="description" content="Texinfo with a Bibliography and References">
-<meta name="keywords" content="Texinfo with a Bibliography and References">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-h1.settitle {text-align:center}
-pre.menu-comment-preformatted {font-family: serif}
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
-td.name-direction-about {text-align:center}
-th.menu-comment {text-align:left}
-ul.mark-none {list-style-type: none}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-<h1 class="settitle">Texinfo with a Bibliography and References</h1>
-<hr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+$result_floats{'bib_example'} = {};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<div class="top-level-extent" id="Top">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ < ]</td>
-<td>[<a href="#Introduction" title="Next section in reading order"> >
</a>]</td>
-<td> </td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="top" id="Top-1">Top</h1>
-
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#Introduction">1
Introduction</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-<tr><td class="menu-entry-destination"><a href="#References">2
References</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-<tr><th class="menu-comment" colspan="3"><pre
class="menu-comment-preformatted">
-
-</pre></th></tr></table>
-
-<hr style="height: 6px;">
-<div class="chapter-level-extent" id="Introduction">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Beginning of this chapter or previous chapter">
<< </a>]</td>
-<td>[<a href="#Top" title="Previous section in reading order"> < </a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
-<td>[<a href="#References" title="Next section in reading order"> >
</a>]</td>
-<td>[<a href="#References" title="Next chapter"> >> </a>]</td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="Introduction-1">1 Introduction</h1>
-
-<p>The ability of a documentation format to make cross references to a
-bibliography, a feature of LaTeX (See item [LaTeX2e] in <a class="ref"
href="#References">LaTeX2e</a>.)
-, isn’t
-currently supported in Texinfo.
-</p>
-<hr>
-</div>
-<div class="chapter-level-extent" id="References">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Introduction" title="Beginning of this chapter or previous
chapter"> << </a>]</td>
-<td>[<a href="#Introduction" title="Previous section in reading order"> <
</a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
-<td>[ > ]</td>
-<td>[ >> ]</td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="References-1">2 References</h1>
-
-<ul class="itemize mark-none">
-<li><a class="anchor" id="LaTeX2e"></a>[LaTeX2e]
- Leslie Lamport, LaTeX User’s Guide and
-Reference Manual, 2nd edition, Addison-Wesley, Reading,
-Massachusetts, 1994.
-
-</li></ul>
-
-</div>
-</div>
-<hr>
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<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 class="emph">a sunny day</em> using <a
class="uref" href="http://www.gnu.org/software/texinfo/";><em
class="emph">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 class="button-direction-about"> [ << ] </td>
- <td class="name-direction-about">FastBack</td>
- <td>Beginning of this chapter or previous chapter</td>
- <td>1</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ < ] </td>
- <td class="name-direction-about">Back</td>
- <td>Previous section in reading order</td>
- <td>1.2.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ Up ] </td>
- <td class="name-direction-about">Up</td>
- <td>Up section</td>
- <td>1.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ > ] </td>
- <td class="name-direction-about">Forward</td>
- <td>Next section in reading order</td>
- <td>1.2.4</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ >> ] </td>
- <td class="name-direction-about">FastForward</td>
- <td>Next chapter</td>
- <td>2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Top] </td>
- <td class="name-direction-about">Top</td>
- <td>Cover (top) of document</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Contents] </td>
- <td class="name-direction-about">Contents</td>
- <td>Table of contents</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Index] </td>
- <td class="name-direction-about">Index</td>
- <td>Index</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ ? ] </td>
- <td class="name-direction-about">About</td>
- <td>About (help)</td>
- <td> </td>
- </tr>
-</table>
-
-<p>
- where the <strong class="strong"> Example </strong> assumes that the current
position is at <strong class="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>
-</div><hr>
-<p>
- <span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
-';
-
1;
diff --git a/tp/t/results/formatting/glossary.pl
b/tp/t/results/macro/glossary.pl
similarity index 86%
rename from tp/t/results/formatting/glossary.pl
rename to tp/t/results/macro/glossary.pl
index a19b6e5a19..964553a691 100644
--- a/tp/t/results/formatting/glossary.pl
+++ b/tp/t/results/macro/glossary.pl
@@ -1401,201 +1401,4 @@ $result_errors{'glossary'} = [
$result_floats{'glossary'} = {};
-
-$result_converted{'html'}->{'glossary'} = '<!DOCTYPE html>
-<html>
-<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Top</title>
-
-<meta name="description" content="Top">
-<meta name="keywords" content="Top">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="texi2any">
-<meta name="viewport" content="width=device-width,initial-scale=1">
-
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
-td.button-direction-about {text-align:center}
-td.menu-entry-description {vertical-align: top}
-td.menu-entry-destination {vertical-align: top}
-td.name-direction-about {text-align:center}
--->
-</style>
-
-
-</head>
-
-<body lang="en">
-
-
-
-
-<div class="top-level-extent" id="Top">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[ < ]</td>
-<td>[<a href="#glossary" title="Next section in reading order"> > </a>]</td>
-<td> </td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="top" id="Top-1">Top</h1>
-
-<table class="menu" border="0" cellspacing="0">
-<tr><td class="menu-entry-destination"><a href="#glossary">1
glossary</a></td><td> </td><td class="menu-entry-description">
-</td></tr>
-</table>
-
-<p>The ‘name1’
- is used in many cases while
-<a class="ref" href="#id2">name2</a>
- is quite specific
-</p>
-<hr style="height: 6px;">
-<div class="chapter-level-extent" id="glossary">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Beginning of this chapter or previous chapter">
<< </a>]</td>
-<td>[<a href="#Top" title="Previous section in reading order"> < </a>]</td>
-<td>[<a href="#Top" title="Up section"> Up </a>]</td>
-<td>[ > ]</td>
-<td>[ >> ]</td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td> </td>
-<td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<a href="#SEC_About" title="About (help)"> ? </a>]</td>
-</tr></table>
-<h1 class="chapter" id="glossary-1">1 glossary</h1>
-
-<p>name2 <a class="anchor" id="id2"></a>text2
-</p>
-
-</div>
-</div>
-<hr>
-<div class="element-about" id="SEC_About">
-<table class="nav-panel" cellpadding="1" cellspacing="1" border="0">
-<tr><td>[<a href="#Top" title="Cover (top) of document">Top</a>]</td>
-<td>[Contents]</td>
-<td>[Index]</td>
-<td>[<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 class="emph">a sunny day</em> using <a
class="uref" href="http://www.gnu.org/software/texinfo/";><em
class="emph">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 class="button-direction-about"> [ << ] </td>
- <td class="name-direction-about">FastBack</td>
- <td>Beginning of this chapter or previous chapter</td>
- <td>1</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ < ] </td>
- <td class="name-direction-about">Back</td>
- <td>Previous section in reading order</td>
- <td>1.2.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ Up ] </td>
- <td class="name-direction-about">Up</td>
- <td>Up section</td>
- <td>1.2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ > ] </td>
- <td class="name-direction-about">Forward</td>
- <td>Next section in reading order</td>
- <td>1.2.4</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ >> ] </td>
- <td class="name-direction-about">FastForward</td>
- <td>Next chapter</td>
- <td>2</td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Top] </td>
- <td class="name-direction-about">Top</td>
- <td>Cover (top) of document</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Contents] </td>
- <td class="name-direction-about">Contents</td>
- <td>Table of contents</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [Index] </td>
- <td class="name-direction-about">Index</td>
- <td>Index</td>
- <td> </td>
- </tr>
- <tr>
- <td class="button-direction-about"> [ ? ] </td>
- <td class="name-direction-about">About</td>
- <td>About (help)</td>
- <td> </td>
- </tr>
-</table>
-
-<p>
- where the <strong class="strong"> Example </strong> assumes that the current
position is at <strong class="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>
-</div><hr>
-<p>
- <span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
-</p>
-
-
-</body>
-</html>
-';
-
1;
diff --git a/tp/tests/formatting/Makefile.am b/tp/tests/formatting/Makefile.am
index 03fae2d99f..7aa0a14e56 100644
--- a/tp/tests/formatting/Makefile.am
+++ b/tp/tests/formatting/Makefile.am
@@ -1,5 +1,6 @@
EXTRA_DIST = \
simplest.texi documentlanguage.texi \
+ defxcond.texi \
ignore_and_comments.texi split_nocopying.texi \
inc_file.texi test_need.texi \
lightweight_markups.texi japanese_long_name.texi \
diff --git a/tp/t/input_files/defxcond.texi b/tp/tests/formatting/defxcond.texi
similarity index 84%
rename from tp/t/input_files/defxcond.texi
rename to tp/tests/formatting/defxcond.texi
index 8fc4ef8707..751da3a09c 100644
--- a/tp/t/input_files/defxcond.texi
+++ b/tp/tests/formatting/defxcond.texi
@@ -5,7 +5,8 @@
@c set this from the command line.
@c set bar
-@c deffnx inside conditional.
+@top deffnx inside conditional
+
@deffn foo
@ifset bar
diff --git a/tp/tests/formatting/list-of-tests
b/tp/tests/formatting/list-of-tests
index 903548ebdb..ed8cfbb3f5 100644
--- a/tp/tests/formatting/list-of-tests
+++ b/tp/tests/formatting/list-of-tests
@@ -6,6 +6,10 @@ test_redefine_need test_need.texi --init redefine_need.init
split_nocopying_split_dev_null split_nocopying.texi --info --split-size 1 -o
/dev/null
simplest_test_css simplest.texi --css-include file.css
+# already tested in t/*.t. Here check the command line, for -D
+defcondx_Dbar defxcond.texi --html -D 'bar 1' --no-split -c TEXI2HTML=undef
+defcondx_Ubar defxcond.texi --html --no-split -c TEXI2HTML=undef
+
# check that command line overrides document
documentlanguage_cmdline documentlanguage.texi --document-language=fr
diff --git a/tp/tests/formatting/res_parser/defcondx_Dbar/defxcond.1
b/tp/tests/formatting/res_parser/defcondx_Dbar/defxcond.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tp/tests/formatting/res_parser/defcondx_Dbar/defxcond.2
b/tp/tests/formatting/res_parser/defcondx_Dbar/defxcond.2
new file mode 100644
index 0000000000..5cf8aa7fda
--- /dev/null
+++ b/tp/tests/formatting/res_parser/defcondx_Dbar/defxcond.2
@@ -0,0 +1,2 @@
+defxcond.texi:10: warning: missing name for @deffn
+defxcond.texi:13: warning: missing name for @deffnx
diff --git a/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html
b/tp/tests/formatting/res_parser/defcondx_Dbar/defxcond.html
similarity index 58%
rename from tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html
rename to tp/tests/formatting/res_parser/defcondx_Dbar/defxcond.html
index 562a8398c0..2e6eef1fcd 100644
--- a/tp/t/results/formatting/defcondx_Dbar/res_html/defxcond.html
+++ b/tp/tests/formatting/res_parser/defcondx_Dbar/defxcond.html
@@ -3,20 +3,15 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
+<title>deffnx inside conditional</title>
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
+<meta name="description" content="deffnx inside conditional">
+<meta name="keywords" content="deffnx inside conditional">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
<meta name="viewport" content="width=device-width,initial-scale=1">
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
</head>
@@ -24,6 +19,9 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
+<div class="top-level-extent" id="deffnx-inside-conditional">
+<h1 class="top">deffnx inside conditional</h1>
+
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">foo: </span></dt>
<dt class="deffnx def-cmd-deffn"><span class="category-def">bar: </span></dt>
@@ -32,10 +30,8 @@ span.program-in-footer {font-size: smaller}
</p>
</dd></dl>
-<hr>
-<p>
- <span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
-</p>
+</div>
+
</body>
diff --git a/tp/tests/formatting/res_parser/defcondx_Ubar/defxcond.1
b/tp/tests/formatting/res_parser/defcondx_Ubar/defxcond.1
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tp/tests/formatting/res_parser/defcondx_Ubar/defxcond.2
b/tp/tests/formatting/res_parser/defcondx_Ubar/defxcond.2
new file mode 100644
index 0000000000..b598b4dcad
--- /dev/null
+++ b/tp/tests/formatting/res_parser/defcondx_Ubar/defxcond.2
@@ -0,0 +1 @@
+defxcond.texi:10: warning: missing name for @deffn
diff --git a/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html
b/tp/tests/formatting/res_parser/defcondx_Ubar/defxcond.html
similarity index 54%
rename from tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html
rename to tp/tests/formatting/res_parser/defcondx_Ubar/defxcond.html
index 37c9fecf95..82ef7423e2 100644
--- a/tp/t/results/formatting/defcondx_Ubar/res_html/defxcond.html
+++ b/tp/tests/formatting/res_parser/defcondx_Ubar/defxcond.html
@@ -3,20 +3,15 @@
<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<title>Untitled Document</title>
+<title>deffnx inside conditional</title>
-<meta name="description" content="Untitled Document">
-<meta name="keywords" content="Untitled Document">
+<meta name="description" content="deffnx inside conditional">
+<meta name="keywords" content="deffnx inside conditional">
<meta name="resource-type" content="document">
<meta name="distribution" content="global">
<meta name="Generator" content="texi2any">
<meta name="viewport" content="width=device-width,initial-scale=1">
-<style type="text/css">
-<!--
-span.program-in-footer {font-size: smaller}
--->
-</style>
</head>
@@ -24,6 +19,9 @@ span.program-in-footer {font-size: smaller}
<body lang="en">
+<div class="top-level-extent" id="deffnx-inside-conditional">
+<h1 class="top">deffnx inside conditional</h1>
+
<dl class="first-deffn">
<dt class="deffn"><span class="category-def">foo: </span></dt>
<dd>
@@ -32,10 +30,8 @@ span.program-in-footer {font-size: smaller}
</p>
</dd></dl>
-<hr>
-<p>
- <span class="program-in-footer">This document was generated on <em
class="emph">a sunny day</em> using <a class="uref"
href="http://www.gnu.org/software/texinfo/";><em
class="emph">texi2any</em></a>.</span>
-</p>
+</div>
+
</body>
diff --git a/tp/tests/test_scripts/formatting_defcondx_Dbar.sh
b/tp/tests/test_scripts/formatting_defcondx_Dbar.sh
new file mode 100755
index 0000000000..57f6ef7cdf
--- /dev/null
+++ b/tp/tests/test_scripts/formatting_defcondx_Dbar.sh
@@ -0,0 +1,19 @@
+#! /bin/sh
+# This file generated by maintain/regenerate_cmd_tests.sh
+
+if test z"$srcdir" = "z"; then
+ srcdir=.
+fi
+
+one_test_logs_dir=test_log
+
+
+dir=formatting
+name='defcondx_Dbar'
+mkdir -p $dir
+
+"$srcdir"/run_parser_all.sh -dir $dir $name
+exit_status=$?
+cat $dir/$one_test_logs_dir/$name.log
+exit $exit_status
+
diff --git a/tp/tests/test_scripts/formatting_defcondx_Ubar.sh
b/tp/tests/test_scripts/formatting_defcondx_Ubar.sh
new file mode 100755
index 0000000000..4f2044083d
--- /dev/null
+++ b/tp/tests/test_scripts/formatting_defcondx_Ubar.sh
@@ -0,0 +1,19 @@
+#! /bin/sh
+# This file generated by maintain/regenerate_cmd_tests.sh
+
+if test z"$srcdir" = "z"; then
+ srcdir=.
+fi
+
+one_test_logs_dir=test_log
+
+
+dir=formatting
+name='defcondx_Ubar'
+mkdir -p $dir
+
+"$srcdir"/run_parser_all.sh -dir $dir $name
+exit_status=$?
+cat $dir/$one_test_logs_dir/$name.log
+exit $exit_status
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/Makefile.am (test_files), tp/Makefile.tres, tp/t/55conditionals.t, tp/t/92formatting.t, tp/tests/formatting/Makefile.am (EXTRA_DIST), tp/tests/formatting/list-of-tests: move defcondx_Dbar and defcondx_Ubar tests to tp/t/55conditionals.t. Add also similar tests in tp/tests/formatting/list-of-tests to test the command line. Move defxcond.texi to tp/tests/formatting/.,
Patrice Dumas <=