diff -Nru libhtml-format-perl-2.10/Build.PL libhtml-format-perl-2.11/Build.PL --- libhtml-format-perl-2.10/Build.PL 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/Build.PL 2013-10-27 20:57:43.000000000 +0000 @@ -6,59 +6,77 @@ my %module_build_args = ( - 'build_requires' => { - 'English' => '0', - 'File::Find' => '0', - 'File::Slurp' => '0', - 'File::Spec' => '0', - 'File::Temp' => '0', - 'Module::Build' => '0.3601', - 'Scalar::Util' => '0', - 'Test::More' => '0.96', - 'bytes' => '0' + "build_requires" => { + "Module::Build" => "0.3601" }, - 'configure_requires' => { - 'Module::Build' => '0.3601' + "configure_requires" => { + "Module::Build" => "0.3601" }, - 'dist_abstract' => 'Base class for HTML formatters', - 'dist_author' => [ - 'Nigel Metheringham ', - 'Sean M Burke ', - 'Gisle Aas ' + "dist_abstract" => "Base class for HTML formatters", + "dist_author" => [ + "Nigel Metheringham ", + "Sean M Burke ", + "Gisle Aas " ], - 'dist_name' => 'HTML-Format', - 'dist_version' => '2.10', - 'license' => 'perl', - 'module_name' => 'HTML::Format', - 'recommends' => {}, - 'recursive_test_files' => 1, - 'requires' => { - 'Carp' => '0', - 'Data::Dumper' => '0', - 'Encode' => '0', - 'Font::Metrics::Courier' => '0', - 'Font::Metrics::CourierBold' => '0', - 'Font::Metrics::CourierBoldOblique' => '0', - 'Font::Metrics::CourierOblique' => '0', - 'Font::Metrics::Helvetica' => '0', - 'Font::Metrics::HelveticaBold' => '0', - 'Font::Metrics::HelveticaBoldOblique' => '0', - 'Font::Metrics::HelveticaOblique' => '0', - 'Font::Metrics::TimesBold' => '0', - 'Font::Metrics::TimesBoldItalic' => '0', - 'Font::Metrics::TimesItalic' => '0', - 'Font::Metrics::TimesRoman' => '0', - 'HTML::Element' => '3.15', - 'HTML::TreeBuilder' => '0', - 'IO::File' => '0', - 'integer' => '0', - 'perl' => '5.008', - 'utf8' => '0' + "dist_name" => "HTML-Format", + "dist_version" => "2.11", + "license" => "perl", + "module_name" => "HTML::Format", + "recommends" => {}, + "recursive_test_files" => 1, + "requires" => { + "Carp" => 0, + "Data::Dumper" => 0, + "Encode" => 0, + "Font::Metrics::Courier" => 0, + "Font::Metrics::CourierBold" => 0, + "Font::Metrics::CourierBoldOblique" => 0, + "Font::Metrics::CourierOblique" => 0, + "Font::Metrics::Helvetica" => 0, + "Font::Metrics::HelveticaBold" => 0, + "Font::Metrics::HelveticaBoldOblique" => 0, + "Font::Metrics::HelveticaOblique" => 0, + "Font::Metrics::TimesBold" => 0, + "Font::Metrics::TimesBoldItalic" => 0, + "Font::Metrics::TimesItalic" => 0, + "Font::Metrics::TimesRoman" => 0, + "HTML::Element" => "3.15", + "HTML::TreeBuilder" => 0, + "IO::File" => 0, + "base" => 0, + "integer" => 0, + "parent" => 0, + "perl" => "5.008", + "strict" => 0, + "utf8" => 0, + "warnings" => 0 }, - 'script_files' => [] + "script_files" => [], + "test_requires" => { + "File::Slurp" => 0, + "File::Spec" => 0, + "IO::Handle" => 0, + "IPC::Open3" => 0, + "Scalar::Util" => 0, + "Test::More" => "0.96", + "bytes" => 0 + } ); +unless ( eval { Module::Build->VERSION(0.4004) } ) { + my $tr = delete $module_build_args{test_requires}; + my $br = $module_build_args{build_requires}; + for my $mod ( keys %$tr ) { + if ( exists $br->{$mod} ) { + $br->{$mod} = $tr->{$mod} if $tr->{$mod} > $br->{$mod}; + } + else { + $br->{$mod} = $tr->{$mod}; + } + } +} + my $build = Module::Build->new(%module_build_args); $build->create_build_script; diff -Nru libhtml-format-perl-2.10/Changes libhtml-format-perl-2.11/Changes --- libhtml-format-perl-2.10/Changes 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/Changes 2013-10-27 20:57:43.000000000 +0000 @@ -1,3 +1,9 @@ +2.11 2013-10-27 20:57:23 Europe/London + - Typo fixes from dsteinbrunner + https://github.com/nigelm/html-format/pull/2 + - Markdown support from mrallen1 + https://github.com/nigelm/html-format/pull/1 + 2.10 2011-07-18 17:07:35 Europe/London - Tests reworked to not use subtests. Development versions of Test::More do not support subtests, and the smokers diff -Nru libhtml-format-perl-2.10/LICENSE libhtml-format-perl-2.11/LICENSE --- libhtml-format-perl-2.10/LICENSE 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/LICENSE 2013-10-27 20:57:43.000000000 +0000 @@ -1,4 +1,4 @@ -This software is copyright (c) 2011 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. +This software is copyright (c) 2013 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. @@ -12,7 +12,7 @@ --- The GNU General Public License, Version 1, February 1989 --- -This software is Copyright (c) 2011 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. +This software is Copyright (c) 2013 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. This is free software, licensed under: @@ -22,7 +22,7 @@ Version 1, February 1989 Copyright (C) 1989 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + 51 Franklin St, Suite 500, Boston, MA 02110-1335 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -272,7 +272,7 @@ --- The Artistic License 1.0 --- -This software is Copyright (c) 2011 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. +This software is Copyright (c) 2013 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. This is free software, licensed under: diff -Nru libhtml-format-perl-2.10/MANIFEST libhtml-format-perl-2.11/MANIFEST --- libhtml-format-perl-2.10/MANIFEST 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/MANIFEST 2013-10-27 20:57:43.000000000 +0000 @@ -6,16 +6,21 @@ META.json META.yml README +lib/HTML/FormatMarkdown.pm lib/HTML/FormatPS.pm lib/HTML/FormatRTF.pm lib/HTML/FormatText.pm lib/HTML/Formatter.pm +perltidy.LOG t/00-compile.t t/000-report-versions.t t/01_ps.t t/02_rtf.t t/03_text.t +t/04_md.t t/author-critic.t +t/author-pod-spell.t +t/data/expected/test.md t/data/expected/test.ps t/data/expected/test.rtf t/data/expected/test.txt @@ -26,7 +31,6 @@ t/release-has-version.t t/release-minimum-version.t t/release-no-tabs.t -t/release-pod-spell.t t/release-pod-syntax.t t/release-portability.t t/release-synopsis.t diff -Nru libhtml-format-perl-2.10/META.json libhtml-format-perl-2.11/META.json --- libhtml-format-perl-2.10/META.json 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/META.json 2013-10-27 20:57:43.000000000 +0000 @@ -6,7 +6,7 @@ "Gisle Aas " ], "dynamic_config" : 0, - "generated_by" : "Dist::Zilla version 4.200009, CPAN::Meta::Converter version 2.110440", + "generated_by" : "Dist::Zilla version 4.300039, CPAN::Meta::Converter version 2.132661", "license" : [ "perl_5" ], @@ -26,60 +26,75 @@ "Module::Build" : "0.3601" } }, + "develop" : { + "requires" : { + "Test::CPAN::Meta" : "0", + "Test::More" : "0", + "Test::NoTabs" : "0", + "Test::Pod" : "1.41" + } + }, "runtime" : { "requires" : { - "Carp" : 0, - "Data::Dumper" : 0, - "Encode" : 0, - "Font::Metrics::Courier" : 0, - "Font::Metrics::CourierBold" : 0, - "Font::Metrics::CourierBoldOblique" : 0, - "Font::Metrics::CourierOblique" : 0, - "Font::Metrics::Helvetica" : 0, - "Font::Metrics::HelveticaBold" : 0, - "Font::Metrics::HelveticaBoldOblique" : 0, - "Font::Metrics::HelveticaOblique" : 0, - "Font::Metrics::TimesBold" : 0, - "Font::Metrics::TimesBoldItalic" : 0, - "Font::Metrics::TimesItalic" : 0, - "Font::Metrics::TimesRoman" : 0, + "Carp" : "0", + "Data::Dumper" : "0", + "Encode" : "0", + "Font::Metrics::Courier" : "0", + "Font::Metrics::CourierBold" : "0", + "Font::Metrics::CourierBoldOblique" : "0", + "Font::Metrics::CourierOblique" : "0", + "Font::Metrics::Helvetica" : "0", + "Font::Metrics::HelveticaBold" : "0", + "Font::Metrics::HelveticaBoldOblique" : "0", + "Font::Metrics::HelveticaOblique" : "0", + "Font::Metrics::TimesBold" : "0", + "Font::Metrics::TimesBoldItalic" : "0", + "Font::Metrics::TimesItalic" : "0", + "Font::Metrics::TimesRoman" : "0", "HTML::Element" : "3.15", - "HTML::TreeBuilder" : 0, - "IO::File" : 0, - "integer" : 0, + "HTML::TreeBuilder" : "0", + "IO::File" : "0", + "base" : "0", + "integer" : "0", + "parent" : "0", "perl" : "5.008", - "utf8" : 0 + "strict" : "0", + "utf8" : "0", + "warnings" : "0" } }, "test" : { "requires" : { - "English" : 0, - "File::Find" : 0, - "File::Slurp" : 0, - "File::Spec" : 0, - "File::Temp" : 0, - "Scalar::Util" : 0, + "File::Slurp" : "0", + "File::Spec" : "0", + "IO::Handle" : "0", + "IPC::Open3" : "0", + "Scalar::Util" : "0", "Test::More" : "0.96", - "bytes" : 0 + "bytes" : "0" } } }, "provides" : { + "HTML::FormatMarkdown" : { + "file" : "lib/HTML/FormatMarkdown.pm", + "version" : "2.11" + }, "HTML::FormatPS" : { "file" : "lib/HTML/FormatPS.pm", - "version" : "2.10" + "version" : "2.11" }, "HTML::FormatRTF" : { "file" : "lib/HTML/FormatRTF.pm", - "version" : "2.10" + "version" : "2.11" }, "HTML::FormatText" : { "file" : "lib/HTML/FormatText.pm", - "version" : "2.10" + "version" : "2.11" }, "HTML::Formatter" : { "file" : "lib/HTML/Formatter.pm", - "version" : "2.10" + "version" : "2.11" } }, "release_status" : "stable", @@ -88,70 +103,83 @@ "mailto" : "bug-HTML-Format@rt.cpan.org", "web" : "http://rt.cpan.org/Public/Dist/Display.html?Name=HTML-Format" }, - "homepage" : "http://search.cpan.org/dist/HTML-Format", + "homepage" : "https://metacpan.org/release/HTML-Format", "repository" : { "type" : "git", "url" : "git://github.com/nigelm/html-format.git", "web" : "http://github.com/nigelm/html-format" } }, - "version" : "2.10", + "version" : "2.11", "x_Dist_Zilla" : { + "perl" : { + "version" : "5.018001" + }, "plugins" : [ { "class" : "Dist::Zilla::Plugin::Git::NextVersion", "name" : "@NIGELM/Git::NextVersion", - "version" : "1.111590" + "version" : "2.014" }, { "class" : "Dist::Zilla::Plugin::Git::Check", "name" : "@NIGELM/Git::Check", - "version" : "1.111590" + "version" : "2.014" }, { "class" : "Dist::Zilla::Plugin::GatherDir", "name" : "@NIGELM/GatherDir", - "version" : "4.200009" + "version" : "4.300039" }, { - "class" : "Dist::Zilla::Plugin::CompileTests", - "name" : "@NIGELM/CompileTests", - "version" : "1.110930" + "class" : "Dist::Zilla::Plugin::Test::Compile", + "config" : { + "Dist::Zilla::Plugin::Test::Compile" : { + "module_finder" : [ + ":InstallModules" + ], + "script_finder" : [ + ":ExecFiles" + ] + } + }, + "name" : "@NIGELM/Test::Compile", + "version" : "2.033" }, { - "class" : "Dist::Zilla::Plugin::CriticTests", - "name" : "@NIGELM/CriticTests", - "version" : "1.111450" + "class" : "Dist::Zilla::Plugin::Test::Perl::Critic", + "name" : "@NIGELM/Test::Perl::Critic", + "version" : "2.112410" }, { "class" : "Dist::Zilla::Plugin::MetaTests", "name" : "@NIGELM/MetaTests", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::PodSyntaxTests", "name" : "@NIGELM/PodSyntaxTests", - "version" : "4.200009" + "version" : "4.300039" }, { - "class" : "Dist::Zilla::Plugin::PodSpellingTests", - "name" : "@NIGELM/PodSpellingTests", - "version" : "1.111520" + "class" : "Dist::Zilla::Plugin::Test::PodSpelling", + "name" : "@NIGELM/Test::PodSpelling", + "version" : "2.006001" }, { - "class" : "Dist::Zilla::Plugin::PortabilityTests", - "name" : "@NIGELM/PortabilityTests", - "version" : "1.111840" + "class" : "Dist::Zilla::Plugin::Test::Portability", + "name" : "@NIGELM/Test::Portability", + "version" : "2.000005" }, { - "class" : "Dist::Zilla::Plugin::SynopsisTests", - "name" : "@NIGELM/SynopsisTests", - "version" : "1.101420" + "class" : "Dist::Zilla::Plugin::Test::Synopsis", + "name" : "@NIGELM/Test::Synopsis", + "version" : "2.000004" }, { - "class" : "Dist::Zilla::Plugin::MinimumVersionTests", - "name" : "@NIGELM/MinimumVersionTests", - "version" : "1.101421" + "class" : "Dist::Zilla::Plugin::Test::MinimumVersion", + "name" : "@NIGELM/Test::MinimumVersion", + "version" : "2.000005" }, { "class" : "Dist::Zilla::Plugin::HasVersionTests", @@ -159,19 +187,29 @@ "version" : "1.101420" }, { - "class" : "Dist::Zilla::Plugin::DistManifestTests", - "name" : "@NIGELM/DistManifestTests", - "version" : "1.101420" + "class" : "Dist::Zilla::Plugin::Test::DistManifest", + "name" : "@NIGELM/Test::DistManifest", + "version" : "2.000004" }, { - "class" : "Dist::Zilla::Plugin::UnusedVarsTests", - "name" : "@NIGELM/UnusedVarsTests", - "version" : "1.100860" + "class" : "Dist::Zilla::Plugin::Test::UnusedVars", + "name" : "@NIGELM/Test::UnusedVars", + "version" : "2.000005" }, { "class" : "Dist::Zilla::Plugin::NoTabsTests", + "config" : { + "Dist::Zilla::Plugin::Test::NoTabs" : { + "module_finder" : [ + ":InstallModules" + ], + "script_finder" : [ + ":ExecFiles" + ] + } + }, "name" : "@NIGELM/NoTabsTests", - "version" : "0.01" + "version" : "0.04" }, { "class" : "Dist::Zilla::Plugin::EOLTests", @@ -181,7 +219,7 @@ { "class" : "Dist::Zilla::Plugin::InlineFiles", "name" : "@NIGELM/InlineFiles", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::ReportVersions", @@ -191,127 +229,156 @@ { "class" : "Dist::Zilla::Plugin::PruneCruft", "name" : "@NIGELM/PruneCruft", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::PruneFiles", "name" : "@NIGELM/PruneFiles", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::ManifestSkip", "name" : "@NIGELM/ManifestSkip", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::AutoPrereqs", "name" : "@NIGELM/AutoPrereqs", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::MetaConfig", "name" : "@NIGELM/MetaConfig", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::MetaProvides::Class", + "config" : { + "Dist::Zilla::Role::MetaProvider::Provider" : { + "inherit_missing" : "1", + "inherit_version" : "1", + "meta_noindex" : "1" + } + }, "name" : "@NIGELM/MetaProvides::Class", - "version" : "1.12060501" + "version" : "1.14000001" + }, + { + "class" : "Dist::Zilla::Plugin::FinderCode", + "name" : "@NIGELM/MetaProvides::Package/AUTOVIV/:InstallModulesPM", + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::MetaProvides::Package", + "config" : { + "Dist::Zilla::Plugin::MetaProvides::Package" : {}, + "Dist::Zilla::Role::MetaProvider::Provider" : { + "inherit_missing" : "1", + "inherit_version" : "1", + "meta_noindex" : "1" + } + }, "name" : "@NIGELM/MetaProvides::Package", - "version" : "1.12060501" + "version" : "1.15000000" }, { "class" : "Dist::Zilla::Plugin::MetaResources", "name" : "@NIGELM/MetaResources", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::Authority", "name" : "@NIGELM/Authority", - "version" : "1.005" + "version" : "1.006" }, { "class" : "Dist::Zilla::Plugin::ExtraTests", "name" : "@NIGELM/ExtraTests", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::NextRelease", "name" : "@NIGELM/NextRelease", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::OurPkgVersion", "name" : "@NIGELM/OurPkgVersion", - "version" : "0.1.8" + "version" : "0.005000" }, { "class" : "Dist::Zilla::Plugin::PodWeaver", + "config" : { + "Dist::Zilla::Plugin::PodWeaver" : { + "config_plugin" : "@MARCEL", + "finder" : [ + ":InstallModules", + ":ExecFiles" + ] + } + }, "name" : "@NIGELM/PodWeaver", - "version" : "3.101641" + "version" : "3.102000" }, { "class" : "Dist::Zilla::Plugin::License", "name" : "@NIGELM/License", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::ModuleBuild", "name" : "@NIGELM/ModuleBuild", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::MetaYAML", "name" : "@NIGELM/MetaYAML", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::MetaJSON", "name" : "@NIGELM/MetaJSON", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod", "name" : "@NIGELM/ReadmeAnyFromPod", - "version" : "0.103522" + "version" : "0.131500" }, { "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod", "name" : "@NIGELM/ReadmePodInRoot", - "version" : "0.103522" + "version" : "0.131500" }, { "class" : "Dist::Zilla::Plugin::InstallGuide", "name" : "@NIGELM/InstallGuide", - "version" : "1.101461" + "version" : "1.200000" }, { "class" : "Dist::Zilla::Plugin::Manifest", "name" : "@NIGELM/Manifest", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::Git::Commit", "name" : "@NIGELM/Git::Commit", - "version" : "1.111590" + "version" : "2.014" }, { "class" : "Dist::Zilla::Plugin::Git::Tag", "name" : "@NIGELM/Git::Tag", - "version" : "1.111590" + "version" : "2.014" }, { "class" : "Dist::Zilla::Plugin::Git::CommitBuild", "name" : "@NIGELM/Git::CommitBuild", - "version" : "1.111590" + "version" : "2.014" }, { "class" : "Dist::Zilla::Plugin::Git::Push", "name" : "@NIGELM/Git::Push", - "version" : "1.111590" + "version" : "2.014" }, { "class" : "Dist::Zilla::Plugin::CheckChangeLog", @@ -321,7 +388,7 @@ { "class" : "Dist::Zilla::Plugin::UploadToCPAN", "name" : "@NIGELM/UploadToCPAN", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::Prereqs", @@ -332,45 +399,45 @@ } }, "name" : "Prereqs", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":InstallModules", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":IncModules", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":TestFiles", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ExecFiles", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":ShareFiles", - "version" : "4.200009" + "version" : "4.300039" }, { "class" : "Dist::Zilla::Plugin::FinderCode", "name" : ":MainModule", - "version" : "4.200009" + "version" : "4.300039" } ], "zilla" : { "class" : "Dist::Zilla::Dist::Builder", "config" : { - "is_trial" : 0 + "is_trial" : "0" }, - "version" : "4.200009" + "version" : "4.300039" } }, "x_authority" : "cpan:NIGELM" diff -Nru libhtml-format-perl-2.10/META.yml libhtml-format-perl-2.11/META.yml --- libhtml-format-perl-2.10/META.yml 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/META.yml 2013-10-27 20:57:43.000000000 +0000 @@ -5,11 +5,10 @@ - 'Sean M Burke ' - 'Gisle Aas ' build_requires: - English: 0 - File::Find: 0 File::Slurp: 0 File::Spec: 0 - File::Temp: 0 + IO::Handle: 0 + IPC::Open3: 0 Module::Build: 0.3601 Scalar::Util: 0 Test::More: 0.96 @@ -17,25 +16,28 @@ configure_requires: Module::Build: 0.3601 dynamic_config: 0 -generated_by: 'Dist::Zilla version 4.200009, CPAN::Meta::Converter version 2.110440' +generated_by: 'Dist::Zilla version 4.300039, CPAN::Meta::Converter version 2.132661' license: perl meta-spec: url: http://module-build.sourceforge.net/META-spec-v1.4.html version: 1.4 name: HTML-Format provides: + HTML::FormatMarkdown: + file: lib/HTML/FormatMarkdown.pm + version: 2.11 HTML::FormatPS: file: lib/HTML/FormatPS.pm - version: 2.10 + version: 2.11 HTML::FormatRTF: file: lib/HTML/FormatRTF.pm - version: 2.10 + version: 2.11 HTML::FormatText: file: lib/HTML/FormatText.pm - version: 2.10 + version: 2.11 HTML::Formatter: file: lib/HTML/Formatter.pm - version: 2.10 + version: 2.11 requires: Carp: 0 Data::Dumper: 0 @@ -55,76 +57,94 @@ HTML::Element: 3.15 HTML::TreeBuilder: 0 IO::File: 0 + base: 0 integer: 0 + parent: 0 perl: 5.008 + strict: 0 utf8: 0 + warnings: 0 resources: bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=HTML-Format - homepage: http://search.cpan.org/dist/HTML-Format + homepage: https://metacpan.org/release/HTML-Format repository: git://github.com/nigelm/html-format.git -version: 2.10 +version: 2.11 x_Dist_Zilla: + perl: + version: 5.018001 plugins: - class: Dist::Zilla::Plugin::Git::NextVersion name: '@NIGELM/Git::NextVersion' - version: 1.111590 + version: 2.014 - class: Dist::Zilla::Plugin::Git::Check name: '@NIGELM/Git::Check' - version: 1.111590 + version: 2.014 - class: Dist::Zilla::Plugin::GatherDir name: '@NIGELM/GatherDir' - version: 4.200009 + version: 4.300039 - - class: Dist::Zilla::Plugin::CompileTests - name: '@NIGELM/CompileTests' - version: 1.110930 - - - class: Dist::Zilla::Plugin::CriticTests - name: '@NIGELM/CriticTests' - version: 1.111450 + class: Dist::Zilla::Plugin::Test::Compile + config: + Dist::Zilla::Plugin::Test::Compile: + module_finder: + - ':InstallModules' + script_finder: + - ':ExecFiles' + name: '@NIGELM/Test::Compile' + version: 2.033 + - + class: Dist::Zilla::Plugin::Test::Perl::Critic + name: '@NIGELM/Test::Perl::Critic' + version: 2.112410 - class: Dist::Zilla::Plugin::MetaTests name: '@NIGELM/MetaTests' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::PodSyntaxTests name: '@NIGELM/PodSyntaxTests' - version: 4.200009 - - - class: Dist::Zilla::Plugin::PodSpellingTests - name: '@NIGELM/PodSpellingTests' - version: 1.111520 - - - class: Dist::Zilla::Plugin::PortabilityTests - name: '@NIGELM/PortabilityTests' - version: 1.111840 - - - class: Dist::Zilla::Plugin::SynopsisTests - name: '@NIGELM/SynopsisTests' - version: 1.101420 + version: 4.300039 - - class: Dist::Zilla::Plugin::MinimumVersionTests - name: '@NIGELM/MinimumVersionTests' - version: 1.101421 + class: Dist::Zilla::Plugin::Test::PodSpelling + name: '@NIGELM/Test::PodSpelling' + version: 2.006001 + - + class: Dist::Zilla::Plugin::Test::Portability + name: '@NIGELM/Test::Portability' + version: 2.000005 + - + class: Dist::Zilla::Plugin::Test::Synopsis + name: '@NIGELM/Test::Synopsis' + version: 2.000004 + - + class: Dist::Zilla::Plugin::Test::MinimumVersion + name: '@NIGELM/Test::MinimumVersion' + version: 2.000005 - class: Dist::Zilla::Plugin::HasVersionTests name: '@NIGELM/HasVersionTests' version: 1.101420 - - class: Dist::Zilla::Plugin::DistManifestTests - name: '@NIGELM/DistManifestTests' - version: 1.101420 - - - class: Dist::Zilla::Plugin::UnusedVarsTests - name: '@NIGELM/UnusedVarsTests' - version: 1.100860 + class: Dist::Zilla::Plugin::Test::DistManifest + name: '@NIGELM/Test::DistManifest' + version: 2.000004 + - + class: Dist::Zilla::Plugin::Test::UnusedVars + name: '@NIGELM/Test::UnusedVars' + version: 2.000005 - class: Dist::Zilla::Plugin::NoTabsTests + config: + Dist::Zilla::Plugin::Test::NoTabs: + module_finder: + - ':InstallModules' + script_finder: + - ':ExecFiles' name: '@NIGELM/NoTabsTests' - version: 0.01 + version: 0.04 - class: Dist::Zilla::Plugin::EOLTests name: '@NIGELM/EOLTests' @@ -132,7 +152,7 @@ - class: Dist::Zilla::Plugin::InlineFiles name: '@NIGELM/InlineFiles' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::ReportVersions name: '@NIGELM/ReportVersions' @@ -140,103 +160,124 @@ - class: Dist::Zilla::Plugin::PruneCruft name: '@NIGELM/PruneCruft' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::PruneFiles name: '@NIGELM/PruneFiles' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::ManifestSkip name: '@NIGELM/ManifestSkip' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::AutoPrereqs name: '@NIGELM/AutoPrereqs' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::MetaConfig name: '@NIGELM/MetaConfig' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::MetaProvides::Class + config: + Dist::Zilla::Role::MetaProvider::Provider: + inherit_missing: 1 + inherit_version: 1 + meta_noindex: 1 name: '@NIGELM/MetaProvides::Class' - version: 1.12060501 + version: 1.14000001 + - + class: Dist::Zilla::Plugin::FinderCode + name: '@NIGELM/MetaProvides::Package/AUTOVIV/:InstallModulesPM' + version: 4.300039 - class: Dist::Zilla::Plugin::MetaProvides::Package + config: + Dist::Zilla::Plugin::MetaProvides::Package: {} + Dist::Zilla::Role::MetaProvider::Provider: + inherit_missing: 1 + inherit_version: 1 + meta_noindex: 1 name: '@NIGELM/MetaProvides::Package' - version: 1.12060501 + version: 1.15000000 - class: Dist::Zilla::Plugin::MetaResources name: '@NIGELM/MetaResources' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::Authority name: '@NIGELM/Authority' - version: 1.005 + version: 1.006 - class: Dist::Zilla::Plugin::ExtraTests name: '@NIGELM/ExtraTests' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::NextRelease name: '@NIGELM/NextRelease' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::OurPkgVersion name: '@NIGELM/OurPkgVersion' - version: 0.1.8 + version: 0.005000 - class: Dist::Zilla::Plugin::PodWeaver + config: + Dist::Zilla::Plugin::PodWeaver: + config_plugin: '@MARCEL' + finder: + - ':InstallModules' + - ':ExecFiles' name: '@NIGELM/PodWeaver' - version: 3.101641 + version: 3.102000 - class: Dist::Zilla::Plugin::License name: '@NIGELM/License' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::ModuleBuild name: '@NIGELM/ModuleBuild' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::MetaYAML name: '@NIGELM/MetaYAML' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::MetaJSON name: '@NIGELM/MetaJSON' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::ReadmeAnyFromPod name: '@NIGELM/ReadmeAnyFromPod' - version: 0.103522 + version: 0.131500 - class: Dist::Zilla::Plugin::ReadmeAnyFromPod name: '@NIGELM/ReadmePodInRoot' - version: 0.103522 + version: 0.131500 - class: Dist::Zilla::Plugin::InstallGuide name: '@NIGELM/InstallGuide' - version: 1.101461 + version: 1.200000 - class: Dist::Zilla::Plugin::Manifest name: '@NIGELM/Manifest' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::Git::Commit name: '@NIGELM/Git::Commit' - version: 1.111590 + version: 2.014 - class: Dist::Zilla::Plugin::Git::Tag name: '@NIGELM/Git::Tag' - version: 1.111590 + version: 2.014 - class: Dist::Zilla::Plugin::Git::CommitBuild name: '@NIGELM/Git::CommitBuild' - version: 1.111590 + version: 2.014 - class: Dist::Zilla::Plugin::Git::Push name: '@NIGELM/Git::Push' - version: 1.111590 + version: 2.014 - class: Dist::Zilla::Plugin::CheckChangeLog name: '@NIGELM/CheckChangeLog' @@ -244,7 +285,7 @@ - class: Dist::Zilla::Plugin::UploadToCPAN name: '@NIGELM/UploadToCPAN' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::Prereqs config: @@ -252,34 +293,34 @@ phase: runtime type: requires name: Prereqs - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':InstallModules' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':IncModules' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':TestFiles' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':ExecFiles' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':ShareFiles' - version: 4.200009 + version: 4.300039 - class: Dist::Zilla::Plugin::FinderCode name: ':MainModule' - version: 4.200009 + version: 4.300039 zilla: class: Dist::Zilla::Dist::Builder config: is_trial: 0 - version: 4.200009 + version: 4.300039 x_authority: cpan:NIGELM diff -Nru libhtml-format-perl-2.10/README libhtml-format-perl-2.11/README --- libhtml-format-perl-2.10/README 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/README 2013-10-27 20:57:43.000000000 +0000 @@ -2,7 +2,7 @@ HTML::Formatter - Base class for HTML formatters VERSION - version 2.10 + version 2.11 SYNOPSIS use HTML::FormatSomething; @@ -22,8 +22,9 @@ DESCRIPTION HTML::Formatter is a base class for classes that take HTML and format it to some output format. When you take an object of such a base class and - call "$formatter->format( $tree )" with an HTML::TreeBuilder (or - HTML::Element) object, they return the + call "$formatter-"format( $tree )> with an HTML::TreeBuilder (or + HTML::Element) object, they return the appropriately formatted string + for the input HTML. HTML formatters are able to format a HTML syntax tree into various printable formats. Different formatters produce output for different @@ -93,22 +94,16 @@ modules. BUGS AND LIMITATIONS - No bugs have been reported. - - Please report any bugs or feature requests through the web interface at + You can make new bug reports, and view existing ones, through the web + interface at . AVAILABILITY - The project homepage is . + The project homepage is . The latest version of this module is available from the Comprehensive Perl Archive Network (CPAN). Visit to find a - CPAN site near you, or see . - - The development version lives at - and may be cloned from . - Instead of sending patches, please fork this project using the standard - git and github infrastructure. + CPAN site near you, or see . AUTHORS * Nigel Metheringham @@ -118,7 +113,7 @@ * Gisle Aas COPYRIGHT AND LICENSE - This software is copyright (c) 2011 by Nigel Metheringham, 2002-2005 + This software is copyright (c) 2013 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. This is free software; you can redistribute it and/or modify it under diff -Nru libhtml-format-perl-2.10/debian/changelog libhtml-format-perl-2.11/debian/changelog --- libhtml-format-perl-2.10/debian/changelog 2011-07-26 15:19:24.000000000 +0000 +++ libhtml-format-perl-2.11/debian/changelog 2013-11-01 10:05:59.000000000 +0000 @@ -1,3 +1,31 @@ +libhtml-format-perl (2.11-1) unstable; urgency=low + + [ Ansgar Burchardt ] + * debian/control: Convert Vcs-* fields to Git. + + [ Salvatore Bonaccorso ] + * debian/copyright: Replace DEP5 Format-Specification URL from + svn.debian.org to anonscm.debian.org URL. + * Change Vcs-Git to canonical URI (git://anonscm.debian.org) + * Change search.cpan.org based URIs to metacpan.org based URIs + + [ gregor herrmann ] + * Swap order of alternative (build) dependencies after the perl 5.14 + transition. + + [ Axel Beckert ] + * debian/copyright: migrate pre-1.0 format to 1.0 using "cme fix + dpkg-copyright" + + [ Angel Abad ] + * mass updated Angel Abad's email address + * Imported Upstream version 2.11 + * debian/control: Build depends on debhelper (>= 9.20120312) + * Bump Standards-Version to 3.9.5 (no changes) + * debian/copyright: Update years. + + -- Angel Abad Fri, 01 Nov 2013 11:01:57 +0100 + libhtml-format-perl (2.10-1) unstable; urgency=low [ Angel Abad ] diff -Nru libhtml-format-perl-2.10/debian/control libhtml-format-perl-2.11/debian/control --- libhtml-format-perl-2.10/debian/control 2011-07-26 15:19:24.000000000 +0000 +++ libhtml-format-perl-2.11/debian/control 2013-11-01 09:59:08.000000000 +0000 @@ -6,18 +6,18 @@ Jonathan Yu , Martín Ferrari , Fabrizio Regalli , - Angel Abad -Build-Depends: debhelper (>= 8), + Angel Abad +Build-Depends: debhelper (>= 9.20120312), perl Build-Depends-Indep: libfile-slurp-perl, libfont-afm-perl, libhtml-tree-perl, - libmodule-build-perl (>= 0.360100) | perl (>= 5.11.4), - libtest-simple-perl (>= 0.96) | perl (>= 5.13.4) -Standards-Version: 3.9.2 -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-perl/trunk/libhtml-format-perl/ -Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libhtml-format-perl/ -Homepage: http://search.cpan.org/dist/HTML-Format/ + perl (>= 5.11.4) | libmodule-build-perl, + perl (>= 5.13.4) | libtest-simple-perl (>= 0.96) +Standards-Version: 3.9.5 +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/libhtml-format-perl.git +Vcs-Git: git://anonscm.debian.org/pkg-perl/packages/libhtml-format-perl.git +Homepage: https://metacpan.org/release/HTML-Format/ Package: libhtml-format-perl Architecture: all diff -Nru libhtml-format-perl-2.10/debian/copyright libhtml-format-perl-2.11/debian/copyright --- libhtml-format-perl-2.10/debian/copyright 2011-07-26 15:19:24.000000000 +0000 +++ libhtml-format-perl-2.11/debian/copyright 2013-11-01 10:00:53.000000000 +0000 @@ -1,10 +1,10 @@ -Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 -Maintainer: Nigel Metheringham -Source: http://search.cpan.org/dist/HTML-Format/ -Name: HTML-Format +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Source: https://metacpan.org/release/HTML-Format +Upstream-Contact: Nigel Metheringham +Upstream-Name: HTML-Format Files: * -Copyright: 2011, Nigel Metheringham +Copyright: 2011-2013, Nigel Metheringham 2002-2005, Sean M Burke 1999-2002, Gisle Aas License: Artistic or GPL-1+ @@ -14,7 +14,7 @@ 2003, Hans Freitag 2004, Jay Bonci 2008, Martín Ferrari - 2011, Angel Abad + 2011-2013, Angel Abad 2011, Ansgar Burchardt 2011, Fabrizio Regalli 2011, Jonathan Yu diff -Nru libhtml-format-perl-2.10/debian/watch libhtml-format-perl-2.11/debian/watch --- libhtml-format-perl-2.10/debian/watch 2011-03-18 11:19:34.000000000 +0000 +++ libhtml-format-perl-2.11/debian/watch 2013-11-01 09:54:03.000000000 +0000 @@ -1,3 +1,3 @@ version=3 -http://search.cpan.org/dist/HTML-Format/ .+/HTML-Format-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ +https://metacpan.org/release/HTML-Format/ .+/HTML-Format-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$ diff -Nru libhtml-format-perl-2.10/lib/HTML/FormatMarkdown.pm libhtml-format-perl-2.11/lib/HTML/FormatMarkdown.pm --- libhtml-format-perl-2.10/lib/HTML/FormatMarkdown.pm 1970-01-01 00:00:00.000000000 +0000 +++ libhtml-format-perl-2.11/lib/HTML/FormatMarkdown.pm 2013-10-27 20:57:43.000000000 +0000 @@ -0,0 +1,375 @@ +package HTML::FormatMarkdown; + +# ABSTRACT: Format HTML as Markdown + + +use 5.006_001; +use strict; +use warnings; + +use parent 'HTML::Formatter'; + +our $VERSION = '2.11'; # VERSION +our $AUTHORITY = 'cpan:NIGELM'; # AUTHORITY + +sub default_values { + ( shift->SUPER::default_values(), + lm => 0, + rm => 70, + ); +} + +sub configure { + my ( $self, $hash ) = @_; + + my $lm = $self->{lm}; + my $rm = $self->{rm}; + + $lm = delete $hash->{lm} if exists $hash->{lm}; + $lm = delete $hash->{leftmargin} if exists $hash->{leftmargin}; + $rm = delete $hash->{rm} if exists $hash->{rm}; + $rm = delete $hash->{rightmargin} if exists $hash->{rightmargin}; + + my $width = $rm - $lm; + if ( $width < 1 ) { + warn "Bad margins, ignored" if $^W; + return; + } + if ( $width < 20 ) { + warn "Page probably too narrow" if $^W; + } + + for ( keys %$hash ) { + warn "Unknown configure option '$_'" if $^W; + } + + $self->{lm} = $lm; + $self->{rm} = $rm; + $self; +} + +sub begin { + my $self = shift; + + $self->SUPER::begin(); + $self->{maxpos} = 0; + $self->{curpos} = 0; # current output position. +} + +sub end { + shift->collect("\n"); +} + +sub header_start { + my ( $self, $level ) = @_; + + $self->vspace(1); + $self->out( '#' x $level . ' ' ); + 1; +} + +sub header_end { + my ( $self, $level ) = @_; + + $self->out( ' ' . '#' x $level ); + $self->vspace(1); +} + +sub bullet { + my $self = shift; + + $self->SUPER::bullet( $_[0] . ' ' ); + +} + +sub hr_start { + my $self = shift; + + $self->vspace(1); + $self->out('- - -'); + $self->vspace(1); +} + +sub img_start { + my ( $self, $node ) = @_; + + my $alt = $node->attr('alt'); + my $src = $node->attr('src'); + + $self->out("![$alt]($src)"); +} + +sub a_start { + my ( $self, $node ) = @_; + + # ignore named anchors + if ( $node->attr('name') ) { + 1; + } + elsif ( $node->attr('href') =~ /^#/ ) { + 1; + } + else { + $self->out("["); + } + +} + +sub a_end { + my ( $self, $node ) = @_; + + if ( $node->attr('name') ) { + return; + } + elsif ( my $href = $node->attr('href') ) { + if ( $href =~ /^#/ ) { + return; + } + $self->out("]($href)"); + } +} + +sub b_start { shift->out("**") } +sub b_end { shift->out("**") } +sub i_start { shift->out("*") } +sub i_end { shift->out("*") } + +sub tt_start { + my $self = shift; + + if ( $self->{pre} ) { + return 1; + } + else { + $self->out("`"); + } +} + +sub tt_end { + my $self = shift; + + if ( $self->{pre} ) { + return; + } + else { + $self->out("`"); + } +} + +sub blockquote_start { + my $self = shift; + + $self->{blockquote}++; + $self->vspace(1); + $self->adjust_rm(-4); + + 1; +} + +sub blockquote_end { + my $self = shift; + + $self->{blockquote}--; + $self->vspace(1); + $self->adjust_rm(+4); + +} + +sub blockquote_out { + my ( $self, $text ) = @_; + + $self->nl; + $self->goto_lm; + + my $line = "> "; + $self->{curpos} += 2; + + foreach my $word ( split /\s/, $text ) { + $line .= "$word "; + if ( ( $self->{curpos} + length($line) ) > $self->{rm} ) { + $self->collect($line); + $self->nl; + $self->goto_lm; + $line = "> "; + $self->{curpos} += 2; + } + } + + $self->collect($line); + $self->nl; + +} + +# Quoted from HTML::FormatText +sub pre_out { + my $self = shift; + + if ( defined $self->{vspace} ) { + if ( $self->{out} ) { + $self->nl() while $self->{vspace}-- >= 0; + $self->{vspace} = undef; + } + } + + my $indent = ' ' x $self->{lm}; + $indent .= ' ' x 4; + my $pre = shift; + $pre =~ s/^/$indent/mg; + $self->collect($pre); + $self->{out}++; +} + +sub out { + my $self = shift; + my $text = shift; + + $text =~ tr/\xA0\xAD/ /d; + + if ( $text =~ /^\s*$/ ) { + $self->{hspace} = 1; + return; + } + + if ( defined $self->{vspace} ) { + if ( $self->{out} ) { + $self->nl while $self->{vspace}-- >= 0; + } + $self->goto_lm; + $self->{vspace} = undef; + $self->{hspace} = 0; + } + + if ( $self->{hspace} ) { + if ( $self->{curpos} + length($text) > $self->{rm} ) { + + # word will not fit on line; do a line break + $self->nl; + $self->goto_lm; + } + else { + + # word fits on line; use a space + $self->collect(' '); + ++$self->{curpos}; + } + $self->{hspace} = 0; + } + + $self->collect($text); + my $pos = $self->{curpos} += length $text; + $self->{maxpos} = $pos if $self->{maxpos} < $pos; + $self->{'out'}++; +} + +sub goto_lm { + my $self = shift; + + my $pos = $self->{curpos}; + my $lm = $self->{lm}; + if ( $pos < $lm ) { + $self->{curpos} = $lm; + $self->collect( " " x ( $lm - $pos ) ); + } +} + +sub nl { + my $self = shift; + + $self->{'out'}++; + $self->{curpos} = 0; + $self->collect("\n"); +} + +sub adjust_lm { + my $self = shift; + + $self->{lm} += $_[0]; + $self->goto_lm; +} + +sub adjust_rm { + shift->{rm} += $_[0]; +} + +1; + +__END__ + +=pod + +=for stopwords CPAN Markdown homepage + +=for test_synopsis 1; +__END__ + +=head1 NAME + +HTML::FormatMarkdown - Format HTML as Markdown + +=head1 VERSION + +version 2.11 + +=head1 SYNOPSIS + + use HTML::FormatMarkdown; + + my $string = HTML::FormatMarkdown->format_file( + 'test.html' + ); + + open my $fh, ">", "test.md" or die "$!\n"; + print $fh $string; + close $fh; + +=head1 DESCRIPTION + +HTML::FormatMarkdown is a formatter that outputs Markdown. + +HTML::FormatMarkdown is built on L and documentation for that +module applies to this - especially L, +L and L. + +=head1 INSTALLATION + +See perlmodinstall for information and options on installing Perl modules. + +=head1 BUGS AND LIMITATIONS + +You can make new bug reports, and view existing ones, through the +web interface at L. + +=head1 AVAILABILITY + +The project homepage is L. + +The latest version of this module is available from the Comprehensive Perl +Archive Network (CPAN). Visit L to find a CPAN +site near you, or see L. + +=head1 AUTHORS + +=over 4 + +=item * + +Nigel Metheringham + +=item * + +Sean M Burke + +=item * + +Gisle Aas + +=back + +=head1 COPYRIGHT AND LICENSE + +This software is copyright (c) 2013 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. + +This is free software; you can redistribute it and/or modify it under +the same terms as the Perl 5 programming language system itself. + +=cut diff -Nru libhtml-format-perl-2.10/lib/HTML/FormatPS.pm libhtml-format-perl-2.11/lib/HTML/FormatPS.pm --- libhtml-format-perl-2.10/lib/HTML/FormatPS.pm 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/lib/HTML/FormatPS.pm 2013-10-27 20:57:43.000000000 +0000 @@ -13,7 +13,7 @@ use base 'HTML::Formatter'; -our $VERSION = '2.10'; # VERSION +our $VERSION = '2.11'; # VERSION our $AUTHORITY = 'cpan:NIGELM'; # AUTHORITY # We now use Smart::Comments in place of the old DEBUG framework. @@ -578,7 +578,7 @@ if ( $bullet eq '*' ) { # There is no character that is really suitable. Let's make - # a medium-sized filled cirle ourself. + # a medium-sized filled circle ourself. my $radius = $self->{pointsize} / 8; ### Adding code for a '*' bullet for that line... @@ -636,7 +636,7 @@ local $self->{'pointsize'} = $self->{'pointsize'}; # That's needed for protecting against one bit of the - # potential side-effects from from page-numbering code + # potential side-effects from page-numbering code if ( $self->{'out'} ) { # whether we've sent anything to the current page so far. ### Newpage calls endpage... @@ -860,6 +860,7 @@ 1; __END__ + =pod =for test_synopsis 1; @@ -869,6 +870,7 @@ horizontalmargin leftmargin noprolog notrailer pageno paperheight papersize paperwidth postscript rightmargin startpage topmargin verticalmargin ledding leeding prolog + CPAN Quarto Tabloid Unicode homepage =head1 NAME @@ -876,7 +878,7 @@ =head1 VERSION -version 2.10 +version 2.11 =head1 SYNOPSIS @@ -901,11 +903,11 @@ =head1 DESCRIPTION -The HTML::FormatPS is a formatter that outputs PostScript code. -Formatting of HTML tables and forms is not implemented. +The HTML::FormatPS is a formatter that outputs PostScript code. Formatting of +HTML tables and forms is not implemented. -HTML::FormatPS is built on top of L and so further -detail may be found in the documentation for L. +HTML::FormatPS is built on top of L and so further detail may +be found in the documentation for L. You might specify the following parameters when constructing the formatter object (or when calling format_file or format_string): @@ -914,21 +916,19 @@ =item PaperSize -What kind of paper should we format for. The value can be one of -these: A3, A4, A5, B4, B5, Letter, Legal, Executive, Tabloid, -Statement, Folio, 10x14, Quarto. +What kind of paper should we format for. The value can be one of these: A3, +A4, A5, B4, B5, Letter, Legal, Executive, Tabloid, Statement, Folio, 10x14, +Quarto. The default is "A4". =item PaperWidth -The width of the paper, in points. Setting PaperSize also defines this -value. +The width of the paper, in points. Setting PaperSize also defines this value. =item PaperHeight -The height of the paper, in points. Setting PaperSize also defines -this value. +The height of the paper, in points. Setting PaperSize also defines this value. =item LeftMargin @@ -956,51 +956,48 @@ =item PageNo -This parameter determines if we should put page numbers on the pages. -The default value is true; so you have to set this value to 0 in order to -suppress page numbers. (The "No" in "PageNo" means number/numero!) +This parameter determines if we should put page numbers on the pages. The +default value is true; so you have to set this value to 0 in order to suppress +page numbers. (The "No" in "PageNo" means number/numero!) =item FontFamily -This parameter specifies which family of fonts to use for the formatting. -Legal values are "Courier", "Helvetica" and "Times". The default is -"Times". +This parameter specifies which family of fonts to use for the formatting. Legal +values are "Courier", "Helvetica" and "Times". The default is "Times". =item FontScale This is a scaling factor for all the font sizes. The default value is 1. -For example, if you want everything to be almost three times as large, -you could set this to 2.7. If you wanted things just a bit smaller than -normal, you could set it to .92. +For example, if you want everything to be almost three times as large, you +could set this to 2.7. If you wanted things just a bit smaller than normal, +you could set it to .92. =item Leading -This option (pronounced "ledding", not "leeding") controls how much is -space between lines. This is a factor of the font size used for that -line. Default is 0.1 -- so between two 12-point lines, there will be -1.2 points of space. +This option (pronounced "ledding", not "leeding") controls how much is space +between lines. This is a factor of the font size used for that line. Default +is 0.1 -- so between two 12-point lines, there will be 1.2 points of space. =item StartPage -Assuming you have PageNo on, StartPage controls what the page number of -the first page will be. By default, it is 1. So if you set this to 87, -the first page would say "87" on it, the next "88", and so on. +Assuming you have PageNo on, StartPage controls what the page number of the +first page will be. By default, it is 1. So if you set this to 87, the first +page would say "87" on it, the next "88", and so on. =item NoProlog If this option is set to a true value, HTML::FormatPS will make a point of -I emitting the PostScript prolog before the document. By default, -this is off, meaning that HTML::FormatPS I emit the prolog. This -option is of interest only to advanced users. +I emitting the PostScript prolog before the document. By default, this is +off, meaning that HTML::FormatPS I emit the prolog. This option is of +interest only to advanced users. =item NoTrailer If this option is set to a true value, HTML::FormatPS will make a point of -I emitting the PostScript trailer at the end of the document. By -default, this is off, meaning that HTML::FormatPS I emit the bit -of PostScript that ends the document. This option is of interest only to -advanced users. +I emitting the PostScript trailer at the end of the document. By default, +this is off, meaning that HTML::FormatPS I emit the bit of PostScript +that ends the document. This option is of interest only to advanced users. =back @@ -1024,10 +1021,9 @@ =item * -Output is in ISO Latin1 format. The underlying HTML parsers tend to -now work in Unicode (perl native) code points. There is an impedance -mismatch between these, which may give issues with complex characters -within HTML. +Output is in ISO Latin1 format. The underlying HTML parsers tend to now work in +Unicode (perl native) code points. There is an impedance mismatch between +these, which may give issues with complex characters within HTML. =back @@ -1037,8 +1033,8 @@ =item * -Support for some more character styles, notably including: -strike-through, underlining, superscript, and subscript. +Support for some more character styles, notably including: strike-through, +underlining, superscript, and subscript. =item * @@ -1046,8 +1042,8 @@ =item * -Support for Win-1252 encoding, since that's what most people -mean when they use characters in the range 0x80-0x9F in HTML. +Support for Win-1252 encoding, since that's what most people mean when they use +characters in the range 0x80-0x9F in HTML. =item * @@ -1055,8 +1051,8 @@ =back -I would welcome email from people who can help me out or advise -me on the above. +I would welcome email from people who can help me out or advise me on the +above. =head1 INSTALLATION @@ -1064,23 +1060,16 @@ =head1 BUGS AND LIMITATIONS -No bugs have been reported. - -Please report any bugs or feature requests through the web interface at -L. +You can make new bug reports, and view existing ones, through the +web interface at L. =head1 AVAILABILITY -The project homepage is L. +The project homepage is L. The latest version of this module is available from the Comprehensive Perl Archive Network (CPAN). Visit L to find a CPAN -site near you, or see L. - -The development version lives at L -and may be cloned from L. -Instead of sending patches, please fork this project using the standard -git and github infrastructure. +site near you, or see L. =head1 AUTHORS @@ -1102,10 +1091,9 @@ =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2011 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. +This software is copyright (c) 2013 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libhtml-format-perl-2.10/lib/HTML/FormatRTF.pm libhtml-format-perl-2.11/lib/HTML/FormatRTF.pm --- libhtml-format-perl-2.10/lib/HTML/FormatRTF.pm 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/lib/HTML/FormatRTF.pm 2013-10-27 20:57:43.000000000 +0000 @@ -13,7 +13,7 @@ use base 'HTML::Formatter'; -our $VERSION = '2.10'; # VERSION +our $VERSION = '2.11'; # VERSION our $AUTHORITY = 'cpan:NIGELM'; # AUTHORITY # ------------------------------------------------------------------------ @@ -32,12 +32,12 @@ #"\cm" => "\n\\line ", #"\cj" => "\n\\line ", - "\t" => "\\tab ", # Tabs (altho theoretically raw \t's are okay) + "\t" => "\\tab ", # Tabs (altho theoretically raw \t's are okay) # "\f" => "\n\\page\n", # Formfeed - "-" => "\\_", # Turn plaintext '-' into a non-breaking hyphen - "\xA0" => "\\~", # Latin-1 non-breaking space - "\xAD" => "\\-", # Latin-1 soft (optional) hyphen + "-" => "\\_", # Turn plaintext '-' into a non-breaking hyphen + "\xA0" => "\\~", # Latin-1 non-breaking space + "\xAD" => "\\-", # Latin-1 soft (optional) hyphen # CRAZY HACKS: "\n" => "\\line\n", @@ -439,16 +439,16 @@ elsif (wantarray) { # return an array return map { ; - ( $x = $_ ) =~ s/([F\x00-\x1F\-\\\{\}\x7F-\xFF])/$Escape{$1}/g; # ESCAPER + ( $x = $_ ) =~ s/([F\x00-\x1F\-\\\{\}\x7F-\xFF])/$Escape{$1}/g; # ESCAPER $x =~ s/([^\x00-\xFF])/'\\uc1\\u'.((ord($1)<32768)?ord($1):(ord($1)-65536)).'?'/eg; # Hyper-escape all Unicode characters. $x; } @_; } - else { # return a single scalar + else { # return a single scalar ( $x = ( ( @_ == 1 ) ? $_[0] : join '', @_ ) ) =~ s/([F\x00-\x1F\-\\\{\}\x7F-\xFF])/$Escape{$1}/g; # ESCAPER - # Escape \, {, }, -, control chars, and 7f-ff. + # Escape \, {, }, -, control chars, and 7f-ff. $x =~ s/([^\x00-\xFF])/'\\uc1\\u'.((ord($1)<32768)?ord($1):(ord($1)-65536)).'?'/eg; # Hyper-escape all Unicode characters. @@ -494,7 +494,7 @@ 1; - +__END__ =pod @@ -502,6 +502,7 @@ __END__ =for stopwords arial bookman lm pagenumber p.pagenumber prolog rtf tahoma verdana + CPAN homepage rm sans serif twentieths =head1 NAME @@ -509,7 +510,7 @@ =head1 VERSION -version 2.10 +version 2.11 =head1 SYNOPSIS @@ -527,12 +528,12 @@ =head1 DESCRIPTION -HTML::FormatRTF is a class for objects that you use to convert HTML to -RTF. There is currently no proper support for tables or forms. +HTML::FormatRTF is a class for objects that you use to convert HTML to RTF. +There is currently no proper support for tables or forms. -This is a subclass of L, whose documentation you -should consult for more information on underlying methods such as -C, C, C etc +This is a subclass of L, whose documentation you should +consult for more information on underlying methods such as C, C, +C etc You can specify any of the following parameters in the call to C, C, or C: @@ -544,10 +545,10 @@ Amount of I indenting to apply to the left margin, in twips (IentIeths of a I

oint). Default is 0. -So if you wanted the left margin to be an additional half inch larger, -you'd set C<< lm => 720 >> (since there's 1440 twips in an inch). -If you wanted it to be about 1.5cm larger, you'd set -C<< lw => 850 >> (since there's about 567 twips in a centimeter). +So if you wanted the left margin to be an additional half inch larger, you'd +set C<< lm => 720 >> (since there's 1440 twips in an inch). If you wanted it to +be about 1.5cm larger, you'd set C<< lw => 850 >> (since there's about 567 +twips in a centimeter). =item rm @@ -556,74 +557,72 @@ =item normal_halfpoint_size -This is the size of normal text in the document, in I-points. -The default value is 22, meaning that normal text is in 11 point. +This is the size of normal text in the document, in I-points. The default +value is 22, meaning that normal text is in 11 point. =item header_halfpoint_size -This is the size of text used in the document's page-header, in -I-points. The default value is 17, meaning that normal text is in -7.5 point. Currently, the header consists just of "p.I" -in the upper-right-hand corner, and cannot be disabled. +This is the size of text used in the document's page-header, in I-points. +The default value is 17, meaning that normal text is in 7.5 point. Currently, +the header consists just of "p.I" in the upper-right-hand corner, +and cannot be disabled. =item head1_halfpoint_size ... head6_halfpoint_size -These control the font size of each heading level, in half-twips. For -example, the default for head3_halfpoint_size is 25, meaning that HTML -C<<

...

>> text will be in 12.5 point text (in addition to being -underlined and in the heading font). +These control the font size of each heading level, in half-twips. For example, +the default for head3_halfpoint_size is 25, meaning that HTML C<<

...

+>> text will be in 12.5 point text (in addition to being underlined and in the +heading font). =item codeblock_halfpoint_size -This controls the font size (in half-points) of the text used for -C<<
...
>> text. By default, it is 18, meaning 9 point. +This controls the font size (in half-points) of the text used for C<< +
...
>> text. By default, it is 18, meaning 9 point. =item fontname_body -This option controls what font is to be used for the body of the -text -- that is, everything other than heading text and text in -pre/code/tt elements. The default value is currently "Times". Other -handy values I can suggest using are "Georgia" or "Bookman Old Style". +This option controls what font is to be used for the body of the text -- that +is, everything other than heading text and text in pre/code/tt elements. The +default value is currently "Times". Other handy values I can suggest using are +"Georgia" or "Bookman Old Style". =item fontname_code -This option controls what font is to be used for text in pre/code/tt -elements. The default value is currently "Courier New". +This option controls what font is to be used for text in pre/code/tt elements. +The default value is currently "Courier New". =item fontname_headings -This option controls what font name is to be used for headings. You can -use the same font as fontname_body, but I prefer a sans-serif font, so -the default value is currently "Arial". Also consider -"Tahoma" and "Verdana". +This option controls what font name is to be used for headings. You can use +the same font as fontname_body, but I prefer a sans-serif font, so the default +value is currently "Arial". Also consider "Tahoma" and "Verdana". =item document_language -This option controls what Microsoft language number will be specified as -the language for this document. The current default value is 1033, for -US English. Consult an RTF reference for other language numbers. +This option controls what Microsoft language number will be specified as the +language for this document. The current default value is 1033, for US English. +Consult an RTF reference for other language numbers. =item hr_width -This option controls how many underline characters will be used for -rendering a "
" tag. Its default value is currently 50. You can -usually leave this alone, but under some circumstances you might want to -use a smaller or larger number. +This option controls how many underline characters will be used for rendering a +"
" tag. Its default value is currently 50. You can usually leave this +alone, but under some circumstances you might want to use a smaller or larger +number. =item no_prolog If this option is set to a true value, HTML::FormatRTF will make a point of -I emitting the RTF prolog before the document. By default, this is -off, meaning that HTML::FormatRTF I emit the prolog. This option -is of interest only to advanced users. +I emitting the RTF prolog before the document. By default, this is off, +meaning that HTML::FormatRTF I emit the prolog. This option is of +interest only to advanced users. =item no_trailer If this option is set to a true value, HTML::FormatRTF will make a point of -I emitting the RTF trailer at the end of the document. By default, -this is off, meaning that HTML::FormatRTF I emit the bit of RTF -that ends the document. This option is of interest only to advanced -users. +I emitting the RTF trailer at the end of the document. By default, this +is off, meaning that HTML::FormatRTF I emit the bit of RTF that ends the +document. This option is of interest only to advanced users. =back @@ -637,23 +636,16 @@ =head1 BUGS AND LIMITATIONS -No bugs have been reported. - -Please report any bugs or feature requests through the web interface at -L. +You can make new bug reports, and view existing ones, through the +web interface at L. =head1 AVAILABILITY -The project homepage is L. +The project homepage is L. The latest version of this module is available from the Comprehensive Perl Archive Network (CPAN). Visit L to find a CPAN -site near you, or see L. - -The development version lives at L -and may be cloned from L. -Instead of sending patches, please fork this project using the standard -git and github infrastructure. +site near you, or see L. =head1 AUTHORS @@ -675,13 +667,9 @@ =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2011 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. +This software is copyright (c) 2013 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. =cut - - -__END__ - diff -Nru libhtml-format-perl-2.10/lib/HTML/FormatText.pm libhtml-format-perl-2.11/lib/HTML/FormatText.pm --- libhtml-format-perl-2.10/lib/HTML/FormatText.pm 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/lib/HTML/FormatText.pm 2013-10-27 20:57:43.000000000 +0000 @@ -13,7 +13,7 @@ use base 'HTML::Formatter'; -our $VERSION = '2.10'; # VERSION +our $VERSION = '2.11'; # VERSION our $AUTHORITY = 'cpan:NIGELM'; # AUTHORITY # ------------------------------------------------------------------------ @@ -208,12 +208,13 @@ 1; __END__ + =pod =for test_synopsis 1; __END__ -=for stopwords latin1 leftmargin lm plaintext rightmargin +=for stopwords latin1 leftmargin lm plaintext rightmargin rm CPAN homepage =head1 NAME @@ -221,7 +222,7 @@ =head1 VERSION -version 2.10 +version 2.11 =head1 SYNOPSIS @@ -242,17 +243,15 @@ =head1 DESCRIPTION -HTML::FormatText is a formatter that outputs plain latin1 text. -All character attributes (bold/italic/underline) are ignored. -Formatting of HTML tables and forms is not implemented. - -HTML::FormatText is built on L and documentation -for that module applies to this - especially -L, L and -L. +HTML::FormatText is a formatter that outputs plain latin1 text. All character +attributes (bold/italic/underline) are ignored. Formatting of HTML tables and +forms is not implemented. + +HTML::FormatText is built on L and documentation for that +module applies to this - especially L, +L and L. -You might specify the following parameters when constructing the -formatter: +You might specify the following parameters when constructing the formatter: =over 4 @@ -276,23 +275,16 @@ =head1 BUGS AND LIMITATIONS -No bugs have been reported. - -Please report any bugs or feature requests through the web interface at -L. +You can make new bug reports, and view existing ones, through the +web interface at L. =head1 AVAILABILITY -The project homepage is L. +The project homepage is L. The latest version of this module is available from the Comprehensive Perl Archive Network (CPAN). Visit L to find a CPAN -site near you, or see L. - -The development version lives at L -and may be cloned from L. -Instead of sending patches, please fork this project using the standard -git and github infrastructure. +site near you, or see L. =head1 AUTHORS @@ -314,10 +306,9 @@ =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2011 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. +This software is copyright (c) 2013 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libhtml-format-perl-2.10/lib/HTML/Formatter.pm libhtml-format-perl-2.11/lib/HTML/Formatter.pm --- libhtml-format-perl-2.10/lib/HTML/Formatter.pm 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/lib/HTML/Formatter.pm 2013-10-27 20:57:43.000000000 +0000 @@ -14,7 +14,7 @@ # this should be commented out in release versions.... ##use Smart::Comments; -our $VERSION = '2.10'; # VERSION +our $VERSION = '2.11'; # VERSION our $AUTHORITY = 'cpan:NIGELM'; # AUTHORITY # @@ -734,6 +734,10 @@ $_[0] =~ s/^\n//; $self->pre_out( $_[0] ); } + elsif ( $self->{blockquote} ) { + $_[0] =~ s/\A\s//; + $self->blockquote_out( $_[0] ); + } else { for ( split( /(\s+)/, $_[0] ) ) { next unless length $_; @@ -785,12 +789,13 @@ 1; __END__ + =pod =for test_synopsis 1; __END__ -=for stopwords formatters +=for stopwords formatters CPAN homepage =head1 NAME @@ -798,7 +803,7 @@ =head1 VERSION -version 2.10 +version 2.11 =head1 SYNOPSIS @@ -818,18 +823,17 @@ =head1 DESCRIPTION -HTML::Formatter is a base class for classes that take HTML -and format it to some output format. When you take an object -of such a base class and call C<< $formatter->format( $tree ) >> -with an HTML::TreeBuilder (or HTML::Element) object, they return -the - -HTML formatters are able to format a HTML syntax tree into various -printable formats. Different formatters produce output for different -output media. Common for all formatters are that they will return the -formatted output when the format() method is called. The format() -method takes a HTML::Element object (usually the HTML::TreeBuilder -root object) as parameter. +HTML::Formatter is a base class for classes that take HTML and format it to +some output format. When you take an object of such a base class and call +C<$formatter->format( $tree )> with an L (or +L) object, they return the appropriately formatted string for +the input HTML. + +HTML formatters are able to format a HTML syntax tree into various printable +formats. Different formatters produce output for different output media. +Common for all formatters are that they will return the formatted output when +the format() method is called. The format() method takes a HTML::Element +object (usually the HTML::TreeBuilder root object) as parameter. =head1 METHODS @@ -850,10 +854,10 @@ option1 => value1, option2 => value2, ... ); -Return a string consisting of the result of using the given class -to format the given HTML file according to the given (optional) options. -Internally it calls C<< SomeClass->new( ... )->format( ... ) >> on a new -HTML::TreeBuilder object based on the given HTML file. +Return a string consisting of the result of using the given class to format the +given HTML file according to the given (optional) options. Internally it calls +C<< SomeClass->new( ... )->format( ... ) >> on a new HTML::TreeBuilder object +based on the given HTML file. =head2 format_string @@ -864,20 +868,19 @@ option1 => value1, option2 => value2, ... ); -Return a string consisting of the result of using the given class -to format the given HTML source according to the given (optional) -options. Internally it calls C<< SomeClass->new( ... )->format( ... ) >> -on a new HTML::TreeBuilder object based on the given source. +Return a string consisting of the result of using the given class to format the +given HTML source according to the given (optional) options. Internally it +calls C<< SomeClass->new( ... )->format( ... ) >> on a new HTML::TreeBuilder +object based on the given source. =head2 format my $render_string = $formatter->format( $html_tree_object ); -This renders the given HTML object according to the options set for -$formatter. +This renders the given HTML object according to the options set for $formatter. -After you've used a particular formatter object to format a particular -HTML tree object, you probably should not use either again. +After you've used a particular formatter object to format a particular HTML +tree object, you probably should not use either again. =head1 SEE ALSO @@ -908,23 +911,16 @@ =head1 BUGS AND LIMITATIONS -No bugs have been reported. - -Please report any bugs or feature requests through the web interface at -L. +You can make new bug reports, and view existing ones, through the +web interface at L. =head1 AVAILABILITY -The project homepage is L. +The project homepage is L. The latest version of this module is available from the Comprehensive Perl Archive Network (CPAN). Visit L to find a CPAN -site near you, or see L. - -The development version lives at L -and may be cloned from L. -Instead of sending patches, please fork this project using the standard -git and github infrastructure. +site near you, or see L. =head1 AUTHORS @@ -946,10 +942,9 @@ =head1 COPYRIGHT AND LICENSE -This software is copyright (c) 2011 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. +This software is copyright (c) 2013 by Nigel Metheringham, 2002-2005 Sean M Burke, 1999-2002 Gisle Aas. This is free software; you can redistribute it and/or modify it under the same terms as the Perl 5 programming language system itself. =cut - diff -Nru libhtml-format-perl-2.10/perltidy.LOG libhtml-format-perl-2.11/perltidy.LOG --- libhtml-format-perl-2.10/perltidy.LOG 1970-01-01 00:00:00.000000000 +0000 +++ libhtml-format-perl-2.11/perltidy.LOG 2013-10-27 20:57:43.000000000 +0000 @@ -0,0 +1,20 @@ +perltidy version 20130806 log file on a darwin system, OLD_PERL_VERSION=5.018001 +Found Configuration File >>> /Users/nigel/Tasks/perl_modules/HTML-Format/.perltidyrc +Configuration and command line parameters for this run: +--maximum-line-length=120 -i=4 -ci=4 -vt=2 -cti=0 -pt=1 -sbt=1 -bt=1 -bbt=1 -nsfs -nolq -wbb=% + - * / x != == >= <= =~ < > | & **= += *= &= <<= &&= -= /= |= >>= ||= .= %= ^= x= -asc -aws -tqw -ibc -msc=4 -fpsc=0 -hsc -sbc -nssc -dnl -bbc -bbs -bbb -lbl=8 -bar -nolc -noll -nola -profile=/Users/nigel/Tasks/perl_modules/HTML-Format/.perltidyrc +To find error messages search for 'WARNING' with your editor +Indentation will be with 4 spaces +Line 1 implies starting-indentation-level = 0 +The nesting depths in the table below are at the start of the lines. +The indicated output line numbers are not always exact. +ci = levels of continuation indentation; bk = 1 if in BLOCK, 0 if not. + +in:out indent c b nesting code + messages; (messages begin with >>>) +lines levels i k (code begins with one '.' per indent level) +------ ----- - - -------- ------------------------------------------- +L25:25 i0:0 0 1 { >>>Last line + +No indentation disagreement seen + +No lines exceeded 120 characters + Maximum output line length was 120 at line 24 diff -Nru libhtml-format-perl-2.10/t/00-compile.t libhtml-format-perl-2.11/t/00-compile.t --- libhtml-format-perl-2.10/t/00-compile.t 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/t/00-compile.t 2013-10-27 20:57:43.000000000 +0000 @@ -1,59 +1,50 @@ -#!perl - use strict; use warnings; -use Test::More; +# this test was generated with Dist::Zilla::Plugin::Test::Compile 2.033 +use Test::More tests => 5 + ($ENV{AUTHOR_TESTING} ? 1 : 0); -use File::Find; -use File::Temp qw{ tempdir }; -my @modules; -find( - sub { - return if $File::Find::name !~ /\.pm\z/; - my $found = $File::Find::name; - $found =~ s{^lib/}{}; - $found =~ s{[/\\]}{::}g; - $found =~ s/\.pm$//; - # nothing to skip - push @modules, $found; - }, - 'lib', +my @module_files = ( + 'HTML/FormatMarkdown.pm', + 'HTML/FormatPS.pm', + 'HTML/FormatRTF.pm', + 'HTML/FormatText.pm', + 'HTML/Formatter.pm' ); -my @scripts; -if ( -d 'bin' ) { - find( - sub { - return unless -f; - my $found = $File::Find::name; - # nothing to skip - push @scripts, $found; - }, - 'bin', - ); -} -my $plan = scalar(@modules) + scalar(@scripts); -$plan ? (plan tests => $plan) : (plan skip_all => "no tests to run"); -{ - # fake home for cpan-testers - # no fake requested ## local $ENV{HOME} = tempdir( CLEANUP => 1 ); +# no fake home requested - like( qx{ $^X -Ilib -e "require $_; print '$_ ok'" }, qr/^\s*$_ ok/s, "$_ loaded ok" ) - for sort @modules; +use File::Spec; +use IPC::Open3; +use IO::Handle; - SKIP: { - eval "use Test::Script 1.05; 1;"; - skip "Test::Script needed to test script compilation", scalar(@scripts) if $@; - foreach my $file ( @scripts ) { - my $script = $file; - $script =~ s!.*/!!; - script_compiles( $file, "$script script compiles" ); - } +my @warnings; +for my $lib (@module_files) +{ + # see L + open my $stdin, '<', File::Spec->devnull or die "can't open devnull: $!"; + my $stderr = IO::Handle->new; + + my $pid = open3($stdin, '>&STDERR', $stderr, $^X, '-Mblib', '-e', "require q[$lib]"); + binmode $stderr, ':crlf' if $^O eq 'MSWin32'; + my @_warnings = <$stderr>; + waitpid($pid, 0); + is($? >> 8, 0, "$lib loaded ok"); + + if (@_warnings) + { + warn @_warnings; + push @warnings, @_warnings; } } + + + +is(scalar(@warnings), 0, 'no warnings found') if $ENV{AUTHOR_TESTING}; + + diff -Nru libhtml-format-perl-2.10/t/04_md.t libhtml-format-perl-2.11/t/04_md.t --- libhtml-format-perl-2.10/t/04_md.t 1970-01-01 00:00:00.000000000 +0000 +++ libhtml-format-perl-2.11/t/04_md.t 2013-10-27 20:57:43.000000000 +0000 @@ -0,0 +1,33 @@ +use strict; +use warnings; +use File::Spec; # try to keep pathnames neutral +use Test::More 0.96; + +BEGIN { use_ok("HTML::FormatMarkdown"); } + +foreach my $infile ( glob( File::Spec->catfile( 't', 'data', 'in', '*.html' ) ) ) { + my $obj = new_ok("HTML::FormatMarkdown"); + ok( -f $infile, "Testing file handling for $infile" ); + my $expfilename = ( File::Spec->splitpath($infile) )[2]; + $expfilename =~ s/\.html$/.md/i; + my $expfile = File::Spec->catfile( 't', 'data', 'expected', $expfilename ); + ok( -f $expfile, ' Expected result file exists' ); + if ( -f $expfile ) { + + # read file content - split into lines, but we exclude the + # doccomm line since it includes a timestamp and version information + open( my $fh, '<', $expfile ) or die "Unable to open expected file $expfile - $!\n"; + my $exp_text = do { local ($/); <$fh> }; + my $exp_lines = [ split( /\n/, $exp_text ) ]; + + # read and convert file + my $text = HTML::FormatMarkdown->format_file( $infile, leftmargin => 5, rightmargin => 50 ); + my $got_lines = [ split( /\n/, $text ) ]; + + ok( length($text), ' Returned a string from conversion' ); + is_deeply( $got_lines, $exp_lines, ' Correct text string returned' ); + } +} + +# finish up +done_testing(); diff -Nru libhtml-format-perl-2.10/t/author-pod-spell.t libhtml-format-perl-2.11/t/author-pod-spell.t --- libhtml-format-perl-2.10/t/author-pod-spell.t 1970-01-01 00:00:00.000000000 +0000 +++ libhtml-format-perl-2.11/t/author-pod-spell.t 2013-10-27 20:57:43.000000000 +0000 @@ -0,0 +1,38 @@ + +BEGIN { + unless ($ENV{AUTHOR_TESTING}) { + require Test::More; + Test::More::plan(skip_all => 'these tests are for testing by the author'); + } +} + +use strict; +use warnings; +use Test::More; + +# generated by Dist::Zilla::Plugin::Test::PodSpelling 2.006001 +use Test::Spelling 0.12; +use Pod::Wordlist; + + +add_stopwords(); +all_pod_files_spelling_ok( qw( bin lib ) ); +__DATA__ +Nigel +Metheringham +nigelm +Sean +Burke +sburke +Gisle +Aas +gisle +2002 +1999 +lib +HTML +FormatMarkdown +Formatter +FormatText +FormatPS +FormatRTF diff -Nru libhtml-format-perl-2.10/t/data/expected/test.md libhtml-format-perl-2.11/t/data/expected/test.md --- libhtml-format-perl-2.10/t/data/expected/test.md 1970-01-01 00:00:00.000000000 +0000 +++ libhtml-format-perl-2.11/t/data/expected/test.md 2013-10-27 20:57:43.000000000 +0000 @@ -0,0 +1,83 @@ + # This is a test # + + **This is bold** + + *This is italic* + + `This is teletype` + + - - - + + 1. One + + 2. Two + + This is a quote from Abraham Lincoln: + > Four score and seven years ago our fathers + > brought forth on this continent, a new + > nation, conceived in Liberty, and dedicated + > to the proposition that all men are created + > equal. + + + In order to install and use this package you + will need Perl version 5.004 or better. You + will also need to have the HTML-Tree + distribution (version 0.61 or better) + installed. If you intend to use the PostScript + formatter you need the Font-AFM distribution. + All of these should be available from CPAN. In + order to install and use this package you will + need Perl version 5.004 or better. You will + also need to have the HTML-Tree distribution + (version 0.61 or better) installed. If you + intend to use the PostScript formatter you + need the Font-AFM distribution. All of these + should be available from CPAN. In order to + install and use this package you will need + Perl version 5.004 or better. You will also + need to have the HTML-Tree distribution + (version 0.61 or better) installed. If you + intend to use the PostScript formatter you + need the Font-AFM distribution. All of these + should be available from CPAN. + + In order to install and use this package you + will need Perl version 5.004 or better. + + * You will also need to have the HTML-Tree + distribution (version 0.61 or better) + installed. + + * If you intend to use the PostScript + formatter you need the Font-AFM + distribution. + + All of these should be available from CPAN. + + In order to install and use this package you + will need Perl version 5.004 or better. You + will also need to have the HTML-Tree + distribution (version 0.61 or better) + installed. If you intend to use the PostScript + formatter you need the Font-AFM distribution. + All of these should be available from CPAN. + + ## Installation ## + + Just follow the usual procedure: + + perl Makefile.PL + make + make test + make install + + In order to install and use this package you + will need Perl version 5.004 or better. You + will also need to have the HTML-Tree + distribution (version 0.61 or better) + installed. If you intend to use the PostScript + formatter you need the Font-AFM distribution. + All of these should be available from CPAN. + + [Byte me dot org](http://byte-me.org) diff -Nru libhtml-format-perl-2.10/t/data/expected/test.ps libhtml-format-perl-2.11/t/data/expected/test.ps --- libhtml-format-perl-2.10/t/data/expected/test.ps 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/t/data/expected/test.ps 2013-10-27 20:57:43.000000000 +0000 @@ -1,6 +1,6 @@ %!PS-Adobe-3.0 -%%Creator: HTML::FormatPS (v2.05, using HTML::TreeBuilder v4.1, and HTML::Parser v3.68) -%%CreationDate: Mon Feb 14 20:03:30 2011 +%%Creator: HTML::FormatPS (v?, using HTML::TreeBuilder v5.03, and HTML::Parser v3.71) +%%CreationDate: Sat Oct 5 23:48:53 2013 %%Pages: 1 %%PageOrder: Ascend %%Orientation: Portrait @@ -8,6 +8,7 @@ %%DocumentNeededResources: %%+ font Courier %%+ font Times-Bold +%%+ font Times-Italic %%+ font Times-Roman %%DocumentSuppliedResources: procset newencode 1.0 0 %%+ encoding ISOLatin1Encoding @@ -86,11 +87,15 @@ %%BeginSetup ISOLatin1Encoding/Courier-ISO/Courier NE -/F5/Courier-ISO findfont 10 scalefont def +/F6/Courier-ISO findfont 10 scalefont def ISOLatin1Encoding/Times-Bold-ISO/Times-Bold NE -/F4/Times-Bold-ISO findfont 18 scalefont def +/F4/Times-Bold-ISO findfont 10 scalefont def +ISOLatin1Encoding/Times-Bold-ISO/Times-Bold NE +/F7/Times-Bold-ISO findfont 18 scalefont def ISOLatin1Encoding/Times-Bold-ISO/Times-Bold NE /F2/Times-Bold-ISO findfont 24 scalefont def +ISOLatin1Encoding/Times-Italic-ISO/Times-Italic NE +/F5/Times-Italic-ISO findfont 10 scalefont def ISOLatin1Encoding/Times-Roman-ISO/Times-Roman NE /F3/Times-Roman-ISO findfont 10 scalefont def ISOLatin1Encoding/Times-Roman-ISO/Times-Roman NE @@ -107,58 +112,84 @@ F2 SF (This is a test)S 5.0 683.5 M +F4 SF +(This is bold)S +5.0 662.5 M +F5 SF +(This is italic)S +5.0 641.5 M +F6 SF +(This is teletype)S +newpath 5.0 630.5 M 545.3 630.5 lineto stroke +27.0 610.5 M F3 SF +(One)S +16.0 (1.) stringwidth pop sub 6.2 add 610.5 M +(1.)S +27.0 589.5 M +(Two)S +16.0 (2.) stringwidth pop sub 6.2 add 589.5 M +(2.)S +5.0 568.5 M +(This is a quote from Abraham Lincoln:)S +16.0 547.5 M +(Four score and seven years ago our fathers brought forth on this continent, a new nation, conceived in Liberty, and dedicated to)S +16.0 536.5 M +(the proposition that all men are created equal.)S +5.0 515.5 M (In order to install and use this package you will need Perl version 5.004 or better. You will also need to have the HTML-Tree)S -5.0 672.5 M +5.0 504.5 M (distribution \(version 0.61 or better\) installed. If you intend to use the PostScript formatter you need the Font-AFM distribution. All of)S -5.0 661.5 M +5.0 493.5 M (these should be available from CPAN. In order to install and use this package you will need Perl version 5.004 or better. You will also)S -5.0 650.5 M +5.0 482.5 M (need to have the HTML-Tree distribution \(version 0.61 or better\) installed. If you intend to use the PostScript formatter you need the)S -5.0 639.5 M +5.0 471.5 M (Font-AFM distribution. All of these should be available from CPAN. In order to install and use this package you will need Perl)S -5.0 628.5 M +5.0 460.5 M (version 5.004 or better. You will also need to have the HTML-Tree distribution \(version 0.61 or better\) installed. If you intend to use)S -5.0 617.5 M +5.0 449.5 M (the PostScript formatter you need the Font-AFM distribution. All of these should be available from CPAN.)S -5.0 596.5 M +5.0 428.5 M (In order to install and use this package you will need Perl version 5.004 or better.)S -27.0 575.5 M +27.0 407.5 M (You will also need to have the HTML-Tree distribution \(version 0.61 or better\) installed.)S -newpath 17.2 578.0 1.2 0 360 arc fill -27.0 554.5 M +newpath 17.2 410.0 1.2 0 360 arc fill +27.0 386.5 M (If you intend to use the PostScript formatter you need the Font-AFM distribution.)S -newpath 17.2 557.0 1.2 0 360 arc fill -5.0 533.5 M +newpath 17.2 389.0 1.2 0 360 arc fill +5.0 365.5 M (All of these should be available from CPAN.)S -5.0 512.5 M +5.0 344.5 M (In order to install and use this package you will need Perl version 5.004 or better. You will also need to have the HTML-Tree)S -5.0 501.5 M +5.0 333.5 M (distribution \(version 0.61 or better\) installed. If you intend to use the PostScript formatter you need the Font-AFM distribution. All of)S -5.0 490.5 M +5.0 322.5 M (these should be available from CPAN.)S -5.0 444.7 M -F4 SF +5.0 276.7 M +F7 SF (Installation)S -5.0 423.7 M +5.0 255.7 M F3 SF (Just follow the usual procedure:)S -5.0 402.7 M -F5 SF -( perl Makefile.PL)S -5.0 391.7 M -( make)S -5.0 380.7 M -( make test)S -5.0 369.7 M -( make install)S -5.0 348.7 M +5.0 234.7 M +F6 SF +(perl Makefile.PL)S +5.0 223.7 M +(make)S +5.0 212.7 M +(make test)S +5.0 201.7 M +(make install)S +5.0 180.7 M F3 SF (In order to install and use this package you will need Perl version 5.004 or better. You will also need to have the HTML-Tree)S -5.0 337.7 M +5.0 169.7 M (distribution \(version 0.61 or better\) installed. If you intend to use the PostScript formatter you need the Font-AFM distribution. All of)S -5.0 326.7 M +5.0 158.7 M (these should be available from CPAN.)S +5.0 137.7 M +(Byte me dot org)S showpage %%Trailer diff -Nru libhtml-format-perl-2.10/t/data/expected/test.rtf libhtml-format-perl-2.11/t/data/expected/test.rtf --- libhtml-format-perl-2.10/t/data/expected/test.rtf 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/t/data/expected/test.rtf 2013-10-27 20:57:43.000000000 +0000 @@ -24,7 +24,7 @@ } {\colortbl;\red255\green0\blue0;\red0\green0\blue255;} -{\info{\doccomm generated by HTML::FormatRTF (v2.04, using HTML::TreeBuilder v4.1, and HTML::Parser v3.68)} +{\info{\doccomm generated by HTML::FormatRTF (v?, using HTML::TreeBuilder v5.03, and HTML::Parser v3.71)} {\author [see doc]}{\company [see doc]}{\operator [see doc]} } @@ -44,6 +44,42 @@ \par} {\pard\sa220\li0\ri0\ql\plain +{\b This is bold} +\par} + +{\pard\sa220\li0\ri0\ql\plain +{\i This is italic} +\par} + +{\pard\sa220\li0\ri0\ql\plain +{\f1\noproof\lang1024\lang1076 This is teletype} +\par} + +{\pard\sa154\li0\ri0\ql\plain +\qc\ul\f1\fs20\nocheck\lang1024 \~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~\~ +\par} + +{\pard\sa220\li440\ri0\ql\plain +\fi-99 +1.. One +\par} + +{\pard\sa220\li440\ri0\ql\plain +\fi-99 +2.. Two +\par} + +{\pard\sa220\li0\ri0\ql\plain +This is a quote from Abraham Lincoln: +\par} + +{\pard\sa220\li220\ri220\ql\plain +\'46our score and seven years ago our fathers brought forth on this +continent, a new nation, conceived in Liberty, and dedicated to the +proposition that all men are created equal. +\par} + +{\pard\sa220\li0\ri0\ql\plain In order to install and use this package you will need Perl version 5.004 or better. You will also need to have the HTML\_Tree distribution (version 0.61 or better) installed. If you intend to use the PostScript @@ -99,10 +135,10 @@ \par} {\pard\sa220\li0\ri0\ql\plain -\s20\f1\fs18\noproof\lang1024\lang1076 perl Makefile.PL\line - make\line - make test\line - make install +\s20\f1\fs18\noproof\lang1024\lang1076 perl Makefile.PL\line +make\line +make test\line +make install \par} {\pard\sa220\li0\ri0\ql\plain @@ -113,4 +149,8 @@ should be available from CPAN. \par} +{\pard\sa220\li0\ri0\ql\plain +Byte me dot org +\par} + } \ No newline at end of file diff -Nru libhtml-format-perl-2.10/t/data/expected/test.txt libhtml-format-perl-2.11/t/data/expected/test.txt --- libhtml-format-perl-2.10/t/data/expected/test.txt 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/t/data/expected/test.txt 2013-10-27 20:57:43.000000000 +0000 @@ -1,6 +1,26 @@ This is a test ============== + This is bold + + This is italic + + This is teletype + + --------------------------------------------- + + 1. One + + 2. Two + + This is a quote from Abraham Lincoln: + + Four score and seven years ago our fathers + brought forth on this continent, a new + nation, conceived in Liberty, and + dedicated to the proposition that all men + are created equal. + In order to install and use this package you will need Perl version 5.004 or better. You will also need to have the HTML-Tree @@ -50,10 +70,10 @@ Just follow the usual procedure: - perl Makefile.PL - make - make test - make install + perl Makefile.PL + make + make test + make install In order to install and use this package you will need Perl version 5.004 or better. You @@ -62,3 +82,5 @@ installed. If you intend to use the PostScript formatter you need the Font-AFM distribution. All of these should be available from CPAN. + + Byte me dot org diff -Nru libhtml-format-perl-2.10/t/data/in/test.html libhtml-format-perl-2.11/t/data/in/test.html --- libhtml-format-perl-2.10/t/data/in/test.html 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/t/data/in/test.html 2013-10-27 20:57:43.000000000 +0000 @@ -3,6 +3,26 @@

This is a test

+

This is bold

+ +

This is italic

+ +

This is teletype

+ +
+ +
    +
  1. One
  2. +
  3. Two
  4. +
+ +

This is a quote from Abraham Lincoln:

+
+Four score and seven years ago our fathers brought forth on this +continent, a new nation, conceived in Liberty, and dedicated to +the proposition that all men are created equal. +
+

In order to install and use this package you will need Perl version 5.004 or better. You will also need to have the HTML-Tree distribution (version 0.61 or better) installed. If you intend to use @@ -42,10 +62,10 @@

Just follow the usual procedure:

-   perl Makefile.PL
-   make
-   make test
-   make install
+perl Makefile.PL
+make
+make test
+make install
 

In order to install and use this package you will need Perl version @@ -54,4 +74,5 @@ the PostScript formatter you need the Font-AFM distribution. All of these should be available from CPAN. +

Byte me dot org

diff -Nru libhtml-format-perl-2.10/t/release-no-tabs.t libhtml-format-perl-2.11/t/release-no-tabs.t --- libhtml-format-perl-2.10/t/release-no-tabs.t 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/t/release-no-tabs.t 2013-10-27 20:57:43.000000000 +0000 @@ -8,9 +8,19 @@ use strict; use warnings; -use Test::More; -eval 'use Test::NoTabs'; -plan skip_all => 'Test::NoTabs required' if $@; +# this test was generated with Dist::Zilla::Plugin::NoTabsTests 0.04 -all_perl_files_ok(); +use Test::More 0.88; +use Test::NoTabs; + +my @files = ( + 'lib/HTML/FormatMarkdown.pm', + 'lib/HTML/FormatPS.pm', + 'lib/HTML/FormatRTF.pm', + 'lib/HTML/FormatText.pm', + 'lib/HTML/Formatter.pm' +); + +notabs_ok($_) foreach @files; +done_testing; diff -Nru libhtml-format-perl-2.10/t/release-pod-spell.t libhtml-format-perl-2.11/t/release-pod-spell.t --- libhtml-format-perl-2.10/t/release-pod-spell.t 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/t/release-pod-spell.t 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -#!perl - -BEGIN { - unless ($ENV{RELEASE_TESTING}) { - require Test::More; - Test::More::plan(skip_all => 'these tests are for release candidate testing'); - } -} - - -use Test::More; - -eval "use Pod::Wordlist::hanekomu"; -plan skip_all => "Pod::Wordlist::hanekomu required for testing POD spelling" - if $@; - -eval "use Test::Spelling 0.12"; -plan skip_all => "Test::Spelling 0.12 required for testing POD spelling" - if $@; - - -add_stopwords(); -all_pod_files_spelling_ok('lib'); -__DATA__ -Nigel -Metheringham -Sean -Burke -Gisle -Aas diff -Nru libhtml-format-perl-2.10/t/release-portability.t libhtml-format-perl-2.11/t/release-portability.t --- libhtml-format-perl-2.10/t/release-portability.t 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/t/release-portability.t 2013-10-27 20:57:43.000000000 +0000 @@ -8,9 +8,12 @@ } +use strict; +use warnings; + use Test::More; -eval "use Test::Portability::Files"; -plan skip_all => "Test::Portability::Files required for testing portability" - if $@; +eval 'use Test::Portability::Files'; +plan skip_all => 'Test::Portability::Files required for testing portability' + if $@; run_tests(); diff -Nru libhtml-format-perl-2.10/t/release-synopsis.t libhtml-format-perl-2.11/t/release-synopsis.t --- libhtml-format-perl-2.10/t/release-synopsis.t 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/t/release-synopsis.t 2013-10-27 20:57:43.000000000 +0000 @@ -13,4 +13,4 @@ eval "use Test::Synopsis"; plan skip_all => "Test::Synopsis required for testing synopses" if $@; -all_synopsis_ok('lib'); +all_synopsis_ok(); diff -Nru libhtml-format-perl-2.10/t/rt69426.t libhtml-format-perl-2.11/t/rt69426.t --- libhtml-format-perl-2.10/t/rt69426.t 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/t/rt69426.t 2013-10-27 20:57:43.000000000 +0000 @@ -25,42 +25,42 @@ }; foreach my $quoted ( sort { $a cmp $b } keys %{$table} ) { - my $desc = $table->{$quoted}; - my $obj = new_ok("HTML::FormatPS"); - my $htree = new_ok("HTML::TreeBuilder"); - - my $html = 'The ' . $desc . ' is a ' . $quoted . ' character'; - ok( $html, "HTML string containing an $desc should map to $desc" ); - - ok( $htree->parse_content($html), ' Parse HTML content' ); - - my $result = $obj->format_string($html); - ok( $result, ' Converted HTML object' ); - - # count high bit characters - my $count; - { - use bytes; - if ( $quoted eq '£' ) { - - # we must exclude latin1 pound - char \243 - $count = $result =~ tr/\177-\242\244-\377//; - } - else { - $count = $result =~ tr/\177-\377//; - } + my $desc = $table->{$quoted}; + my $obj = new_ok("HTML::FormatPS"); + my $htree = new_ok("HTML::TreeBuilder"); + + my $html = 'The ' . $desc . ' is a ' . $quoted . ' character'; + ok( $html, "HTML string containing an $desc should map to $desc" ); + + ok( $htree->parse_content($html), ' Parse HTML content' ); + + my $result = $obj->format_string($html); + ok( $result, ' Converted HTML object' ); + + # count high bit characters + my $count; + { + use bytes; + if ( $quoted eq '£' ) { + + # we must exclude latin1 pound - char \243 + $count = $result =~ tr/\177-\242\244-\377//; + } + else { + $count = $result =~ tr/\177-\377//; } + } - ok( ( $count == 0 ), ' No unexpected high-bit characters found' ); + ok( ( $count == 0 ), ' No unexpected high-bit characters found' ); - ## # stuff postscript out into file - uncomment if you need for debugging - ## my $fn = $quoted; - ## $fn =~ tr/a-z//cd; - ## $fn .= '.ps'; - ## write_file( $fn, { binmode => ':raw' }, $result ); + ## # stuff postscript out into file - uncomment if you need for debugging + ## my $fn = $quoted; + ## $fn =~ tr/a-z//cd; + ## $fn .= '.ps'; + ## write_file( $fn, { binmode => ':raw' }, $result ); - ## # tell details about errors - uncomment if needed - ## diag( dump( { orig => $html, dump => $htree->dump, result => $result } ) ) if ($count); + ## # tell details about errors - uncomment if needed + ## diag( dump( { orig => $html, dump => $htree->dump, result => $result } ) ) if ($count); } # finish up diff -Nru libhtml-format-perl-2.10/t/support/generate_results.pl libhtml-format-perl-2.11/t/support/generate_results.pl --- libhtml-format-perl-2.10/t/support/generate_results.pl 2011-07-18 16:07:49.000000000 +0000 +++ libhtml-format-perl-2.11/t/support/generate_results.pl 2013-10-27 20:57:43.000000000 +0000 @@ -13,10 +13,13 @@ use HTML::FormatRTF; use HTML::FormatPS; use HTML::FormatText; +use HTML::FormatMarkdown; foreach my $infile ( glob( File::Spec->catfile( 't', 'data', 'in', '*.html' ) ) ) { - my $outfile = substr( File::Spec->catfile( 't', 'data', 'expected', ( File::Spec->splitpath($infile) )[2] ), 0, -4 ); + my $outfile = + substr( File::Spec->catfile( 't', 'data', 'expected', ( File::Spec->splitpath($infile) )[2] ), 0, -4 ); write_file( ( $outfile . 'ps' ), HTML::FormatPS->format_file( $infile, leftmargin => 5, rightmargin => 50 ) ); write_file( ( $outfile . 'rtf' ), HTML::FormatRTF->format_file( $infile, leftmargin => 5, rightmargin => 50 ) ); write_file( ( $outfile . 'txt' ), HTML::FormatText->format_file( $infile, leftmargin => 5, rightmargin => 50 ) ); + write_file( ( $outfile . 'md' ), HTML::FormatMarkdown->format_file( $infile, leftmargin => 5, rightmargin => 50 ) ); }