branch master updated: * tp/Texinfo/Report.pm (format_line_message): change a translation context string.

[Patrice Dumas]

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 ec10ccb713 * tp/Texinfo/Report.pm (format_line_message): change a 
translation context string.
ec10ccb713 is described below

commit ec10ccb713fa1d3a0a62e913e0aff33245a0bab3
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Sun Feb 18 17:06:43 2024 +0100

    * tp/Texinfo/Report.pm (format_line_message): change a translation
    context string.
    
    * tp/Texinfo/Structuring.pm: set re => /a.
    
    Minor modifications of FIXME/TODO.
---
 ChangeLog                       |  9 +++++++++
 tp/Texinfo/Common.pm            |  2 +-
 tp/Texinfo/Convert/LaTeX.pm     |  4 ++--
 tp/Texinfo/Convert/Plaintext.pm |  4 ++--
 tp/Texinfo/Convert/Text.pm      |  4 +++-
 tp/Texinfo/ParserNonXS.pm       | 10 +++++-----
 tp/Texinfo/Report.pm            |  4 +---
 tp/Texinfo/Structuring.pm       |  8 +++-----
 tp/Texinfo/Transformations.pm   |  2 +-
 9 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 54642d4b74..1074271a79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-02-18  Patrice Dumas  <pertusus@free.fr>
+
+       * tp/Texinfo/Report.pm (format_line_message): change a translation
+       context string.
+
+       * tp/Texinfo/Structuring.pm: set re => /a.
+
+       Minor modifications of FIXME/TODO.
+
 2024-02-18  Patrice Dumas  <pertusus@free.fr>
 
        * tp/Texinfo/Convert/HTML.pm (url_protect_url_text)
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 127eed85c9..dde7b335ee 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -1730,7 +1730,7 @@ sub split_custom_heading_command_contents($)
   return $result;
 }
 
-# FIXME document?
+# TODO document?
 # currently untested/unused, but there is a similar function in XS that
 # is used.
 sub replace_element_in_contents($$$)
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 0c1069e530..cfe6b55596 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -3332,7 +3332,7 @@ sub _convert($$)
             # the table of content.  In that case, setup a text representation.
             $text_representation = '';
           }
-          # TODO: should translate
+          # TODO translation
           my $reference_result = '';
           if ($cmdname eq 'xref') {
             $reference_result = "See ";
@@ -3425,7 +3425,7 @@ sub _convert($$)
           # external ref
           # TODO hyper reference to manual file which seems to be implemented
           # in recent Texinfo TeX
-          # TODO: should translate
+          # TODO translation
           if ($cmdname eq 'xref') {
             $result .= "See ";
           } elsif ($cmdname eq 'pxref') {
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index bd7308f783..70a3136c8b 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -1227,7 +1227,7 @@ sub _compute_spaces_align_line($$$;$)
   return $spaces_prepended;
 }
 
-# TODO: $bytes_count return value is not needed anywheree
+# TODO $bytes_count return value is not needed anywhere
 sub _align_lines($$$$$$)
 {
   my ($self, $text_encoded, $max_column, $direction,
@@ -2507,7 +2507,7 @@ sub _convert($$)
 
           # Check if punctuation follows the ref command.
           #
-          # FIXME: is @xref really special here?  Original comment:
+          # FIXME is @xref really special here?  Original comment:
           # "If command is @xref, the punctuation must always follow the
           # command, for other commands it may be in the argument..."
 
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 1f6286c6ba..b620077696 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -158,7 +158,9 @@ sub _initialize_options_encoding($$)
   }
 }
 
-# TODO not documented.  Document?
+# TODO not documented.  Not generally useful, as it is called
+# in Texinfo::Convert::Converter to setup options that can be reused.
+#
 # $SELF is an object implementing get_conf, in general a converter.
 # Setup options as used by Texinfo::Convert::Text::convert_to_text
 # based on the converter information.
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 19ae4a1a0d..5be83bb764 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -3027,7 +3027,7 @@ sub _isolate_last_space
     $current->{'info'} = {} if (!$current->{'info'});
     $current->{'info'}->{'comment_at_end'}
                            = _pop_element_from_contents($self, $current);
-    # TODO: @c should probably not be allowed inside most brace commands
+    # TODO @c should probably not be allowed inside most brace commands
     # as this would be difficult to implement properly in TeX.
   }
 
@@ -4031,7 +4031,7 @@ sub _end_line_starting_block($$$)
         if ($content->{'type'} and $content->{'type'} eq 'bracketed_arg') {
           $max_columns++;
         } elsif ($content->{'text'}) {
-          # TODO: this should be a warning or an error - all prototypes
+          # TODO this should be a warning or an error - all prototypes
           # on a @multitable line should be in braces, as documented in the
           # Texinfo manual.
         } else {
@@ -4975,7 +4975,7 @@ sub _handle_macro($$$$$)
     if ($self->{'DEBUG'});
 
   my $error;
-  # FIXME use a different counter for linemacro?
+  # TODO use a different counter for linemacro?
   if ($self->{'MAX_MACRO_CALL_NESTING'}
       and $self->{'macro_expansion_nr'} > $self->{'MAX_MACRO_CALL_NESTING'}) {
     $self->_line_warn(sprintf(__(
@@ -4988,7 +4988,7 @@ sub _handle_macro($$$$$)
     foreach my $input (@{$self->{'input'}}[0..$#{$self->{'input'}}-1]) {
       if (defined($input->{'input_source_info'}->{'macro'})
           and $input->{'input_source_info'}->{'macro'} eq $command) {
-        # FIXME different message for linemacro?
+        # TODO different message for linemacro?
         $self->_line_error(sprintf(__(
        "recursive call of macro %s is not allowed; use \@rmacro if needed"),
                                    $command), $source_info);
@@ -5298,7 +5298,7 @@ sub _handle_other_command($$$$$)
 
     if ($in_heading_spec_commands{$command}) {
       # TODO use a more generic system for check of @-command nesting
-      # in command on context stack
+      # in command on context stack?
       my $top_context_command = $self->_top_context_command();
       if (not defined($top_context_command)
           or not $heading_spec_commands{$top_context_command}) {
diff --git a/tp/Texinfo/Report.pm b/tp/Texinfo/Report.pm
index 6af12df1d1..274f1e3ddf 100644
--- a/tp/Texinfo/Report.pm
+++ b/tp/Texinfo/Report.pm
@@ -97,9 +97,7 @@ sub format_line_message($$$$;$)
 
   if (defined($error_location_info->{'macro'})) {
     if ($type eq 'warning') {
-      # TODO change the context to "Texinfo source file warning in a macro"
-      # when nearing the release
-      $message_line = sprintf(__p("Texinfo source file warning",
+      $message_line = sprintf(__p("Texinfo source file warning in macro",
                                "warning: %s (possibly involving \@%s)")."\n",
                            $text, $error_location_info->{'macro'});
     } else {
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index 35b84774fb..e56cff7d23 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -30,11 +30,9 @@ use strict;
 # Can be used to check that there is no incorrect autovivfication
 # no autovivification qw(fetch delete exists store strict);
 
-# FIXME Could not do that before index sorting was in that file, probably
-# for uc().
 # stop \s from matching non-ASCII spaces, etc.  \p{...} can still be
 # used to match Unicode character classes.
-#use if $] >= 5.014, re => '/a';
+use if $] >= 5.014, re => '/a';
 
 use Carp qw(cluck confess);
 
@@ -1011,8 +1009,8 @@ sub complete_node_tree_with_menus($$$)
             $up_node->{'source_info'});
         }
       }
-      # FIXME check that the all the nodes are in a menu (except for Top)?
-      # FIXME check that node_up is not an external node (except for Top)?
+      # TODO check that the all the nodes are in a menu (except for Top)?
+      # TODO check that node_up is not an external node (except for Top)?
     }
   }
 }
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index 4323feda17..e93dfaa530 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -672,7 +672,7 @@ sub regenerate_master_menu($$;$)
           splice (@$global_detailmenu, $global_detailmenu_index, 1,
                   $new_master_menu);
         }
-        # FIXME use an API?
+        # FIXME use an API to register a new internal reference?
         my $internal_references = $document->internal_references_information();
         foreach my $detailmenu_entry (@{$entry->{'contents'}}) {
           if ($detailmenu_entry->{'type'}