[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[no subject]
|
From: |
Patrice Dumas |
|
Date: |
Sun, 5 May 2024 18:44:08 -0400 (EDT) |
branch: master
commit bcedc78d6193357cc448ad9df194e69bddb1c4e1
Author: Patrice Dumas <pertusus@free.fr>
AuthorDate: Mon May 6 00:43:58 2024 +0200
Update use use.
Replace require VERSION by use, do not use use vars, update use Perl
version to be 5.006 if our is used, use use warnings instead of $^W.
Remove %EXPORT_TAGS.
---
ChangeLog | 9 +++++++++
Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm | 10 +++-------
Pod-Simple-Texinfo/pod2texi.pl | 5 +++--
man/pod2texi.1 | 2 +-
tp/Texinfo/Common.pm | 13 +++++--------
tp/Texinfo/Convert/ConvertXS.pm | 3 +--
tp/Texinfo/Convert/Converter.pm | 13 +++++--------
tp/Texinfo/Convert/DocBook.pm | 8 +++-----
tp/Texinfo/Convert/HTML.pm | 7 +++----
tp/Texinfo/Convert/IXIN.pm | 7 +++----
tp/Texinfo/Convert/IXINSXML.pm | 7 +++----
tp/Texinfo/Convert/Info.pm | 7 +++----
tp/Texinfo/Convert/LaTeX.pm | 7 +++----
tp/Texinfo/Convert/NodeNameNormalization.pm | 13 +++++--------
tp/Texinfo/Convert/Paragraph.pm | 3 +--
tp/Texinfo/Convert/PlainTexinfo.pm | 11 +++++------
tp/Texinfo/Convert/Plaintext.pm | 7 +++----
tp/Texinfo/Convert/Texinfo.pm | 13 +++++--------
tp/Texinfo/Convert/TexinfoMarkup.pm | 7 +++----
tp/Texinfo/Convert/TexinfoSXML.pm | 7 +++----
tp/Texinfo/Convert/TexinfoXML.pm | 7 +++----
tp/Texinfo/Convert/Text.pm | 13 +++++--------
tp/Texinfo/Convert/TextContent.pm | 7 +++----
tp/Texinfo/Convert/Unicode.pm | 10 +++-------
tp/Texinfo/Convert/Utils.pm | 13 ++++++-------
tp/Texinfo/DebugTree.pm | 3 +--
tp/Texinfo/Indices.pm | 6 ++----
tp/Texinfo/ManipulateTree.pm | 13 +++++--------
tp/Texinfo/MiscXS.pm | 3 +--
tp/Texinfo/OutputUnits.pm | 13 +++++--------
tp/Texinfo/Parser.pm | 3 +--
tp/Texinfo/ParserNonXS.pm | 11 ++++-------
tp/Texinfo/Structuring.pm | 13 +++++--------
tp/Texinfo/Transformations.pm | 13 +++++--------
tp/Texinfo/Translations.pm | 4 +++-
tp/Texinfo/XSLoader.pm | 2 +-
tp/ext/highlight_syntax.pm | 2 +-
tp/ext/latex2html.pm | 2 +-
tp/maintain/regenerate_C_options_info.pl | 6 +-----
tp/maintain/regenerate_commands_perl_info.pl | 6 +-----
tp/maintain/regenerate_documentlanguages-iana.pl | 6 +-----
tp/maintain/regenerate_documentlanguages-loc.pl | 8 ++------
tp/maintain/regenerate_file_lists.pl | 7 ++-----
tp/maintain/regenerate_perl_options_info.pl | 6 +-----
tp/texi2any.pl | 3 +--
45 files changed, 134 insertions(+), 205 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ec28b315f3..18d59d59ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2024-05-05 Patrice Dumas <pertusus@free.fr>
+
+ Update use use.
+
+ Replace require VERSION by use, do not use use vars, update use Perl
+ version to be 5.006 if our is used, use use warnings instead of $^W.
+
+ Remove %EXPORT_TAGS.
+
2024-05-05 Patrice Dumas <pertusus@free.fr>
* doc/generate_html_doc_texi.pl: remove use re => '/a', there is no
diff --git a/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm
b/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm
index 4f5fef5d4a..95b9d086b5 100644
--- a/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm
+++ b/Pod-Simple-Texinfo/lib/Pod/Simple/Texinfo.pm
@@ -42,7 +42,7 @@
package Pod::Simple::Texinfo;
-require 5;
+use 5.006;
use strict;
#no autovivification qw(fetch delete exists store strict);
@@ -61,12 +61,8 @@ use Texinfo::Document;
use Texinfo::ManipulateTree;
use Texinfo::Transformations;
-use vars qw(
- @ISA $VERSION
-);
-
-@ISA = ('Pod::Simple::PullParser');
-$VERSION = '0.01';
+our @ISA = qw(Pod::Simple::PullParser);
+our $VERSION = '0.01';
# Allows being called from the command line as
# perl -w -MPod::Simple::Texinfo -e Pod::Simple::Texinfo::go thingy.pod
diff --git a/Pod-Simple-Texinfo/pod2texi.pl b/Pod-Simple-Texinfo/pod2texi.pl
index 27e7e84497..1d739db18c 100755
--- a/Pod-Simple-Texinfo/pod2texi.pl
+++ b/Pod-Simple-Texinfo/pod2texi.pl
@@ -17,6 +17,8 @@
#
# Original author: Patrice Dumas <pertusus@free.fr>
+use 5.006;
+
use strict;
use Getopt::Long qw(GetOptions);
# for fileparse.
@@ -122,8 +124,7 @@ use Texinfo::Transformations;
# any output.
package Pod::Simple::PullParserRun;
-use vars qw(@ISA);
-@ISA = ('Pod::Simple::PullParser');
+our @ISA = qw(Pod::Simple::PullParser);
sub new
{
return shift->SUPER::new(@_);
diff --git a/man/pod2texi.1 b/man/pod2texi.1
index 368e502265..62411239e2 100644
--- a/man/pod2texi.1
+++ b/man/pod2texi.1
@@ -55,7 +55,7 @@
.\" ========================================================================
.\"
.IX Title "POD2TEXI 1"
-.TH POD2TEXI 1 2024-04-17 perl "User Contributed Perl Documentation"
+.TH POD2TEXI 1 2024-05-05 perl "User Contributed Perl Documentation"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
diff --git a/tp/Texinfo/Common.pm b/tp/Texinfo/Common.pm
index 28dd559338..abefbd0957 100644
--- a/tp/Texinfo/Common.pm
+++ b/tp/Texinfo/Common.pm
@@ -48,25 +48,22 @@ use Texinfo::Commands;
use Texinfo::Options;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
collect_commands_in_tree
collect_commands_list_in_tree
valid_customization_option
valid_tree_transformation
-) ] );
-
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+);
# This is where the Texinfo modules get access to __( without explicit
# import.
-@EXPORT = qw(
+our @EXPORT = qw(
__ __p
);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
# i18n
# For the messages translations.
diff --git a/tp/Texinfo/Convert/ConvertXS.pm b/tp/Texinfo/Convert/ConvertXS.pm
index 0a0faaf02b..f6d5d3b16b 100644
--- a/tp/Texinfo/Convert/ConvertXS.pm
+++ b/tp/Texinfo/Convert/ConvertXS.pm
@@ -17,8 +17,7 @@ package Texinfo::Convert::ConvertXS;
# This package loads XS implementations of converter functions.
-# same as texi2any.pl
-use 5.00405;
+use 5.006;
use strict;
use warnings;
diff --git a/tp/Texinfo/Convert/Converter.pm b/tp/Texinfo/Convert/Converter.pm
index 3eb589603d..e248eaa707 100644
--- a/tp/Texinfo/Convert/Converter.pm
+++ b/tp/Texinfo/Convert/Converter.pm
@@ -19,7 +19,7 @@
package Texinfo::Convert::Converter;
-use 5.00405;
+use 5.006;
use strict;
# To check if there is no erroneous autovivification
@@ -54,19 +54,16 @@ use Texinfo::OutputUnits;
use Texinfo::Translations;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
xml_protect_text
xml_comment
xml_accent
xml_accents
-) ] );
-
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my $XS_convert = Texinfo::XSLoader::XS_convert_enabled();
diff --git a/tp/Texinfo/Convert/DocBook.pm b/tp/Texinfo/Convert/DocBook.pm
index 685f3aa8a2..e9a90d70fa 100644
--- a/tp/Texinfo/Convert/DocBook.pm
+++ b/tp/Texinfo/Convert/DocBook.pm
@@ -19,7 +19,7 @@
package Texinfo::Convert::DocBook;
-use 5.00405;
+use 5.006;
use strict;
# To check if there is no erroneous autovivification
@@ -42,11 +42,9 @@ use Texinfo::Convert::Plaintext;
use Data::Dumper;
use Carp qw(cluck);
-require Exporter;
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::Converter);
+our @ISA = qw(Texinfo::Convert::Converter);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my %brace_commands = %Texinfo::Commands::brace_commands;
diff --git a/tp/Texinfo/Convert/HTML.pm b/tp/Texinfo/Convert/HTML.pm
index 4e0337def1..0c51709edc 100644
--- a/tp/Texinfo/Convert/HTML.pm
+++ b/tp/Texinfo/Convert/HTML.pm
@@ -85,12 +85,11 @@ use Texinfo::Convert::Converter;
# \mathord{\text{}} \textsl{} \copyright{} \mathsterling{}
use Texinfo::Convert::LaTeX;
-
require Exporter;
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::Converter);
-$VERSION = '7.1dev';
+our @ISA = qw(Texinfo::Convert::Converter);
+
+our $VERSION = '7.1dev';
my $XS_convert = Texinfo::XSLoader::XS_convert_enabled();
diff --git a/tp/Texinfo/Convert/IXIN.pm b/tp/Texinfo/Convert/IXIN.pm
index dbe2a3f4f8..a0685536cd 100644
--- a/tp/Texinfo/Convert/IXIN.pm
+++ b/tp/Texinfo/Convert/IXIN.pm
@@ -63,7 +63,7 @@
package Texinfo::Convert::IXIN;
-use 5.00405;
+use 5.006;
use strict;
# To check if there is no erroneous autovivification
@@ -82,10 +82,9 @@ use Texinfo::OutputUnits;
use Texinfo::Convert::TexinfoSXML;
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::Converter);
+our @ISA = qw(Texinfo::Convert::Converter);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my $ixin_version = 1;
diff --git a/tp/Texinfo/Convert/IXINSXML.pm b/tp/Texinfo/Convert/IXINSXML.pm
index fa18cce278..af558f201d 100644
--- a/tp/Texinfo/Convert/IXINSXML.pm
+++ b/tp/Texinfo/Convert/IXINSXML.pm
@@ -27,7 +27,7 @@
package Texinfo::Convert::IXINSXML;
-use 5.00405;
+use 5.006;
use strict;
use Texinfo::Convert::TexinfoSXML;
@@ -35,10 +35,9 @@ use Texinfo::Convert::IXIN;
use Carp qw(cluck);
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::TexinfoSXML Texinfo::Convert::IXIN);
+our @ISA = qw(Texinfo::Convert::TexinfoSXML Texinfo::Convert::IXIN);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my %defaults = (
diff --git a/tp/Texinfo/Convert/Info.pm b/tp/Texinfo/Convert/Info.pm
index dc83a137f9..e31db82ebd 100644
--- a/tp/Texinfo/Convert/Info.pm
+++ b/tp/Texinfo/Convert/Info.pm
@@ -21,7 +21,7 @@
package Texinfo::Convert::Info;
-use 5.00405;
+use 5.006;
use strict;
@@ -37,10 +37,9 @@ use Texinfo::Convert::Plaintext;
use Texinfo::Convert::Paragraph;
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::Plaintext);
+our @ISA = qw(Texinfo::Convert::Plaintext);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my $STDIN_DOCU_NAME = 'stdin';
diff --git a/tp/Texinfo/Convert/LaTeX.pm b/tp/Texinfo/Convert/LaTeX.pm
index 0f006832f3..b83c5ce33f 100644
--- a/tp/Texinfo/Convert/LaTeX.pm
+++ b/tp/Texinfo/Convert/LaTeX.pm
@@ -163,7 +163,7 @@
package Texinfo::Convert::LaTeX;
-use 5.00405;
+use 5.006;
# See comment at start of HTML.pm
use if $] >= 5.012, feature => qw(unicode_strings);
@@ -185,10 +185,9 @@ use Texinfo::Convert::Text;
use Texinfo::Indices;
use Texinfo::Convert::Converter;
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::Converter);
+our @ISA = qw(Texinfo::Convert::Converter);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
# could export convert_to_latex_math
diff --git a/tp/Texinfo/Convert/NodeNameNormalization.pm
b/tp/Texinfo/Convert/NodeNameNormalization.pm
index c8b4b6ed20..f509c7adf2 100644
--- a/tp/Texinfo/Convert/NodeNameNormalization.pm
+++ b/tp/Texinfo/Convert/NodeNameNormalization.pm
@@ -22,7 +22,7 @@
package Texinfo::Convert::NodeNameNormalization;
-use 5.00405;
+use 5.006;
use strict;
# stop \s from matching non-ASCII spaces, etc. \p{...} can still be
@@ -48,19 +48,16 @@ use Texinfo::Convert::Unicode;
# -> Texinfo::Parser -> this module
require Exporter;
-use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
convert_to_identifier
normalize_transliterate_texinfo
transliterate_texinfo
transliterate_protect_file_name
-) ] );
+);
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my %normalize_node_brace_no_arg_commands
diff --git a/tp/Texinfo/Convert/Paragraph.pm b/tp/Texinfo/Convert/Paragraph.pm
index 9da8e4697f..e4f0e167b9 100644
--- a/tp/Texinfo/Convert/Paragraph.pm
+++ b/tp/Texinfo/Convert/Paragraph.pm
@@ -15,8 +15,7 @@
package Texinfo::Convert::Paragraph;
-# same as texi2any.pl
-use 5.00405;
+use 5.006;
use strict;
use warnings;
diff --git a/tp/Texinfo/Convert/PlainTexinfo.pm
b/tp/Texinfo/Convert/PlainTexinfo.pm
index b64a97cb80..d4148b1dc7 100644
--- a/tp/Texinfo/Convert/PlainTexinfo.pm
+++ b/tp/Texinfo/Convert/PlainTexinfo.pm
@@ -22,19 +22,18 @@
package Texinfo::Convert::PlainTexinfo;
-use 5.00405;
+use 5.006;
use strict;
use Texinfo::Convert::ConvertXS;
use Texinfo::XSLoader;
-use Texinfo::Convert::Texinfo qw(convert_to_texinfo);
+use Texinfo::Convert::Texinfo;
use Texinfo::Convert::Converter;
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::Converter);
+our @ISA = qw(Texinfo::Convert::Converter);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my $XS_convert = Texinfo::XSLoader::XS_convert_enabled();
@@ -82,7 +81,7 @@ sub convert_tree($$)
return _convert_tree_with_XS($root);
}
- return convert_to_texinfo($root);
+ return Texinfo::Convert::Texinfo::convert_to_texinfo($root);
}
sub output($$)
diff --git a/tp/Texinfo/Convert/Plaintext.pm b/tp/Texinfo/Convert/Plaintext.pm
index deb1f11707..959da67822 100644
--- a/tp/Texinfo/Convert/Plaintext.pm
+++ b/tp/Texinfo/Convert/Plaintext.pm
@@ -21,7 +21,7 @@
package Texinfo::Convert::Plaintext;
-use 5.00405;
+use 5.006;
# See comment at start of HTML.pm
use if $] >= 5.012, feature => qw(unicode_strings);
@@ -48,8 +48,7 @@ use Texinfo::Convert::Converter;
use Texinfo::Convert::Paragraph;
require Exporter;
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::Converter);
+our @ISA = qw(Texinfo::Convert::Converter);
# Some extra initialization for the first time this module is loaded.
# This could be done in a UNITCHECK block, introduced in Perl 5.10.
@@ -65,7 +64,7 @@ sub import {
goto &Exporter::import;
}
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
# commands that are of use for formatting.
diff --git a/tp/Texinfo/Convert/Texinfo.pm b/tp/Texinfo/Convert/Texinfo.pm
index f6f53319f9..c7c9bb7ee9 100644
--- a/tp/Texinfo/Convert/Texinfo.pm
+++ b/tp/Texinfo/Convert/Texinfo.pm
@@ -20,7 +20,7 @@
package Texinfo::Convert::Texinfo;
-use 5.00405;
+use 5.006;
use strict;
# stop \s from matching non-ASCII spaces, etc. \p{...} can still be
@@ -41,18 +41,15 @@ use Texinfo::Commands;
use Texinfo::Common;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
convert_to_texinfo
link_element_to_texi
target_element_to_texi_label
-) ] );
+);
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
-
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my $XS_convert = Texinfo::XSLoader::XS_convert_enabled();
diff --git a/tp/Texinfo/Convert/TexinfoMarkup.pm
b/tp/Texinfo/Convert/TexinfoMarkup.pm
index 74450a2bf1..e6eb93c976 100644
--- a/tp/Texinfo/Convert/TexinfoMarkup.pm
+++ b/tp/Texinfo/Convert/TexinfoMarkup.pm
@@ -29,7 +29,7 @@
package Texinfo::Convert::TexinfoMarkup;
-use 5.00405;
+use 5.006;
use strict;
# To check if there is no erroneous autovivification
@@ -46,10 +46,9 @@ use Texinfo::Convert::Texinfo;
use Data::Dumper;
use Carp qw(cluck);
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::Converter);
+our @ISA = qw(Texinfo::Convert::Converter);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
# our because it is used in the xml to texi translator and subclasses.
diff --git a/tp/Texinfo/Convert/TexinfoSXML.pm
b/tp/Texinfo/Convert/TexinfoSXML.pm
index e7155f93ff..4d388b2f80 100644
--- a/tp/Texinfo/Convert/TexinfoSXML.pm
+++ b/tp/Texinfo/Convert/TexinfoSXML.pm
@@ -22,16 +22,15 @@
package Texinfo::Convert::TexinfoSXML;
-use 5.00405;
+use 5.006;
use strict;
use Texinfo::Convert::TexinfoMarkup;
use Carp qw(cluck);
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::TexinfoMarkup);
+our @ISA = qw(Texinfo::Convert::TexinfoMarkup);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
# SXML specific
diff --git a/tp/Texinfo/Convert/TexinfoXML.pm b/tp/Texinfo/Convert/TexinfoXML.pm
index 1bdfb77e2a..371d77bb00 100644
--- a/tp/Texinfo/Convert/TexinfoXML.pm
+++ b/tp/Texinfo/Convert/TexinfoXML.pm
@@ -22,7 +22,7 @@
package Texinfo::Convert::TexinfoXML;
-use 5.00405;
+use 5.006;
use strict;
use Carp qw(cluck);
@@ -32,10 +32,9 @@ use Texinfo::Convert::TexinfoMarkup;
# for xml formatting methods
use Texinfo::Convert::Converter;
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::TexinfoMarkup Texinfo::Convert::Converter);
+our @ISA = qw(Texinfo::Convert::TexinfoMarkup Texinfo::Convert::Converter);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
# TexinfoXML specific
diff --git a/tp/Texinfo/Convert/Text.pm b/tp/Texinfo/Convert/Text.pm
index 250d942398..ae40c1072d 100644
--- a/tp/Texinfo/Convert/Text.pm
+++ b/tp/Texinfo/Convert/Text.pm
@@ -19,7 +19,7 @@
package Texinfo::Convert::Text;
-use 5.00405;
+use 5.006;
use strict;
# To check if there is no erroneous autovivification
@@ -45,17 +45,14 @@ use Texinfo::Convert::Utils;
use Texinfo::Translations;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
convert_to_text
text_accents
-) ] );
-
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my $XS_convert = Texinfo::XSLoader::XS_convert_enabled();
diff --git a/tp/Texinfo/Convert/TextContent.pm
b/tp/Texinfo/Convert/TextContent.pm
index ac278001de..497b6a40a5 100644
--- a/tp/Texinfo/Convert/TextContent.pm
+++ b/tp/Texinfo/Convert/TextContent.pm
@@ -19,7 +19,7 @@
package Texinfo::Convert::TextContent;
-use 5.00405;
+use 5.006;
use strict;
# To check if there is no erroneous autovivification
@@ -31,10 +31,9 @@ use Texinfo::Convert::Utils;
use Texinfo::Convert::Text;
use Texinfo::Convert::Converter;
-use vars qw($VERSION @ISA);
-@ISA = qw(Texinfo::Convert::Converter);
+our @ISA = qw(Texinfo::Convert::Converter);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my %ignored_brace_commands;
diff --git a/tp/Texinfo/Convert/Unicode.pm b/tp/Texinfo/Convert/Unicode.pm
index cd16fbec45..a92efac13d 100644
--- a/tp/Texinfo/Convert/Unicode.pm
+++ b/tp/Texinfo/Convert/Unicode.pm
@@ -54,19 +54,15 @@ sub import {
goto &Exporter::import;
}
-use vars qw($VERSION @EXPORT_OK %EXPORT_TAGS);
-
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
unicode_accent
encoded_accents
brace_no_arg_command
unicode_text
string_width
-) ] );
-
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
our %unicode_diacritics = (
diff --git a/tp/Texinfo/Convert/Utils.pm b/tp/Texinfo/Convert/Utils.pm
index d9ed89d976..e2bcb2a056 100644
--- a/tp/Texinfo/Convert/Utils.pm
+++ b/tp/Texinfo/Convert/Utils.pm
@@ -31,6 +31,8 @@ package Texinfo::Convert::Utils;
use strict;
+use 5.006;
+
# To check if there is no erroneous autovivification
#no autovivification qw(fetch delete exists store strict);
@@ -44,21 +46,18 @@ use Texinfo::Convert::Texinfo;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
# There is no specific reason to export those functions and not
# other functions of the module. It could be possible not to
# export any function.
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
expand_today
expand_verbatiminclude
add_heading_number
-) ] );
-
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
our @month_name =
diff --git a/tp/Texinfo/DebugTree.pm b/tp/Texinfo/DebugTree.pm
index cf1f3e5d08..a2d1c22728 100644
--- a/tp/Texinfo/DebugTree.pm
+++ b/tp/Texinfo/DebugTree.pm
@@ -33,8 +33,7 @@ package Texinfo::DebugTree;
use Texinfo::Common;
use Texinfo::Convert::Converter;
-use vars qw(@ISA);
-@ISA = qw(Texinfo::Convert::Converter);
+our @ISA = qw(Texinfo::Convert::Converter);
my %defaults = (
'EXTENSION' => 'debugtree',
diff --git a/tp/Texinfo/Indices.pm b/tp/Texinfo/Indices.pm
index be9a82da01..792eee7f26 100644
--- a/tp/Texinfo/Indices.pm
+++ b/tp/Texinfo/Indices.pm
@@ -25,7 +25,7 @@
package Texinfo::Indices;
-use 5.00405;
+use 5.006;
# See comment at start of HTML.pm
use if $] >= 5.012, feature => 'unicode_strings';
@@ -60,9 +60,7 @@ use Texinfo::Convert::Text;
# loading is not important.
#use Texinfo::Document;
-use vars qw($VERSION);
-
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
# The methods that are usefully called directly (outside of tests) are:
# index_entry_element_sort_string
diff --git a/tp/Texinfo/ManipulateTree.pm b/tp/Texinfo/ManipulateTree.pm
index 7890c2884a..084dd98257 100644
--- a/tp/Texinfo/ManipulateTree.pm
+++ b/tp/Texinfo/ManipulateTree.pm
@@ -28,7 +28,7 @@
package Texinfo::ManipulateTree;
-use 5.00405;
+use 5.006;
# stop \s from matching non-ASCII spaces, etc. \p{...} can still be
# used to match Unicode character classes.
@@ -49,21 +49,18 @@ use Texinfo::XSLoader;
use Texinfo::Common;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
move_index_entries_after_items_in_tree
relate_index_entries_to_table_items_in_tree
protect_colon_in_tree
protect_comma_in_tree
protect_first_parenthesis
protect_node_after_label_in_tree
-) ] );
-
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my $XS_structuring = Texinfo::XSLoader::XS_structuring_enabled();
diff --git a/tp/Texinfo/MiscXS.pm b/tp/Texinfo/MiscXS.pm
index 4646a0649c..ed97b385ca 100644
--- a/tp/Texinfo/MiscXS.pm
+++ b/tp/Texinfo/MiscXS.pm
@@ -17,8 +17,7 @@ package Texinfo::MiscXS;
# This package loads XS implementations of various functions.
-# same as texi2any.pl
-use 5.00405;
+use 5.006;
use strict;
use warnings;
diff --git a/tp/Texinfo/OutputUnits.pm b/tp/Texinfo/OutputUnits.pm
index 9a86f5b3a2..5fe7dc1180 100644
--- a/tp/Texinfo/OutputUnits.pm
+++ b/tp/Texinfo/OutputUnits.pm
@@ -19,7 +19,7 @@
package Texinfo::OutputUnits;
-use 5.00405;
+use 5.006;
# See comment at start of HTML.pm
use if $] >= 5.012, feature => 'unicode_strings';
@@ -44,20 +44,17 @@ use Texinfo::Common;
use Texinfo::ManipulateTree;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
units_directions
units_file_directions
split_by_node
split_by_section
split_pages
-) ] );
-
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my $XS_structuring = Texinfo::XSLoader::XS_structuring_enabled();
diff --git a/tp/Texinfo/Parser.pm b/tp/Texinfo/Parser.pm
index 57b9ca1f6f..347a09fe13 100644
--- a/tp/Texinfo/Parser.pm
+++ b/tp/Texinfo/Parser.pm
@@ -15,8 +15,7 @@
package Texinfo::Parser;
-# same as texi2any.pl
-use 5.00405;
+use 5.006;
use strict;
use warnings;
diff --git a/tp/Texinfo/ParserNonXS.pm b/tp/Texinfo/ParserNonXS.pm
index 946a84a105..46b6ea984a 100644
--- a/tp/Texinfo/ParserNonXS.pm
+++ b/tp/Texinfo/ParserNonXS.pm
@@ -94,8 +94,7 @@ use Texinfo::Convert::NodeNameNormalization;
use Texinfo::Translations;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
our $module_loaded = 0;
sub import {
@@ -110,17 +109,15 @@ sub import {
goto &Exporter::import;
}
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
parser
parse_texi_file
parse_texi_line
parse_texi_piece
parse_texi_text
-) ] );
-
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
# these are the default values for the parser state
diff --git a/tp/Texinfo/Structuring.pm b/tp/Texinfo/Structuring.pm
index cbd21b00b0..b985ab17b5 100644
--- a/tp/Texinfo/Structuring.pm
+++ b/tp/Texinfo/Structuring.pm
@@ -21,7 +21,7 @@
package Texinfo::Structuring;
-use 5.00405;
+use 5.006;
# See comment at start of HTML.pm
use if $] >= 5.012, feature => 'unicode_strings';
@@ -54,10 +54,9 @@ use Texinfo::Convert::NodeNameNormalization;
use Texinfo::Translations;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
associate_internal_references
check_nodes_are_referenced
complete_node_tree_with_menus
@@ -66,11 +65,9 @@ use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
sectioning_structure
set_menus_node_directions
warn_non_empty_parts
-) ] );
-
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my $XS_structuring = Texinfo::XSLoader::XS_structuring_enabled();
diff --git a/tp/Texinfo/Transformations.pm b/tp/Texinfo/Transformations.pm
index d534fa0e30..fd7d9804a1 100644
--- a/tp/Texinfo/Transformations.pm
+++ b/tp/Texinfo/Transformations.pm
@@ -20,7 +20,7 @@
package Texinfo::Transformations;
-use 5.00405;
+use 5.006;
use strict;
@@ -42,17 +42,14 @@ use Texinfo::ManipulateTree;
use Texinfo::Structuring;
require Exporter;
-use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS);
-@ISA = qw(Exporter);
+our @ISA = qw(Exporter);
-%EXPORT_TAGS = ( 'all' => [ qw(
+our @EXPORT_OK = qw(
protect_hashchar_at_line_beginning
reference_to_arg_in_tree
-) ] );
-
-@EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+);
-$VERSION = '7.1dev';
+our $VERSION = '7.1dev';
my $XS_structuring = Texinfo::XSLoader::XS_structuring_enabled();
diff --git a/tp/Texinfo/Translations.pm b/tp/Texinfo/Translations.pm
index dbe9da62c7..9b8ab7c924 100644
--- a/tp/Texinfo/Translations.pm
+++ b/tp/Texinfo/Translations.pm
@@ -22,7 +22,7 @@
package Texinfo::Translations;
-use 5.00405;
+use 5.006;
use strict;
# To check if there is no erroneous autovivification
@@ -49,6 +49,8 @@ use Texinfo::Parser;
use Texinfo::ManipulateTree;
+our $VERSION = '7.1dev';
+
# we want a reliable way to switch locale for the document
# strings translations so we don't use the system gettext.
Locale::Messages->select_package ('gettext_pp');
diff --git a/tp/Texinfo/XSLoader.pm b/tp/Texinfo/XSLoader.pm
index 1967bb32ee..ac616d4567 100644
--- a/tp/Texinfo/XSLoader.pm
+++ b/tp/Texinfo/XSLoader.pm
@@ -15,7 +15,7 @@
package Texinfo::XSLoader;
-use 5.00405;
+use 5.006;
use strict;
use warnings;
diff --git a/tp/ext/highlight_syntax.pm b/tp/ext/highlight_syntax.pm
index b793ea0d99..953f5c10eb 100644
--- a/tp/ext/highlight_syntax.pm
+++ b/tp/ext/highlight_syntax.pm
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-require 5.0;
+use 5.006;
use strict;
# To check if there is no erroneous autovivification
diff --git a/tp/ext/latex2html.pm b/tp/ext/latex2html.pm
index d48dee8673..4d539cf6f4 100644
--- a/tp/ext/latex2html.pm
+++ b/tp/ext/latex2html.pm
@@ -24,7 +24,7 @@
#
#-##############################################################################
-require 5.0;
+use 5.006;
use strict;
# To check if there is no erroneous autovivification
diff --git a/tp/maintain/regenerate_C_options_info.pl
b/tp/maintain/regenerate_C_options_info.pl
index c825bbf96d..ee5c5b6519 100755
--- a/tp/maintain/regenerate_C_options_info.pl
+++ b/tp/maintain/regenerate_C_options_info.pl
@@ -20,11 +20,7 @@
use strict;
-# emulates -w
-BEGIN
-{
- $^W = 1;
-}
+use warnings;
my %option_categories;
diff --git a/tp/maintain/regenerate_commands_perl_info.pl
b/tp/maintain/regenerate_commands_perl_info.pl
index e5b50551e0..14920d3300 100755
--- a/tp/maintain/regenerate_commands_perl_info.pl
+++ b/tp/maintain/regenerate_commands_perl_info.pl
@@ -20,11 +20,7 @@
use strict;
-# emulates -w
-BEGIN
-{
- $^W = 1;
-}
+use warnings;
# need this information to fill in automatically the index commands
my %index_in_code = (
diff --git a/tp/maintain/regenerate_documentlanguages-iana.pl
b/tp/maintain/regenerate_documentlanguages-iana.pl
index 76dfc08a82..f55bac8509 100755
--- a/tp/maintain/regenerate_documentlanguages-iana.pl
+++ b/tp/maintain/regenerate_documentlanguages-iana.pl
@@ -16,11 +16,7 @@
use strict;
-# emulates -w
-BEGIN
-{
- $^W = 1;
-}
+use warnings;
my $dir = 'maintain';
system ("cd $dir && wget -N
http://www.iana.org/assignments/language-subtag-registry";);
diff --git a/tp/maintain/regenerate_documentlanguages-loc.pl
b/tp/maintain/regenerate_documentlanguages-loc.pl
index 6581faf333..799d375cb1 100755
--- a/tp/maintain/regenerate_documentlanguages-loc.pl
+++ b/tp/maintain/regenerate_documentlanguages-loc.pl
@@ -17,16 +17,12 @@
use strict;
+use warnings;
+
use List::Util qw(first);
# not in core perl
use Text::CSV;
-# emulates -w
-BEGIN
-{
- $^W = 1;
-}
-
my $dir = 'maintain';
system ("cd $dir && wget -N
https://www.loc.gov/standards/iso639-2/ISO-639-2_utf-8.txt";);
# the ISO 3166-1 alpha-2 codes are not easily accessible from the ISO website,
there is
diff --git a/tp/maintain/regenerate_file_lists.pl
b/tp/maintain/regenerate_file_lists.pl
index b68f9024da..f829b71a0b 100755
--- a/tp/maintain/regenerate_file_lists.pl
+++ b/tp/maintain/regenerate_file_lists.pl
@@ -13,11 +13,8 @@
use strict;
-# emulates -w
-BEGIN
-{
- $^W = 1;
-}
+use warnings;
+
use File::Find;
use File::Basename;
use File::Spec;
diff --git a/tp/maintain/regenerate_perl_options_info.pl
b/tp/maintain/regenerate_perl_options_info.pl
index 297384cc00..e7fd1568be 100755
--- a/tp/maintain/regenerate_perl_options_info.pl
+++ b/tp/maintain/regenerate_perl_options_info.pl
@@ -20,11 +20,7 @@
use strict;
-# emulates -w
-BEGIN
-{
- $^W = 1;
-}
+use warnings;
my %option_categories;
diff --git a/tp/texi2any.pl b/tp/texi2any.pl
index c55916c608..4b87497aa0 100755
--- a/tp/texi2any.pl
+++ b/tp/texi2any.pl
@@ -20,8 +20,7 @@
# Original author: Patrice Dumas <pertusus@free.fr>
# Parts (also from Patrice Dumas) come from texi2html.pl or texi2html.init.
-# for POSIX::setlocale and File::Spec
-require 5.00405;
+use 5.006;
use strict;