[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
branch master updated: Correct text and variable names using plural info
|
From: |
Patrice Dumas |
|
Subject: |
branch master updated: Correct text and variable names using plural informations |
|
Date: |
Thu, 03 Feb 2022 13:56:55 -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 6f6b853c0f Correct text and variable names using plural informations
6f6b853c0f is described below
commit 6f6b853c0feca8f88a62de384d09358a80be512e
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Thu Feb 3 19:56:16 2022 +0100
Correct text and variable names using plural informations
---
doc/customization_api.texi | 105 ++++++++--------
doc/texinfo.texi | 2 +-
tp/Texinfo/Common.pm | 56 ++++-----
tp/Texinfo/Convert/Converter.pm | 9 +-
tp/Texinfo/Convert/DocBook.pm | 2 +-
tp/Texinfo/Convert/HTML.pm | 62 +++++-----
tp/Texinfo/Convert/IXIN.pm | 2 +-
tp/Texinfo/Convert/Info.pm | 2 +-
tp/Texinfo/Convert/NodeNameNormalization.pm | 10 +-
tp/Texinfo/Convert/Plaintext.pm | 2 +-
tp/Texinfo/Convert/TexinfoXML.pm | 2 +-
tp/Texinfo/Convert/Text.pm | 6 +-
tp/Texinfo/Convert/Utils.pm | 14 +--
tp/Texinfo/ParserNonXS.pm | 36 ++----
tp/Texinfo/Report.pm | 52 ++++----
tp/Texinfo/Structuring.pm | 134 ++++++++++-----------
tp/Texinfo/Transformations.pm | 10 +-
tp/Texinfo/XS/parsetexi/Parsetexi.pm | 16 +--
tp/Texinfo/XS/parsetexi/api.c | 2 +-
tp/maintain/template.pod | 2 +-
tp/t/README | 4 +-
tp/t/automatic_menus.t | 4 +-
tp/t/automatic_nodes.t | 18 +--
tp/t/do_master_menu.t | 16 +--
tp/t/input_files/topic_guide.texi | 10 +-
tp/t/results/sectioning/topic_guide.pl | 30 ++---
.../sectioning/topic_guide/res_html/topic1.html | 2 +-
.../sectioning/topic_guide/res_html/topic2.html | 2 +-
.../sectioning/topic_guide/res_html/topic3.html | 2 +-
.../sectioning/topic_guide/res_html/topic4.html | 2 +-
.../sectioning/topic_guide/res_html/topic5.html | 2 +-
.../topic_guide/res_info/topic_guide.info | 20 +--
tp/t/test_sort.t | 4 +-
tp/t/test_utils.pl | 22 ++--
tp/texi2any.pl | 26 ++--
35 files changed, 339 insertions(+), 351 deletions(-)
diff --git a/doc/customization_api.texi b/doc/customization_api.texi
index 7b614b1536..a91baa9575 100644
--- a/doc/customization_api.texi
+++ b/doc/customization_api.texi
@@ -191,7 +191,7 @@ The conversion of Texinfo to HTML is broadly done in two
steps. The first step
parsing of the Texinfo code in a tree-like structure representing the document.
The second step is the conversion of the tree-like structure. The first step
is
done in the main program, which reads command line options and loads init files
-before the parsing. The main programs determines informations on the document
+before the parsing. The main programs gather information on the document
structure after the parsing, before the conversion of the tree. The
conversion step is done in a @dfn{converter} which holds configuration
information, allows to register error messages and can interact with user
@@ -512,12 +512,12 @@ foreach my $context ('normal', 'example', string') @{
@node Simple Customization of Containers
@section Simple Customization of Containers
-Texinfo tree elements that are not text container nor directly associated
-with an @@-command can have some informations on their formatting set.
-The first information that can be set is whether their contents should be
considered
-in code context (@pxref{Init File Expansion Contexts}). The other information
is the type of
-preformatted environment they are, analogous with the @@-command names of
@code{@@example}
-or @code{@@display}@footnote{Note that setting the type of preformatted
environment does not
+Texinfo tree elements that are not text container nor directly associated with
+an @@-command can have information set on their formatting. The first piece of
+information is whether their contents should be considered in code context
(@pxref{Init
+File Expansion Contexts}). The other piece of information is the type of
+preformatted environment they are, analogous with the @@-command names of
+@code{@@example} or @code{@@display}@footnote{Note that setting the type of
preformatted environment does not
make sure that there are preformatted containers used for the formatting of
their
contents instead of paragraph containers, since this is determined in the very
first step of parsing the Texinfo code, which cannot be customized.}.
@@ -554,14 +554,14 @@ CSS in HTML output can already be modified with command
line options
(@pxref{HTML CSS,,,texinfo}) and customization options such as
@code{NO_CSS} and @code{INLINE_CSS_STYLE}.
-Informations on static CSS information used in conversion and some control
-over the CSS associated output is possible. The corresponding informations are
-CSS rules lines and CSS import lines obtained from parsing
-@option{--css-include=@var{file}} files, as described in @ref{HTML
CSS,,,texinfo},
-and CSS rules associated with HTML elements and class attributes
-used in conversion. The CSS rules selectors are, classically,
-@code{@var{element}.@var{class}} strings with @var{element} an HTML element and
-@var{class} an attribute class associated to that element.
+Information on static CSS data used in conversion and some control over the CSS
+output is possible. The information is about CSS rules lines and CSS import
+lines obtained from parsing @option{--css-include=@var{file}} files, as
+described in @ref{HTML CSS,,,texinfo}, and CSS style rules associated with HTML
+elements and class attributes used in the conversion to HTML. The CSS style
+rules selectors are, classically, @code{@var{element}.@var{class}} strings with
+@var{element} an HTML element and @var{class} an attribute class associated to
+that element.
The function used are @code{css_get_info} to get information and
@code{css_add_info} to modify:
@@ -573,21 +573,21 @@ Those functions can only be used on a converter
@var{$converter}, from
functions registered and called with a converter. @var{$specification} is
@code{'rules'} to get information on or set information for CSS rules lines and
@code{'imports'} to get information on or set information for CSS import lines.
-Any other value for @var{$specification} corresponds to CSS rules associated
-with HTML elements and class attributes selectors.
+Any other value for @var{$specification} corresponds to CSS style rules
+associated with HTML elements and class attributes selectors.
-With @code{css_get_info}, if @var{$specification} is set as @code{'rules'} or
+With @code{css_get_info}, if @var{$specification} is set to @code{'rules'} or
@code{'imports'}, the corresponding arrays are returned. Otherwise,
if @var{$css_info} is @code{undef}, a hash reference with all the CSS rules
selector as keys
-and the corresponding styles as values is returned. If @var{$css_info} is
defined,
-it is considered to be a CSS rules selector and the corresponding CSS style is
returned,
+and the corresponding rules as values is returned. If @var{$css_info} is
defined,
+it is considered to be a CSS rule selector and the corresponding CSS style is
returned,
or @code{undef} if not found.
With @code{css_add_info}, @var{$css_info} is an additional entry added to
CSS rules lines if @var{$specification} is set to @code{'rules'} or an
additional
entry added to CSS import lines if @var{$specification} is set to
@code{'imports'}.
Otherwise, @var{$css_info} is a CSS rule selector and the associated
-style is set to @var{$css_style}.
+style rule is set to @var{$css_style}.
@end defun
Some examples of use:
@@ -601,11 +601,10 @@ $converter->css_add_info('styles', 'h1.titlefont',
'text-align:center');
$converter->css_add_info('imports', "\@@import \"special.css\";\n");
@end example
-Note that the CSS selectors and associated styles that can be accessed and
+Note that the CSS selectors and associated style rules that can be accessed and
modified will not necessarily end up in the HTML output. They are output
only if the HTML element and class corresponding to a selector is seen in the
-document.
-@c @xref{} html_attribute_class
+document. @xref{Customizing CSS}.
How to run code during the conversion process is described later
(@pxref{Init File Calling at Different Stages}). The simplest way to
@@ -748,7 +747,7 @@ elements.
@section Directions
@cindex Output element unit directions
-@cindex Links informations
+@cindex Links information
@cindex Element directions
A variety of data items, called @dfn{element directions}, are associated
@@ -1180,7 +1179,7 @@ document, two elements are added,
(@pxref{Output Element Units}), and special elements with type
@code{special_element} that correspond to added special elements (@pxref{Output
Element Units}). These added elements, as well as nodes and sectioning
elements
-hold informations on the document structure in the @code{structure} element
hash
+hold information on the document structure in the @code{structure} element hash
(@pxref{Texinfo::Structuring METHODS,,,tp_api}).
Normal tree unit elements have a @code{unit_command} key in the
@@ -1341,7 +1340,7 @@ is expanded, use @code{is_format_expanded}:
@deftypefun $is_format_expanded $converter->is_format_expanded ($format)
Return true if format @var{$format} is expanded, according to
-the command-line and init file informations.
+command-line and init file information.
@end deftypefun
The main method to get information from the converter is @code{get_info}:
@@ -1350,7 +1349,7 @@ The main method to get information from the converter is
@code{get_info}:
Return information on @var{$info}.
@end defun
-The available informations are:
+The available information is about:
@table @code
@item copying_comment
Text appearing in @code{@@copying} with all the Texinfo commands
@@ -1370,12 +1369,12 @@ Base name of the document.
@xref{Init File Expansion Contexts}.
@item floats
-Informations on floats. Gathered from the Texinfo parsing result.
+Information on floats. Gathered from the Texinfo parsing result.
@xref{Texinfo::Parser $float_types = floats_information($parser),,
Texinfo::Parser::floats_information,tp_api}.
@item global_commands
-Global commands informations. Gathered from the Texinfo parsing result.
+Global commands information. Gathered from the Texinfo parsing result.
@xref{Texinfo::Parser $commands = global_commands_information($parser),,
Texinfo::Parser::global_commands_information,tp_api}.
@@ -1384,13 +1383,13 @@ Information on indices taking into account merged
indices.
@xref{Texinfo::Structuring $merged_entries =
merge_indices($index_names),,Texinfo::Structuring::merge_indices, tp_api}.
@item index_entries_by_letter
-Index entries sorted by letter. @xref{Texinfo::Structuring
($index_entries_sorted@comma{} $index_entries_sort_strings) =
sort_indices($registrar@comma{} $configuration_informations@comma{}
$merged_index_entries@comma{}
$sort_by_letter),,Texinfo::Structuring::sort_indices,tp_api}.
+Index entries sorted by letter. @xref{Texinfo::Structuring
($index_entries_sorted@comma{} $index_entries_sort_strings) =
sort_indices($registrar@comma{} $configuration_information@comma{}
$merged_index_entries@comma{}
$sort_by_letter),,Texinfo::Structuring::sort_indices,tp_api}.
@item jslicenses
An hash reference with categories of javascript used in the document
as keys. The corresponding values are also hashes with file names
as keys and with array references as values. The array references contain
-informations on each of the file licences, with content
+information on each of the file licences, with content
@enumerate
@item licence name
@item license url
@@ -1429,7 +1428,7 @@ a Texinfo tree corresponding to the simpletitle, and
@code{simpletitle_command_n
is the @@-command name used for the simpletitle, without the leading @@.
@item structuring
-Informations on the document structure. Gathered before the conversion.
+Information on the document structure. Gathered before the conversion.
Two hash keys correspond to interesting information, @code{sectioning_root}
which points to the top level sectioning command tree element, and
@code{sections_list} which holds the list of the sectioning commands in the
@@ -2036,7 +2035,7 @@ is also no attribute.
If @code{NO_CSS} is set, no attribute is set for the element. Otherwise
a @code{class} attribute is set based on @var{\@@classes }. If
@code{INLINE_CSS_STYLE} is set, a CSS style attribute based on
-CSS element class styles is also added. Otherwise the information that
+CSS element class rules is also added. Otherwise the information that
the element class was seen is registered by the converter.
@end deftypefun
@@ -2085,7 +2084,7 @@ Substitute @code{ } according to configuration
variables values.
@end deftypefun
This is not needed if the @code{non_breaking_space} information is taken from
-general informations (@pxref{Conversion General Information}).
+the general information (@pxref{Conversion General Information}).
@node Conversion in String Context
@@ -2289,8 +2288,8 @@ Return an anchor with identifier @var{$id}.
@end table
-@node Getting and Passing Conversion Informations
-@chapter Getting and Passing Conversion Informations
+@node Getting and Passing Conversion Information
+@chapter Getting and Passing Conversion Information
Dynamic formatting information on the conversion can be obtained from the
converter.
@@ -2299,7 +2298,7 @@ For advanced customization, it is also often necessary to
pass information
during conversion between different formatting functions or between
different calls calls of the same function.
-These informations are often useful for the formatting of paragraph and
+The information is often useful for the formatting of paragraph and
preformatted containers and @@-comands such as @code{@@abbr},
@code{@@footnote},
@code{@@node}, sectioning commands, @code{@@quotation} and @code{@@float}.
@@ -2346,7 +2345,7 @@ To get the location of an image file, use
@code{html_image_file_location_name}:
of an @code{@@image} @@-command formatting (@pxref{Command Tree Element
Conversion Functions}).
-The return values are informations on the image file if found, or fallback
values.
+The return values gives information on the image file if found, or fallback
values.
@var{$image_file} is the relative image file name. It is the file name used in
formatting of the @code{@@image} command in the default case.
@var{$image_basefile}
is the base file name of the image, without extension, corresponding to the
@@ -2355,8 +2354,8 @@ file extension (without a leading dot).
@var{$image_path} is the path to the
actual image file, @code{undef} if no file was found.
@end deftypefun
-@xref{Conversion in Preformatted Context} for informations on getting
-preformatted commands and container types nesting informations.
+@xref{Conversion in Preformatted Context} for information on getting
+preformatted commands and container types nesting information.
@node Opening and Closing Sectioning Commands Extent
@@ -2409,7 +2408,7 @@ environments. The Texinfo code parsing makes sure that
it is the case, to
simplify conversion to formats which allow text only in specific environments
such as HTML.
-Formatted text may also be prepared based on informations from Texinfo
+Formatted text may also be prepared based on information from Texinfo
elements tree while out of the inline containers. For that case, functions
allow to register pending inline formatted content, and get the content to be
prepended in inline text containers.
@@ -2515,7 +2514,7 @@ $@{$foot_num_reference@}++;
Navigation headers, navigation panels, end or beginning of files, @code{@@xref}
and similar @@-commands output, @code{@@menu}, @code{@@node}, sectioning
commands, @code{@@printindex} and @code{@@listoffloats} formatting requires
-directions, links, labels and files informations.
+directions, links, labels and files information.
@node Target Commands Links@comma{} Texts and Associated Commands
@@ -2594,8 +2593,8 @@ Return the node element associated with
@var{\%target_element}.
@end deftypefun
-@node Other Links@comma{} Headings and Associated Informations for Special
Elements
-@section Other Links, Headings and Associated Informations for Special Elements
+@node Other Links@comma{} Headings and Associated Information for Special
Elements
+@section Other Links, Headings and Associated Information for Special Elements
To get the id of a footnote in the main document, use
@code{footnote_location_target}:
@@ -2653,7 +2652,7 @@ Top element (@pxref{Output Element Units}) and is either
associated with the
@code{@@top} sectioning command or with the @code{Top} @code{@@node}.
@end deftypefun
-To get informations on the special element variety associated with
+To get information on the special element variety associated with
an @@-command command name, use
@code{command_name_special_element_information}:
@deftypefun {($special_element_variety, \%special_element, $class_base,
$special_element_direction)} @
@@ -2781,7 +2780,7 @@ also call @code{command_href} to link to the location
where the footnote
text will be expanded (@pxref{Target Commands Links@comma{} Texts and
Associated Commands}).
@deftypefun {@@pending_footnotes_information}
$converter->get_pending_footnotes ()
-Returns in @var{@@pending_footnotes_information} the informations gathered
+Returns in @var{@@pending_footnotes_information} the information gathered
in @code{register_footnote}. Each of the array element in
@var{@@pending_footnotes_information}
is an array reference containing the arguments of @code{register_footnote}
in the same order.
@@ -2796,7 +2795,7 @@ The formatting of footnotes content is done by the
Formats and returns the footnotes that need to be formatted. This function
normally calls @code{get_pending_footnotes}. The default function also calls
@code{footnote_location_href} (@pxref{Other Links@comma{} Headings and
-Associated Informations for Special Elements}) to link to the location
+Associated Information for Special Elements}) to link to the location
in the document where the footnote appeared.
@end deftypefn
@@ -2893,10 +2892,10 @@ Texinfo tree element conversion, and not as a special
element body formatting.
@var{$filename} is optional and should correspond to the filename where the
formatting happens, for links. If unset, the current file name is used.
-In the default function, structuring informations are used
+In the default function, structuring information is used
to format the table of contents (@pxref{Conversion General Information}),
and @code{command_contents_href} (@pxref{Other Links@comma{} Headings and
-Associated Informations for Special Elements}) and @code{command_href}
+Associated Information for Special Elements}) and @code{command_href}
(@pxref{Target Commands Links@comma{} Texts and Associated Commands})
are used for links.
@@ -3252,7 +3251,7 @@ If @code{USE_TITLEPAGE_FOR_TITLE} is set but there is no
output of
@node Customizing CSS
@section Customizing the CSS lines
-@xref{Simple Customization of CSS} for some information on CSS customization.
+@xref{Simple Customization of CSS} for information on CSS customization.
The CSS @var{element}.@var{class} that appeared in a file, gathered through
@code{html_attribute_class} calls (@pxref{Formatting HTML Element with Classes
@@ -3314,7 +3313,7 @@ be used for specific elements formatting:
Texinfo::Convert::Utils::expand_today, tp_api}.
@item @code{@@verbatiminclude}
-@xref{Texinfo::Convert::Utils $tree =
expand_verbatiminclude($registrar@comma{} $configuration_informations@comma{}
$verbatiminclude),,
+@xref{Texinfo::Convert::Utils $tree =
expand_verbatiminclude($registrar@comma{} $configuration_information@comma{}
$verbatiminclude),,
Texinfo::Convert::Utils::expand_verbatiminclude, tp_api}.
@item @code{@@def*} @@-commands
@@ -3349,7 +3348,7 @@ Texinfo::Convert::Converter::comma_index_subentries_tree,
tp_api}. Can be
called as @code{$converter->comma_index_subentries_tree}.
@item global informative commands (@code{@@contents}, @code{@@footnotestyle}
@enddots{})
-@xref{Texinfo::Common
set_informative_command_value($configuration_informations@comma{} $element),,
+@xref{Texinfo::Common
set_informative_command_value($configuration_information@comma{} $element),,
Texinfo::Common::set_informative_command_value, tp_api}.
@item heading commands, such as @code{@@subheading}
diff --git a/doc/texinfo.texi b/doc/texinfo.texi
index f3c54cd024..3ece7fc72f 100644
--- a/doc/texinfo.texi
+++ b/doc/texinfo.texi
@@ -1821,7 +1821,7 @@ Commands that affects document formatting as a whole but
do not produce
output, or do not produce output straight away, such as @code{@@settitle}
(@pxref{@code{@@settitle}}), @code{@@documentlanguage},
(@pxref{@code{@@documentlanguage}}), commands setting the headings,
-informations on indentation, on hyphenation or on table of contents
+setting information on indentation, on hyphenation or on table of contents
(@pxref{Contents}) do not stop the the preamble. The preamble can also contain
raw formatter commands (@pxref{Raw Formatter Commands}), but it is not checked
that the content of these commands is actually preamble material and not
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 74f26efe86..b08070555d 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1184,7 +1184,7 @@ sub locate_init_file($$$)
sub output_files_open_out($$$;$$)
{
my $self = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $file = shift;
my $use_binmode = shift;
my $output_encoding = shift;
@@ -1192,8 +1192,8 @@ sub output_files_open_out($$$;$$)
my $encoding;
if (defined($output_encoding)) {
$encoding = $output_encoding;
- } elsif
(defined($configuration_informations->get_conf('OUTPUT_PERL_ENCODING'))) {
- $encoding = $configuration_informations->get_conf('OUTPUT_PERL_ENCODING');
+ } elsif
(defined($configuration_information->get_conf('OUTPUT_PERL_ENCODING'))) {
+ $encoding = $configuration_information->get_conf('OUTPUT_PERL_ENCODING');
}
if ($file eq '-') {
@@ -1502,7 +1502,7 @@ sub parse_node_manual($)
sub locate_include_file($$)
{
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $text = shift;
my $file;
@@ -1511,7 +1511,7 @@ sub locate_include_file($$)
my ($volume, $directories, $filename) = File::Spec->splitpath($text);
my @directories = File::Spec->splitdir($directories);
- #print STDERR "$configuration_informations $text
@{$configuration_informations->get_conf('INCLUDE_DIRECTORIES')}\n";
+ #print STDERR "$configuration_information $text
@{$configuration_information->get_conf('INCLUDE_DIRECTORIES')}\n";
# If the path is absolute or begins with . or .., do not search in
# include directories.
if (File::Spec->file_name_is_absolute($text)) {
@@ -1532,14 +1532,14 @@ sub locate_include_file($$)
$file = $text if (-e $text and -r $text);
} else {
my @dirs;
- if ($configuration_informations
- and $configuration_informations->get_conf('INCLUDE_DIRECTORIES')) {
- @dirs = @{$configuration_informations->get_conf('INCLUDE_DIRECTORIES')};
+ if ($configuration_information
+ and $configuration_information->get_conf('INCLUDE_DIRECTORIES')) {
+ @dirs = @{$configuration_information->get_conf('INCLUDE_DIRECTORIES')};
} else {
# no object with directory list and not an absolute path, never succeed
return undef;
}
- foreach my $include_dir
(@{$configuration_informations->get_conf('INCLUDE_DIRECTORIES')}) {
+ foreach my $include_dir
(@{$configuration_information->get_conf('INCLUDE_DIRECTORIES')}) {
my ($include_volume, $include_directories, $include_filename)
= File::Spec->splitpath($include_dir, 1);
@@ -1571,9 +1571,9 @@ sub _informative_command_value($)
return undef;
}
-# REMARK documentencoding handling is not reverted by resetting
-# a value with set_conf, as the encodings are set using other
-# informations (possibly based on @documentencoding) in converter.
+# REMARK documentencoding handling is not reverted by resetting a value with
+# set_conf, as the encodings are set using other sources of information
+# (possibly based on @documentencoding) in converter.
sub set_informative_command_value($$)
{
my $self = shift;
@@ -1660,18 +1660,18 @@ sub set_global_document_command($$$$)
sub set_output_encodings($$)
{
- my $configuration_informations = shift;
- my $parser_informations = shift;
+ my $configuration_information = shift;
+ my $parser_information = shift;
- $configuration_informations->set_conf('OUTPUT_ENCODING_NAME',
- $parser_informations->{'input_encoding_name'})
- if ($parser_informations->{'input_encoding_name'});
- if (!$configuration_informations->get_conf('OUTPUT_PERL_ENCODING')
- and $configuration_informations->get_conf('OUTPUT_ENCODING_NAME')) {
+ $configuration_information->set_conf('OUTPUT_ENCODING_NAME',
+ $parser_information->{'input_encoding_name'})
+ if ($parser_information->{'input_encoding_name'});
+ if (!$configuration_information->get_conf('OUTPUT_PERL_ENCODING')
+ and $configuration_information->get_conf('OUTPUT_ENCODING_NAME')) {
my $perl_encoding
- =
Encode::resolve_alias($configuration_informations->get_conf('OUTPUT_ENCODING_NAME'));
+ =
Encode::resolve_alias($configuration_information->get_conf('OUTPUT_ENCODING_NAME'));
if ($perl_encoding) {
- $configuration_informations->set_conf('OUTPUT_PERL_ENCODING',
$perl_encoding);
+ $configuration_information->set_conf('OUTPUT_PERL_ENCODING',
$perl_encoding);
}
}
}
@@ -2792,7 +2792,7 @@ Texinfo::Common - Classification of commands and
miscellaneous methods
Texinfo::Common holds hashes with miscellaneous information and hashes
classifying Texinfo @-commands, as well as miscellaneous methods.
-=head1 MISC INFORMATIONS
+=head1 MISC INFORMATION
Hashes are defined as C<our> variables, and are therefore available
outside of the module.
@@ -3071,10 +3071,10 @@ Return a contents array reference with first
parenthesis in the
contents array reference protected. If I<$contents> is undef
a fatal error with a backtrace will be emitted.
-=item protect_hashchar_at_line_beginning($registrar,
$configuration_informations, $tree)
+=item protect_hashchar_at_line_beginning($registrar,
$configuration_information, $tree)
Protect hash character at beginning of line if the line is a cpp
-line directive. The I<$registrar> and I<$configuration_informations>
+line directive. The I<$registrar> and I<$configuration_information>
arguments may be undef, if they are defined they are used for
error reporting in case an hash character could not be protected
because it appeared in a raw environment.
@@ -3090,10 +3090,10 @@ Remove the index @-command from the tree.
Return numbered level of the tree sectioning I<$section>, as modified by
raise/lowersections.
-=item $element = set_global_document_command($configuration_informations,
$global_commands_information, $cmdname, $command_location)
+=item $element = set_global_document_command($configuration_information,
$global_commands_information, $cmdname, $command_location)
Set the Texinfo configuration option corresponding to I<$cmdname> in
-I<$configuration_informations>. The I<$global_commands_information> should
+I<$configuration_information>. The I<$global_commands_information> should
contain information about global commands in a Texinfo document, typically
obtained
from a parser, like L<Texinfo::Parser/$commands =
global_commands_information($parser)>.
I<$command_location> specifies where in the document the value should be taken
from,
@@ -3120,14 +3120,14 @@ sequentially to the values in the Texinfo preamble.
The I<$element> returned is the last element that was used to set the
configuration value, or C<undef> if no configuration value was found.
-=item set_informative_command_value($configuration_informations, $element)
+=item set_informative_command_value($configuration_information, $element)
Set the Texinfo configuration option corresponding to the tree element
I<$element>. The command associated to the tree element should be
a command that sets some information, such as C<@documentlanguage>,
C<@contents> or C<@footnotestyle> for example.
-=item set_output_encodings($configuration_informations, $parser_informations)
+=item set_output_encodings($configuration_information, $parser_information)
If not already set, set C<OUTPUT_ENCODING_NAME> based on input file
encoding. Also set C<OUTPUT_PERL_ENCODING> accordingly which is used
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 30cc50ed0c..b6342f89e5 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -195,7 +195,7 @@ sub converter(;$)
if ($conf->{'parser'}) {
$converter->{'global_commands'}
= $conf->{'parser'}->global_commands_information();
- $converter->{'parser_info'} = $conf->{'parser'}->global_informations();
+ $converter->{'parser_info'} = $conf->{'parser'}->global_information();
my $floats = $conf->{'parser'}->floats_information();
my ($labels, $targets_list, $nodes_list)
= $conf->{'parser'}->labels_information();
@@ -1013,7 +1013,7 @@ sub present_bug_message($$;$)
}
my $additional_information = '';
if ($line_message.$current_element_message ne '') {
- $additional_information = "Additional informations:\n".
+ $additional_information = "Additional information:\n".
$line_message.$current_element_message;
}
warn "You found a bug: $message\n\n".$additional_information;
@@ -1645,8 +1645,7 @@ useful methods.
In turn, the converter should define some methods. Two are
optional, C<converter_defaults>, C<converter_initialize> and
-used for initialization, to give C<Texinfo::Convert::Converter>
-some informations.
+used for initialization, to give information to C<Texinfo::Convert::Converter>.
The C<convert_tree> method is more or less mandatory and should
convert portions of Texinfo tree. The C<output> and C<convert>
@@ -1816,7 +1815,7 @@ account additional constraint on file names and adding a
file extension.
=item $converter->present_bug_message($message, $element)
-Show a bug message using I<$message> text. Add informations on
+Show a bug message using I<$message> text. Use information on
I<$element> tree element if given in argument.
=item $converter->set_conf($option_string, $value)
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 65d293af32..332ea12a6e 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -1504,7 +1504,7 @@ described in the Texinfo manual. Those options, when
appropriate,
override the document content. The parser should not be available
directly anymore after getting the associated information.
-See L<Texinfo::Convert::Converter> for more informations.
+See L<Texinfo::Convert::Converter> for more information.
=item $converter->output($tree)
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index bde13ecc31..7e4bf148f3 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -1487,7 +1487,7 @@ sub register_file_information($$;$)
my $key = shift;
my $value = shift;
- $self->{'file_informations'}->{$self->{'current_filename'}}->{$key} = $value;
+ $self->{'files_information'}->{$self->{'current_filename'}}->{$key} = $value;
}
sub get_file_information($$;$)
@@ -1499,10 +1499,10 @@ sub get_file_information($$;$)
if (not defined($filename)) {
$filename = $self->{'current_filename'};
}
- if (not
exists($self->{'file_informations'}->{$self->{'current_filename'}}->{$key})) {
+ if (not
exists($self->{'files_information'}->{$self->{'current_filename'}}->{$key})) {
return (0, undef);
}
- return (1,
$self->{'file_informations'}->{$self->{'current_filename'}}->{$key})
+ return (1,
$self->{'files_information'}->{$self->{'current_filename'}}->{$key})
}
# information from converter available 'read-only', in general set up before
@@ -6704,7 +6704,7 @@ sub _load_htmlxref_files {
# API exists
# targets for directions. Keys are elements references, values are
# target information hash references described above before
-# the API functions used to access those informations.
+# the API functions used to access this information.
# special_targets
# special_elements_targets
# special_elements_directions
@@ -6720,7 +6720,7 @@ sub _load_htmlxref_files {
# file_css
#
# API exists
-# file_informations
+# files_information
#
# tree_units
# out_filepaths
@@ -7359,7 +7359,7 @@ sub _new_sectioning_command_target($$)
# This set with two different codes
# * the target information, id and normalized filename of 'labels',
# ie everything that may be the target of a ref, like @node, @float,
@anchor...
-# * The target informations of sectioning elements by going through tree units
+# * The target information of sectioning elements by going through tree units
# @node and section commands targets are therefore both set.
#
# conversion to HTML is done on-demand, upon call to command_text
@@ -8422,7 +8422,7 @@ sub _root_html_element_attributes_string($)
# This is used for normal output files and other files, like
# redirection file headers. $COMMAND is the tree element for
# a @node that is being output in the file.
-sub _file_header_informations($$;$)
+sub _file_header_information($$;$)
{
my $self = shift;
my $command = shift;
@@ -8596,7 +8596,7 @@ sub _default_format_begin_file($$$)
my ($title, $description, $encoding, $date, $css_lines,
$doctype, $root_html_element_attributes, $bodytext, $copying_comment,
$after_body_open, $extra_head, $program_and_version,
$program_homepage,
- $program, $generator) = $self->_file_header_informations($command,
$filename);
+ $program, $generator) = $self->_file_header_information($command,
$filename);
my $links = $self->_get_links($filename, $element);
@@ -8636,7 +8636,7 @@ sub _default_format_node_redirection_page($$)
my ($title, $description, $encoding, $date, $css_lines,
$doctype, $root_html_element_attributes, $bodytext, $copying_comment,
$after_body_open, $extra_head, $program_and_version,
$program_homepage,
- $program, $generator) = $self->_file_header_informations($command);
+ $program, $generator) = $self->_file_header_information($command);
my $name = $self->command_text($command);
my $href = $self->command_href($command);
@@ -9039,8 +9039,8 @@ sub convert($$)
$self->{'shared_conversion_state'} = {};
# call before _prepare_conversion_tree_units, which calls _translate_names.
- # Some informations are not set yet.
- $self->_reset_infos();
+ # Some information is not available yet.
+ $self->_reset_info();
my ($tree_units, $special_elements)
= $self->_prepare_conversion_tree_units($root, undef, undef);
@@ -9048,8 +9048,8 @@ sub convert($$)
$self->_prepare_index_entries();
$self->_prepare_footnotes();
- # all informations should be set.
- $self->_reset_infos();
+ # complete information should be available.
+ $self->_reset_info();
if (!defined($tree_units)) {
print STDERR "\nC NO UNIT\n" if ($self->get_conf('DEBUG'));
@@ -9158,7 +9158,7 @@ sub run_stage_handlers($$$)
return 1;
}
-sub _reset_infos()
+sub _reset_info()
{
my $self = shift;
@@ -9242,9 +9242,9 @@ sub output($$)
$self->{'shared_conversion_state'} = {};
- # setup informations once here, to have some information for
- # run_stage_handlers. Some informations are not set yet.
- $self->_reset_infos();
+ # set information, to have some information for run_stage_handlers.
+ # Some information is not available yet.
+ $self->_reset_info();
my $setup_status = $self->run_stage_handlers($root, 'setup');
return undef unless($setup_status);
@@ -9287,11 +9287,11 @@ sub output($$)
$self->{'document_name'} = $document_name;
$self->{'destination_directory'} = $created_directory;
- # setup informations here, to have some information for
- # conversions belows, in translate_names called by
- # _prepare_conversion_tree_units and in titles formatting.
- # Some informations are not set yet.
- $self->_reset_infos();
+ # set information, to have it available for the conversions below,
+ # in translate_names called by _prepare_conversion_tree_units and in
+ # titles formatting.
+ # Some information is not available yet.
+ $self->_reset_info();
# Get the list of "elements" to be processed, i.e. nodes or sections.
# This should return undef if called on a tree without node or sections.
@@ -9340,9 +9340,9 @@ sub output($$)
$self->{'elements_in_file_count'}->{$filename} =
$self->{'file_counters'}->{$filename};
}
- # setup informations once here, to have some information for
- # run_stage_handlers. Some informations are not set yet.
- $self->_reset_infos();
+ # set information, to have it ready for
+ # run_stage_handlers. Some information is not available yet.
+ $self->_reset_info();
my $structure_status = $self->run_stage_handlers($root, 'structure');
return undef unless($structure_status);
@@ -9443,9 +9443,9 @@ sub output($$)
chomp($self->{'documentdescription_string'});
}
- # setup informations once here, to have some information for
- # run_stage_handlers. Some informations are not set yet.
- $self->_reset_infos();
+ # set information, to have it ready for un_stage_handlers.
+ # Some information is not available yet.
+ $self->_reset_info();
my $init_status = $self->run_stage_handlers($root, 'init');
return undef unless($init_status);
@@ -9457,8 +9457,8 @@ sub output($$)
}
- # all the informations should be available
- $self->_reset_infos();
+ # complete information should be available.
+ $self->_reset_info();
my $fh;
my $output = '';
@@ -10207,7 +10207,7 @@ described in the Texinfo manual. Those options, when
appropriate,
override the document content. The parser should not be available
directly anymore after getting the associated information.
-See L<Texinfo::Convert::Converter> for more informations.
+See L<Texinfo::Convert::Converter> for more information.
=item $converter->output($tree)
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index 41496e2974..94002fad8d 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -651,7 +651,7 @@ sub output_ixin($$)
}
}
- # Gather informations on printindex @-commands associated node id
+ # Gather information on printindex @-commands associated node id
if ($self->{'global_commands'}->{'printindex'}) {
foreach my $command (@{$self->{'global_commands'}->{'printindex'}}) {
my $associated_node_id = $self->_associated_node_id($command,
diff --git a/tp/Texinfo/Convert/Info.pm b/tp/Texinfo/Convert/Info.pm
index 4888e984fb..ea887712c5 100644
--- a/tp/Texinfo/Convert/Info.pm
+++ b/tp/Texinfo/Convert/Info.pm
@@ -597,7 +597,7 @@ described in the Texinfo manual. Those options, when
appropriate,
override the document content. The parser should not be available
directly anymore after getting the associated information.
-See L<Texinfo::Convert::Converter> for more informations.
+See L<Texinfo::Convert::Converter> for more information.
=item $converter->output($tree)
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index f2ee0da1b4..d1bedb0d6a 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -285,7 +285,7 @@ sub set_nodes_list_labels($$$)
{
my $self = shift;
my $registrar = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
$self->{'nodes'} = [];
my %labels = ();
@@ -309,7 +309,7 @@ sub set_nodes_list_labels($$$)
{'contents' =>
$target->{'extra'}->{'node_content'}});
if ($normalized !~ /[^-]/) {
- $registrar->line_error($configuration_informations,
+ $registrar->line_error($configuration_information,
sprintf(__("empty node name after expansion `%s'"),
Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
=> $target->{'extra'}->{'node_content'}})),
@@ -317,13 +317,13 @@ sub set_nodes_list_labels($$$)
delete $target->{'extra'}->{'node_content'};
} else {
if (defined $labels{$normalized}) {
- $registrar->line_error($configuration_informations,
+ $registrar->line_error($configuration_information,
sprintf(__("\@%s `%s' previously defined"),
$target->{'cmdname'},
Texinfo::Convert::Texinfo::convert_to_texinfo({'contents'
=> $target->{'extra'}->{'node_content'}})),
$target->{'line_nr'});
- $registrar->line_error($configuration_informations,
+ $registrar->line_error($configuration_information,
sprintf(__("here is the previous definition as \@%s"),
$labels{$normalized}->{'cmdname'}),
$labels{$normalized}->{'line_nr'});
@@ -343,7 +343,7 @@ sub set_nodes_list_labels($$$)
}
} else {
if ($target->{'cmdname'} eq 'node') {
- $registrar->line_error($configuration_informations,
+ $registrar->line_error($configuration_information,
sprintf(__("empty argument in \@%s"),
$target->{'cmdname'}), $target->{'line_nr'});
delete $target->{'extra'}->{'node_content'};
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index 15e5ce3065..c9470a92d2 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -3344,7 +3344,7 @@ described in the Texinfo manual. Those options, when
appropriate,
override the document content. The parser should not be available
directly anymore after getting the associated information.
-See L<Texinfo::Convert::Converter> for more informations.
+See L<Texinfo::Convert::Converter> for more information.
=item $converter->output($tree)
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 803a8ef00a..a798fac6bf 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -1748,7 +1748,7 @@ described in the Texinfo manual. Those options, when
appropriate,
override the document content. The parser should not be available
directly anymore after getting the associated information.
-See L<Texinfo::Convert::Converter> for more informations.
+See L<Texinfo::Convert::Converter> for more information.
=item $converter->output($tree)
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 1cc8be6027..3a36bb8e0d 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -322,7 +322,7 @@ sub heading($$$;$$)
# $SELF is typically a converter object.
# Setup options as used by Texinfo::Convert::Text::convert_to_text
-# based on the converter informations.
+# based on the converter information.
sub copy_options_for_convert_text($)
{
my $self = shift;
@@ -350,7 +350,7 @@ sub convert_to_text($;$)
#print STDERR "CONVERT\n";
# this is needed for locate_include_file which uses
- # $configurations_informations->get_conf() and thus requires a blessed
reference.
+ # $configurations_information->get_conf() and thus requires a blessed
reference.
if (defined($options)) {
bless $options;
if ($options->{'code'}) {
@@ -663,7 +663,7 @@ sub converter($)
my $expanded_formats = $converter->{'EXPANDED_FORMATS'};;
if ($converter->{'parser'}) {
- $converter->{'parser_info'} =
$converter->{'parser'}->global_informations();
+ $converter->{'parser_info'} = $converter->{'parser'}->global_information();
$converter->{'global_commands'}
= $converter->{'parser'}->global_commands_information();
foreach my $global_command ('documentencoding') {
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index dc1c1bfaa4..25414b1a1f 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -185,26 +185,26 @@ sub find_innermost_accent_contents($;$)
}
# $REGISTRAR argument (in practice, a converter) is optional.
-# $CONFIGURATION_INFORMATIONS is also optional, but without this
+# $CONFIGURATION_INFORMATION is also optional, but without this
# argument and the 'INCLUDE_DIRECTORIES' available through
# get_conf(), the included file can only be found in specific
# circumstances.
sub expand_verbatiminclude($$$)
{
my $registrar = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $current = shift;
return unless ($current->{'extra'} and
defined($current->{'extra'}->{'text_arg'}));
my $text = $current->{'extra'}->{'text_arg'};
- my $file = Texinfo::Common::locate_include_file($configuration_informations,
$text);
+ my $file = Texinfo::Common::locate_include_file($configuration_information,
$text);
my $verbatiminclude;
if (defined($file)) {
if (!open(VERBINCLUDE, $file)) {
if ($registrar) {
- $registrar->line_error($configuration_informations,
+ $registrar->line_error($configuration_information,
sprintf(__("could not read %s: %s"), $file, $!),
$current->{'line_nr'});
}
@@ -225,14 +225,14 @@ sub expand_verbatiminclude($$$)
if (!close (VERBINCLUDE)) {
if ($registrar) {
$registrar->document_warn(
- $configuration_informations, sprintf(__(
+ $configuration_information, sprintf(__(
"error on closing \@verbatiminclude file %s: %s"),
$file, $!));
}
}
}
} elsif ($registrar) {
- $registrar->line_error($configuration_informations,
+ $registrar->line_error($configuration_information,
sprintf(__("\@%s: could not find %s"),
$current->{'cmdname'}, $text),
$current->{'line_nr'});
@@ -352,7 +352,7 @@ translated.
Expand today's date, as a texinfo tree with translations.
-=item $tree = expand_verbatiminclude($registrar, $configuration_informations,
$verbatiminclude)
+=item $tree = expand_verbatiminclude($registrar, $configuration_information,
$verbatiminclude)
The I<$registrar> argument may be undef. I<$verbatiminclude> is a
C<@verbatiminclude> tree element. This function returns a
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index e6aa79adbf..e67d559e28 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -129,7 +129,7 @@ my %parser_state_initialization = (
'regions_stack' => [], # a stack of regions commands elements (in
%region_commands)
'sections_level' => 0, # modified by raise/lowersections
'targets' => [], # array of elements used to build 'labels'
- # initialization of information returned by global_informations()
+ # initialization of information returned by global_information()
'info' => {
'input_encoding_name' => 'utf-8',
'input_perl_encoding' => 'utf-8'
@@ -649,7 +649,7 @@ sub _bug_message($$;$$)
$current_element_message = "current: ". _print_current($current);
}
warn "You found a bug: $message\n\n".
- "Additional informations:\n".
+ "Additional information:\n".
$line_message.$message_context_stack.$current_element_message;
}
@@ -777,10 +777,10 @@ sub parser(;$$)
}
# simple parser initialization. The only difference with a regular parser
-# is that the dynamical @-commands groups and indices informations that are
-# initialized in each regular parser are initialized once for all and shared
-# among simple parsers. It is used in gdt() and this has a sizable effect
-# on performance.
+# is that the dynamical @-commands groups and indices information references
+# that are initialized in each regular parser are initialized once for all
+# and shared among simple parsers. It is used in gdt() and this has a sizable
+# effect on performance.
my $simple_parser_line_commands = dclone(\%line_commands);
my $simple_parser_valid_nestings = dclone(\%default_valid_nestings);
my $simple_parser_no_paragraph_commands = { %default_no_paragraph_commands };
@@ -902,9 +902,6 @@ sub parse_texi_piece($$;$$$$)
my $tree = $self->_parse_texi($document_root, $before_node_section);
- # TODO remove
- $self->_set_global_informations();
-
return $tree;
}
@@ -956,11 +953,6 @@ sub _open_in {
}
}
-sub _set_global_informations($)
-{
- my $self = shift;
-}
-
# parse a texi file
sub parse_texi_file($$)
{
@@ -1030,12 +1022,10 @@ sub _parse_texi_document($)
Texinfo::Common::rearrange_tree_beginning($self, $before_node_section);
- $self->_set_global_informations();
-
return $tree;
}
-# return indices informations
+# return indices information
sub indices_information($)
{
my $self = shift;
@@ -1064,7 +1054,7 @@ sub global_commands_information($)
# perl_encoding
# input_encoding_name
# input_file_name
-sub global_informations($)
+sub global_information($)
{
my $self = shift;
return $self->{'info'};
@@ -5999,9 +5989,9 @@ Texinfo::Parser - Parse Texinfo code into a Perl tree
# A hash reference, keys are @-command names, value is an
# array reference holding all the corresponding @-commands.
my $global_commands_information = $parser->global_commands_information();
- # a hash reference on some document informations (encodings,
+ # a hash reference on document information (encodings,
# input file name, dircategory and direntry list, for exampel).
- my $global_informations = $parser->global_informations();
+ my $global_information = $parser->global_information();
# a Texinfo::Report object in which the errors and warnings
# encountered while parsing are registered.
my $registrar = $parser->registered_errors();
@@ -6081,7 +6071,7 @@ A string, the C<@kbdinputstyle> style.
=item documentlanguage
A string corresponding to a document language set by C<@documentlanguage>.
-It overrides the document C<@documentlanguage> informations, if present.
+It overrides the document C<@documentlanguage> information, if present.
=item registrar
@@ -6237,11 +6227,11 @@ a new one is created.
After parsing some information about the Texinfo code that was processed
is available from the parser.
-Some global information is available through C<global_informations>
+Some global information is available through C<global_information>
=over
-=item $info = global_informations($parser)
+=item $info = global_information($parser)
The I<$info> returned is a hash reference. The possible keys are
diff --git a/tp/Texinfo/Report.pm b/tp/Texinfo/Report.pm
index 5384d2b2b2..9d3ba8fb96 100644
--- a/tp/Texinfo/Report.pm
+++ b/tp/Texinfo/Report.pm
@@ -70,7 +70,7 @@ sub errors($)
sub line_warn($$$$)
{
my $self = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $text = shift;
chomp ($text);
my $line_number = shift;
@@ -79,8 +79,8 @@ sub line_warn($$$$)
# otherwise out of source build fail since the file names are different
my ($directories, $suffix);
($file, $directories, $suffix) = fileparse($file)
- if (defined($configuration_informations)
- and $configuration_informations->get_conf('TEST'));
+ if (defined($configuration_information)
+ and $configuration_information->get_conf('TEST'));
my $warn_line;
if ($line_number->{'macro'} ne '') {
$warn_line = sprintf(__p("Texinfo source file warning",
@@ -91,8 +91,8 @@ sub line_warn($$$$)
"%s:%d: warning: %s\n"),
$file, $line_number->{'line_nr'}, $text);
}
- warn $warn_line if (defined($configuration_informations)
- and $configuration_informations->get_conf('DEBUG'));
+ warn $warn_line if (defined($configuration_information)
+ and $configuration_information->get_conf('DEBUG'));
push @{$self->{'errors_warnings'}},
{ 'type' => 'warning', 'text' => $text, 'error_line' => $warn_line,
%{$line_number} };
@@ -102,7 +102,7 @@ sub line_warn($$$$)
sub line_error($$$$)
{
my $self = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $text = shift;
chomp ($text);
my $line_number = shift;
@@ -110,14 +110,14 @@ sub line_error($$$$)
my $file = $line_number->{'file_name'};
my ($directories, $suffix);
($file, $directories, $suffix) = fileparse($file)
- if (defined($configuration_informations)
- and $configuration_informations->get_conf('TEST'));
+ if (defined($configuration_information)
+ and $configuration_information->get_conf('TEST'));
my $macro_text = '';
$macro_text = " (possibly involving \@$line_number->{'macro'})"
if ($line_number->{'macro'} ne '');
my $error_text = "$file:$line_number->{'line_nr'}: $text$macro_text\n";
- warn $error_text if (defined($configuration_informations)
- and $configuration_informations->get_conf('DEBUG'));
+ warn $error_text if (defined($configuration_information)
+ and $configuration_information->get_conf('DEBUG'));
push @{$self->{'errors_warnings'}},
{ 'type' => 'error', 'text' => $text, 'error_line' => $error_text,
%{$line_number} };
@@ -128,16 +128,16 @@ sub line_error($$$$)
sub document_warn($$$)
{
my $self = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $text = shift;
chomp($text);
my $warn_line;
- if (defined($configuration_informations)
- and defined($configuration_informations->get_conf('PROGRAM'))
- and $configuration_informations->get_conf('PROGRAM') ne '') {
+ if (defined($configuration_information)
+ and defined($configuration_information->get_conf('PROGRAM'))
+ and $configuration_information->get_conf('PROGRAM') ne '') {
$warn_line = sprintf(__p("whole document warning", "%s: warning: %s\n"),
- $configuration_informations->get_conf('PROGRAM'), $text);
+ $configuration_information->get_conf('PROGRAM'), $text);
} else {
$warn_line = sprintf(__p("whole document warning", "warning: %s\n"),
$text);
@@ -149,15 +149,15 @@ sub document_warn($$$)
sub document_error($$$)
{
my $self = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $text = shift;
chomp($text);
my $error_line;
- if (defined($configuration_informations)
- and defined($configuration_informations->get_conf('PROGRAM'))
- and $configuration_informations->get_conf('PROGRAM') ne '') {
+ if (defined($configuration_information)
+ and defined($configuration_information->get_conf('PROGRAM'))
+ and $configuration_information->get_conf('PROGRAM') ne '') {
$error_line = sprintf("%s: %s\n",
- $configuration_informations->get_conf('PROGRAM'), $text);
+ $configuration_information->get_conf('PROGRAM'), $text);
} else {
$error_line = "$text\n";
}
@@ -307,12 +307,12 @@ the error or warning.
=back
-=item $registrar->line_warn($text, $configuration_informations, $line_nr)
+=item $registrar->line_warn($text, $configuration_information, $line_nr)
-=item $registrar->line_error($text, $configuration_informations, $line_nr)
+=item $registrar->line_error($text, $configuration_information, $line_nr)
Register a warning or an error. The I<$text> is the text of the
-error or warning. The I<$configuration_informations> object gives
+error or warning. The I<$configuration_information> object gives
some information that can modify the messages or their delivery.
The optional I<$line_nr> holds the information on the error or
warning location. It is associated with the I<line_nr> key of
@@ -321,12 +321,12 @@ for the @-commands. The I<$line_nr> structure is
described
in L<errors|/($error_warnings_list, $error_count) = errors ($registrar)>
above.
-=item $registrar->document_warn($configuration_informations, $text)
+=item $registrar->document_warn($configuration_information, $text)
-=item $registrar->document_error($configuration_informations, $text)
+=item $registrar->document_error($configuration_information, $text)
Register a document-wide error or warning. I<$text> is the error or
-warning message. The I<$configuration_informations> object gives
+warning message. The I<$configuration_information> object gives
some information that can modify the messages or their delivery.
=item $registrar->file_line_warn($text, $file, $line_nr)
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index b3057c8dfc..f25b6bbe3b 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -1,4 +1,4 @@
-# Structuring.pm: extract informations about a document structure based on the
+# Structuring.pm: extract information about a document structure based on the
# document tree.
#
# Copyright 2010-2019 Free Software Foundation, Inc.
@@ -103,7 +103,7 @@ $unnumbered_commands{'part'} = 1;
sub sectioning_structure($$$)
{
my $registrar = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $root = shift;
my $sec_root;
@@ -145,7 +145,7 @@ sub sectioning_structure($$$)
# new command is below
if ($previous_section->{'structure'}->{'section_level'} < $level) {
if ($level - $previous_section->{'structure'}->{'section_level'} > 1) {
- $registrar->line_error($configuration_informations,
+ $registrar->line_error($configuration_information,
sprintf(__("raising the section level of \@%s which is too low"),
$content->{'cmdname'}), $content->{'line_nr'});
$content->{'structure'}->{'section_level'}
@@ -179,12 +179,12 @@ sub sectioning_structure($$$)
if ($content->{'cmdname'} eq 'part') {
$new_upper_part_element = 1;
if ($level < $up->{'structure'}->{'section_level'}) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("no chapter-level command before \@%s"),
$content->{'cmdname'}), $content->{'line_nr'});
}
} else {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("lowering the section level of \@%s appearing after a lower
element"),
$content->{'cmdname'}), $content->{'line_nr'});
$content->{'structure'}->{'section_level'}
@@ -277,7 +277,7 @@ sub sectioning_structure($$$)
}
} elsif ($content->{'cmdname'} eq 'part'
and !$content->{'extra'}->{'part_associated_section'}) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("no sectioning command associated with \@%s"),
$content->{'cmdname'}), $content->{'line_nr'});
}
@@ -302,13 +302,13 @@ sub _print_sectioning_tree($)
sub warn_non_empty_parts($$$)
{
my $registrar = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $global_commands = shift;
if ($global_commands->{'part'}) {
foreach my $part (@{$global_commands->{'part'}}) {
if (!Texinfo::Common::is_content_empty($part)) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("\@%s not empty"),
$part->{'cmdname'}), $part->{'line_nr'});
}
@@ -356,7 +356,7 @@ my %direction_texts = (
sub _check_menu_entry($$$$$)
{
my $registrar = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $labels = shift;
my $command = shift;
my $menu_content = shift;
@@ -367,14 +367,14 @@ sub _check_menu_entry($$$$$)
my $menu_node = $labels->{$normalized_menu_node};
if (!$menu_node) {
- $registrar->line_error($configuration_informations,
+ $registrar->line_error($configuration_information,
sprintf(__("\@%s reference to nonexistent node `%s'"), $command,
node_extra_to_texi($menu_content->{'extra'}->{'menu_entry_node'})),
$menu_content->{'line_nr'});
} else {
if (!_check_node_same_texinfo_code($menu_node,
$menu_content->{'extra'}->{'menu_entry_node'})) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("\@%s entry node name `%s' different from %s name `%s'"),
$command,
node_extra_to_texi($menu_content->{'extra'}->{'menu_entry_node'}),
@@ -389,7 +389,7 @@ sub _check_menu_entry($$$$$)
# to try to generate menus automatically before checking.
sub check_nodes_are_referenced
{
- my ($registrar, $configuration_informations, $nodes_list, $top_node,
$labels, $refs) = @_;
+ my ($registrar, $configuration_information, $nodes_list, $top_node, $labels,
$refs) = @_;
return undef unless ($nodes_list and scalar(@{$nodes_list}));
@@ -425,7 +425,7 @@ sub check_nodes_are_referenced
foreach my $node (@{$nodes_list}) {
if (not exists($referenced_nodes{$node})) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("node `%s' unreferenced"),
node_extra_to_texi($node->{'extra'})),
$node->{'line_nr'});
@@ -437,16 +437,16 @@ sub check_nodes_are_referenced
sub set_menus_node_directions($$$$$$)
{
my $registrar = shift;
- my $configuration_informations = shift;
- my $parser_informations = shift;
+ my $configuration_information = shift;
+ my $parser_information = shift;
my $global_commands = shift;
my $nodes_list = shift;
my $labels = shift;
return undef unless ($nodes_list and scalar(@{$nodes_list}));
- my $check_menu_entries =
(!$configuration_informations->get_conf('novalidate')
- and $configuration_informations->get_conf('FORMAT_MENU') eq 'menu');
+ my $check_menu_entries = (!$configuration_information->get_conf('novalidate')
+ and $configuration_information->get_conf('FORMAT_MENU') eq 'menu');
# First go through all the menus and set menu_up, menu_next and menu_prev,
# and warn for unknown nodes.
@@ -459,7 +459,7 @@ sub set_menus_node_directions($$$$$$)
if ($node->{'extra'}->{'menus'}) {
if (@{$node->{'extra'}->{'menus'}} > 1) {
foreach my $menu (@{$node->{'extra'}->{'menus'}}[1 ..
$#{$node->{'extra'}->{'menus'}}]) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("multiple \@%s"),
$menu->{'cmdname'}), $menu->{'line_nr'});
}
@@ -477,7 +477,7 @@ sub set_menus_node_directions($$$$$$)
->{'menu_entry_node'}->{'normalized'}};
if ($check_menu_entries) {
- _check_menu_entry($registrar, $configuration_informations,
+ _check_menu_entry($registrar, $configuration_information,
$labels, 'menu', $menu_content);
}
# this may happen more than once for a given node if the node
@@ -517,7 +517,7 @@ sub set_menus_node_directions($$$$$$)
if ($menu_content->{'extra'}
and $menu_content->{'extra'}->{'menu_entry_node'}) {
if
(!$menu_content->{'extra'}->{'menu_entry_node'}->{'manual_content'}) {
- _check_menu_entry($registrar, $configuration_informations,
+ _check_menu_entry($registrar, $configuration_information,
$labels, 'detailmenu', $menu_content);
}
}
@@ -555,7 +555,7 @@ sub _section_direction_associated_node($$)
sub complete_node_tree_with_menus($$$$)
{
my $registrar = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $nodes_list = shift;
my $top_node = shift;
@@ -586,13 +586,13 @@ sub complete_node_tree_with_menus($$$$)
my $direction_associated_node
= _section_direction_associated_node($section, $direction);
if ($direction_associated_node) {
- if
($configuration_informations->get_conf('CHECK_NORMAL_MENU_STRUCTURE')) {
+ if
($configuration_information->get_conf('CHECK_NORMAL_MENU_STRUCTURE')) {
if ($section->{'structure'}->{'section_up'}{'extra'}
and
$section->{'structure'}->{'section_up'}{'extra'}{'associated_node'}
and
$section->{'structure'}->{'section_up'}{'extra'}{'associated_node'}{'menus'}
and
@{$section->{'structure'}->{'section_up'}{'extra'}{'associated_node'}{'menus'}}
and !$node->{'structure'}->{'menu_'.$direction}) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("node %s for `%s' is `%s' in sectioning but not in menu"),
$direction,
node_extra_to_texi($node->{'extra'}),
@@ -608,9 +608,9 @@ sub complete_node_tree_with_menus($$$$)
if (!$node->{'structure'}->{'node_'.$direction}
and $node->{'structure'}->{'menu_'.$direction}
and
!$node->{'structure'}->{'menu_'.$direction}->{'extra'}->{'manual_content'}) {
- if
($configuration_informations->get_conf('CHECK_NORMAL_MENU_STRUCTURE')
+ if
($configuration_information->get_conf('CHECK_NORMAL_MENU_STRUCTURE')
and $node->{'extra'}->{'associated_section'}) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("node `%s' is %s for `%s' in menu but not in sectioning"),
node_extra_to_texi($node->{'structure'}->{'menu_'.$direction}->{'extra'}),
$direction,
@@ -647,13 +647,13 @@ sub complete_node_tree_with_menus($$$$)
# check consistency between node pointer and node entries menu order
if ($node->{'extra'}->{'normalized'} ne 'Top') {
foreach my $direction (@node_directions) {
- if
($configuration_informations->get_conf('CHECK_NORMAL_MENU_STRUCTURE')
+ if ($configuration_information->get_conf('CHECK_NORMAL_MENU_STRUCTURE')
and $node->{'structure'}->{'node_'.$direction}
and $node->{'structure'}->{'menu_'.$direction}
and $node->{'structure'}->{'menu_'.$direction}
ne $node->{'structure'}->{'node_'.$direction}
and not
$node->{'structure'}->{'menu_'.$direction}->{'extra'}->{'manual_content'}) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("node %s pointer for `%s' is `%s' but %s is `%s' in
menu"),
$direction,
node_extra_to_texi($node->{'extra'}),
@@ -666,7 +666,7 @@ sub complete_node_tree_with_menus($$$$)
}
# check for node up / menu up mismatch
- if ($configuration_informations->get_conf('CHECK_NORMAL_MENU_STRUCTURE')
+ if ($configuration_information->get_conf('CHECK_NORMAL_MENU_STRUCTURE')
and $node->{'structure'}->{'node_up'}
# No check if node up is an external manual
and (!$node->{'structure'}->{'node_up'}->{'extra'}->{'manual_content'})
@@ -675,7 +675,7 @@ sub complete_node_tree_with_menus($$$$)
# check if up node has a menu
if ($node->{'structure'}->{'node_up'}->{'extra'}->{'menus'}
and @{$node->{'structure'}->{'node_up'}->{'extra'}->{'menus'}}) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(
__("node `%s' lacks menu item for `%s' despite being its Up
target"),
node_extra_to_texi($node->{'structure'}->{'node_up'}->{'extra'}),
@@ -693,8 +693,8 @@ sub complete_node_tree_with_menus($$$$)
sub nodes_tree($$$$$)
{
my $registrar = shift;
- my $configuration_informations = shift;
- my $parser_informations = shift;
+ my $configuration_information = shift;
+ my $parser_information = shift;
my $nodes_list = shift;
my $labels = shift;
return undef unless ($nodes_list and @{$nodes_list});
@@ -762,10 +762,10 @@ sub nodes_tree($$$$$)
= $labels->{$node_direction->{'normalized'}};
$node->{'structure'}->{'node_'.$direction} = $node_target;
- if (!$configuration_informations->get_conf('novalidate')
+ if (!$configuration_information->get_conf('novalidate')
and !_check_node_same_texinfo_code($node_target,
$node_direction)) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(
__("%s pointer `%s' (for node `%s') different from %s name
`%s'"),
$direction_texts{$direction},
@@ -776,10 +776,10 @@ sub nodes_tree($$$$$)
$node->{'line_nr'});
}
} else {
- if ($configuration_informations->get_conf('novalidate')) {
+ if ($configuration_information->get_conf('novalidate')) {
$node->{'structure'}->{'node_'.$direction} = { 'extra' =>
$node_direction };
} else {
- $registrar->line_error($configuration_informations,
+ $registrar->line_error($configuration_information,
sprintf(__("%s reference to nonexistent `%s'"),
$direction_texts{$direction},
node_extra_to_texi($node_direction)),
@@ -1009,7 +1009,7 @@ sub _tree_unit_node($)
# other root elements could probably be used, in theory.
sub elements_directions($$$)
{
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $labels = shift;
my $tree_units = shift;
return if (!$tree_units or !@$tree_units);
@@ -1142,7 +1142,7 @@ sub elements_directions($$$)
}
# Use node up for Up if there is no section up.
# Not done in the default case.
- if ($configuration_informations->get_conf('USE_UP_NODE_FOR_ELEMENT_UP')
+ if ($configuration_information->get_conf('USE_UP_NODE_FOR_ELEMENT_UP')
and !$directions->{'Up'} and defined($node)
and $node->{'structure'}->{'node_up'}
and (!$node_top or ($node ne $node_top))) {
@@ -1158,7 +1158,7 @@ sub elements_directions($$$)
$tree_unit->{'structure'}->{'directions'} = $directions;
}
}
- if ($configuration_informations->get_conf('DEBUG')) {
+ if ($configuration_information->get_conf('DEBUG')) {
foreach my $tree_unit (@$tree_units) {
print STDERR "Directions($tree_unit): "
. print_element_directions($tree_unit)."\n";
@@ -1287,8 +1287,8 @@ sub print_element_directions($)
sub associate_internal_references($$$$$)
{
my $registrar = shift;
- my $configuration_informations = shift;
- my $parser_informations = shift;
+ my $configuration_information = shift;
+ my $parser_information = shift;
my $labels = shift;
my $refs = shift;
@@ -1316,8 +1316,8 @@ sub associate_internal_references($$$$$)
$node_arg->{'normalized'} = $normalized;
}
if (!defined($labels->{$node_arg->{'normalized'}})) {
- if (!$configuration_informations->get_conf('novalidate')) {
- $registrar->line_error($configuration_informations,
+ if (!$configuration_information->get_conf('novalidate')) {
+ $registrar->line_error($configuration_information,
sprintf(__("\@%s reference to nonexistent node `%s'"),
$ref->{'cmdname'}, node_extra_to_texi($node_arg)),
$ref->{'line_nr'});
@@ -1325,9 +1325,9 @@ sub associate_internal_references($$$$$)
} else {
my $node_target = $labels->{$node_arg->{'normalized'}};
$ref->{'extra'}->{'label'} = $node_target;
- if (!$configuration_informations->get_conf('novalidate')
+ if (!$configuration_information->get_conf('novalidate')
and !_check_node_same_texinfo_code($node_target, $node_arg)) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("\@%s to `%s', different from %s name `%s'"),
$ref->{'cmdname'},
node_extra_to_texi($node_arg),
@@ -1566,11 +1566,11 @@ sub _sort_index_entries($$)
sub setup_index_entry_keys_formatting($)
{
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $options = {'sort_string' => 1, 'ascii_punctuation' => 1,
Texinfo::Convert::Text::copy_options_for_convert_text(
- $configuration_informations)};
+ $configuration_information)};
return $options;
}
@@ -1614,11 +1614,11 @@ sub index_entry_sort_string($$$$)
sub sort_indices($$$;$)
{
my $registrar = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $index_entries = shift;
my $sort_by_letter = shift;
- my $options = setup_index_entry_keys_formatting($configuration_informations);
+ my $options = setup_index_entry_keys_formatting($configuration_information);
my $sorted_index_entries;
my $index_entries_sort_strings = {};
foreach my $index_name (keys(%$index_entries)) {
@@ -1632,7 +1632,7 @@ sub sort_indices($$$;$)
$entry->{'sortas'}, $options);
$index_entries_sort_strings->{$entry} = $entry_key;
if ($entry_key !~ /\S/) {
- $registrar->line_warn($configuration_informations,
+ $registrar->line_warn($configuration_information,
sprintf(__("empty index key in \@%s"),
$entry->{'index_at_command'}),
$entry->{'command'}->{'line_nr'});
@@ -1704,15 +1704,15 @@ Texinfo::Structuring - information on Texinfo::Parser
tree
my $registrar = $parser->registered_errors();
my $sections_root = sectioning_structure ($registrar, $config, $tree);
my ($labels, $targets_list, $nodes_list) = $parser->labels_information();
- my $parser_informations = $parser->global_informations();
+ my $parser_information = $parser->global_information();
my $global_commands = $parser->global_commands_information();
- set_menus_node_directions($registrar, $config, $parser_informations,
+ set_menus_node_directions($registrar, $config, $parser_information,
$global_commands, $nodes_list, $labels);
- my $top_node = nodes_tree($registrar, $config, $parser_informations,
$nodes_list, $labels);
+ my $top_node = nodes_tree($registrar, $config, $parser_information,
$nodes_list, $labels);
complete_node_tree_with_menus($registrar, $config, $nodes_list, $top_node);
my $refs = $parser->internal_references_information();
check_nodes_are_referenced($registrar, $config, $nodes_list, $top_node,
$labels, $refs);
- associate_internal_references($registrar, $parser, $parser_informations,
$labels, $refs);
+ associate_internal_references($registrar, $parser, $parser_information,
$labels, $refs);
number_floats($parser->floats_information());
my $tree_units;
if ($split_at_nodes) {
@@ -1739,8 +1739,8 @@ Texinfo::Structuring - information on Texinfo::Parser tree
=head1 DESCRIPTION
-Texinfo::Structuring first allows to collect informations on a Texinfo tree.
-In most case, it also requires informations from a parser object to do that
+Texinfo::Structuring first allows to collect information on a Texinfo tree.
+In most case, it also requires information from a parser object to do that
job. Thanks to C<sectioning_structure> the hierarchy of sectioning commands is
determined. The directions implied by menus are determined with
C<set_menus_node_directions>. The node tree is analysed with C<nodes_tree>.
@@ -1783,7 +1783,7 @@ labels or refs are obtained from a parser, see
L<Texinfo::Parser>.
=over
-=item associate_internal_references($registrar, $configuration_informations,
$parser_informations, $labels, $refs)
+=item associate_internal_references($registrar, $configuration_information,
$parser_information, $labels, $refs)
Verify that internal references (C<@ref> and similar without
fourth of fifth argument) have an associated node, anchor or float.
@@ -1791,7 +1791,7 @@ Set the C<label> key in the C<extra> hash of the
reference tree
element to the associated labeled tree element. Register errors
in I<$registrar>.
-=item check_nodes_are_referenced($registrar, $configuration_informations,
$nodes_list, $top_node, $labels, $refs)
+=item check_nodes_are_referenced($registrar, $configuration_information,
$nodes_list, $top_node, $labels, $refs)
Check that all the nodes are referenced (in menu, @*ref or node direction).
Register errors in I<$registrar>.
@@ -1799,13 +1799,13 @@ Register errors in I<$registrar>.
Should be called after C<complete_node_tree_with_menus> in order to
have the autogenerated menus available.
-=item complete_node_tree_with_menus($registrar, $configuration_informations,
$nodes_list, $top_node)
+=item complete_node_tree_with_menus($registrar, $configuration_information,
$nodes_list, $top_node)
Complete nodes directions with menu directions. Check consistency
of menus, sectionning and nodes direction structures.
Register errors in I<$registrar>.
-=item elements_directions($configuration_informations, $labels, $tree_units)
+=item elements_directions($configuration_information, $labels, $tree_units)
Directions are set up for the tree unit elements in the array reference
I<$tree_units> given in argument. The corresponding hash is in
@@ -1898,11 +1898,11 @@ that can be used to gather information. I<$sortas> can
be given to
override the sort string (typically obtained from C<@sortas>). The
I<$options> are options used for Texinfo to text conversion for
the generation of the sort string, typically obtained from
-L<setup_index_entry_keys_formatting|/$option =
setup_index_entry_keys_formatting($configuration_informations)>.
+L<setup_index_entry_keys_formatting|/$option =
setup_index_entry_keys_formatting($configuration_information)>.
=item $merged_entries = merge_indices($index_names)
-Using informations returned by L<Texinfo::Parser/indices_information>,
+Using information returned by L<Texinfo::Parser/indices_information>,
a structure holding all the index entries by index name is returned,
with all the entries of merged indices merged with those of the indice
merged into.
@@ -1927,7 +1927,7 @@ is set, use section names instead of node names in menu.
Returns the texinfo tree corresponding to a single menu entry pointing to
I<$node>. If I<$use_sections> is set, use the section name instead of node
name.
-=item $top_node = nodes_tree($registrar, $configuration_informations,
$parser_informations, $nodes_list, $labels)
+=item $top_node = nodes_tree($registrar, $configuration_information,
$parser_information, $nodes_list, $labels)
Goes through nodes and set directions. Returns the top
node. Register errors in I<$registrar>.
@@ -1958,7 +1958,7 @@ Return the sectioning command name corresponding to the
sectioning
element I<$element>, adjusted in order to take into account raised
and lowered sections, when needed.
-=item $sections_root, $sections_list = sectioning_structure($registrar,
$configuration_informations, $tree)
+=item $sections_root, $sections_list = sectioning_structure($registrar,
$configuration_information, $tree)
This function goes through the tree and gather information on
the document structure for sectioning commands. It returns I<$sections_root>
@@ -2003,7 +2003,7 @@ account C<@part> elements.
=back
-=item set_menus_node_directions($registrar, $configuration_informations,
$parser_informations, $global_commands, $nodes_list, $labels);
+=item set_menus_node_directions($registrar, $configuration_information,
$parser_information, $global_commands, $nodes_list, $labels);
Goes through menu and set directions. Register errors in I<$registrar>.
@@ -2025,11 +2025,11 @@ Up, next and previous directions as set in menus.
=back
-=item $option = setup_index_entry_keys_formatting($configuration_informations)
+=item $option = setup_index_entry_keys_formatting($configuration_information)
Return options for conversion of Texinfo to text relevant for index keys
sorting.
-=item ($index_entries_sorted, $index_entries_sort_strings) =
sort_indices($registrar, $configuration_informations, $merged_index_entries,
$sort_by_letter)
+=item ($index_entries_sorted, $index_entries_sort_strings) =
sort_indices($registrar, $configuration_information, $merged_index_entries,
$sort_by_letter)
If I<$sort_by_letter> is set, sort by letter, otherwise sort all
entries together. In both cases, a hash reference with index names
@@ -2110,7 +2110,7 @@ No splitting, only one page is returned, holding all the
tree units.
=back
-=item warn_non_empty_parts($registrar, $configuration_informations,
$global_commands)
+=item warn_non_empty_parts($registrar, $configuration_information,
$global_commands)
Register a warning in I<$registrar> for each C<@part> that is not empty
in I<$global_commands> information (typically obtained by calling
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index fd2017f2b3..d6569ff448 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -760,7 +760,7 @@ sub _protect_hashchar_at_line_beginning($$$)
my $current = shift;
my $argument = shift;
- my ($registrar, $configuration_informations) = @$argument;
+ my ($registrar, $configuration_information) = @$argument;
#print STDERR "$type $current ".debug_print_element($current)."\n";
# if the next is a hash character at line beginning, mark it
@@ -804,7 +804,7 @@ sub _protect_hashchar_at_line_beginning($$$)
while ($parent) {
if ($parent->{'cmdname'} and $parent->{'line_nr'}) {
if ($registrar) {
- $registrar->line_warn($configuration_informations, sprintf(__(
+ $registrar->line_warn($configuration_information, sprintf(__(
"could not protect hash character in \@%s"),
$parent->{'cmdname'}), $parent->{'line_nr'});
}
@@ -830,11 +830,11 @@ sub _protect_hashchar_at_line_beginning($$$)
sub protect_hashchar_at_line_beginning($$$)
{
my $registrar = shift;
- my $configuration_informations = shift;
+ my $configuration_information = shift;
my $tree = shift;
return Texinfo::Common::modify_tree($tree,
\&_protect_hashchar_at_line_beginning,
- [$registrar,
$configuration_informations]);
+ [$registrar,
$configuration_information]);
}
1;
@@ -922,7 +922,7 @@ C<$add_section_names_in_entries> argument is set, a menu
entry
name is added using the section name. This function should be
called after L<sectioning_structure>.
-=item protect_hashchar_at_line_beginning($registrar,
$configuration_informations, $tree)
+=item protect_hashchar_at_line_beginning($registrar,
$configuration_information, $tree)
Protect hash (#) character at the beginning of line such that they would
not be considered as lines to be processed by the CPP processor.
diff --git a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
index 7e0ce674b6..108495385e 100644
--- a/tp/Texinfo/XS/parsetexi/Parsetexi.pm
+++ b/tp/Texinfo/XS/parsetexi/Parsetexi.pm
@@ -168,8 +168,8 @@ sub _get_error_registrar($)
$self->{'registrar'} = Texinfo::Report::new();
}
my $registrar = $self->{'registrar'};
- my $configuration_informations = $self;
- return $registrar, $configuration_informations;
+ my $configuration_information = $self;
+ return $registrar, $configuration_information;
}
# done after all the parsings. Part may not make much sense for
parse_texi_line,
@@ -220,8 +220,8 @@ sub parse_texi_file ($$)
my $status = parse_file ($file_name);
if ($status) {
- my ($registrar, $configuration_informations) = _get_error_registrar($self);
- $registrar->document_error($configuration_informations,
+ my ($registrar, $configuration_information) = _get_error_registrar($self);
+ $registrar->document_error($configuration_information,
sprintf(__("could not open %s: %s"), $file_name, $!));
return undef;
}
@@ -250,17 +250,17 @@ sub parse_texi_file ($$)
sub _get_errors($)
{
my $self = shift;
- my ($registrar, $configuration_informations) = _get_error_registrar($self);
+ my ($registrar, $configuration_information) = _get_error_registrar($self);
my $ERRORS;
my $tree_stream = dump_errors();
eval $tree_stream;
for my $error (@{$ERRORS}) {
if ($error->{'type'} eq 'error') {
- $registrar->line_error ($configuration_informations,
+ $registrar->line_error ($configuration_information,
$error->{'message'}, $error->{'line_nr'});
} else {
- $registrar->line_warn ($configuration_informations,
+ $registrar->line_warn ($configuration_information,
$error->{'message'}, $error->{'line_nr'});
}
}
@@ -383,7 +383,7 @@ sub global_commands_information($)
return $self->{'commands_info'};
}
-sub global_informations($)
+sub global_information($)
{
my $self = shift;
return $self->{'info'};
diff --git a/tp/Texinfo/XS/parsetexi/api.c b/tp/Texinfo/XS/parsetexi/api.c
index dbe5a8f121..a640096ad6 100644
--- a/tp/Texinfo/XS/parsetexi/api.c
+++ b/tp/Texinfo/XS/parsetexi/api.c
@@ -931,7 +931,7 @@ build_index_data (void)
/* Return object to be used as $self->{'info'} in the Perl code, retrievable
- with the 'global_informations' function. */
+ with the 'global_information' function. */
HV *
build_global_info (void)
{
diff --git a/tp/maintain/template.pod b/tp/maintain/template.pod
index 601759af22..03cb02303a 100644
--- a/tp/maintain/template.pod
+++ b/tp/maintain/template.pod
@@ -33,7 +33,7 @@ described in the Texinfo manual. Those options, when
appropriate,
override the document content. The parser should not be available
directly anymore after getting the associated information.
-See L<Texinfo::Convert::Converter> for more informations.
+See L<Texinfo::Convert::Converter> for more information.
=item $converter->output($tree)
diff --git a/tp/t/README b/tp/t/README
index 129877b91e..0869cc9de7 100644
--- a/tp/t/README
+++ b/tp/t/README
@@ -52,8 +52,8 @@ change any of the output, one way to check this would be to
run "make
check" and then "grep FAIL test-suite.log | grep -v 'tree$'".
The tests output on STDERR are not checked, it is possible to look
-for surious output on STDERR in addition to the header and a few
-informations after "make check" with:
+for surious output on STDERR in addition to the header and
+information after "make check" with:
grep -v -e '^ok [0-9]\+' -e '^PASS:' -e '^SKIP:' -e '1\.\.[0-9]\+$' t/*.log
diff --git a/tp/t/automatic_menus.t b/tp/t/automatic_menus.t
index c030819ce5..6202e7abd9 100644
--- a/tp/t/automatic_menus.t
+++ b/tp/t/automatic_menus.t
@@ -26,10 +26,10 @@ sub test($$$;$)
my $tree = $parser->parse_texi_text($in);
my $registrar = $parser->registered_errors();
my ($labels, $targets_list, $nodes_list) = $parser->labels_information();
- my $parser_informations = $parser->global_informations();
+ my $parser_information = $parser->global_information();
my $refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar, $parser,
- $parser_informations, $labels, $refs);
+ $parser_information, $labels, $refs);
my ($sectioning_root, $sections_list)
= Texinfo::Structuring::sectioning_structure($registrar,
$parser, $tree);
diff --git a/tp/t/automatic_nodes.t b/tp/t/automatic_nodes.t
index 29143a3992..3210ebe923 100644
--- a/tp/t/automatic_nodes.t
+++ b/tp/t/automatic_nodes.t
@@ -26,10 +26,10 @@ sub test_new_node($$$$)
my $node_tree = $parser->parse_texi_line ($in);
my $registrar = $parser->registered_errors();
my ($labels, $targets_list, $nodes_list) = $parser->labels_information();
- my $parser_informations = $parser->global_informations();
+ my $parser_information = $parser->global_information();
my $refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar, $parser,
- $parser_informations, $labels, $refs);
+ $parser_information, $labels, $refs);
# $labels, $nodes_list, $targets_list are modified
my $node = Texinfo::Transformations::_new_node($node_tree, $nodes_list,
$targets_list, $labels);
@@ -39,7 +39,7 @@ sub test_new_node($$$$)
$texi_result = Texinfo::Convert::Texinfo::convert_to_texinfo($node);
my $refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar, $parser,
- $parser_informations, $labels, $refs);
+ $parser_information, $labels, $refs);
$normalized = $node->{'extra'}->{'normalized'};
my @labels = sort(keys(%$labels));
if (scalar(@labels) != 1) {
@@ -80,10 +80,10 @@ my $tree = $parser->parse_texi_piece('@node a node
my $line_tree = Texinfo::Parser::parse_texi_line (undef, 'a node');
my $registrar = $parser->registered_errors();
my ($labels, $targets_list, $nodes_list) = $parser->labels_information();
-my $parser_informations = $parser->global_informations();
+my $parser_information = $parser->global_information();
my $refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar, $parser,
- $parser_informations, $labels, $refs);
+ $parser_information, $labels, $refs);
my $node = Texinfo::Transformations::_new_node($line_tree, $nodes_list,
$targets_list, $labels);
is ('@node a node 1
@@ -157,10 +157,10 @@ Text.
$tree = $parser->parse_texi_text($sections_text);
$registrar = $parser->registered_errors();
($labels, $targets_list, $nodes_list) = $parser->labels_information();
- $parser_informations = $parser->global_informations();
+ $parser_information = $parser->global_information();
$refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar, $parser,
- $parser_informations, $labels, $refs);
+ $parser_information, $labels, $refs);
my ($new_content, $added_nodes)
= Texinfo::Transformations::insert_nodes_for_sectioning_commands($tree,
$nodes_list, $targets_list, $labels);
@@ -183,10 +183,10 @@ $tree = $parser->parse_texi_text('@node Top
');
$registrar = $parser->registered_errors();
($labels, $targets_list, $nodes_list) = $parser->labels_information();
-$parser_informations = $parser->global_informations();
+$parser_information = $parser->global_information();
$refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar, $parser,
- $parser_informations, $labels, $refs);
+ $parser_information, $labels, $refs);
($new_content, $added_nodes)
= Texinfo::Transformations::insert_nodes_for_sectioning_commands($tree,
$nodes_list, $targets_list, $labels);
diff --git a/tp/t/do_master_menu.t b/tp/t/do_master_menu.t
index 5afc07f89f..95db9ae5bc 100644
--- a/tp/t/do_master_menu.t
+++ b/tp/t/do_master_menu.t
@@ -126,10 +126,10 @@ my $parser = Texinfo::Parser::parser();
my $tree = $parser->parse_texi_piece($in_detailmenu);
my $registrar = $parser->registered_errors();
my ($labels, $targets_list, $nodes_list) = $parser->labels_information();
-my $parser_informations = $parser->global_informations();
+my $parser_information = $parser->global_information();
my $refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar, $parser,
- $parser_informations, $labels, $refs);
+ $parser_information, $labels, $refs);
my $master_menu = Texinfo::Transformations::new_master_menu($parser, $labels);
my $out = Texinfo::Convert::Texinfo::convert_to_texinfo($master_menu);
@@ -171,10 +171,10 @@ $parser = Texinfo::Parser::parser();
$tree = $parser->parse_texi_piece($no_detailmenu);
$registrar = $parser->registered_errors();
($labels, $targets_list, $nodes_list) = $parser->labels_information();
-$parser_informations = $parser->global_informations();
+$parser_information = $parser->global_information();
$refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar, $parser,
- $parser_informations, $labels, $refs);
+ $parser_information, $labels, $refs);
$master_menu = Texinfo::Transformations::new_master_menu($parser, $labels);
$out = Texinfo::Convert::Texinfo::convert_to_texinfo($master_menu);
is ($out, $reference, 'master menu no detailmenu');
@@ -183,10 +183,10 @@ $parser = Texinfo::Parser::parser();
$tree = $parser->parse_texi_piece($in_detailmenu);
$registrar = $parser->registered_errors();
($labels, $targets_list, $nodes_list) = $parser->labels_information();
-$parser_informations = $parser->global_informations();
+$parser_information = $parser->global_information();
$refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar, $parser,
- $parser_informations, $labels, $refs);
+ $parser_information, $labels, $refs);
Texinfo::Transformations::regenerate_master_menu($parser, $labels);
$out = Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
@@ -198,10 +198,10 @@ $parser = Texinfo::Parser::parser();
$tree = $parser->parse_texi_piece($no_detailmenu);
$registrar = $parser->registered_errors();
($labels, $targets_list, $nodes_list) = $parser->labels_information();
-$parser_informations = $parser->global_informations();
+$parser_information = $parser->global_information();
$refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar, $parser,
- $parser_informations, $labels, $refs);
+ $parser_information, $labels, $refs);
Texinfo::Transformations::regenerate_master_menu($parser, $labels);
$out = Texinfo::Convert::Texinfo::convert_to_texinfo($tree);
diff --git a/tp/t/input_files/topic_guide.texi
b/tp/t/input_files/topic_guide.texi
index ea92e7b5ce..465ab52d47 100644
--- a/tp/t/input_files/topic_guide.texi
+++ b/tp/t/input_files/topic_guide.texi
@@ -27,7 +27,7 @@ This is the guide for an easy use.
This is topic 1.
@menu
-More informations
+More information
* guide1:: guide 1
@end menu
@@ -37,7 +37,7 @@ More informations
This is topic 2
@menu
-More informations
+More information
* guide1:: guide 1
@end menu
@@ -47,7 +47,7 @@ More informations
This is topic 3
@menu
-More informations
+More information
@end menu
@@ -56,7 +56,7 @@ More informations
This is topic 4
@menu
-More informations
+More information
* guide2:: guide 2
@end menu
@@ -66,7 +66,7 @@ More informations
This is topic 5
@menu
-More informations
+More information
* guide1:: guide 1
* guide2:: guide 2
diff --git a/tp/t/results/sectioning/topic_guide.pl
b/tp/t/results/sectioning/topic_guide.pl
index a8d1a789eb..6c171953af 100644
--- a/tp/t/results/sectioning/topic_guide.pl
+++ b/tp/t/results/sectioning/topic_guide.pl
@@ -703,7 +703,7 @@ $result_trees{'topic_guide'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'More informations
+ 'text' => 'More information
'
},
{
@@ -937,7 +937,7 @@ $result_trees{'topic_guide'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'More informations
+ 'text' => 'More information
'
},
{
@@ -1177,7 +1177,7 @@ $result_trees{'topic_guide'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'More informations
+ 'text' => 'More information
'
},
{
@@ -1336,7 +1336,7 @@ $result_trees{'topic_guide'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'More informations
+ 'text' => 'More information
'
},
{
@@ -1559,7 +1559,7 @@ $result_trees{'topic_guide'} = {
'contents' => [
{
'parent' => {},
- 'text' => 'More informations
+ 'text' => 'More information
'
},
{
@@ -2391,7 +2391,7 @@ This is the guide for an easy use.
This is topic 1.
@menu
-More informations
+More information
* guide1:: guide 1
@end menu
@@ -2401,7 +2401,7 @@ More informations
This is topic 2
@menu
-More informations
+More information
* guide1:: guide 1
@end menu
@@ -2411,7 +2411,7 @@ More informations
This is topic 3
@menu
-More informations
+More information
@end menu
@@ -2420,7 +2420,7 @@ More informations
This is topic 4
@menu
-More informations
+More information
* guide2:: guide 2
@end menu
@@ -2430,7 +2430,7 @@ More informations
This is topic 5
@menu
-More informations
+More information
* guide1:: guide 1
* guide2:: guide 2
@@ -2471,34 +2471,34 @@ This is the guide for an easy use.
This is topic 1.
-More informations
+More information
* guide1:: guide 1
This is topic 2
-More informations
+More information
* guide1:: guide 1
This is topic 3
-More informations
+More information
This is topic 4
-More informations
+More information
* guide2:: guide 2
This is topic 5
-More informations
+More information
* guide1:: guide 1
* guide2:: guide 2
diff --git a/tp/t/results/sectioning/topic_guide/res_html/topic1.html
b/tp/t/results/sectioning/topic_guide/res_html/topic1.html
index cf1eb6b214..b5d3a24fa2 100644
--- a/tp/t/results/sectioning/topic_guide/res_html/topic1.html
+++ b/tp/t/results/sectioning/topic_guide/res_html/topic1.html
@@ -33,7 +33,7 @@ Next: <a href="topic2.html" accesskey="n"
rel="next">topic2</a> </p>
<p>This is topic 1.
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">More informations
+<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">More information
</pre></th></tr><tr><td align="left" valign="top">• <a href="guide1.html"
accesskey="1">guide1</a>:</td><td> </td><td align="left"
valign="top">guide 1
</td></tr>
diff --git a/tp/t/results/sectioning/topic_guide/res_html/topic2.html
b/tp/t/results/sectioning/topic_guide/res_html/topic2.html
index c9b33658be..a5a67b0219 100644
--- a/tp/t/results/sectioning/topic_guide/res_html/topic2.html
+++ b/tp/t/results/sectioning/topic_guide/res_html/topic2.html
@@ -34,7 +34,7 @@ Next: <a href="topic3.html" accesskey="n"
rel="next">topic3</a>, Previous: <a hr
<p>This is topic 2
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">More informations
+<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">More information
</pre></th></tr><tr><td align="left" valign="top">• <a href="guide1.html"
accesskey="1">guide1</a>:</td><td> </td><td align="left"
valign="top">guide 1
</td></tr>
diff --git a/tp/t/results/sectioning/topic_guide/res_html/topic3.html
b/tp/t/results/sectioning/topic_guide/res_html/topic3.html
index bba75075b8..758bbd9ec3 100644
--- a/tp/t/results/sectioning/topic_guide/res_html/topic3.html
+++ b/tp/t/results/sectioning/topic_guide/res_html/topic3.html
@@ -34,7 +34,7 @@ Next: <a href="topic5.html" accesskey="n"
rel="next">topic5</a>, Previous: <a hr
<p>This is topic 3
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">More informations
+<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">More information
</pre></th></tr></table>
diff --git a/tp/t/results/sectioning/topic_guide/res_html/topic4.html
b/tp/t/results/sectioning/topic_guide/res_html/topic4.html
index 6f56047a0a..87a7000d79 100644
--- a/tp/t/results/sectioning/topic_guide/res_html/topic4.html
+++ b/tp/t/results/sectioning/topic_guide/res_html/topic4.html
@@ -34,7 +34,7 @@ Previous: <a href="topic5.html" accesskey="p"
rel="prev">topic5</a>, Up: <a href
<p>This is topic 4
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">More informations
+<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">More information
</pre></th></tr><tr><td align="left" valign="top">• <a href="guide2.html"
accesskey="1">guide2</a>:</td><td> </td><td align="left"
valign="top">guide 2
</td></tr>
diff --git a/tp/t/results/sectioning/topic_guide/res_html/topic5.html
b/tp/t/results/sectioning/topic_guide/res_html/topic5.html
index 528b076e1a..34c34ffbc9 100644
--- a/tp/t/results/sectioning/topic_guide/res_html/topic5.html
+++ b/tp/t/results/sectioning/topic_guide/res_html/topic5.html
@@ -33,7 +33,7 @@ Previous: <a href="topic3.html" accesskey="p"
rel="prev">topic3</a> </p>
<p>This is topic 5
</p>
<table class="menu" border="0" cellspacing="0">
-<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">More informations
+<tr><th colspan="3" align="left" valign="top"><pre
class="menu-comment-preformatted">More information
</pre></th></tr><tr><td align="left" valign="top">• <a href="guide1.html"
accesskey="1">guide1</a>:</td><td> </td><td align="left"
valign="top">guide 1
</td></tr>
diff --git a/tp/t/results/sectioning/topic_guide/res_info/topic_guide.info
b/tp/t/results/sectioning/topic_guide/res_info/topic_guide.info
index c30c74df3c..7237c26da8 100644
--- a/tp/t/results/sectioning/topic_guide/res_info/topic_guide.info
+++ b/tp/t/results/sectioning/topic_guide/res_info/topic_guide.info
@@ -35,7 +35,7 @@ This is topic 1.
* Menu:
-More informations
+More information
* guide1:: guide 1
@@ -46,7 +46,7 @@ This is topic 2
* Menu:
-More informations
+More information
* guide1:: guide 1
@@ -57,7 +57,7 @@ This is topic 3
* Menu:
-More informations
+More information
@@ -67,7 +67,7 @@ This is topic 4
* Menu:
-More informations
+More information
* guide2:: guide 2
@@ -78,7 +78,7 @@ This is topic 5
* Menu:
-More informations
+More information
* guide1:: guide 1
* guide2:: guide 2
@@ -102,11 +102,11 @@ Tag Table:
Node: Top59
Node: guide1334
Node: topic1569
-Node: topic2691
-Node: topic3827
-Node: topic4944
-Node: topic51078
-Node: guide21218
+Node: topic2690
+Node: topic3825
+Node: topic4941
+Node: topic51074
+Node: guide21213
End Tag Table
diff --git a/tp/t/test_sort.t b/tp/t/test_sort.t
index 8371cd1767..cbc4660685 100644
--- a/tp/t/test_sort.t
+++ b/tp/t/test_sort.t
@@ -46,9 +46,9 @@ $tree = $parser->parse_texi_text('@node Top
my $registrar = $parser->registered_errors();
my ($index_names, $merged_indices) = $parser->indices_information();
my $index_entries = Texinfo::Structuring::merge_indices($index_names);
-my $parser_informations = $parser->global_informations();
+my $parser_information = $parser->global_information();
my $main_configuration = Texinfo::MainConfig::new({'ENABLE_ENCODING' => 1});
-Texinfo::Common::set_output_encodings($main_configuration,
$parser_informations);
+Texinfo::Common::set_output_encodings($main_configuration,
$parser_information);
my ($sorted_index_entries, $index_entries_sort_strings)
= Texinfo::Structuring::sort_indices($registrar, $main_configuration,
$index_entries);
diff --git a/tp/t/test_utils.pl b/tp/t/test_utils.pl
index e12e637baa..afa0ad87ca 100644
--- a/tp/t/test_utils.pl
+++ b/tp/t/test_utils.pl
@@ -907,9 +907,9 @@ sub test($$)
}
}
- my $parser_informations = $parser->global_informations();
+ my $parser_information = $parser->global_information();
- Texinfo::Common::set_output_encodings($main_configuration,
$parser_informations);
+ Texinfo::Common::set_output_encodings($main_configuration,
$parser_information);
my $global_commands = $parser->global_commands_information();
if ($global_commands->{'novalidate'}) {
@@ -920,28 +920,28 @@ sub test($$)
my $refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar,
$main_configuration,
- $parser_informations, $labels, $refs);
+ $parser_information, $labels, $refs);
my $floats = $parser->floats_information();
- my $structure_informations = {};
+ my $structure_information = {};
my ($sectioning_root, $sections_list)
= Texinfo::Structuring::sectioning_structure($registrar,
$main_configuration,
$result);
if ($sectioning_root) {
Texinfo::Structuring::warn_non_empty_parts($registrar, $main_configuration,
$global_commands);
- $structure_informations->{'sectioning_root'} = $sectioning_root;
- $structure_informations->{'sections_list'} = $sections_list;
+ $structure_information->{'sectioning_root'} = $sectioning_root;
+ $structure_information->{'sections_list'} = $sections_list;
}
Texinfo::Structuring::number_floats($floats);
Texinfo::Structuring::set_menus_node_directions($registrar,
$main_configuration,
- $parser_informations, $global_commands, $nodes_list,
$labels);
+ $parser_information, $global_commands, $nodes_list, $labels);
my $top_node = Texinfo::Structuring::nodes_tree($registrar,
$main_configuration,
- $parser_informations, $nodes_list,
$labels);
+ $parser_information, $nodes_list, $labels);
if (defined($top_node)) {
- $structure_informations->{'top_node'} = $top_node;
+ $structure_information->{'top_node'} = $top_node;
}
if (defined($nodes_list)) {
@@ -994,7 +994,7 @@ sub test($$)
my %converted;
my %converted_errors;
$converter_options = {} if (!defined($converter_options));
- $converter_options->{'structuring'} = $structure_informations;
+ $converter_options->{'structuring'} = $structure_information;
foreach my $format (@tested_formats) {
if (defined($formats{$format})) {
my $format_converter_options = {%$converter_options};
@@ -1052,7 +1052,7 @@ sub test($$)
if (!open (OUTFILE, ">$outfile")) {
warn "Open $outfile: $!\n";
} else {
- my $info = $parser->global_informations();
+ my $info = $parser->global_information();
if ($info and $info->{'perl_encoding'}) {
binmode(OUTFILE, ":encoding($info->{'perl_encoding'})");
}
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index 67d3f01728..c7262bb47e 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -391,8 +391,8 @@ my @prepend_dirs = ();
# $init_files_options are managed by Texinfo::Config, set by
# texinfo_set_from_init_file in init files.
#
-# There is in addition $parser_options for parser related informations
-# that are not set otherwise.
+# There is in addition $parser_options for parser related information
+# that is not gathered otherwise.
# The configuration values are later on copied over to the parser if
# they are parser options.
my $parser_options = {'values' => {'txicommandconditionals' => 1}};
@@ -1205,10 +1205,10 @@ while(@input_files) {
# needing access to the configuration information.
my $main_configuration = Texinfo::MainConfig::new();
- my $parser_informations = $parser->global_informations();
+ my $parser_information = $parser->global_information();
# encoding is needed for output files
# encoding and documentlanguage are needed for gdt() in
regenerate_master_menu
- Texinfo::Common::set_output_encodings($main_configuration,
$parser_informations);
+ Texinfo::Common::set_output_encodings($main_configuration,
$parser_information);
my $global_commands = $parser->global_commands_information();
if (not defined($main_configuration->get_conf('documentlanguage'))) {
my $element =
Texinfo::Common::set_global_document_command($main_configuration,
@@ -1283,20 +1283,20 @@ while(@input_files) {
my $refs = $parser->internal_references_information();
Texinfo::Structuring::associate_internal_references($registrar,
$main_configuration,
- $parser_informations, $labels, $refs);
- # filled with informations obtained through Texinfo::Structuring
+ $parser_information, $labels, $refs);
+ # information obtained through Texinfo::Structuring
# and usefull in converters.
# FIXME the keys are not documented anywhere. It is unclear where they
# should be documented.
- my $structure_informations = {};
+ my $structure_information = {};
# every format needs the sectioning structure
my ($sectioning_root, $sections_list)
= Texinfo::Structuring::sectioning_structure($registrar,
$main_configuration, $tree);
if ($sectioning_root) {
- $structure_informations->{'sectioning_root'} = $sectioning_root;
- $structure_informations->{'sections_list'} = $sections_list;
+ $structure_information->{'sectioning_root'} = $sectioning_root;
+ $structure_information->{'sections_list'} = $sections_list;
if (!$formats_table{$format}->{'no_warn_non_empty_parts'}) {
Texinfo::Structuring::warn_non_empty_parts($registrar,
$main_configuration,
$global_commands);
@@ -1326,13 +1326,13 @@ while(@input_files) {
if (not defined(get_conf('FORMAT_MENU'))
or get_conf('FORMAT_MENU') eq 'menu') {
Texinfo::Structuring::set_menus_node_directions($registrar,
- $main_configuration, $parser_informations, $global_commands,
+ $main_configuration, $parser_information, $global_commands,
$nodes_list, $labels);
}
$top_node = Texinfo::Structuring::nodes_tree($registrar,
$main_configuration,
- $parser_informations, $nodes_list, $labels);
+ $parser_information, $nodes_list, $labels);
if (defined($top_node)) {
- $structure_informations->{'top_node'} = $top_node;
+ $structure_information->{'top_node'} = $top_node;
}
if (not defined(get_conf('FORMAT_MENU'))
or get_conf('FORMAT_MENU') eq 'menu') {
@@ -1381,7 +1381,7 @@ while(@input_files) {
# for instance to have some consistent information for Structuring
# and Converters.
$converter_options->{'parser'} = $parser;
- $converter_options->{'structuring'} = $structure_informations;
+ $converter_options->{'structuring'} = $structure_information;
$converter_options->{'output_format'} = $format;
$converter_options->{'language_config_dirs'} = \@language_config_dirs;
unshift @{$converter_options->{'INCLUDE_DIRECTORIES'}},
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- branch master updated: Correct text and variable names using plural informations,
Patrice Dumas <=