Hello community,
here is the log from the commit of package perl-Text-Autoformat for
openSUSE:Factory checked in at 2015-06-23 11:55:56
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Text-Autoformat (Old)
and /work/SRC/openSUSE:Factory/.perl-Text-Autoformat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Text-Autoformat"
Changes:
--------
---
/work/SRC/openSUSE:Factory/perl-Text-Autoformat/perl-Text-Autoformat.changes
2015-05-06 07:49:39.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Text-Autoformat.new/perl-Text-Autoformat.changes
2015-06-23 11:55:57.000000000 +0200
@@ -1,0 +2,15 @@
+Mon Jun 15 09:13:50 UTC 2015 - [email protected]
+
+- updated to 1.72
+ see /usr/share/doc/packages/perl-Text-Autoformat/Changes
+
+ 1.72 2015-06-14 NEILB
+ - Switched to Dist::Zilla, dropping both Build.PL and Makefile.PL --
phew!
+ - Refactored the two cuckoo packages into separate modules,
+ Text::Autoformat::Hang and Text::Autoformat::NullHang.
+
+ 1.71_01 2015-06-06 NEILB
+ - The changes released in 1.72 (above) were first done in a
+ developer release.
+
+-------------------------------------------------------------------
Old:
----
Text-Autoformat-1.71.tar.gz
New:
----
Text-Autoformat-1.72.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Text-Autoformat.spec ++++++
--- /var/tmp/diff_new_pack.QLyQ5Q/_old 2015-06-23 11:55:57.000000000 +0200
+++ /var/tmp/diff_new_pack.QLyQ5Q/_new 2015-06-23 11:55:57.000000000 +0200
@@ -17,11 +17,11 @@
Name: perl-Text-Autoformat
-Version: 1.71
+Version: 1.72
Release: 0
%define cpan_name Text-Autoformat
Summary: Automatic text wrapping and reformatting
-License: GPL-1.0+ or Artistic-1.0
+License: Artistic-1.0 or GPL-1.0+
Group: Development/Libraries/Perl
Url: http://search.cpan.org/dist/Text-Autoformat/
Source0:
http://www.cpan.org/authors/id/N/NE/NEILB/%{cpan_name}-%{version}.tar.gz
@@ -30,11 +30,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
BuildRequires: perl-macros
-BuildRequires: perl(Module::Build)
-BuildRequires: perl(Text::Reform) >= 1.11
-BuildRequires: perl(version)
-Requires: perl(Text::Reform) >= 1.11
-Requires: perl(version)
+BuildRequires: perl(Test::More) >= 0.88
+BuildRequires: perl(Text::Reform)
+Requires: perl(Text::Reform)
%{perl_requires}
%description
@@ -45,18 +43,19 @@
find . -type f -print0 | xargs -0 chmod 644
%build
-%{__perl} Build.PL installdirs=vendor
-./Build build flags=%{?_smp_mflags}
+%{__perl} Makefile.PL INSTALLDIRS=vendor
+%{__make} %{?_smp_mflags}
%check
-./Build test
+%{__make} test
%install
-./Build install destdir=%{buildroot} create_packlist=0
+%perl_make_install
+%perl_process_packlist
%perl_gen_filelist
%files -f %{name}.files
%defattr(-,root,root,755)
-%doc Changes config.emacs config.vim README
+%doc Changes config.emacs config.vim LICENSE README
%changelog
++++++ Text-Autoformat-1.71.tar.gz -> Text-Autoformat-1.72.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/Build.PL
new/Text-Autoformat-1.72/Build.PL
--- old/Text-Autoformat-1.71/Build.PL 2015-01-08 22:36:51.000000000 +0100
+++ new/Text-Autoformat-1.72/Build.PL 1970-01-01 01:00:00.000000000 +0100
@@ -1,23 +0,0 @@
-use strict;
-use warnings;
-use Module::Build;
-
-my $builder = Module::Build->new(
- module_name => 'Text::Autoformat',
- license => 'perl',
- dist_author => 'Damian Conway <[email protected]>',
- dist_version_from => 'lib/Text/Autoformat.pm',
- requires => {
- 'Test::More' => 0,
- 'Text::Reform' => 1.11,
- 'version' => 0,
- },
- add_to_cleanup => [ 'Text-Autoformat-*' ],
- meta_merge => {
- resources => {
- repository => 'https://github.com/neilbowers/Text-Autoformat'
- }
- },
-);
-
-$builder->create_build_script();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/Changes
new/Text-Autoformat-1.72/Changes
--- old/Text-Autoformat-1.71/Changes 2015-05-05 00:37:07.000000000 +0200
+++ new/Text-Autoformat-1.72/Changes 2015-06-14 22:08:40.000000000 +0200
@@ -1,5 +1,14 @@
Revision history for Perl module Text::Autoformat
+1.72 2015-06-14 NEILB
+ - Switched to Dist::Zilla, dropping both Build.PL and Makefile.PL -- phew!
+ - Refactored the two cuckoo packages into separate modules,
+ Text::Autoformat::Hang and Text::Autoformat::NullHang.
+
+1.71_01 2015-06-06 NEILB
+ - The changes released in 1.72 (above) were first done in a
+ developer release.
+
1.71 2015-05-04 NEILB
- Previous release had a problem with PAUSE, caused by the two internal
packages not having a $VERSION. Identified and reported as PAUSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/LICENSE
new/Text-Autoformat-1.72/LICENSE
--- old/Text-Autoformat-1.71/LICENSE 1970-01-01 01:00:00.000000000 +0100
+++ new/Text-Autoformat-1.72/LICENSE 2015-06-14 22:08:40.000000000 +0200
@@ -0,0 +1,379 @@
+This software is copyright (c) 1997 by Damian Conway.
+
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
+
+Terms of the Perl programming language system itself
+
+a) the GNU General Public License as published by the Free
+ Software Foundation; either version 1, or (at your option) any
+ later version, or
+b) the "Artistic License"
+
+--- The GNU General Public License, Version 1, February 1989 ---
+
+This software is Copyright (c) 1997 by Damian Conway.
+
+This is free software, licensed under:
+
+ The GNU General Public License, Version 1, February 1989
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 1, February 1989
+
+ Copyright (C) 1989 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The license agreements of most software companies try to keep users
+at the mercy of those companies. By contrast, our General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. The
+General Public License applies to the Free Software Foundation's
+software and to any other program whose authors commit to using it.
+You can use it for your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Specifically, the General Public License is designed to make
+sure that you have the freedom to give away or sell copies of free
+software, that you receive source code or can get it if you want it,
+that you can change the software or use pieces of it in new free
+programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of a such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must tell them their rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License Agreement applies to any program or other work which
+contains a notice placed by the copyright holder saying it may be
+distributed under the terms of this General Public License. The
+"Program", below, refers to any such program or work, and a "work based
+on the Program" means either the Program or any work containing the
+Program or a portion of it, either verbatim or with modifications. Each
+licensee is addressed as "you".
+
+ 1. You may copy and distribute verbatim copies of the Program's source
+code as you receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice and
+disclaimer of warranty; keep intact all the notices that refer to this
+General Public License and to the absence of any warranty; and give any
+other recipients of the Program a copy of this General Public License
+along with the Program. You may charge a fee for the physical act of
+transferring a copy.
+
+ 2. You may modify your copy or copies of the Program or any portion of
+it, and copy and distribute such modifications under the terms of Paragraph
+1 above, provided that you also do the following:
+
+ a) cause the modified files to carry prominent notices stating that
+ you changed the files and the date of any change; and
+
+ b) cause the whole of any work that you distribute or publish, that
+ in whole or in part contains the Program or any part thereof, either
+ with or without modifications, to be licensed at no charge to all
+ third parties under the terms of this General Public License (except
+ that you may choose to grant warranty protection to some or all
+ third parties, at your option).
+
+ c) If the modified program normally reads commands interactively when
+ run, you must cause it, when started running for such interactive use
+ in the simplest and most usual way, to print or display an
+ announcement including an appropriate copyright notice and a notice
+ that there is no warranty (or else, saying that you provide a
+ warranty) and that users may redistribute the program under these
+ conditions, and telling the user how to view a copy of this General
+ Public License.
+
+ d) You may charge a fee for the physical act of transferring a
+ copy, and you may at your option offer warranty protection in
+ exchange for a fee.
+
+Mere aggregation of another independent work with the Program (or its
+derivative) on a volume of a storage or distribution medium does not bring
+the other work under the scope of these terms.
+
+ 3. You may copy and distribute the Program (or a portion or derivative of
+it, under Paragraph 2) in object code or executable form under the terms of
+Paragraphs 1 and 2 above provided that you also do one of the following:
+
+ a) accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of
+ Paragraphs 1 and 2 above; or,
+
+ b) accompany it with a written offer, valid for at least three
+ years, to give any third party free (except for a nominal charge
+ for the cost of distribution) a complete machine-readable copy of the
+ corresponding source code, to be distributed under the terms of
+ Paragraphs 1 and 2 above; or,
+
+ c) accompany it with the information you received as to where the
+ corresponding source code may be obtained. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form alone.)
+
+Source code for a work means the preferred form of the work for making
+modifications to it. For an executable file, complete source code means
+all the source code for all modules it contains; but, as a special
+exception, it need not include source code for modules which are standard
+libraries that accompany the operating system on which the executable
+file runs, or for standard header files or definitions files that
+accompany that operating system.
+
+ 4. You may not copy, modify, sublicense, distribute or transfer the
+Program except as expressly provided under this General Public License.
+Any attempt otherwise to copy, modify, sublicense, distribute or transfer
+the Program is void, and will automatically terminate your rights to use
+the Program under this License. However, parties who have received
+copies, or rights to use copies, from you under this General Public
+License will not have their licenses terminated so long as such parties
+remain in full compliance.
+
+ 5. By copying, distributing or modifying the Program (or any work based
+on the Program) you indicate your acceptance of this license to do so,
+and all its terms and conditions.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the original
+licensor to copy, distribute or modify the Program subject to these
+terms and conditions. You may not impose any further restrictions on the
+recipients' exercise of the rights granted herein.
+
+ 7. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of the license which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+the license, you may choose any version ever published by the Free Software
+Foundation.
+
+ 8. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 9. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 10. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ Appendix: How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to humanity, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these
+terms.
+
+ To do so, attach the following notices to the program. It is safest to
+attach them to the start of each source file to most effectively convey
+the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 1, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301
USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) 19xx name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the
+appropriate parts of the General Public License. Of course, the
+commands you use may be called something other than `show w' and `show
+c'; they could even be mouse-clicks or menu items--whatever suits your
+program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the
+ program `Gnomovision' (a program to direct compilers to make passes
+ at assemblers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+That's all there is to it!
+
+
+--- The Artistic License 1.0 ---
+
+This software is Copyright (c) 1997 by Damian Conway.
+
+This is free software, licensed under:
+
+ The Artistic License 1.0
+
+The Artistic License
+
+Preamble
+
+The intent of this document is to state the conditions under which a Package
+may be copied, such that the Copyright Holder maintains some semblance of
+artistic control over the development of the package, while giving the users of
+the package the right to use and distribute the Package in a more-or-less
+customary fashion, plus the right to make reasonable modifications.
+
+Definitions:
+
+ - "Package" refers to the collection of files distributed by the Copyright
+ Holder, and derivatives of that collection of files created through
+ textual modification.
+ - "Standard Version" refers to such a Package if it has not been modified,
+ or has been modified in accordance with the wishes of the Copyright
+ Holder.
+ - "Copyright Holder" is whoever is named in the copyright or copyrights for
+ the package.
+ - "You" is you, if you're thinking about copying or distributing this
Package.
+ - "Reasonable copying fee" is whatever you can justify on the basis of media
+ cost, duplication charges, time of people involved, and so on. (You will
+ not be required to justify it to the Copyright Holder, but only to the
+ computing community at large as a market that must bear the fee.)
+ - "Freely Available" means that no fee is charged for the item itself, though
+ there may be fees involved in handling the item. It also means that
+ recipients of the item may redistribute it under the same conditions they
+ received it.
+
+1. You may make and give away verbatim copies of the source form of the
+Standard Version of this Package without restriction, provided that you
+duplicate all of the original copyright notices and associated disclaimers.
+
+2. You may apply bug fixes, portability fixes and other modifications derived
+from the Public Domain or from the Copyright Holder. A Package modified in such
+a way shall still be considered the Standard Version.
+
+3. You may otherwise modify your copy of this Package in any way, provided that
+you insert a prominent notice in each changed file stating how and when you
+changed that file, and provided that you do at least ONE of the following:
+
+ a) place your modifications in the Public Domain or otherwise make them
+ Freely Available, such as by posting said modifications to Usenet or an
+ equivalent medium, or placing the modifications on a major archive site
+ such as ftp.uu.net, or by allowing the Copyright Holder to include your
+ modifications in the Standard Version of the Package.
+
+ b) use the modified Package only within your corporation or organization.
+
+ c) rename any non-standard executables so the names do not conflict with
+ standard executables, which must also be provided, and provide a separate
+ manual page for each non-standard executable that clearly documents how it
+ differs from the Standard Version.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+4. You may distribute the programs of this Package in object code or executable
+form, provided that you do at least ONE of the following:
+
+ a) distribute a Standard Version of the executables and library files,
+ together with instructions (in the manual page or equivalent) on where to
+ get the Standard Version.
+
+ b) accompany the distribution with the machine-readable source of the Package
+ with your modifications.
+
+ c) accompany any non-standard executables with their corresponding Standard
+ Version executables, giving the non-standard executables non-standard
+ names, and clearly documenting the differences in manual pages (or
+ equivalent), together with instructions on where to get the Standard
+ Version.
+
+ d) make other distribution arrangements with the Copyright Holder.
+
+5. You may charge a reasonable copying fee for any distribution of this
+Package. You may charge any fee you choose for support of this Package. You
+may not charge a fee for this Package itself. However, you may distribute this
+Package in aggregate with other (possibly commercial) programs as part of a
+larger (possibly commercial) software distribution provided that you do not
+advertise this Package as a product of your own.
+
+6. The scripts and library files supplied as input to or produced as output
+from the programs of this Package do not automatically fall under the copyright
+of this Package, but belong to whomever generated them, and may be sold
+commercially, and may be aggregated with this Package.
+
+7. C or perl subroutines supplied by you and linked into this Package shall not
+be considered part of this Package.
+
+8. The name of the Copyright Holder may not be used to endorse or promote
+products derived from this software without specific prior written permission.
+
+9. THIS PACKAGE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF
+MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+
+The End
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/MANIFEST
new/Text-Autoformat-1.72/MANIFEST
--- old/Text-Autoformat-1.71/MANIFEST 2015-04-25 10:16:07.000000000 +0200
+++ new/Text-Autoformat-1.72/MANIFEST 2015-06-14 22:08:40.000000000 +0200
@@ -1,13 +1,18 @@
-Build.PL
+# This file was automatically generated by Dist::Zilla::Plugin::Manifest
v5.032.
Changes
+LICENSE
MANIFEST
-META.yml # Will be created by "make dist"
+META.json
+META.yml
Makefile.PL
README
+config.emacs
+config.vim
+dist.ini
lib/Text/Autoformat.pm
+lib/Text/Autoformat/Hang.pm
+lib/Text/Autoformat/NullHang.pm
t/00.load.t
t/01.ignore.t
+t/02.empty-string.t
t/02.wide-numbers.t
-config.emacs
-config.vim
-META.json
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/META.json
new/Text-Autoformat-1.72/META.json
--- old/Text-Autoformat-1.71/META.json 2015-05-05 00:37:20.000000000 +0200
+++ new/Text-Autoformat-1.72/META.json 2015-06-14 22:08:40.000000000 +0200
@@ -1,50 +1,52 @@
{
"abstract" : "Automatic text wrapping and reformatting",
"author" : [
- "Damian Conway <[email protected]>"
+ "Damian Conway <[email protected]>"
],
- "dynamic_config" : 1,
- "generated_by" : "ExtUtils::MakeMaker version 7.02, CPAN::Meta::Converter
version 2.150001",
+ "dynamic_config" : 0,
+ "generated_by" : "Dist::Zilla version 5.032, CPAN::Meta::Converter version
2.150001",
"license" : [
- "unknown"
+ "perl_5"
],
"meta-spec" : {
"url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
"version" : "2"
},
"name" : "Text-Autoformat",
- "no_index" : {
- "directory" : [
- "t",
- "inc"
- ]
- },
"prereqs" : {
- "build" : {
+ "configure" : {
"requires" : {
"ExtUtils::MakeMaker" : "0"
}
},
- "configure" : {
+ "runtime" : {
"requires" : {
- "ExtUtils::MakeMaker" : "0"
+ "Carp" : "0",
+ "Exporter" : "0",
+ "Text::Reform" : "0",
+ "Text::Tabs" : "0",
+ "overload" : "0",
+ "perl" : "5.006",
+ "strict" : "0",
+ "warnings" : "0"
}
},
- "runtime" : {
+ "test" : {
"requires" : {
- "Test::More" : "0",
- "Text::Reform" : "1.11",
- "version" : "0"
+ "Test::More" : "0.88",
+ "utf8" : "0"
}
}
},
"release_status" : "stable",
"resources" : {
+ "homepage" : "https://github.com/neilbowers/Text-Autoformat",
"repository" : {
"type" : "git",
- "url" : "git://github.com/neilbowers/Text-Autoformat.git",
+ "url" : "https://github.com/neilbowers/Text-Autoformat.git",
"web" : "https://github.com/neilbowers/Text-Autoformat"
}
},
- "version" : "1.71"
+ "version" : "1.72"
}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/META.yml
new/Text-Autoformat-1.72/META.yml
--- old/Text-Autoformat-1.71/META.yml 2015-05-05 00:37:20.000000000 +0200
+++ new/Text-Autoformat-1.72/META.yml 2015-06-14 22:08:40.000000000 +0200
@@ -1,26 +1,29 @@
---
abstract: 'Automatic text wrapping and reformatting'
author:
- - 'Damian Conway <[email protected]>'
+ - 'Damian Conway <[email protected]>'
build_requires:
- ExtUtils::MakeMaker: '0'
+ Test::More: '0.88'
+ utf8: '0'
configure_requires:
ExtUtils::MakeMaker: '0'
-dynamic_config: 1
-generated_by: 'ExtUtils::MakeMaker version 7.02, CPAN::Meta::Converter version
2.150001'
-license: unknown
+dynamic_config: 0
+generated_by: 'Dist::Zilla version 5.032, CPAN::Meta::Converter version
2.150001'
+license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
version: '1.4'
name: Text-Autoformat
-no_index:
- directory:
- - t
- - inc
requires:
- Test::More: '0'
- Text::Reform: '1.11'
- version: '0'
+ Carp: '0'
+ Exporter: '0'
+ Text::Reform: '0'
+ Text::Tabs: '0'
+ overload: '0'
+ perl: '5.006'
+ strict: '0'
+ warnings: '0'
resources:
- repository: git://github.com/neilbowers/Text-Autoformat.git
-version: '1.71'
+ homepage: https://github.com/neilbowers/Text-Autoformat
+ repository: https://github.com/neilbowers/Text-Autoformat.git
+version: '1.72'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/Makefile.PL
new/Text-Autoformat-1.72/Makefile.PL
--- old/Text-Autoformat-1.71/Makefile.PL 2015-01-08 22:35:23.000000000
+0100
+++ new/Text-Autoformat-1.72/Makefile.PL 2015-06-14 22:08:40.000000000
+0200
@@ -1,39 +1,63 @@
+# This file was automatically generated by Dist::Zilla::Plugin::MakeMaker
v5.032.
use strict;
use warnings;
+
+use 5.006;
+
use ExtUtils::MakeMaker;
-my $mm_ver = $ExtUtils::MakeMaker::VERSION;
-if ($mm_ver =~ /_/) { # dev version
- $mm_ver = eval $mm_ver;
- die $@ if $@;
-}
+my %WriteMakefileArgs = (
+ "ABSTRACT" => "Automatic text wrapping and reformatting",
+ "AUTHOR" => "Damian Conway <damian\@conway.org>",
+ "CONFIGURE_REQUIRES" => {
+ "ExtUtils::MakeMaker" => 0
+ },
+ "DISTNAME" => "Text-Autoformat",
+ "EXE_FILES" => [],
+ "LICENSE" => "perl",
+ "MIN_PERL_VERSION" => "5.006",
+ "NAME" => "Text::Autoformat",
+ "PREREQ_PM" => {
+ "Carp" => 0,
+ "Exporter" => 0,
+ "Text::Reform" => 0,
+ "Text::Tabs" => 0,
+ "overload" => 0,
+ "strict" => 0,
+ "warnings" => 0
+ },
+ "TEST_REQUIRES" => {
+ "Test::More" => "0.88",
+ "utf8" => 0
+ },
+ "VERSION" => "1.72",
+ "test" => {
+ "TESTS" => "t/*.t"
+ }
+);
-WriteMakefile(
- NAME => 'Text::Autoformat',
- AUTHOR => 'Damian Conway <[email protected]>',
- VERSION_FROM => 'lib/Text/Autoformat.pm',
- ABSTRACT_FROM => 'lib/Text/Autoformat.pm',
- PL_FILES => {},
- PREREQ_PM => {
- 'Test::More' => 0,
- 'Text::Reform' => 1.11,
- 'version' => 0,
- },
- dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', },
- clean => { FILES => 'Text-Autoformat-*' },
-
- ($mm_ver <= 6.45
- ? ()
- : (META_MERGE => {
- 'meta-spec' => { version => 2 },
- resources => {
- repository => {
- type => 'git',
- web => 'https://github.com/neilbowers/Text-Autoformat',
- url => 'git://github.com/neilbowers/Text-Autoformat.git',
- },
- },
- })
- ),
+my %FallbackPrereqs = (
+ "Carp" => 0,
+ "Exporter" => 0,
+ "ExtUtils::MakeMaker" => 0,
+ "Test::More" => "0.88",
+ "Text::Reform" => 0,
+ "Text::Tabs" => 0,
+ "overload" => 0,
+ "strict" => 0,
+ "utf8" => 0,
+ "warnings" => 0
);
+
+
+unless ( eval { ExtUtils::MakeMaker->VERSION(6.63_03) } ) {
+ delete $WriteMakefileArgs{TEST_REQUIRES};
+ delete $WriteMakefileArgs{BUILD_REQUIRES};
+ $WriteMakefileArgs{PREREQ_PM} = \%FallbackPrereqs;
+}
+
+delete $WriteMakefileArgs{CONFIGURE_REQUIRES}
+ unless eval { ExtUtils::MakeMaker->VERSION(6.52) };
+
+WriteMakefile(%WriteMakefileArgs);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/README
new/Text-Autoformat-1.72/README
--- old/Text-Autoformat-1.71/README 2014-10-03 23:32:33.000000000 +0200
+++ new/Text-Autoformat-1.72/README 2015-06-14 22:08:40.000000000 +0200
@@ -1,52 +1,15 @@
-Text::Autoformat version 1.669006
-NAME
- Text::Autoformat - Automatic and manual text wrapping and reformating
-DESCRIPTION
+This archive contains the distribution Text-Autoformat,
+version 1.72:
- Text::Autoformat provides intelligent formatting of
- plaintext without the need for any kind of embedded mark-up. The module
- recognizes Internet quoting conventions, a wide range of bulleting and
- number schemes, centred text, and block quotations, and reformats each
- appropriately. Other options allow the user to adjust inter-word
- and inter-paragraph spacing, justify text, and impose various
- capitalization schemes.
+ Automatic text wrapping and reformatting
- The module also supplies a re-entrant, highly configurable replacement
- for the built-in Perl format() mechanism.
+This software is copyright (c) 1997 by Damian Conway.
-AUTHOR
- Damian Conway ([email protected])
+This is free software; you can redistribute it and/or modify it under
+the same terms as the Perl 5 programming language system itself.
-INSTALLATION
+This README file was generated by Dist::Zilla::Plugin::Readme v5.032.
-To install this module, run the following commands:
-
- perl Makefile.PL
- make
- make test
- make install
-
-
-Alternatively, to install with Module::Build, you can use the following
commands:
-
- perl Build.PL
- ./Build
- ./Build test
- ./Build install
-
-
-
-DEPENDENCIES
-
-Requires the Text::Reform module
-
-
-COPYRIGHT AND LICENCE
-
-Copyright (C) 1997-2009, Damian Conway
-
-This library is free software; you can redistribute it and/or modify
-it under the same terms as Perl itself.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/dist.ini
new/Text-Autoformat-1.72/dist.ini
--- old/Text-Autoformat-1.71/dist.ini 1970-01-01 01:00:00.000000000 +0100
+++ new/Text-Autoformat-1.72/dist.ini 2015-06-14 22:08:40.000000000 +0200
@@ -0,0 +1,17 @@
+name = Text-Autoformat
+author = Damian Conway <[email protected]>
+license = Perl_5
+copyright_holder = Damian Conway
+copyright_year = 1997
+main_module = lib/Text/Autoformat.pm
+version = 1.72
+
+[@Basic]
+[PkgVersion]
+[AutoPrereqs]
+[MetaJSON]
+[GithubMeta]
+
+[Git::Tag]
+tag_message=
+[Git::Push]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/lib/Text/Autoformat/Hang.pm
new/Text-Autoformat-1.72/lib/Text/Autoformat/Hang.pm
--- old/Text-Autoformat-1.71/lib/Text/Autoformat/Hang.pm 1970-01-01
01:00:00.000000000 +0100
+++ new/Text-Autoformat-1.72/lib/Text/Autoformat/Hang.pm 2015-06-14
22:08:40.000000000 +0200
@@ -0,0 +1,220 @@
+package Text::Autoformat::Hang;
+$Text::Autoformat::Hang::VERSION = '1.72';
+use 5.006;
+use strict;
+use warnings;
+
+# ROMAN NUMERALS
+
+sub inv($@) { my ($k, %inv)=shift; for(0..$#_) {$inv{$_[$_]}=$_*$k} %inv }
+my @unit= ( "" , qw ( I II III IV V VI VII VIII IX ));
+my @ten = ( "" , qw ( X XX XXX XL L LX LXX LXXX XC ));
+my @hund= ( "" , qw ( C CC CCC CD D DC DCC DCCC CM ));
+my @thou= ( "" , qw ( M MM MMM ));
+my %rval= (inv(1,@unit),inv(10,@ten),inv(100,@hund),inv(1000,@thou));
+my $rbpat= join ")(",join("|",reverse @thou), join("|",reverse @hund),
join("|",reverse @ten), join("|",reverse @unit);
+my $rpat= join ")(?:",join("|",reverse @thou), join("|",reverse @hund),
join("|",reverse @ten), join("|",reverse @unit);
+my $rom = qq/(?:(?=[MDCLXVI])(?:$rpat))/;
+
+my $abbrev = join '|', qw{ etc[.] pp[.] ph[.]?d[.] },
+ "(?!$rom)(?:[A-Z][A-Za-z]+[.])+",
+ '(?:[A-Z][.])(?:[A-Z][.])+';
+
+sub fromRoman($)
+{
+ return 0 unless $_[0] =~ /^.*?($rbpat).*$/i;
+ return $rval{uc $1} + $rval{uc $2} + $rval{uc $3} + $rval{uc $4};
+}
+
+sub toRoman($$)
+{
+ my ($num,$example) = @_;
+ return '' unless $num =~ /^([0-3]??)(\d??)(\d??)(\d)$/;
+ my $roman = $thou[$1||0] . $hund[$2||0] . $ten[$3||0] . $unit[$4||0];
+ return $example=~/[A-Z]/ ? uc $roman : lc $roman;
+}
+
+# BITS OF A NUMERIC VALUE
+
+my $num = q/(?:[0-9]{1,3}\b(?!:[0-9][0-9]\b))/; # Ignore 8:20 etc.
+my $let = q/[A-Za-z]/;
+my $pbr = q/[[(<]/;
+my $sbr = q/])>/;
+my $ows = q/[ \t]*/;
+my %close = ( '[' => ']', '(' => ')', '<' => '>', "" => '' );
+
+my $hangPS = qq{(?i:ps:|(?:p\\.?)+s\\b\\.?(?:[ \\t]*:)?)};
+my $hangNB = qq{(?i:n\\.?b\\.?(?:[ \\t]*:)?)};
+my $hangword = qq{(?:(?:Note)[ \\t]*:)};
+my $hangbullet = qq{[*.+-]};
+my $hang = qq{(?:(?i)(?:$hangNB|$hangword|$hangbullet)(?=[ \t]))};
+
+# IMPLEMENTATION
+
+sub new {
+ my ($class, $orig, $lists_mode) = @_;
+ return Text::Autoformat::NullHang->new() if !$lists_mode;
+
+ my $origlen = length $orig;
+ my @vals;
+ if ($_[1] =~ s#\A($hangPS)##) {
+ @vals = { type => 'ps', val => $1 }
+ }
+ elsif ($lists_mode =~ /1|bullet/i && $_[1] =~ s#\A($hang)##) {
+ @vals = { type => 'bul', val => $1 }
+ }
+ elsif ($_[1] =~ m#\A\([^\s)]+\s#) {
+ @vals = ();
+ }
+ else {
+ local $^W;
+ my $cut;
+ while (length $_[1]) {
+ last if $_[1] =~ m#\A($ows)($abbrev)#
+ && (length $1 || !@vals); # ws-separated or first
+
+ last if $_[1] =~ m{\A $ows $pbr [^$sbr \t]* \s}xms;
+
+ $cut = $origlen - length $_[1];
+ my $pre = $_[1] =~ s#\A($ows$pbr$ows)## ? $1 : "";
+ my $val
+ = ($lists_mode =~ /1|number/i && $_[1] =~ s#\A($num)##)
+ ? { type=>'num', val=>$1 }
+ : ($lists_mode =~ /1|roman/i && $_[1] =~ s#\A($rom)\b##i)
+ ? { type=>'rom', val=>$1, nval=>fromRoman($1) }
+ : ($lists_mode =~ /1|alpha/i && $_[1] =~ s#\A($let(?!$let))##i)
+ ? { type=>'let', val=>$1 }
+ : { val => "", type => "" };
+ $_[1] = $pre.$_[1] and last unless $val->{val};
+ $val->{post} = $pre && $_[1] =~
s#\A($ows()[.:/]?[$close{$pre}][.:/]?)## && $1
+ || $_[1] =~ s#\A($ows()[$sbr.:/])## && $1
+ || "";
+ $val->{pre} = $pre;
+ $val->{cut} = $cut;
+ push @vals, $val;
+ }
+ while (@vals && !$vals[-1]{post}) {
+ $_[1] = substr($orig,pop(@vals)->{cut});
+ }
+ }
+
+ # check for orphaned years or unlikely Roman numerals...
+ if (@vals==1 && defined $vals[0]->{post} && $vals[0]->{post} =~ /[\.>)]/) {
+ my $v = $vals[0];
+ if ($v->{type} eq 'num' && $v->{val} >= 1000) {
+ $_[1] = substr($orig,pop(@vals)->{cut});
+ }
+ }
+
+ return Text::Autoformat::NullHang->new if !@vals;
+ bless \@vals, $class;
+}
+
+sub incr {
+ local $^W;
+ my ($self, $prev, $prevsig) = @_;
+ my $level;
+ # check compatibility
+
+ return unless $prev && !$prev->empty;
+
+ for $level (0..(@$self<@$prev ? $#$self : $#$prev)) {
+ if ($self->[$level]{type} ne $prev->[$level]{type}) {
+ return if @$self<=@$prev; # no incr if going up
+ $prev = $prevsig;
+ last;
+ }
+ }
+ return unless $prev && !$prev->empty;
+ if ($self->[0]{type} eq 'ps') {
+ my $count = 1 + $prev->[0]{val} =~ s/(p[.]?)/$1/gi;
+ $prev->[0]{val} =~ /^(p[.]?).*(s[.]?[:]?)/;
+ $self->[0]{val} = $1 x $count . $2;
+ }
+ elsif ($self->[0]{type} eq 'bul') {
+ # do nothing
+ }
+ elsif (@$self>@$prev) { # going down level(s)
+ for $level (0..$#$prev) {
+ @{$self->[$level]}{'val','nval'} =
@{$prev->[$level]}{'val','nval'};
+ }
+ for $level (@$prev..$#$self) {
+ _reset($self->[$level]);
+ }
+ }
+ else # same level or going up
+ {
+ for $level (0..$#$self) {
+ @{$self->[$level]}{'val','nval'} =
@{$prev->[$level]}{'val','nval'};
+ }
+ _incr($self->[-1])
+ }
+}
+
+sub _incr {
+ local $^W;
+ if ($_[0]{type} eq 'rom') {
+ $_[0]{val} = toRoman(++$_[0]{nval},$_[0]{val});
+ }
+ else {
+ $_[0]{val}++ unless $_[0]{type} eq 'let' && $_[0]{val}=~/Z/i;
+ }
+}
+
+sub _reset {
+ local $^W;
+ if ($_[0]{type} eq 'rom') {
+ $_[0]{val} = toRoman($_[0]{nval}=1,$_[0]{val});
+ }
+ elsif ($_[0]{type} eq 'let') {
+ $_[0]{val} = $_[0]{val} =~ /[A-Z]/ ? 'A' : 'a';
+ }
+ else {
+ $_[0]{val} = 1;
+ }
+}
+
+sub stringify {
+ my ($self) = @_;
+ my ($str, $level) = ("");
+ for $level (@$self) {
+ local $^W;
+ $str .= join "", @{$level}{'pre','val','post'};
+ }
+ return $str;
+}
+
+sub val {
+ my ($self, $i) = @_;
+ return $self->[$i]{val};
+}
+
+sub fields { return scalar @{$_[0]} }
+
+sub field {
+ my ($self, $i, $newval) = @_;
+ $self->[$i]{type} = $newval if @_>2;
+ return $self->[$i]{type};
+}
+
+sub signature {
+ local $^W;
+ my ($self) = @_;
+ my ($str, $level) = ("");
+ for $level (@$self) {
+ $level->{type} ||= "";
+ $str .= join "", $level->{pre},
+ ($level->{type} =~ /rom|let/ ? "romlet" :
$level->{type}),
+ $level->{post};
+ }
+ return $str;
+}
+
+sub length {
+ length $_[0]->stringify
+}
+
+sub empty { 0 }
+
+1;
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/lib/Text/Autoformat/NullHang.pm
new/Text-Autoformat-1.72/lib/Text/Autoformat/NullHang.pm
--- old/Text-Autoformat-1.71/lib/Text/Autoformat/NullHang.pm 1970-01-01
01:00:00.000000000 +0100
+++ new/Text-Autoformat-1.72/lib/Text/Autoformat/NullHang.pm 2015-06-14
22:08:40.000000000 +0200
@@ -0,0 +1,17 @@
+package Text::Autoformat::NullHang;
+$Text::Autoformat::NullHang::VERSION = '1.72';
+use 5.006;
+use strict;
+use warnings;
+
+sub new { bless {}, $_[0] }
+sub stringify { "" }
+sub length { 0 }
+sub incr {}
+sub empty { 1 }
+sub signature { "" }
+sub fields { return 0 }
+sub field { return "" }
+sub val { return "" }
+
+1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/lib/Text/Autoformat.pm
new/Text-Autoformat-1.72/lib/Text/Autoformat.pm
--- old/Text-Autoformat-1.71/lib/Text/Autoformat.pm 2015-05-05
00:34:33.000000000 +0200
+++ new/Text-Autoformat-1.72/lib/Text/Autoformat.pm 2015-06-14
22:08:40.000000000 +0200
@@ -1,18 +1,19 @@
package Text::Autoformat;
-
+$Text::Autoformat::VERSION = '1.72';
+use 5.006;
use strict;
-use vars qw($VERSION @ISA @EXPORT @EXPORT_OK);
+use warnings;
use Carp;
-use 5.005;
-our $VERSION = '1.71';
require Exporter;
use Text::Reform qw( form tag break_at break_with break_wrap break_TeX );
+use Text::Autoformat::Hang;
+use Text::Autoformat::NullHang;
-@ISA = qw(Exporter);
-@EXPORT = qw( autoformat );
-@EXPORT_OK =
+our @ISA = qw(Exporter);
+our @EXPORT = qw( autoformat );
+our @EXPORT_OK =
qw( form tag break_at break_with break_wrap break_TeX ignore_headers );
@@ -562,20 +563,6 @@
return $text;
}
-sub inv($@) { my ($k, %inv)=shift; for(0..$#_) {$inv{$_[$_]}=$_*$k} %inv }
-my @unit= ( "" , qw ( I II III IV V VI VII VIII IX ));
-my @ten = ( "" , qw ( X XX XXX XL L LX LXX LXXX XC ));
-my @hund= ( "" , qw ( C CC CCC CD D DC DCC DCCC CM ));
-my @thou= ( "" , qw ( M MM MMM ));
-my %rval= (inv(1,@unit),inv(10,@ten),inv(100,@hund),inv(1000,@thou));
-my $rbpat= join ")(",join("|",reverse @thou), join("|",reverse @hund),
join("|",reverse @ten), join("|",reverse @unit);
-my $rpat= join ")(?:",join("|",reverse @thou), join("|",reverse @hund),
join("|",reverse @ten), join("|",reverse @unit);
-my $rom = qq/(?:(?=[MDCLXVI])(?:$rpat))/;
-
-my $abbrev = join '|', qw{ etc[.] pp[.] ph[.]?d[.] },
- "(?!$rom)(?:[A-Z][A-Za-z]+[.])+",
- '(?:[A-Z][.])(?:[A-Z][.])+';
-
my $gen_abbrev = join '|',
qw{ etc[.] pp[.] ph[.]?d[.] },
'(?:[A-Z][.])(?:[A-Z][.])+',
@@ -650,227 +637,6 @@
return 1;
}
-package Text::Autoformat::Hang;
-
-our $VERSION = '1.71';
-use strict;
-use warnings;
-
-# ROMAN NUMERALS
-
-
-sub fromRoman($)
-{
- return 0 unless $_[0] =~ /^.*?($rbpat).*$/i;
- return $rval{uc $1} + $rval{uc $2} + $rval{uc $3} + $rval{uc $4};
-}
-
-sub toRoman($$)
-{
- my ($num,$example) = @_;
- return '' unless $num =~ /^([0-3]??)(\d??)(\d??)(\d)$/;
- my $roman = $thou[$1||0] . $hund[$2||0] . $ten[$3||0] . $unit[$4||0];
- return $example=~/[A-Z]/ ? uc $roman : lc $roman;
-}
-
-# BITS OF A NUMERIC VALUE
-
-my $num = q/(?:[0-9]{1,3}\b(?!:[0-9][0-9]\b))/; # Ignore 8:20 etc.
-my $let = q/[A-Za-z]/;
-my $pbr = q/[[(<]/;
-my $sbr = q/])>/;
-my $ows = q/[ \t]*/;
-my %close = ( '[' => ']', '(' => ')', '<' => '>', "" => '' );
-
-my $hangPS = qq{(?i:ps:|(?:p\\.?)+s\\b\\.?(?:[ \\t]*:)?)};
-my $hangNB = qq{(?i:n\\.?b\\.?(?:[ \\t]*:)?)};
-my $hangword = qq{(?:(?:Note)[ \\t]*:)};
-my $hangbullet = qq{[*.+-]};
-my $hang = qq{(?:(?i)(?:$hangNB|$hangword|$hangbullet)(?=[ \t]))};
-
-# IMPLEMENTATION
-
-sub new {
- my ($class, $orig, $lists_mode) = @_;
- return Text::Autoformat::NullHang->new() if !$lists_mode;
-
- my $origlen = length $orig;
- my @vals;
- if ($_[1] =~ s#\A($hangPS)##) {
- @vals = { type => 'ps', val => $1 }
- }
- elsif ($lists_mode =~ /1|bullet/i && $_[1] =~ s#\A($hang)##) {
- @vals = { type => 'bul', val => $1 }
- }
- elsif ($_[1] =~ m#\A\([^\s)]+\s#) {
- @vals = ();
- }
- else {
- local $^W;
- my $cut;
- while (length $_[1]) {
- last if $_[1] =~ m#\A($ows)($abbrev)#
- && (length $1 || !@vals); # ws-separated or first
-
- last if $_[1] =~ m{\A $ows $pbr [^$sbr \t]* \s}xms;
-
- $cut = $origlen - length $_[1];
- my $pre = $_[1] =~ s#\A($ows$pbr$ows)## ? $1 : "";
- my $val
- = ($lists_mode =~ /1|number/i && $_[1] =~ s#\A($num)##)
- ? { type=>'num', val=>$1 }
- : ($lists_mode =~ /1|roman/i && $_[1] =~ s#\A($rom)\b##i)
- ? { type=>'rom', val=>$1, nval=>fromRoman($1) }
- : ($lists_mode =~ /1|alpha/i && $_[1] =~ s#\A($let(?!$let))##i)
- ? { type=>'let', val=>$1 }
- : { val => "", type => "" };
- $_[1] = $pre.$_[1] and last unless $val->{val};
- $val->{post} = $pre && $_[1] =~
s#\A($ows()[.:/]?[$close{$pre}][.:/]?)## && $1
- || $_[1] =~ s#\A($ows()[$sbr.:/])## && $1
- || "";
- $val->{pre} = $pre;
- $val->{cut} = $cut;
- push @vals, $val;
- }
- while (@vals && !$vals[-1]{post}) {
- $_[1] = substr($orig,pop(@vals)->{cut});
- }
- }
-
- # check for orphaned years or unlikely Roman numerals...
- if (@vals==1 && defined $vals[0]->{post} && $vals[0]->{post} =~ /[\.>)]/) {
- my $v = $vals[0];
- if ($v->{type} eq 'num' && $v->{val} >= 1000) {
- $_[1] = substr($orig,pop(@vals)->{cut});
- }
- }
-
- return Text::Autoformat::NullHang->new if !@vals;
- bless \@vals, $class;
-}
-
-sub incr {
- local $^W;
- my ($self, $prev, $prevsig) = @_;
- my $level;
- # check compatibility
-
- return unless $prev && !$prev->empty;
-
- for $level (0..(@$self<@$prev ? $#$self : $#$prev)) {
- if ($self->[$level]{type} ne $prev->[$level]{type}) {
- return if @$self<=@$prev; # no incr if going up
- $prev = $prevsig;
- last;
- }
- }
- return unless $prev && !$prev->empty;
- if ($self->[0]{type} eq 'ps') {
- my $count = 1 + $prev->[0]{val} =~ s/(p[.]?)/$1/gi;
- $prev->[0]{val} =~ /^(p[.]?).*(s[.]?[:]?)/;
- $self->[0]{val} = $1 x $count . $2;
- }
- elsif ($self->[0]{type} eq 'bul') {
- # do nothing
- }
- elsif (@$self>@$prev) { # going down level(s)
- for $level (0..$#$prev) {
- @{$self->[$level]}{'val','nval'} =
@{$prev->[$level]}{'val','nval'};
- }
- for $level (@$prev..$#$self) {
- _reset($self->[$level]);
- }
- }
- else # same level or going up
- {
- for $level (0..$#$self) {
- @{$self->[$level]}{'val','nval'} =
@{$prev->[$level]}{'val','nval'};
- }
- _incr($self->[-1])
- }
-}
-
-sub _incr {
- local $^W;
- if ($_[0]{type} eq 'rom') {
- $_[0]{val} = toRoman(++$_[0]{nval},$_[0]{val});
- }
- else {
- $_[0]{val}++ unless $_[0]{type} eq 'let' && $_[0]{val}=~/Z/i;
- }
-}
-
-sub _reset {
- local $^W;
- if ($_[0]{type} eq 'rom') {
- $_[0]{val} = toRoman($_[0]{nval}=1,$_[0]{val});
- }
- elsif ($_[0]{type} eq 'let') {
- $_[0]{val} = $_[0]{val} =~ /[A-Z]/ ? 'A' : 'a';
- }
- else {
- $_[0]{val} = 1;
- }
-}
-
-sub stringify {
- my ($self) = @_;
- my ($str, $level) = ("");
- for $level (@$self) {
- local $^W;
- $str .= join "", @{$level}{'pre','val','post'};
- }
- return $str;
-}
-
-sub val {
- my ($self, $i) = @_;
- return $self->[$i]{val};
-}
-
-sub fields { return scalar @{$_[0]} }
-
-sub field {
- my ($self, $i, $newval) = @_;
- $self->[$i]{type} = $newval if @_>2;
- return $self->[$i]{type};
-}
-
-sub signature {
- local $^W;
- my ($self) = @_;
- my ($str, $level) = ("");
- for $level (@$self) {
- $level->{type} ||= "";
- $str .= join "", $level->{pre},
- ($level->{type} =~ /rom|let/ ? "romlet" :
$level->{type}),
- $level->{post};
- }
- return $str;
-}
-
-sub length {
- length $_[0]->stringify
-}
-
-sub empty { 0 }
-
-package Text::Autoformat::NullHang;
-
-use strict;
-use warnings;
-
-our $VERSION = '1.71';
-
-sub new { bless {}, $_[0] }
-sub stringify { "" }
-sub length { 0 }
-sub incr {}
-sub empty { 1 }
-sub signature { "" }
-sub fields { return 0 }
-sub field { return "" }
-sub val { return "" }
1;
__END__
@@ -881,7 +647,7 @@
=head1 VERSION
-This document describes version 1.70 of Text::Autoformat
+This document describes version 1.72 of Text::Autoformat
=head1 SYNOPSIS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/Text-Autoformat-1.71/t/02.empty-string.t
new/Text-Autoformat-1.72/t/02.empty-string.t
--- old/Text-Autoformat-1.71/t/02.empty-string.t 1970-01-01
01:00:00.000000000 +0100
+++ new/Text-Autoformat-1.72/t/02.empty-string.t 2015-06-14
22:08:40.000000000 +0200
@@ -0,0 +1,14 @@
+#! perl
+
+use strict;
+use warnings;
+use Text::Autoformat qw/ autoformat /;
+use Test::More 0.88 tests => 1;
+
+my $input = '';
+my $expected_output = '';
+my $output = autoformat($input);
+
+ok(defined($output) && $output eq $expected_output,
+ "Empty string input should result in empty string output");
+