[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
From: |
Patrice Dumas |
Date: |
Mon, 25 Jul 2022 10:58:04 -0400 (EDT) |
branch: master
commit eb6d674e643a5d934d62576a9c22cf52942a2ee7
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon Jul 25 16:57:17 2022 +0200
Correct LaTeX output to be slanted when needed, and documentation
* tp/Texinfo/Convert/LaTeX.pm (register_style_format_command)
(%style_brace_format_command_new_commands)
(%LaTeX_style_brace_commands, _latex_header, _convert):
use slanted for @dfn, @var, as in texinfo.tex. Also slanted
for @cite, and, for @cite, not typewriter even in code context.
* doc/texinfo.texi (@code{@@cite}, @code{@@dfn}): @dfn and
@cite are slanted, not italic.
---
ChangeLog | 13 +
doc/texinfo.texi | 11 +-
tp/Texinfo/Convert/LaTeX.pm | 109 +-
tp/t/latex_tests.t | 26 +
.../def_syn_indices/res_latex/def_syn_indices.tex | 2 +-
tp/t/results/latex_tests/combined_fonts.pl | 1166 ++++++++++++++++++++
.../combined_fonts/res_latex/combined_fonts.tex} | 38 +-
.../res_latex/inter_item_commands_in_table.tex | 11 +-
.../inter_item_commands_in_table_in_example.tex | 11 +-
.../indices_in_begin_tables_lists.tex | 11 +-
.../indices_in_begin_tables_lists.tex | 11 +-
.../res_parser/formatting_latex/formatting.tex | 95 +-
12 files changed, 1393 insertions(+), 111 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 28416046c6..d4a1219c69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2022-07-25 Patrice Dumas <pertusus@free.fr>
+
+ Correct LaTeX output to be slanted when needed, and dcumentation
+
+ * tp/Texinfo/Convert/LaTeX.pm (register_style_format_command)
+ (%style_brace_format_command_new_commands)
+ (%LaTeX_style_brace_commands, _latex_header, _convert):
+ use slanted for @dfn, @var, as in texinfo.tex. Also slanted
+ for @cite, and, for @cite, not typewriter even in code context.
+
+ * doc/texinfo.texi (@code{@@cite}, @code{@@dfn}): @dfn and
+ @cite are slanted, not italic.
+
2022-07-25 Gavin Smith <gavinsmith0123@gmail.com>
* doc/texinfo.tex (\unicodechardefs): Define the
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index 8d6bbf79e2..7607e56a67 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -5388,8 +5388,9 @@ specific reason to use colors, best to skip it.
@findex cite
Use the @code{@@cite} command for the name of a book that lacks a
-companion Info file. The command produces italics in the printed
-manual, and quotation marks in the Info file.
+companion Info file. For example, we could refer to @cite{A Book}.
+The command selects a slanted font in the printed
+manual, and generates quotation marks in the Info file.
If a book is written in Texinfo, it is better to use a cross-reference
command since a reader can easily follow such a reference in Info.
@@ -6071,9 +6072,9 @@ Use the @code{@@dfn} command to identify the introductory
or defining
use of a technical term. Use the command only in passages whose
purpose is to introduce a term which will be used again or which the
reader ought to know. Mere passing mention of a term for the first
-time does not deserve @code{@@dfn}. The command generates italics in
-the printed manual, and double quotation marks in the Info file. For
-example:
+time does not deserve @code{@@dfn}. The command selects a slanted font
+in the printed manual, and generates double quotation marks in the Info
+file. For example:
@example
Getting rid of a file is called @@dfn@{deleting@} it.
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 761bcaf4a0..d24c94c5d9 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -553,6 +553,41 @@ foreach my $ignored_type(keys(%ignored_types)) {
$ignorable_types{$ignored_type} = 1;
}
+# The following code is not much used. It was designed to
+# setup combined fonts similar to texinfo.tex fonts, corresponding to
+# cmmands like \ttsl, combining typewriter and slanted. The idea was to use
+# constructs like \ttfamily\textsl to have a cumulative effect. However,
+# it seems that a constructs like \texttt{\textsl{cumulate}} do combine the
+# styles, nothing more is needed. It is used to define style commands
+# with more complex code more generally.
+#
+# As a side note it is not so easy to check the font type combinations
+# results as they depend on the fonts. With \usepackage[T1]{fontenc},
+# used in the default case, there is no difference between typewriter
+# and bold + typewriter, and \textbf{{\ttfamily\textsl{kbd in strong}}}
+# seems to be in italic. it is better to look at the results with
+# \usepackage{lmodern}.
+
+my $style_command_new_commands_prefix = 'GNUTexinfocommandstyle';
+# if new commands are setup for styles, they are in this hash
+my %style_brace_format_command_new_commands;
+
+# setup a new command
+sub register_style_format_command($$$$$)
+{
+ my $formatting_context = shift;
+ my $command = shift;
+ my $formatting = shift;
+ my $style_ref = shift;
+ my $new_commands_ref = shift;
+
+ my $specific_style_command
+ = "\\${style_command_new_commands_prefix}${formatting_context}$command";
+ $style_ref->{$formatting_context}->{$command} = $specific_style_command;
+ $new_commands_ref->{$formatting_context}->{$command}
+ = "$specific_style_command\[1]{{$formatting\{#1}}}";
+}
+
# All those commands run with the text.
# math, verb and kbd are special and implemented separately
my %LaTeX_style_brace_commands = (
@@ -564,7 +599,8 @@ my %LaTeX_style_brace_commands = (
'r' => '\\textrm',
'sc' => '\\textsc',
'sansserif' => '\\textsf',
- 'slanted' => '\\textsl',
+ # slanted in texinfo.tex
+ 'cite' => '\\textsl',
},
'math' => {
'hyphenation' => '',
@@ -575,10 +611,19 @@ my %LaTeX_style_brace_commands = (
'sc' => '', # no obvious way to do it in math mode, not switching to
# text mode only for this command
'sansserif' => '\\mathsf',
- 'slanted' => '',
+ 'cite' => '',
}
);
+my $code_text_context = 'codetext';
+
+# in code, we want to keep @cite result in slanted but
+# not in typewriter, so use \normalfont{} to remove other
+# font effects
+register_style_format_command($code_text_context, 'cite',
+ '\\normalfont{}\\textsl', \%LaTeX_style_brace_commands,
+ \%style_brace_format_command_new_commands);
+
# FIXME dmn, headitemfont
my @asis_commands = ('asis', 'clicksequence',
'headitemfont', 'dmn');
@@ -588,20 +633,35 @@ foreach my $asis_command (@asis_commands) {
$LaTeX_style_brace_commands{'math'}->{$asis_command} = '';
}
-my @emphasized_commands = ('var', 'dfn', 'emph');
+# in texinfo.tex, @var and @dfn are slanted.
+my @slanted_commands = ('var', 'dfn', 'slanted');
+foreach my $slanted_command (@slanted_commands) {
+ $LaTeX_style_brace_commands{'text'}->{$slanted_command} = '\\textsl';
+ $LaTeX_style_brace_commands{'math'}->{$slanted_command} = '';
+ #register_style_format_command($code_text_context, $slanted_command,
+ # '\\ttfamily\\textsl',
\%LaTeX_style_brace_commands,
+ # \%style_brace_format_command_new_commands);
+}
+
+my @emphasized_commands = ('emph');
foreach my $emphasized_command (@emphasized_commands) {
$LaTeX_style_brace_commands{'text'}->{$emphasized_command} = '\\emph';
$LaTeX_style_brace_commands{'math'}->{$emphasized_command} = '';
+ #register_style_format_command($code_text_context, $emphasized_command,
+ # '\\ttfamily\\textsl',
\%LaTeX_style_brace_commands,
+ # \%style_brace_format_command_new_commands);
}
my @bold_commands = ('strong', 'b');
foreach my $bold_command (@bold_commands) {
$LaTeX_style_brace_commands{'text'}->{$bold_command} = '\\textbf';
$LaTeX_style_brace_commands{'math'}->{$bold_command} = '\\mathbf';
+ #register_style_format_command($code_text_context, $bold_command,
+ # '\\ttfamily\\textbf',
\%LaTeX_style_brace_commands,
+ # \%style_brace_format_command_new_commands);
}
-# 'cite' could be emphasized?
-my @italics_commands = ('cite', 'i');
+my @italics_commands = ('i');
foreach my $italics_command (@italics_commands) {
$LaTeX_style_brace_commands{'text'}->{$italics_command} = '\\textit';
$LaTeX_style_brace_commands{'math'}->{$italics_command} = '\\mathit';
@@ -625,7 +685,9 @@ foreach my $quoted_command (@quoted_commands) {
}
# for the distinct kbd style.
-# use \ttfamily to have a cumulative effect with \textsl
+# use \ttfamily to have a cumulative effect with \textsl.
+# FIXME it seems that there is a cumulative effect with
+# \texttt{\textsl{...}}
my $kbd_formatting_latex = '\ttfamily\textsl';
# Format in description for @*table argument
@@ -692,8 +754,8 @@ foreach my $quoted_command (@quoted_commands) {
# \item some text
# but works for
# \item[] some text
- $description_command_new_commands{$quoted_command} =
-
"$specific_format_command\[1]{\\ifstrempty{#1}{}{{$prepended_normalfont`$description_format\{#1}'}}}";
+ $description_command_new_commands{$quoted_command}
+ =
"$specific_format_command\[1]{\\ifstrempty{#1}{}{{$prepended_normalfont`$description_format\{#1}'}}}";
}
$description_command_format{$quoted_command} = $specific_format_command;
}
@@ -724,6 +786,7 @@ sub converter_defaults($$)
# packages
# list_environments
# normalized_float_latex
+# style_brace_format_commands
sub converter_initialize($)
{
@@ -1217,6 +1280,19 @@ sub _latex_header() {
$header_code .= "\n";
}
}
+ foreach my $command_context
(sort(keys(%style_brace_format_command_new_commands))) {
+ if ($self->{'style_brace_format_commands'}->{$command_context}) {
+ foreach my $command
+
(sort(keys(%{$style_brace_format_command_new_commands{$command_context}}))) {
+ if
($self->{'style_brace_format_commands'}->{$command_context}->{$command}) {
+ $header_code .= '% style command for '.$command." in
$command_context\n";
+ $header_code .= "\\newcommand"
+
.$style_brace_format_command_new_commands{$command_context}->{$command}."%\n";
+ $header_code .= "\n";
+ }
+ }
+ }
+ }
$header_code .= $front_main_matter_definitions{$documentclass};
if ($self->{'packages'}->{'babel'}) {
@@ -2262,16 +2338,25 @@ sub _convert($$)
if ($self->{'quotes_map'}->{$cmdname}) {
$result .= $self->{'quotes_map'}->{$cmdname}->[0];
}
- if ($LaTeX_style_brace_commands{$command_context}->{$cmdname}) {
- $result .=
"$LaTeX_style_brace_commands{$command_context}->{$cmdname}\{";
- }
if ($code_style_commands{$cmdname}) {
$self->{'formatting_context'}->[-1]->{'code'} += 1;
}
+ # specific macro for typewriter + other style
+ my $formatting_context = $command_context;
+ if ($self->{'formatting_context'}->[-1]->{'code'}
+ and $command_context eq 'text'
+ and $LaTeX_style_brace_commands{$code_text_context}->{$cmdname}) {
+ $formatting_context = $code_text_context;
+ $self->{'style_brace_format_commands'}->{$formatting_context}
+ ->{$cmdname} = 1;
+ }
+ if ($LaTeX_style_brace_commands{$formatting_context}->{$cmdname}) {
+ $result .=
"$LaTeX_style_brace_commands{$formatting_context}->{$cmdname}\{";
+ }
if ($element->{'args'}) {
$result .= _convert($self, $element->{'args'}->[0]);
}
- if ($LaTeX_style_brace_commands{$command_context}->{$cmdname}) {
+ if ($LaTeX_style_brace_commands{$formatting_context}->{$cmdname}) {
$result .= '}';
}
if ($code_style_commands{$cmdname}) {
diff --git a/tp/t/latex_tests.t b/tp/t/latex_tests.t
index bcf58efc8e..49848a503d 100644
--- a/tp/t/latex_tests.t
+++ b/tp/t/latex_tests.t
@@ -629,7 +629,33 @@ New para
Describe @error{}.
'],
+['combined_fonts',
+'@setfilename combined_fonts.info
+@node Top
+@top top section
+
+@node chapter
+@chapter chapter
+
+@code{code}, @dfn{dfn}, @var{var}, @strong{strong}, @kbd{kbd}, @samp{samp}.
+
+@code{@dfn{dfn in code}}
+@var{@code{code in var}}
+@strong{@kbd{kbd in strong}}
+@samp{@strong{strong in samp}}
+@strong{@samp{samp in strong}}
+
+@cite{cite}
+
+@code{@cite{cite in code}}
+@cite{@code{code in cite}}
+
+@example
+@var{var in example}
+@cite{cite in example}
+@end example
+']
);
foreach my $test (@test_cases) {
diff --git a/tp/t/results/indices/def_syn_indices/res_latex/def_syn_indices.tex
b/tp/t/results/indices/def_syn_indices/res_latex/def_syn_indices.tex
index 779a59f069..af0db12ddb 100644
--- a/tp/t/results/indices/def_syn_indices/res_latex/def_syn_indices.tex
+++ b/tp/t/results/indices/def_syn_indices/res_latex/def_syn_indices.tex
@@ -72,7 +72,7 @@ after
\index[fn]{index truc}%
-\index[codeidx]{a index entry te\~{} i\^{}@\texttt{a \emph{index entry} t\~{e}
\^{\i{}}}}%
+\index[codeidx]{a index entry te\~{} i\^{}@\texttt{a \textsl{index entry}
t\~{e} \^{\i{}}}}%
\index[fn]{cindex entry@\texttt{cindex entry}}%
diff --git a/tp/t/results/latex_tests/combined_fonts.pl
b/tp/t/results/latex_tests/combined_fonts.pl
new file mode 100644
index 0000000000..e55094daaf
--- /dev/null
+++ b/tp/t/results/latex_tests/combined_fonts.pl
@@ -0,0 +1,1166 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors
+ %result_indices %result_sectioning %result_nodes %result_menus
+ %result_floats %result_converted %result_converted_errors
+ %result_elements %result_directions_text %result_indices_sort_strings);
+
+use utf8;
+
+$result_trees{'combined_fonts'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'combined_fonts.info'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'setfilename',
+ 'extra' => {
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'combined_fonts.info'
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 1,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preamble_before_content'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'before_node_section'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 3,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'top section'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'top',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 4,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'chapter'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [
+ {}
+ ],
+ 'normalized' => 'chapter'
+ }
+ ],
+ 'normalized' => 'chapter',
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 6,
+ 'macro' => ''
+ }
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'chapter'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'chapter',
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'code'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => ', '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'dfn'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'dfn',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => ', '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'var'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'var',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => ', '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'strong'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'strong',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => ', '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'kbd'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'kbd',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => ', '
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'samp'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'samp',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 9,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '.
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'dfn in code'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'dfn',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 11,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'code in var'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'var',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 12,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'kbd in strong'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'kbd',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'strong',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 13,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'strong in samp'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'strong',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'samp',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 14,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'samp in strong'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'samp',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'strong',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 15,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'cite'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'cite',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 17,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'cite in code'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'cite',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 19,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'code in cite'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'code',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'cite',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 20,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line'
+ },
+ {
+ 'cmdname' => 'example',
+ 'contents' => [
+ {
+ 'extra' => {
+ 'command' => {}
+ },
+ 'parent' => {},
+ 'text' => '
+',
+ 'type' => 'empty_line_after_command'
+ },
+ {
+ 'contents' => [
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'var in example'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'var',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 23,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'cite in example'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'brace_command_arg'
+ }
+ ],
+ 'cmdname' => 'cite',
+ 'contents' => [],
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 24,
+ 'macro' => ''
+ }
+ },
+ {
+ 'parent' => {},
+ 'text' => '
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'preformatted'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'example'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'line_arg'
+ }
+ ],
+ 'cmdname' => 'end',
+ 'extra' => {
+ 'command_argument' => 'example',
+ 'spaces_before_argument' => ' ',
+ 'text_arg' => 'example'
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 25,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'end_command' => {}
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 22,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'extra' => {
+ 'spaces_before_argument' => ' '
+ },
+ 'parent' => {},
+ 'source_info' => {
+ 'file_name' => '',
+ 'line_nr' => 7,
+ 'macro' => ''
+ }
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'contents'}[1]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[0]{'parent'} =
$result_trees{'combined_fonts'};
+$result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[1]{'extra'}{'node_content'}[0] =
$result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'combined_fonts'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[1]{'parent'} =
$result_trees{'combined_fonts'};
+$result_trees{'combined_fonts'}{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[2]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[2]{'args'}[0]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[2]{'contents'}[0]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[2]{'parent'} =
$result_trees{'combined_fonts'};
+$result_trees{'combined_fonts'}{'contents'}[3]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[3]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[3]{'args'}[0]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[3];
+$result_trees{'combined_fonts'}{'contents'}[3]{'extra'}{'node_content'}[0] =
$result_trees{'combined_fonts'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[3]{'extra'}{'nodes_manuals'}[0]{'node_content'}[0]
= $result_trees{'combined_fonts'}{'contents'}[3]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[3]{'parent'} =
$result_trees{'combined_fonts'};
+$result_trees{'combined_fonts'}{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'args'}[0]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[0]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[4]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[5]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[6];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[6]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[7]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[8];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[8]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[9]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[10];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[10]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'contents'}[11]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[1]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[2]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[1]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[2]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[3]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[4]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[5]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[6];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[6]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[7]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[8];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[8]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'contents'}[9]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[3]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[4]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[5]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[5]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[5];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[5]{'contents'}[1]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[5];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[5]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[6]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[1]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[2]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'contents'}[3]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[7]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[8]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'extra'}{'command'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[1]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[2]{'args'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[2]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'contents'}[3]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[1]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'contents'}[0]{'parent'}
=
$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'args'}[0]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[2]{'parent'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'extra'}{'end_command'}
= $result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'contents'}[2];
+$result_trees{'combined_fonts'}{'contents'}[4]{'contents'}[9]{'parent'} =
$result_trees{'combined_fonts'}{'contents'}[4];
+$result_trees{'combined_fonts'}{'contents'}[4]{'parent'} =
$result_trees{'combined_fonts'};
+
+$result_texis{'combined_fonts'} = '@setfilename combined_fonts.info
+
+@node Top
+@top top section
+
+@node chapter
+@chapter chapter
+
+@code{code}, @dfn{dfn}, @var{var}, @strong{strong}, @kbd{kbd}, @samp{samp}.
+
+@code{@dfn{dfn in code}}
+@var{@code{code in var}}
+@strong{@kbd{kbd in strong}}
+@samp{@strong{strong in samp}}
+@strong{@samp{samp in strong}}
+
+@cite{cite}
+
+@code{@cite{cite in code}}
+@cite{@code{code in cite}}
+
+@example
+@var{var in example}
+@cite{cite in example}
+@end example
+';
+
+
+$result_texts{'combined_fonts'} = '
+top section
+***********
+
+1 chapter
+*********
+
+code, dfn, var, strong, kbd, samp.
+
+dfn in code
+code in var
+kbd in strong
+strong in samp
+samp in strong
+
+cite
+
+cite in code
+code in cite
+
+var in example
+cite in example
+';
+
+$result_sectioning{'combined_fonts'} = {
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'top',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'structure' => {}
+ }
+ },
+ 'structure' => {
+ 'section_childs' => [
+ {
+ 'cmdname' => 'chapter',
+ 'extra' => {
+ 'associated_node' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'chapter'
+ },
+ 'structure' => {}
+ }
+ },
+ 'structure' => {
+ 'section_level' => 1,
+ 'section_number' => 1,
+ 'section_up' => {},
+ 'toplevel_prev' => {},
+ 'toplevel_up' => {}
+ }
+ }
+ ],
+ 'section_level' => 0,
+ 'section_up' => {}
+ }
+ }
+ ],
+ 'section_level' => -1
+ }
+};
+$result_sectioning{'combined_fonts'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'combined_fonts'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'combined_fonts'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_prev'}
= $result_sectioning{'combined_fonts'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'combined_fonts'}{'structure'}{'section_childs'}[0]{'structure'}{'section_childs'}[0]{'structure'}{'toplevel_up'}
= $result_sectioning{'combined_fonts'}{'structure'}{'section_childs'}[0];
+$result_sectioning{'combined_fonts'}{'structure'}{'section_childs'}[0]{'structure'}{'section_up'}
= $result_sectioning{'combined_fonts'};
+
+$result_nodes{'combined_fonts'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'top',
+ 'extra' => {},
+ 'structure' => {}
+ },
+ 'normalized' => 'Top'
+ },
+ 'structure' => {
+ 'node_next' => {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'associated_section' => {
+ 'cmdname' => 'chapter',
+ 'extra' => {},
+ 'structure' => {
+ 'section_number' => 1
+ }
+ },
+ 'normalized' => 'chapter'
+ },
+ 'structure' => {
+ 'node_prev' => {},
+ 'node_up' => {}
+ }
+ }
+ }
+};
+$result_nodes{'combined_fonts'}{'structure'}{'node_next'}{'structure'}{'node_prev'}
= $result_nodes{'combined_fonts'};
+$result_nodes{'combined_fonts'}{'structure'}{'node_next'}{'structure'}{'node_up'}
= $result_nodes{'combined_fonts'};
+
+$result_menus{'combined_fonts'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top'
+ },
+ 'structure' => {}
+};
+
+$result_errors{'combined_fonts'} = [];
+
+
+$result_floats{'combined_fonts'} = {};
+
+
+
+$result_converted{'latex'}->{'combined_fonts'} = '
+\\begin{document}
+\\chapter{chapter}
+\\label{anchor:chapter}%
+
+\\texttt{code}, \\textsl{dfn}, \\textsl{var}, \\textbf{strong},
{\\ttfamily\\textsl{kbd}}, `\\texttt{samp}\'.
+
+\\texttt{\\textsl{dfn in code}}
+\\textsl{\\texttt{code in var}}
+\\textbf{{\\ttfamily\\textsl{kbd in strong}}}
+`\\texttt{\\textbf{strong in samp}}\'
+\\textbf{`\\texttt{samp in strong}\'}
+
+\\textsl{cite}
+
+\\texttt{\\GNUTexinfocommandstylecodetextcite{cite in code}}
+\\textsl{\\texttt{code in cite}}
+
+\\par\\begingroup\\obeylines\\obeyspaces\\frenchspacing\\leftskip=2em\\relax\\parskip=0pt\\relax\\ttfamily{}%
+\\textsl{var in example}
+\\GNUTexinfocommandstylecodetextcite{cite in example}
+\\endgroup{}%
+';
+
+1;
diff --git
a/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
b/tp/t/results/latex_tests/combined_fonts/res_latex/combined_fonts.tex
similarity index 78%
copy from
tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
copy to tp/t/results/latex_tests/combined_fonts/res_latex/combined_fonts.tex
index eb0a115015..1232c075e8 100644
---
a/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
+++ b/tp/t/results/latex_tests/combined_fonts/res_latex/combined_fonts.tex
@@ -1,5 +1,4 @@
\documentclass{book}
-\usepackage{imakeidx}
\usepackage{amsfonts}
\usepackage{amsmath}
\usepackage[gen]{eurosym}
@@ -7,7 +6,6 @@
\usepackage{textcomp}
\usepackage{graphicx}
\usepackage{etoolbox}
-\usepackage{enumitem}
\usepackage{titleps}
\usepackage{float}
% use hidelinks to remove boxes around links to be similar with Texinfo TeX
@@ -16,10 +14,8 @@
\newcommand{\GNUTexinfosettitle}{No Title}%
-\makeindex[name=cp]%
-
-% command used in \description format for var
-\newcommand\GNUTexinfotablestylevar[1]{{\normalfont\emph{#1}}}%
+% style command for cite in codetext
+\newcommand\GNUTexinfocommandstylecodetextcite[1]{{\normalfont{}\textsl{#1}}}%
% redefine the \mainmatter command such that it does not clear page
% as if in double page
@@ -29,9 +25,6 @@
% add command aliases to use the same command in book and report
\newcommand\GNUTexinfomainmatter{\mainmatter}
\newcommand\GNUTexinfofrontmatter{\frontmatter}
-% set defaults for lists that match Texinfo TeX formatting
-\setlist[description]{style=nextline, font=\normalfont}
-
% command that does nothing used to help with substitutions in commands
\newcommand{\GNUTexinfoplaceholder}[1]{}
@@ -67,17 +60,24 @@
\begin{document}
-\begin{description}
-\item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylevar{a--b}\\
-\index[cp]{index entry between item and itemx}%
-\GNUTexinfotablestylevar{b}\\
+\chapter{chapter}
+\label{anchor:chapter}%
+
+\texttt{code}, \textsl{dfn}, \textsl{var}, \textbf{strong},
{\ttfamily\textsl{kbd}}, `\texttt{samp}'.
+
+\texttt{\textsl{dfn in code}}
+\textsl{\texttt{code in var}}
+\textbf{{\ttfamily\textsl{kbd in strong}}}
+`\texttt{\textbf{strong in samp}}'
+\textbf{`\texttt{samp in strong}'}
+
+\textsl{cite}
+
+\texttt{\GNUTexinfocommandstylecodetextcite{cite in code}}
+\textsl{\texttt{code in cite}}
-\GNUTexinfotablestylevar{c}}}]
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
-l{-}{-}ine
+\textsl{var in example}
+\GNUTexinfocommandstylecodetextcite{cite in example}
\endgroup{}%
-\item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylevar{d}}}]
-\end{description}
\end{document}
diff --git
a/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
b/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
index 17010d8c63..4ca24b166e 100644
---
a/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
+++
b/tp/t/results/xtable/inter_item_commands_in_table/res_latex/inter_item_commands_in_table.tex
@@ -23,9 +23,6 @@
% command used in \description format for samp
\newcommand\GNUTexinfotablestylesamp[1]{\ifstrempty{#1}{}{{`\texttt{#1}'}}}%
-% command used in \description format for var
-\newcommand\GNUTexinfotablestylevar[1]{{\normalfont\emph{#1}}}%
-
% redefine the \mainmatter command such that it does not clear page
% as if in double page
\makeatletter
@@ -95,19 +92,19 @@ l--ine
\begin{description}
\item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylevar{avar--b}\\
+\textsl{avar--b}\\
\index[fn]{avar--b@\texttt{avar{-}{-}b}}%
\index[cp]{index entry between item and itemx}%
-\GNUTexinfotablestylevar{b}
+\textsl{b}
\index[fn]{b@\texttt{b}}%
}}]
l--ine
\item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylevar{c}\\
+\textsl{c}\\
\index[fn]{c@\texttt{c}}%
-\GNUTexinfotablestylevar{d}
+\textsl{d}
\index[fn]{d@\texttt{d}}%
}}]
diff --git
a/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
b/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
index eb0a115015..5a37e8298b 100644
---
a/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
+++
b/tp/t/results/xtable/inter_item_commands_in_table_in_example/res_latex/inter_item_commands_in_table_in_example.tex
@@ -18,9 +18,6 @@
\makeindex[name=cp]%
-% command used in \description format for var
-\newcommand\GNUTexinfotablestylevar[1]{{\normalfont\emph{#1}}}%
-
% redefine the \mainmatter command such that it does not clear page
% as if in double page
\makeatletter
@@ -69,15 +66,15 @@
\begin{document}
\begin{description}
\item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylevar{a--b}\\
+\textsl{a--b}\\
\index[cp]{index entry between item and itemx}%
-\GNUTexinfotablestylevar{b}\\
+\textsl{b}\\
-\GNUTexinfotablestylevar{c}}}]
+\textsl{c}}}]
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
l{-}{-}ine
\endgroup{}%
\item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylevar{d}}}]
+\textsl{d}}}]
\end{description}
\end{document}
diff --git
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
index a554e73c7a..b1e6b8fd00 100644
---
a/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
+++
b/tp/tests/indices/res_parser/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
@@ -23,9 +23,6 @@
% command used in \description format for samp
\newcommand\GNUTexinfotablestylesamp[1]{\ifstrempty{#1}{}{{`\texttt{#1}'}}}%
-% command used in \description format for var
-\newcommand\GNUTexinfotablestylevar[1]{{\normalfont\emph{#1}}}%
-
% redefine the \mainmatter command such that it does not clear page
% as if in double page
\makeatletter
@@ -152,19 +149,19 @@ l--ine
\begin{description}
\item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylevar{avar--b}\\
+\textsl{avar--b}\\
\index[fn]{avar--b@\texttt{avar{-}{-}b}}%
\index[cp]{index entry between item and itemx}%
-\GNUTexinfotablestylevar{b}
+\textsl{b}
\index[fn]{b@\texttt{b}}%
}}]
l--ine
\item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylevar{c}\\
+\textsl{c}\\
\index[fn]{c@\texttt{c}}%
-\GNUTexinfotablestylevar{d}
+\textsl{d}
\index[fn]{d@\texttt{d}}%
}}]
diff --git
a/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
b/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
index a554e73c7a..b1e6b8fd00 100644
---
a/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
+++
b/tp/tests/indices/res_parser_info/indices_in_begin_tables_lists_latex/indices_in_begin_tables_lists.tex
@@ -23,9 +23,6 @@
% command used in \description format for samp
\newcommand\GNUTexinfotablestylesamp[1]{\ifstrempty{#1}{}{{`\texttt{#1}'}}}%
-% command used in \description format for var
-\newcommand\GNUTexinfotablestylevar[1]{{\normalfont\emph{#1}}}%
-
% redefine the \mainmatter command such that it does not clear page
% as if in double page
\makeatletter
@@ -152,19 +149,19 @@ l--ine
\begin{description}
\item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylevar{avar--b}\\
+\textsl{avar--b}\\
\index[fn]{avar--b@\texttt{avar{-}{-}b}}%
\index[cp]{index entry between item and itemx}%
-\GNUTexinfotablestylevar{b}
+\textsl{b}
\index[fn]{b@\texttt{b}}%
}}]
l--ine
\item[{\parbox[b]{\linewidth}{%
-\GNUTexinfotablestylevar{c}\\
+\textsl{c}\\
\index[fn]{c@\texttt{c}}%
-\GNUTexinfotablestylevar{d}
+\textsl{d}
\index[fn]{d@\texttt{d}}%
}}]
diff --git a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
index fd87024c7e..e70472fce3 100644
--- a/tp/tests/layout/res_parser/formatting_latex/formatting.tex
+++ b/tp/tests/layout/res_parser/formatting_latex/formatting.tex
@@ -34,6 +34,9 @@
% command used in \description format for samp
\newcommand\GNUTexinfotablestylesamp[1]{\ifstrempty{#1}{}{{`\texttt{#1}'}}}%
+% style command for cite in codetext
+\newcommand\GNUTexinfocommandstylecodetextcite[1]{{\normalfont{}\textsl{#1}}}%
+
% redefine the \mainmatter command such that it does not clear page
% as if in double page
\makeatletter
@@ -234,10 +237,10 @@ but , ,\@
\texttt{@abbr\{@'E{-}{-}. @comma\{\}A.\}} \'{E}--.\@ ,A.\@
\texttt{@asis\{{-}{-}a\}} --a
\texttt{@b\{{-}{-}a\}} \textbf{--a}
-\texttt{@cite\{{-}{-}a\}} \textit{--a}
+\texttt{@cite\{{-}{-}a\}} \textsl{--a}
\texttt{@code\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@dfn\{{-}{-}a\}} \emph{--a}
+\texttt{@dfn\{{-}{-}a\}} \textsl{--a}
\texttt{@dmn\{{-}{-}a\}} --a
\texttt{@email\{{-}{-}a,{-}{-}b\}} \href{mailto:--a}{--b}
\texttt{@email\{,{-}{-}b\}} --b
@@ -269,7 +272,7 @@ but , ,\@
\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
\texttt{@url\{{-}{-}a,\}} \url{--a}
\texttt{@url\{,{-}{-}b\}} --b
-\texttt{@var\{{-}{-}a\}} \emph{--a}
+\texttt{@var\{{-}{-}a\}} \textsl{--a}
\texttt{@verb\{:{-}{-}a:\}} \verb:--a:
\texttt{@verb\{:a < \& @ \% " {-}{-} b:\}} \verb:a < & @ % " -- b:
\texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}
@@ -711,11 +714,11 @@ d--effn
\index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
def--fn
-\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+\noindent\texttt\bgroup{}\textsl{i} a g\egroup{}\hfill[fset]
-\index[fn]{i@\texttt{\emph{i}}}%
+\index[fn]{i@\texttt{\textsl{i}}}%
\index[cp]{index entry within deffn}%
\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
@@ -808,11 +811,11 @@ def--fn
\index[fn]{deffnx@\texttt{deffnx}}%
-\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+\noindent\texttt\bgroup{}\textsl{i} a g\egroup{}\hfill[fset]
-\index[fn]{i@\texttt{\emph{i}}}%
+\index[fn]{i@\texttt{\textsl{i}}}%
\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
@@ -1370,11 +1373,11 @@ Various deff lines
\index[fn]{after@\texttt{after}}%
-\noindent\texttt\bgroup{}\emph{invalid} a g\egroup{}\hfill[fsetinv]
+\noindent\texttt\bgroup{}\textsl{invalid} a g\egroup{}\hfill[fsetinv]
-\index[fn]{invalid@\texttt{\emph{invalid}}}%
+\index[fn]{invalid@\texttt{\textsl{invalid}}}%
\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
@@ -1563,10 +1566,10 @@ but , ,\@
\texttt{@abbr\{@'E{-}{-}. @comma\{\}A.\}} \'{E}--.\@ ,A.\@
\texttt{@asis\{{-}{-}a\}} --a
\texttt{@b\{{-}{-}a\}} \textbf{--a}
-\texttt{@cite\{{-}{-}a\}} \textit{--a}
+\texttt{@cite\{{-}{-}a\}} \textsl{--a}
\texttt{@code\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@dfn\{{-}{-}a\}} \emph{--a}
+\texttt{@dfn\{{-}{-}a\}} \textsl{--a}
\texttt{@dmn\{{-}{-}a\}} --a
\texttt{@email\{{-}{-}a,{-}{-}b\}} \href{mailto:--a}{--b}
\texttt{@email\{,{-}{-}b\}} --b
@@ -1598,7 +1601,7 @@ but , ,\@
\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
\texttt{@url\{{-}{-}a,\}} \url{--a}
\texttt{@url\{,{-}{-}b\}} --b
-\texttt{@var\{{-}{-}a\}} \emph{--a}
+\texttt{@var\{{-}{-}a\}} \textsl{--a}
\texttt{@verb\{:{-}{-}a:\}} \verb:--a:
\texttt{@verb\{:a < \& @ \% " {-}{-} b:\}} \verb:a < & @ % " -- b:
\texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}
@@ -2037,11 +2040,11 @@ d--effn
\index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
def--fn
-\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+\noindent\texttt\bgroup{}\textsl{i} a g\egroup{}\hfill[fset]
-\index[fn]{i@\texttt{\emph{i}}}%
+\index[fn]{i@\texttt{\textsl{i}}}%
\index[cp]{index entry within deffn}%
\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
@@ -2134,11 +2137,11 @@ def--fn
\index[fn]{deffnx@\texttt{deffnx}}%
-\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+\noindent\texttt\bgroup{}\textsl{i} a g\egroup{}\hfill[fset]
-\index[fn]{i@\texttt{\emph{i}}}%
+\index[fn]{i@\texttt{\textsl{i}}}%
\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
@@ -2696,11 +2699,11 @@ Various deff lines
\index[fn]{after@\texttt{after}}%
-\noindent\texttt\bgroup{}\emph{invalid} a g\egroup{}\hfill[fsetinv]
+\noindent\texttt\bgroup{}\textsl{invalid} a g\egroup{}\hfill[fsetinv]
-\index[fn]{invalid@\texttt{\emph{invalid}}}%
+\index[fn]{invalid@\texttt{\textsl{invalid}}}%
\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
@@ -2909,10 +2912,10 @@ but , ,\@
\texttt{@abbr\{@'E{-}{-}. @comma\{\}A.\}} \'{E}--.\@ ,A.\@
\texttt{@asis\{{-}{-}a\}} --a
\texttt{@b\{{-}{-}a\}} \textbf{--a}
-\texttt{@cite\{{-}{-}a\}} \textit{--a}
+\texttt{@cite\{{-}{-}a\}} \textsl{--a}
\texttt{@code\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@dfn\{{-}{-}a\}} \emph{--a}
+\texttt{@dfn\{{-}{-}a\}} \textsl{--a}
\texttt{@dmn\{{-}{-}a\}} --a
\texttt{@email\{{-}{-}a,{-}{-}b\}} \href{mailto:--a}{--b}
\texttt{@email\{,{-}{-}b\}} --b
@@ -2944,7 +2947,7 @@ but , ,\@
\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
\texttt{@url\{{-}{-}a,\}} \url{--a}
\texttt{@url\{,{-}{-}b\}} --b
-\texttt{@var\{{-}{-}a\}} \emph{--a}
+\texttt{@var\{{-}{-}a\}} \textsl{--a}
\texttt{@verb\{:{-}{-}a:\}} \verb:--a:
\texttt{@verb\{:a < \& @ \% " {-}{-} b:\}} \verb:a < & @ % " -- b:
\texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}
@@ -3383,11 +3386,11 @@ d--effn
\index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
def--fn
-\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+\noindent\texttt\bgroup{}\textsl{i} a g\egroup{}\hfill[fset]
-\index[fn]{i@\texttt{\emph{i}}}%
+\index[fn]{i@\texttt{\textsl{i}}}%
\index[cp]{index entry within deffn}%
\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
@@ -3480,11 +3483,11 @@ def--fn
\index[fn]{deffnx@\texttt{deffnx}}%
-\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+\noindent\texttt\bgroup{}\textsl{i} a g\egroup{}\hfill[fset]
-\index[fn]{i@\texttt{\emph{i}}}%
+\index[fn]{i@\texttt{\textsl{i}}}%
\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
@@ -4042,11 +4045,11 @@ Various deff lines
\index[fn]{after@\texttt{after}}%
-\noindent\texttt\bgroup{}\emph{invalid} a g\egroup{}\hfill[fsetinv]
+\noindent\texttt\bgroup{}\textsl{invalid} a g\egroup{}\hfill[fsetinv]
-\index[fn]{invalid@\texttt{\emph{invalid}}}%
+\index[fn]{invalid@\texttt{\textsl{invalid}}}%
\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
@@ -4234,10 +4237,10 @@ but , ,\@
\texttt{@abbr\{@'E{-}{-}. @comma\{\}A.\}} \'{E}--.\@ ,A.\@
\texttt{@asis\{{-}{-}a\}} --a
\texttt{@b\{{-}{-}a\}} \textbf{--a}
-\texttt{@cite\{{-}{-}a\}} \textit{--a}
+\texttt{@cite\{{-}{-}a\}} \textsl{--a}
\texttt{@code\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@dfn\{{-}{-}a\}} \emph{--a}
+\texttt{@dfn\{{-}{-}a\}} \textsl{--a}
\texttt{@dmn\{{-}{-}a\}} --a
\texttt{@email\{{-}{-}a,{-}{-}b\}} \href{mailto:--a}{--b}
\texttt{@email\{,{-}{-}b\}} --b
@@ -4269,7 +4272,7 @@ but , ,\@
\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{--b (\nolinkurl{--a})}
\texttt{@url\{{-}{-}a,\}} \url{--a}
\texttt{@url\{,{-}{-}b\}} --b
-\texttt{@var\{{-}{-}a\}} \emph{--a}
+\texttt{@var\{{-}{-}a\}} \textsl{--a}
\texttt{@verb\{:{-}{-}a:\}} \verb:--a:
\texttt{@verb\{:a < \& @ \% " {-}{-} b:\}} \verb:a < & @ % " -- b:
\texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}
@@ -4708,11 +4711,11 @@ d--effn
\index[fn]{de--ffn\_name@\texttt{de{-}{-}ffn\_name}}%
def--fn
-\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+\noindent\texttt\bgroup{}\textsl{i} a g\egroup{}\hfill[fset]
-\index[fn]{i@\texttt{\emph{i}}}%
+\index[fn]{i@\texttt{\textsl{i}}}%
\index[cp]{index entry within deffn}%
\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
@@ -4805,11 +4808,11 @@ def--fn
\index[fn]{deffnx@\texttt{deffnx}}%
-\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+\noindent\texttt\bgroup{}\textsl{i} a g\egroup{}\hfill[fset]
-\index[fn]{i@\texttt{\emph{i}}}%
+\index[fn]{i@\texttt{\textsl{i}}}%
\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
@@ -5367,11 +5370,11 @@ Various deff lines
\index[fn]{after@\texttt{after}}%
-\noindent\texttt\bgroup{}\emph{invalid} a g\egroup{}\hfill[fsetinv]
+\noindent\texttt\bgroup{}\textsl{invalid} a g\egroup{}\hfill[fsetinv]
-\index[fn]{invalid@\texttt{\emph{invalid}}}%
+\index[fn]{invalid@\texttt{\textsl{invalid}}}%
\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
@@ -5560,10 +5563,10 @@ but , ,\@
\texttt{@abbr\{@'E{-}{-}. @comma\{\}A.\}} \'{E}{-}{-}.\@ ,A.\@
\texttt{@asis\{{-}{-}a\}} {-}{-}a
\texttt{@b\{{-}{-}a\}} \textbf{{-}{-}a}
-\texttt{@cite\{{-}{-}a\}} \textit{{-}{-}a}
+\texttt{@cite\{{-}{-}a\}} \GNUTexinfocommandstylecodetextcite{{-}{-}a}
\texttt{@code\{{-}{-}a\}} \texttt{{-}{-}a}
\texttt{@command\{{-}{-}a\}} \texttt{{-}{-}a}
-\texttt{@dfn\{{-}{-}a\}} \emph{{-}{-}a}
+\texttt{@dfn\{{-}{-}a\}} \textsl{{-}{-}a}
\texttt{@dmn\{{-}{-}a\}} {-}{-}a
\texttt{@email\{{-}{-}a,{-}{-}b\}} \href{mailto:--a}{{-}{-}b}
\texttt{@email\{,{-}{-}b\}} {-}{-}b
@@ -5597,7 +5600,7 @@ but , ,\@
\texttt{@url\{{-}{-}a,{-}{-}b\}} \href{--a}{{-}{-}b (\nolinkurl{--a})}
\texttt{@url\{{-}{-}a,\}} \url{--a}
\texttt{@url\{,{-}{-}b\}} {-}{-}b
-\texttt{@var\{{-}{-}a\}} \emph{{-}{-}a}
+\texttt{@var\{{-}{-}a\}} \textsl{{-}{-}a}
\texttt{@verb\{:{-}{-}a:\}} \verb:--a:
\texttt{@verb\{:a < \& @ \% " {-}{-} b:\}} \verb:a < & @ % " -- b:
\texttt{@w\{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a\}} \hbox{a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a a
a a}
@@ -6296,11 +6299,11 @@ def{-}{-}fn
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
\endgroup{}%
-\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+\noindent\texttt\bgroup{}\textsl{i} a g\egroup{}\hfill[fset]
-\index[fn]{i@\texttt{\emph{i}}}%
+\index[fn]{i@\texttt{\textsl{i}}}%
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
\index[cp]{index entry within deffn}%
\endgroup{}%
@@ -6405,11 +6408,11 @@ def{-}{-}fn
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
\endgroup{}%
-\noindent\texttt\bgroup{}\emph{i} a g\egroup{}\hfill[fset]
+\noindent\texttt\bgroup{}\textsl{i} a g\egroup{}\hfill[fset]
-\index[fn]{i@\texttt{\emph{i}}}%
+\index[fn]{i@\texttt{\textsl{i}}}%
\noindent\texttt\bgroup{}truc \egroup{}\hfill[cmde]
@@ -7211,11 +7214,11 @@ Various deff lines
\par\begingroup\obeylines\obeyspaces\frenchspacing\leftskip=2em\relax\parskip=0pt\relax\ttfamily{}%
\endgroup{}%
-\noindent\texttt\bgroup{}\emph{invalid} a g\egroup{}\hfill[fsetinv]
+\noindent\texttt\bgroup{}\textsl{invalid} a g\egroup{}\hfill[fsetinv]
-\index[fn]{invalid@\texttt{\emph{invalid}}}%
+\index[fn]{invalid@\texttt{\textsl{invalid}}}%
\noindent\texttt\bgroup{}\egroup{}\hfill[\textbf{id `\texttt{i}' ule}]
@@ -7312,7 +7315,7 @@ g{-}{-}roupe
\index[fn]{@\texttt{\hbox{}}}%
-\index[codeidx]{a index---entry te\~{} --- i\^{}@\texttt{a
\emph{index{-}{-}{-}entry} t\~{e} {-}{-}{-} \^{\i{}}}}%
+\index[codeidx]{a index---entry te\~{} --- i\^{}@\texttt{a
\textsl{index{-}{-}{-}entry} t\~{e} {-}{-}{-} \^{\i{}}}}%
\index[truc]{truc}%