[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: * tp/t/converters_tests.t, tp/t/nodenormalization
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: * tp/t/converters_tests.t, tp/t/nodenormalization.t, tp/Makefile.tres: test commands with lower case arguments in @var, with commands_in_var and a test in nodenormalization.t. |
|
Date: |
Fri, 10 Mar 2023 05:47:22 -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 f28f2ad201 * tp/t/converters_tests.t, tp/t/nodenormalization.t,
tp/Makefile.tres: test commands with lower case arguments in @var, with
commands_in_var and a test in nodenormalization.t.
f28f2ad201 is described below
commit f28f2ad201820596249c30db0c4828d2c0a9a04b
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Fri Mar 10 11:47:12 2023 +0100
* tp/t/converters_tests.t, tp/t/nodenormalization.t, tp/Makefile.tres:
test commands with lower case arguments in @var, with commands_in_var
and a test in nodenormalization.t.
---
ChangeLog | 6 +
tp/Makefile.tres | 3 +-
tp/TODO | 1 +
tp/Texinfo/Convert/TextContent.pm | 2 +-
tp/t/converters_tests.t | 11 +-
tp/t/nodenormalization.t | 9 ++
tp/t/results/converters_tests/commands_in_sc.pl | 26 ++--
.../{commands_in_sc.pl => commands_in_var.pl} | 149 +++++++--------------
8 files changed, 89 insertions(+), 118 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index dbb3613832..74b9233748 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2023-03-10 Patrice Dumas <pertusus@free.fr>
+
+ * tp/t/converters_tests.t, tp/t/nodenormalization.t, tp/Makefile.tres:
+ test commands with lower case arguments in @var, with commands_in_var
+ and a test in nodenormalization.t.
+
2023-03-10 Patrice Dumas <pertusus@free.fr>
* tp/Texinfo/Convert/NodeNameNormalization.pm (_convert),
diff --git a/tp/Makefile.tres b/tp/Makefile.tres
index a3f97bd910..251a505add 100644
--- a/tp/Makefile.tres
+++ b/tp/Makefile.tres
@@ -159,6 +159,8 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/converters_tests/combined_fonts/res_info \
t/results/converters_tests/combined_fonts/res_latex \
t/results/converters_tests/combined_fonts/res_xml \
+ t/results/converters_tests/commands_in_sc.pl \
+ t/results/converters_tests/commands_in_var.pl \
t/results/converters_tests/complex_nestings.pl \
t/results/converters_tests/contents_at_document_begin.pl \
t/results/converters_tests/contents_at_document_begin/res_html \
@@ -879,7 +881,6 @@ test_files_generated_list =
$(test_tap_files_generated_list) \
t/results/info_tests/colons_in_index_entries_and_node/res_info \
t/results/info_tests/colons_in_index_entries_and_node_no_quoting.pl \
t/results/info_tests/colons_in_index_entries_and_node_no_quoting/res_info \
- t/results/info_tests/commands_in_sc.pl \
t/results/info_tests/def_in_copying.pl \
t/results/info_tests/direntry_dircategory.pl \
t/results/info_tests/direntry_dircategory/res_info \
diff --git a/tp/TODO b/tp/TODO
index 5d7953206e..4bd5b1588d 100644
--- a/tp/TODO
+++ b/tp/TODO
@@ -637,6 +637,7 @@ t/info_tests.t
Misc notes
==========
+Test validity of Texinfo XML or docbook
export XML_CATALOG_FILES=~/src/texinfo/tp/maintain/catalog.xml
xmllint --nonet --noout --valid commands.xml
diff --git a/tp/Texinfo/Convert/TextContent.pm
b/tp/Texinfo/Convert/TextContent.pm
index 51e07eec5f..e41b657bd3 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -118,7 +118,7 @@ sub _convert($$)
or ($element->{'args'} and $element->{'args'}->[0]
and $element->{'args'}->[0]->{'type'}
and ($element->{'args'}->[0]->{'type'} eq 'line_arg'
- or $element->{'args'}->[0]->{'type'} eq 'rawline_arg')
+ or $element->{'args'}->[0]->{'type'} eq
'rawline_arg')
and
!$self->{'formatted_line_commands'}->{$element->{'cmdname'}})))));
if (defined($element->{'text'})) {
return $element->{'text'};
diff --git a/tp/t/converters_tests.t b/tp/t/converters_tests.t
index 77ea423a00..08c177697d 100644
--- a/tp/t/converters_tests.t
+++ b/tp/t/converters_tests.t
@@ -1093,13 +1093,22 @@ defop n
# if the t/nodenormalization.t test is modified
['commands_in_sc',
'@node Top
-@top top
+@top commands in sc
@node chap
@chapter chap
@sc{'.$string_for_upper_case.'}',
{'EXPANDED_FORMATS' => ['docbook', 'html', 'xml', 'plaintext']}],
+['commands_in_var',
+'@node Top
+@top commands in var
+
+@node chap
+@chapter chap
+
+@var{'.$string_for_upper_case.'}',
+{'EXPANDED_FORMATS' => ['docbook', 'html', 'xml', 'plaintext']}],
# the big rule is set to be different from the normal rule to check the type
# of rule output
['contents_at_document_begin',
diff --git a/tp/t/nodenormalization.t b/tp/t/nodenormalization.t
index cfb8ba95c9..68618da1dc 100644
--- a/tp/t/nodenormalization.t
+++ b/tp/t/nodenormalization.t
@@ -226,3 +226,12 @@ is ($effect_of_sc_node_normalized,
'A-_00d1-_00c5-TeX-MYIMAGE-chap-_0028f_0029node-ext-LATEX-00FF-MA_002bTH-LA-A-A_0040C-AB-MVERB',
'@sc content');
+my $effect_of_var_node_tree =
$parser->parse_texi_line('@var{'.$string_for_upper_case
+ # we add a @verb out of @inline*. @verb is in @inline* to have valid LaTeX
output
+ # in the t/converters_tests.t test
+ . ' @verb{!mverb!}}');
+my $effect_of_var_node_normalized = normalize_node($effect_of_var_node_tree);
+is ($effect_of_var_node_normalized,
+
'a-_00f1-_00e5-TeX-myimage-chap-_0028f_0029node-ext-latex-00ff-ma_002bth-la-a-a_0040c-ab-mverb',
+ '@var content');
+
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl
b/tp/t/results/converters_tests/commands_in_sc.pl
index cb81b3aff5..7032549047 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_sc.pl
@@ -47,7 +47,7 @@ $result_trees{'commands_in_sc'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'commands in sc'
}
],
'info' => {
@@ -723,7 +723,7 @@
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'ar
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
$result_texis{'commands_in_sc'} = '@node Top
-@top top
+@top commands in sc
@node chap
@chapter chap
@@ -734,8 +734,8 @@ $result_texis{'commands_in_sc'} = '@node Top
@url{,,c} @email{a@@c, e} @abbr{ab, d}}';
-$result_texts{'commands_in_sc'} = 'top
-***
+$result_texts{'commands_in_sc'} = 'commands in sc
+**************
1 chap
******
@@ -841,8 +841,8 @@ $result_floats{'commands_in_sc'} = {};
-$result_converted{'plaintext'}->{'commands_in_sc'} = 'top
-***
+$result_converted{'plaintext'}->{'commands_in_sc'} = 'commands in sc
+**************
1 chap
******
@@ -875,7 +875,7 @@ $result_converted{'html_text'}->{'commands_in_sc'} = '<div
class="top-level-exte
<p>
</p>
</div>
-<h1 class="top" id="top"><span>top<a class="copiable-link" href="#top">
¶</a></span></h1>
+<h1 class="top" id="commands-in-sc"><span>commands in sc<a
class="copiable-link" href="#commands-in-sc"> ¶</a></span></h1>
<ul class="mini-toc">
<li><a href="#chap" accesskey="1">chap</a></li>
@@ -916,7 +916,7 @@ $result_converted_errors{'html_text'}->{'commands_in_sc'} =
[
$result_converted{'xml'}->{'commands_in_sc'} = '<node name="Top" spaces="
"><nodename>Top</nodename><nodenext automatic="on">chap</nodenext></node>
-<top spaces=" "><sectiontitle>top</sectiontitle>
+<top spaces=" "><sectiontitle>commands in sc</sectiontitle>
</top>
<node name="chap" spaces=" "><nodename>chap</nodename><nodeprev
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
@@ -979,8 +979,8 @@ $result_converted{'info'}->{'commands_in_sc'} = 'This is ,
produced from .
File: , Node: Top, Next: chap, Up: (dir)
-top
-***
+commands in sc
+**************
* Menu:
@@ -1003,9 +1003,9 @@ MA+TH (1) <la> B (a) LB c E <a@c> AB (D)
Tag Table:
Node: Top27
-Node: chap102
-Ref: inanchor242
-Ref: chap-Footnote-1324
+Node: chap124
+Ref: inanchor264
+Ref: chap-Footnote-1346
End Tag Table
diff --git a/tp/t/results/converters_tests/commands_in_sc.pl
b/tp/t/results/converters_tests/commands_in_var.pl
similarity index 82%
copy from tp/t/results/converters_tests/commands_in_sc.pl
copy to tp/t/results/converters_tests/commands_in_var.pl
index cb81b3aff5..47520ca83d 100644
--- a/tp/t/results/converters_tests/commands_in_sc.pl
+++ b/tp/t/results/converters_tests/commands_in_var.pl
@@ -5,7 +5,7 @@ use vars qw(%result_texis %result_texts %result_trees
%result_errors
use utf8;
-$result_trees{'commands_in_sc'} = {
+$result_trees{'commands_in_var'} = {
'contents' => [
{
'type' => 'before_node_section'
@@ -47,7 +47,7 @@ $result_trees{'commands_in_sc'} = {
{
'contents' => [
{
- 'text' => 'top'
+ 'text' => 'commands in var'
}
],
'info' => {
@@ -691,7 +691,7 @@ $result_trees{'commands_in_sc'} = {
'type' => 'brace_command_arg'
}
],
- 'cmdname' => 'sc',
+ 'cmdname' => 'var',
'source_info' => {
'file_name' => '',
'line_nr' => 7,
@@ -717,34 +717,34 @@ $result_trees{'commands_in_sc'} = {
],
'type' => 'document_root'
};
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'manual_content'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[1];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3];
-$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'commands_in_sc'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[9]{'args'}[0]{'contents'}[0];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'manual_content'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[1];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[11]{'args'}[0]{'contents'}[3];
+$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'extra'}{'node_content'}[0]
=
$result_trees{'commands_in_var'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[13]{'args'}[0]{'contents'}[0];
-$result_texis{'commands_in_sc'} = '@node Top
-@top top
+$result_texis{'commands_in_var'} = '@node Top
+@top commands in var
@node chap
@chapter chap
-@sc{a @~n @aa{} @TeX{} @image{myimage} @ref{chap} @xref{(f)node}
+@var{a @~n @aa{} @TeX{} @image{myimage} @ref{chap} @xref{(f)node}
@ref{ext,,name,argf} @inlinefmtifelse{latex,,@verb{!inverb!}}
@anchor{inanchor} @hyphenation{hyphena-te}
@U{00ff} @math{ma+th} @footnote{infootnote} @url{la} @url{a,b} @url{ ,lb}
@url{,,c} @email{a@@c, e} @abbr{ab, d}}';
-$result_texts{'commands_in_sc'} = 'top
-***
+$result_texts{'commands_in_var'} = 'commands in var
+***************
1 chap
******
-A N~ AA TeX MYIMAGE CHAP (F)NODE
-EXT inverb 00FF MA+TH LA A (B) (LB)
-C E AB (D)';
+a n~ aa TeX myimage chap (f)node
+ext inverb 00ff ma+th la a (b) (lb)
+c e ab (d)';
-$result_sectioning{'commands_in_sc'} = {
+$result_sectioning{'commands_in_var'} = {
'structure' => {
'section_childs' => [
{
@@ -788,12 +788,12 @@ $result_sectioning{'commands_in_sc'} = {
'section_level' => -1
}
};
-$result_sectioning{'commands_in_sc'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'commands_in_sc'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'commands_in_sc'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
= $result_sectioning{'commands_in_sc'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'commands_in_sc'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
= $result_sectioning{'commands_in_sc'}{'structure'}{'section_childs'}[0];
-$result_sectioning{'commands_in_sc'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'commands_in_sc'};
+$result_sectioning{'commands_in_var'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'commands_in_var'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'commands_in_var'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
= $result_sectioning{'commands_in_var'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'commands_in_var'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
= $result_sectioning{'commands_in_var'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'commands_in_var'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'commands_in_var'};
-$result_nodes{'commands_in_sc'} = {
+$result_nodes{'commands_in_var'} = {
'cmdname' => 'node',
'extra' => {
'associated_section' => {
@@ -823,10 +823,10 @@ $result_nodes{'commands_in_sc'} = {
}
}
};
-$result_nodes{'commands_in_sc'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'commands_in_sc'};
-$result_nodes{'commands_in_sc'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'commands_in_sc'};
+$result_nodes{'commands_in_var'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'commands_in_var'};
+$result_nodes{'commands_in_var'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'commands_in_var'};
-$result_menus{'commands_in_sc'} = {
+$result_menus{'commands_in_var'} = {
'cmdname' => 'node',
'extra' => {
'normalized' => 'Top'
@@ -834,15 +834,15 @@ $result_menus{'commands_in_sc'} = {
'structure' => {}
};
-$result_errors{'commands_in_sc'} = [];
+$result_errors{'commands_in_var'} = [];
-$result_floats{'commands_in_sc'} = {};
+$result_floats{'commands_in_var'} = {};
-$result_converted{'plaintext'}->{'commands_in_sc'} = 'top
-***
+$result_converted{'plaintext'}->{'commands_in_var'} = 'commands in var
+***************
1 chap
******
@@ -856,7 +856,7 @@ MA+TH (1) <la> B (a) LB c E <a@c> AB (D)
';
-$result_converted_errors{'plaintext'}->{'commands_in_sc'} = [
+$result_converted_errors{'plaintext'}->{'commands_in_var'} = [
{
'error_line' => 'warning: could not find @image file `myimage.txt\' nor
alternate text
',
@@ -870,12 +870,12 @@ $result_converted_errors{'plaintext'}->{'commands_in_sc'}
= [
-$result_converted{'html_text'}->{'commands_in_sc'} = '<div
class="top-level-extent" id="Top">
+$result_converted{'html_text'}->{'commands_in_var'} = '<div
class="top-level-extent" id="Top">
<div class="nav-panel">
<p>
</p>
</div>
-<h1 class="top" id="top"><span>top<a class="copiable-link" href="#top">
¶</a></span></h1>
+<h1 class="top" id="commands-in-var"><span>commands in var<a
class="copiable-link" href="#commands-in-var"> ¶</a></span></h1>
<ul class="mini-toc">
<li><a href="#chap" accesskey="1">chap</a></li>
@@ -888,9 +888,9 @@ $result_converted{'html_text'}->{'commands_in_sc'} = '<div
class="top-level-exte
</div>
<h2 class="chapter" id="chap-1"><span>1 chap<a class="copiable-link"
href="#chap-1"> ¶</a></span></h2>
-<p><small class="sc">A Ñ Å TeX <img class="image"
src="myimage.jpg" alt="myimage"> <a class="ref" href="#chap">chap</a> SEE <a
data-manual="F" href="f.html#node">(F)NODE</a>
-<a data-manual="argf" href="argf.html#ext">(argf)NAME</a> <code
class="verb">INVERB</code> <a class="anchor" id="inanchor"></a>ÿ <em
class="math">ma+th</em> <a class="footnote" id="DOCF1"
href="#FOOT1"><sup>1</sup></a> <a class="url" href="la">la</a> <a class="url"
href="a">B</a> LB
-C <a class="email" href="mailto:a@c";>E</a> <abbr class="abbr"
title="d">AB</abbr> (D)</small></p></div>
+<p><var class="var">a ñ å TeX <img class="image"
src="myimage.jpg" alt="myimage"> <a class="ref" href="#chap">chap</a> See <a
data-manual="f" href="f.html#node">(f)node</a>
+<a data-manual="argf" href="argf.html#ext">(argf)name</a> <code
class="verb">inverb</code> <a class="anchor" id="inanchor"></a>ÿ <em
class="math">ma+th</em> <a class="footnote" id="DOCF1"
href="#FOOT1"><sup>1</sup></a> <a class="url" href="la">la</a> <a class="url"
href="a">b</a> lb
+c <a class="email" href="mailto:a@c";>e</a> <abbr class="abbr"
title="d">ab</abbr> (d)</var></p></div>
</div>
<div class="footnotes-segment">
<hr>
@@ -901,7 +901,7 @@ C <a class="email" href="mailto:a@c";>E</a> <abbr
class="abbr" title="d">AB</abbr
</div>
';
-$result_converted_errors{'html_text'}->{'commands_in_sc'} = [
+$result_converted_errors{'html_text'}->{'commands_in_var'} = [
{
'error_line' => 'warning: @image file `myimage\' (for HTML) not found,
using `myimage.jpg\'
',
@@ -915,29 +915,29 @@ $result_converted_errors{'html_text'}->{'commands_in_sc'}
= [
-$result_converted{'xml'}->{'commands_in_sc'} = '<node name="Top" spaces="
"><nodename>Top</nodename><nodenext automatic="on">chap</nodenext></node>
-<top spaces=" "><sectiontitle>top</sectiontitle>
+$result_converted{'xml'}->{'commands_in_var'} = '<node name="Top" spaces="
"><nodename>Top</nodename><nodenext automatic="on">chap</nodenext></node>
+<top spaces=" "><sectiontitle>commands in var</sectiontitle>
</top>
<node name="chap" spaces=" "><nodename>chap</nodename><nodeprev
automatic="on">Top</nodeprev><nodeup automatic="on">Top</nodeup></node>
<chapter spaces=" "><sectiontitle>chap</sectiontitle>
-<para><sc>a <accent type="tilde" bracketed="off">n</accent> å &tex;
<image where="inline"><imagefile>myimage</imagefile></image> <ref
label="chap"><xrefnodename>chap</xrefnodename></ref> <xref label="node"
manual="f"><xrefnodename>(f)node</xrefnodename></xref>
+<para><var>a <accent type="tilde" bracketed="off">n</accent> å &tex;
<image where="inline"><imagefile>myimage</imagefile></image> <ref
label="chap"><xrefnodename>chap</xrefnodename></ref> <xref label="node"
manual="f"><xrefnodename>(f)node</xrefnodename></xref>
<ref label="ext"
manual="argf"><xrefnodename>ext</xrefnodename><xrefprinteddesc>name</xrefprinteddesc><xrefinfofile>argf</xrefinfofile></ref>
<inlinefmtifelse><inlinefmtifelseformat>latex</inlinefmtifelseformat><inlinefmtifelsecontentelse><verb
delimiter="!">inverb</verb></inlinefmtifelsecontentelse></inlinefmtifelse>
<anchor name="inanchor">inanchor</anchor> <hyphenation>hyphena-te</hyphenation>
<U>00ff</U> <math>ma+th</math> <footnote><para>infootnote</para></footnote>
<url><urefurl>la</urefurl></url>
<url><urefurl>a</urefurl><urefdesc>b</urefdesc></url> <url><urefurl spaces="
"></urefurl><urefdesc>lb</urefdesc></url>
-<url><urefreplacement>c</urefreplacement></url>
<email><emailaddress>a&arobase;c</emailaddress><emailname spaces="
">e</emailname></email> <abbr><abbrword>ab</abbrword><abbrdesc spaces="
">d</abbrdesc></abbr></sc></para></chapter>
+<url><urefreplacement>c</urefreplacement></url>
<email><emailaddress>a&arobase;c</emailaddress><emailname spaces="
">e</emailname></email> <abbr><abbrword>ab</abbrword><abbrdesc spaces="
">d</abbrdesc></abbr></var></para></chapter>
';
-$result_converted{'docbook'}->{'commands_in_sc'} = '<chapter label="1"
id="chap">
+$result_converted{'docbook'}->{'commands_in_var'} = '<chapter label="1"
id="chap">
<title>chap</title>
-<para>A Ñ Å &tex; <inlinemediaobject><imageobject><imagedata
fileref="myimage.jpg"
format="JPG"></imagedata></imageobject></inlinemediaobject> <link
linkend="chap">chap</link> See <link>(f)node</link>
-section “NAME” in <filename>argf</filename>
<literal>INVERB</literal> <anchor id="inanchor"/>ÿ
<inlineequation><mathphrase>ma+th</mathphrase></inlineequation>
<footnote><para>infootnote</para></footnote> <ulink url="la">la</ulink> <ulink
url="a">B</ulink> <ulink url="">LB</ulink>
-<ulink url="">C</ulink> <ulink url="mailto:a@c";>E</ulink> <abbrev>AB</abbrev>
(D)</para></chapter>
+<para><replaceable>a ñ å &tex;
<inlinemediaobject><imageobject><imagedata fileref="myimage.jpg"
format="JPG"></imagedata></imageobject></inlinemediaobject> <link
linkend="chap">chap</link> See <link>(f)node</link>
+section “name” in <filename>argf</filename>
<literal>inverb</literal> <anchor id="inanchor"/>ÿ
<inlineequation><mathphrase>ma+th</mathphrase></inlineequation>
<footnote><para>infootnote</para></footnote> <ulink url="la">la</ulink> <ulink
url="a">b</ulink> <ulink url="">lb</ulink>
+<ulink url="">c</ulink> <ulink url="mailto:a@c";>e</ulink> <abbrev>ab</abbrev>
(d)</replaceable></para></chapter>
';
-$result_converted_errors{'docbook'}->{'commands_in_sc'} = [
+$result_converted_errors{'docbook'}->{'commands_in_var'} = [
{
'error_line' => 'warning: @image file `myimage\' not found, using
`myimage.jpg\'
',
@@ -951,16 +951,16 @@ $result_converted_errors{'docbook'}->{'commands_in_sc'} =
[
-$result_converted{'latex_text'}->{'commands_in_sc'} = '\\label{anchor:Top}%
+$result_converted{'latex_text'}->{'commands_in_var'} = '\\label{anchor:Top}%
\\chapter{{chap}}
\\label{anchor:chap}%
-\\textsc{a \\~{n} \\aa{} \\TeX{} \\includegraphics{myimage}
\\hyperref[anchor:chap]{\\chaptername~\\ref*{anchor:chap} [chap],
page~\\pageref*{anchor:chap}} See (f)node
+\\Texinfocommandstyletextvar{a \\~{n} \\aa{} \\TeX{}
\\includegraphics{myimage}
\\hyperref[anchor:chap]{\\chaptername~\\ref*{anchor:chap} [chap],
page~\\pageref*{anchor:chap}} See (f)node
Section ``name\'\' in \\texttt{argf} \\label{anchor:inanchor}%
\\hyphenation{hyphena-te}ÿ $ma+th$ \\footnote{infootnote} \\url{la}
\\href{a}{b (\\nolinkurl{a})} lb
c \\href{mailto:a@c}{e} ab (d)}';
-$result_converted_errors{'latex_text'}->{'commands_in_sc'} = [
+$result_converted_errors{'latex_text'}->{'commands_in_var'} = [
{
'error_line' => 'warning: @image file `myimage\' (for LaTeX) not found
',
@@ -973,59 +973,4 @@ $result_converted_errors{'latex_text'}->{'commands_in_sc'}
= [
];
-
-$result_converted{'info'}->{'commands_in_sc'} = 'This is , produced from .
-
-
-File: , Node: Top, Next: chap, Up: (dir)
-
-top
-***
-
-* Menu:
-
-* chap::
-
-
-File: , Node: chap, Prev: Top, Up: Top
-
-1 chap
-******
-
-A Ñ Å TeX [myimage] *note chap:: *Note (f)node:: *note NAME: (argf)ext. inverb
ÿ
-MA+TH (1) <la> B (a) LB c E <a@c> AB (D)
-
- ---------- Footnotes ----------
-
- (1) infootnote
-
-
-
-Tag Table:
-Node: Top27
-Node: chap102
-Ref: inanchor242
-Ref: chap-Footnote-1324
-
-End Tag Table
-
-
-Local Variables:
-coding: utf-8
-End:
-';
-
-$result_converted_errors{'info'}->{'commands_in_sc'} = [
- {
- 'error_line' => 'warning: could not find @image file `myimage.txt\' nor
alternate text
-',
- 'file_name' => '',
- 'line_nr' => 7,
- 'macro' => '',
- 'text' => 'could not find @image file `myimage.txt\' nor alternate text',
- 'type' => 'warning'
- }
-];
-
-
1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: * tp/t/converters_tests.t, tp/t/nodenormalization.t, tp/Makefile.tres: test commands with lower case arguments in @var, with commands_in_var and a test in nodenormalization.t.,
Patrice Dumas <=
- Prev by Date:
branch master updated: * tp/Texinfo/Convert/NodeNameNormalization.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_handle_line_command), tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command): rename 'misc_arg' type as 'rawline_arg'.
- Next by Date:
branch master updated: t/nodenormalization.t: update number of tests.
- Previous by thread:
branch master updated: * tp/Texinfo/Convert/NodeNameNormalization.pm (_convert), tp/Texinfo/Convert/Text.pm (_convert), tp/Texinfo/Convert/TextContent.pm (_convert), tp/Texinfo/ParserNonXS.pm (_handle_line_command), tp/Texinfo/XS/parsetexi/element_types.txt, tp/Texinfo/XS/parsetexi/handle_commands.c (handle_line_command): rename 'misc_arg' type as 'rawline_arg'.
- Next by thread:
branch master updated: t/nodenormalization.t: update number of tests.
- Index(es):