r77464 - in /branches/upstream/libhtml-format-perl/current: Build.PL Changes LICENSE MANIFEST META.json META.yml README lib/HTML/FormatPS.pm lib/HTML/FormatRTF.pm lib/HTML/FormatText.pm lib/HTML/Formatter.pm t/release-pod-spell.t t/rt69426.t

fabreg-guest at users.alioth.debian.org fabreg-guest at users.alioth.debian.org
Fri Jul 15 12:26:22 UTC 2011


Author: fabreg-guest
Date: Fri Jul 15 12:26:10 2011
New Revision: 77464

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=77464
Log:
[svn-upgrade] new version libhtml-format-perl (2.08)

Added:
    branches/upstream/libhtml-format-perl/current/t/rt69426.t
Modified:
    branches/upstream/libhtml-format-perl/current/Build.PL
    branches/upstream/libhtml-format-perl/current/Changes
    branches/upstream/libhtml-format-perl/current/LICENSE
    branches/upstream/libhtml-format-perl/current/MANIFEST
    branches/upstream/libhtml-format-perl/current/META.json
    branches/upstream/libhtml-format-perl/current/META.yml
    branches/upstream/libhtml-format-perl/current/README
    branches/upstream/libhtml-format-perl/current/lib/HTML/FormatPS.pm
    branches/upstream/libhtml-format-perl/current/lib/HTML/FormatRTF.pm
    branches/upstream/libhtml-format-perl/current/lib/HTML/FormatText.pm
    branches/upstream/libhtml-format-perl/current/lib/HTML/Formatter.pm
    branches/upstream/libhtml-format-perl/current/t/release-pod-spell.t

Modified: branches/upstream/libhtml-format-perl/current/Build.PL
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/Build.PL?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/Build.PL (original)
+++ branches/upstream/libhtml-format-perl/current/Build.PL Fri Jul 15 12:26:10 2011
@@ -7,6 +7,7 @@
 
 my %module_build_args = (
   'build_requires' => {
+    'Data::Dump' => '0',
     'English' => '0',
     'File::Find' => '0',
     'File::Slurp' => '0',
@@ -14,7 +15,8 @@
     'File::Temp' => '0',
     'Module::Build' => '0.3601',
     'Scalar::Util' => '0',
-    'Test::More' => '0.96'
+    'Test::More' => '0.96',
+    'bytes' => '0'
   },
   'configure_requires' => {
     'Module::Build' => '0.3601'
@@ -26,7 +28,7 @@
     'Gisle Aas <gisle at ActiveState.com>'
   ],
   'dist_name' => 'HTML-Format',
-  'dist_version' => '2.07',
+  'dist_version' => '2.08',
   'license' => 'perl',
   'module_name' => 'HTML::Format',
   'recommends' => {},
@@ -34,6 +36,7 @@
   'requires' => {
     'Carp' => '0',
     'Data::Dumper' => '0',
+    'Encode' => '0',
     'Font::Metrics::Courier' => '0',
     'Font::Metrics::CourierBold' => '0',
     'Font::Metrics::CourierBoldOblique' => '0',
@@ -50,7 +53,8 @@
     'HTML::TreeBuilder' => '0',
     'IO::File' => '0',
     'integer' => '0',
-    'perl' => '5.006_001'
+    'perl' => '5.008',
+    'utf8' => '0'
   },
   'script_files' => []
 );

Modified: branches/upstream/libhtml-format-perl/current/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/Changes?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/Changes (original)
+++ branches/upstream/libhtml-format-perl/current/Changes Fri Jul 15 12:26:10 2011
@@ -1,3 +1,7 @@
+2.08      2011-07-13 16:20:54 Europe/London
+    - RT#69426 - issues with HTML quotes
+    - UTF8 handling requires perl 5.8, so minimum requirement bumped
+
 2.07      2011-04-20 16:08:15 Europe/London
     - Release unchanged except for version number after a period
       to see if test release threw up any issues...

Modified: branches/upstream/libhtml-format-perl/current/LICENSE
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/LICENSE?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/LICENSE (original)
+++ branches/upstream/libhtml-format-perl/current/LICENSE Fri Jul 15 12:26:10 2011
@@ -18,15 +18,16 @@
 
   The GNU General Public License, Version 1, February 1989
 
-		    GNU GENERAL PUBLIC LICENSE
-		     Version 1, February 1989
+                    GNU GENERAL PUBLIC LICENSE
+                     Version 1, February 1989
 
  Copyright (C) 1989 Free Software Foundation, Inc.
-                59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
+                    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
+                            Preamble
 
   The license agreements of most software companies try to keep users
 at the mercy of those companies.  By contrast, our General Public
@@ -67,7 +68,7 @@
   The precise terms and conditions for copying, distribution and
 modification follow.
 
-		    GNU GENERAL PUBLIC LICENSE
+                    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
   0. This License Agreement applies to any program or other work which
@@ -185,7 +186,7 @@
 of preserving the free status of all derivatives of our free software and
 of promoting the sharing and reuse of software generally.
 
-			    NO WARRANTY
+                            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
@@ -207,9 +208,9 @@
 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
+                     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
@@ -235,8 +236,9 @@
     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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+    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.
 

Modified: branches/upstream/libhtml-format-perl/current/MANIFEST
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/MANIFEST?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/MANIFEST (original)
+++ branches/upstream/libhtml-format-perl/current/MANIFEST Fri Jul 15 12:26:10 2011
@@ -31,4 +31,5 @@
 t/release-portability.t
 t/release-synopsis.t
 t/release-unused-vars.t
+t/rt69426.t
 t/support/generate_results.pl

Modified: branches/upstream/libhtml-format-perl/current/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/META.json?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/META.json (original)
+++ branches/upstream/libhtml-format-perl/current/META.json Fri Jul 15 12:26:10 2011
@@ -6,7 +6,7 @@
       "Gisle Aas <gisle at ActiveState.com>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 4.200004, CPAN::Meta::Converter version 2.110930",
+   "generated_by" : "Dist::Zilla version 4.200009, CPAN::Meta::Converter version 2.110440",
    "license" : [
       "perl_5"
    ],
@@ -30,6 +30,7 @@
          "requires" : {
             "Carp" : 0,
             "Data::Dumper" : 0,
+            "Encode" : 0,
             "Font::Metrics::Courier" : 0,
             "Font::Metrics::CourierBold" : 0,
             "Font::Metrics::CourierBoldOblique" : 0,
@@ -46,19 +47,40 @@
             "HTML::TreeBuilder" : 0,
             "IO::File" : 0,
             "integer" : 0,
-            "perl" : "5.006_001"
+            "perl" : "5.008",
+            "utf8" : 0
          }
       },
       "test" : {
          "requires" : {
+            "Data::Dump" : 0,
             "English" : 0,
             "File::Find" : 0,
             "File::Slurp" : 0,
             "File::Spec" : 0,
             "File::Temp" : 0,
             "Scalar::Util" : 0,
-            "Test::More" : "0.96"
-         }
+            "Test::More" : "0.96",
+            "bytes" : 0
+         }
+      }
+   },
+   "provides" : {
+      "HTML::FormatPS" : {
+         "file" : "lib/HTML/FormatPS.pm",
+         "version" : "2.08"
+      },
+      "HTML::FormatRTF" : {
+         "file" : "lib/HTML/FormatRTF.pm",
+         "version" : "2.08"
+      },
+      "HTML::FormatText" : {
+         "file" : "lib/HTML/FormatText.pm",
+         "version" : "2.08"
+      },
+      "HTML::Formatter" : {
+         "file" : "lib/HTML/Formatter.pm",
+         "version" : "2.08"
       }
    },
    "release_status" : "stable",
@@ -74,23 +96,23 @@
          "web" : "http://github.com/nigelm/html-format"
       }
    },
-   "version" : "2.07",
+   "version" : "2.08",
    "x_Dist_Zilla" : {
       "plugins" : [
          {
             "class" : "Dist::Zilla::Plugin::Git::NextVersion",
             "name" : "@NIGELM/Git::NextVersion",
-            "version" : "1.110500"
+            "version" : "1.111590"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Check",
             "name" : "@NIGELM/Git::Check",
-            "version" : "1.110500"
+            "version" : "1.111590"
          },
          {
             "class" : "Dist::Zilla::Plugin::GatherDir",
             "name" : "@NIGELM/GatherDir",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::CompileTests",
@@ -100,27 +122,27 @@
          {
             "class" : "Dist::Zilla::Plugin::CriticTests",
             "name" : "@NIGELM/CriticTests",
-            "version" : "1.102280"
+            "version" : "1.111450"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaTests",
             "name" : "@NIGELM/MetaTests",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodSyntaxTests",
             "name" : "@NIGELM/PodSyntaxTests",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodSpellingTests",
             "name" : "@NIGELM/PodSpellingTests",
-            "version" : "1.103491"
+            "version" : "1.111520"
          },
          {
             "class" : "Dist::Zilla::Plugin::PortabilityTests",
             "name" : "@NIGELM/PortabilityTests",
-            "version" : "1.101420"
+            "version" : "1.111840"
          },
          {
             "class" : "Dist::Zilla::Plugin::SynopsisTests",
@@ -160,7 +182,7 @@
          {
             "class" : "Dist::Zilla::Plugin::InlineFiles",
             "name" : "@NIGELM/InlineFiles",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::ReportVersions",
@@ -170,32 +192,42 @@
          {
             "class" : "Dist::Zilla::Plugin::PruneCruft",
             "name" : "@NIGELM/PruneCruft",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::PruneFiles",
             "name" : "@NIGELM/PruneFiles",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::ManifestSkip",
             "name" : "@NIGELM/ManifestSkip",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::AutoPrereqs",
             "name" : "@NIGELM/AutoPrereqs",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaConfig",
             "name" : "@NIGELM/MetaConfig",
-            "version" : "4.200004"
+            "version" : "4.200009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaProvides::Class",
+            "name" : "@NIGELM/MetaProvides::Class",
+            "version" : "1.12060501"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::MetaProvides::Package",
+            "name" : "@NIGELM/MetaProvides::Package",
+            "version" : "1.12060501"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaResources",
             "name" : "@NIGELM/MetaResources",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::Authority",
@@ -205,17 +237,17 @@
          {
             "class" : "Dist::Zilla::Plugin::ExtraTests",
             "name" : "@NIGELM/ExtraTests",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::NextRelease",
             "name" : "@NIGELM/NextRelease",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::OurPkgVersion",
             "name" : "@NIGELM/OurPkgVersion",
-            "version" : "0.1.5"
+            "version" : "0.1.8"
          },
          {
             "class" : "Dist::Zilla::Plugin::PodWeaver",
@@ -225,22 +257,22 @@
          {
             "class" : "Dist::Zilla::Plugin::License",
             "name" : "@NIGELM/License",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::ModuleBuild",
             "name" : "@NIGELM/ModuleBuild",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaYAML",
             "name" : "@NIGELM/MetaYAML",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::MetaJSON",
             "name" : "@NIGELM/MetaJSON",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::ReadmeAnyFromPod",
@@ -260,27 +292,27 @@
          {
             "class" : "Dist::Zilla::Plugin::Manifest",
             "name" : "@NIGELM/Manifest",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Commit",
             "name" : "@NIGELM/Git::Commit",
-            "version" : "1.110500"
+            "version" : "1.111590"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Tag",
             "name" : "@NIGELM/Git::Tag",
-            "version" : "1.110500"
+            "version" : "1.111590"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::CommitBuild",
             "name" : "@NIGELM/Git::CommitBuild",
-            "version" : "1.110500"
+            "version" : "1.111590"
          },
          {
             "class" : "Dist::Zilla::Plugin::Git::Push",
             "name" : "@NIGELM/Git::Push",
-            "version" : "1.110500"
+            "version" : "1.111590"
          },
          {
             "class" : "Dist::Zilla::Plugin::CheckChangeLog",
@@ -290,7 +322,7 @@
          {
             "class" : "Dist::Zilla::Plugin::UploadToCPAN",
             "name" : "@NIGELM/UploadToCPAN",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::Prereqs",
@@ -301,27 +333,37 @@
                }
             },
             "name" : "Prereqs",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":InstallModules",
-            "version" : "4.200004"
+            "version" : "4.200009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":IncModules",
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":TestFiles",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ExecFiles",
-            "version" : "4.200004"
+            "version" : "4.200009"
          },
          {
             "class" : "Dist::Zilla::Plugin::FinderCode",
             "name" : ":ShareFiles",
-            "version" : "4.200004"
+            "version" : "4.200009"
+         },
+         {
+            "class" : "Dist::Zilla::Plugin::FinderCode",
+            "name" : ":MainModule",
+            "version" : "4.200009"
          }
       ],
       "zilla" : {
@@ -329,7 +371,7 @@
          "config" : {
             "is_trial" : 0
          },
-         "version" : "4.200004"
+         "version" : "4.200009"
       }
    },
    "x_authority" : "cpan:NIGELM"

Modified: branches/upstream/libhtml-format-perl/current/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/META.yml?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/META.yml (original)
+++ branches/upstream/libhtml-format-perl/current/META.yml Fri Jul 15 12:26:10 2011
@@ -5,6 +5,7 @@
   - 'Sean M Burke <sburke at cpan.org>'
   - 'Gisle Aas <gisle at ActiveState.com>'
 build_requires:
+  Data::Dump: 0
   English: 0
   File::Find: 0
   File::Slurp: 0
@@ -13,18 +14,33 @@
   Module::Build: 0.3601
   Scalar::Util: 0
   Test::More: 0.96
+  bytes: 0
 configure_requires:
   Module::Build: 0.3601
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.200004, CPAN::Meta::Converter version 2.110930'
+generated_by: 'Dist::Zilla version 4.200009, CPAN::Meta::Converter version 2.110440'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
   version: 1.4
 name: HTML-Format
+provides:
+  HTML::FormatPS:
+    file: lib/HTML/FormatPS.pm
+    version: 2.08
+  HTML::FormatRTF:
+    file: lib/HTML/FormatRTF.pm
+    version: 2.08
+  HTML::FormatText:
+    file: lib/HTML/FormatText.pm
+    version: 2.08
+  HTML::Formatter:
+    file: lib/HTML/Formatter.pm
+    version: 2.08
 requires:
   Carp: 0
   Data::Dumper: 0
+  Encode: 0
   Font::Metrics::Courier: 0
   Font::Metrics::CourierBold: 0
   Font::Metrics::CourierBoldOblique: 0
@@ -41,26 +57,27 @@
   HTML::TreeBuilder: 0
   IO::File: 0
   integer: 0
-  perl: 5.006_001
+  perl: 5.008
+  utf8: 0
 resources:
   bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=HTML-Format
   homepage: http://search.cpan.org/dist/HTML-Format
   repository: git://github.com/nigelm/html-format.git
-version: 2.07
+version: 2.08
 x_Dist_Zilla:
   plugins:
     -
       class: Dist::Zilla::Plugin::Git::NextVersion
       name: '@NIGELM/Git::NextVersion'
-      version: 1.110500
+      version: 1.111590
     -
       class: Dist::Zilla::Plugin::Git::Check
       name: '@NIGELM/Git::Check'
-      version: 1.110500
+      version: 1.111590
     -
       class: Dist::Zilla::Plugin::GatherDir
       name: '@NIGELM/GatherDir'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::CompileTests
       name: '@NIGELM/CompileTests'
@@ -68,23 +85,23 @@
     -
       class: Dist::Zilla::Plugin::CriticTests
       name: '@NIGELM/CriticTests'
-      version: 1.102280
+      version: 1.111450
     -
       class: Dist::Zilla::Plugin::MetaTests
       name: '@NIGELM/MetaTests'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::PodSyntaxTests
       name: '@NIGELM/PodSyntaxTests'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::PodSpellingTests
       name: '@NIGELM/PodSpellingTests'
-      version: 1.103491
+      version: 1.111520
     -
       class: Dist::Zilla::Plugin::PortabilityTests
       name: '@NIGELM/PortabilityTests'
-      version: 1.101420
+      version: 1.111840
     -
       class: Dist::Zilla::Plugin::SynopsisTests
       name: '@NIGELM/SynopsisTests'
@@ -116,7 +133,7 @@
     -
       class: Dist::Zilla::Plugin::InlineFiles
       name: '@NIGELM/InlineFiles'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::ReportVersions
       name: '@NIGELM/ReportVersions'
@@ -124,27 +141,35 @@
     -
       class: Dist::Zilla::Plugin::PruneCruft
       name: '@NIGELM/PruneCruft'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::PruneFiles
       name: '@NIGELM/PruneFiles'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::ManifestSkip
       name: '@NIGELM/ManifestSkip'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::AutoPrereqs
       name: '@NIGELM/AutoPrereqs'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::MetaConfig
       name: '@NIGELM/MetaConfig'
-      version: 4.200004
+      version: 4.200009
+    -
+      class: Dist::Zilla::Plugin::MetaProvides::Class
+      name: '@NIGELM/MetaProvides::Class'
+      version: 1.12060501
+    -
+      class: Dist::Zilla::Plugin::MetaProvides::Package
+      name: '@NIGELM/MetaProvides::Package'
+      version: 1.12060501
     -
       class: Dist::Zilla::Plugin::MetaResources
       name: '@NIGELM/MetaResources'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::Authority
       name: '@NIGELM/Authority'
@@ -152,15 +177,15 @@
     -
       class: Dist::Zilla::Plugin::ExtraTests
       name: '@NIGELM/ExtraTests'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::NextRelease
       name: '@NIGELM/NextRelease'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::OurPkgVersion
       name: '@NIGELM/OurPkgVersion'
-      version: 0.1.5
+      version: 0.1.8
     -
       class: Dist::Zilla::Plugin::PodWeaver
       name: '@NIGELM/PodWeaver'
@@ -168,19 +193,19 @@
     -
       class: Dist::Zilla::Plugin::License
       name: '@NIGELM/License'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::ModuleBuild
       name: '@NIGELM/ModuleBuild'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::MetaYAML
       name: '@NIGELM/MetaYAML'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::MetaJSON
       name: '@NIGELM/MetaJSON'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::ReadmeAnyFromPod
       name: '@NIGELM/ReadmeAnyFromPod'
@@ -196,23 +221,23 @@
     -
       class: Dist::Zilla::Plugin::Manifest
       name: '@NIGELM/Manifest'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::Git::Commit
       name: '@NIGELM/Git::Commit'
-      version: 1.110500
+      version: 1.111590
     -
       class: Dist::Zilla::Plugin::Git::Tag
       name: '@NIGELM/Git::Tag'
-      version: 1.110500
+      version: 1.111590
     -
       class: Dist::Zilla::Plugin::Git::CommitBuild
       name: '@NIGELM/Git::CommitBuild'
-      version: 1.110500
+      version: 1.111590
     -
       class: Dist::Zilla::Plugin::Git::Push
       name: '@NIGELM/Git::Push'
-      version: 1.110500
+      version: 1.111590
     -
       class: Dist::Zilla::Plugin::CheckChangeLog
       name: '@NIGELM/CheckChangeLog'
@@ -220,7 +245,7 @@
     -
       class: Dist::Zilla::Plugin::UploadToCPAN
       name: '@NIGELM/UploadToCPAN'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::Prereqs
       config:
@@ -228,26 +253,34 @@
           phase: runtime
           type: requires
       name: Prereqs
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':InstallModules'
-      version: 4.200004
+      version: 4.200009
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':IncModules'
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':TestFiles'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ExecFiles'
-      version: 4.200004
+      version: 4.200009
     -
       class: Dist::Zilla::Plugin::FinderCode
       name: ':ShareFiles'
-      version: 4.200004
+      version: 4.200009
+    -
+      class: Dist::Zilla::Plugin::FinderCode
+      name: ':MainModule'
+      version: 4.200009
   zilla:
     class: Dist::Zilla::Dist::Builder
     config:
       is_trial: 0
-    version: 4.200004
+    version: 4.200009
 x_authority: cpan:NIGELM

Modified: branches/upstream/libhtml-format-perl/current/README
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/README?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/README (original)
+++ branches/upstream/libhtml-format-perl/current/README Fri Jul 15 12:26:10 2011
@@ -2,7 +2,7 @@
     HTML::Formatter - Base class for HTML formatters
 
 VERSION
-    version 2.07
+    version 2.08
 
 SYNOPSIS
       use HTML::FormatSomething;

Modified: branches/upstream/libhtml-format-perl/current/lib/HTML/FormatPS.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/lib/HTML/FormatPS.pm?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/lib/HTML/FormatPS.pm (original)
+++ branches/upstream/libhtml-format-perl/current/lib/HTML/FormatPS.pm Fri Jul 15 12:26:10 2011
@@ -3,15 +3,17 @@
 # ABSTRACT: Format HTML as PostScript
 
 
-use 5.006_001;
+use 5.008;
 use strict;
 use warnings;
 use Carp;
+use Encode;
 use IO::File;
+use utf8;    # for the is_utf8 function
 
 use base 'HTML::Formatter';
 
-our $VERSION = '2.07'; # VERSION
+our $VERSION = '2.08'; # VERSION
 our $AUTHORITY = 'cpan:NIGELM'; # AUTHORITY
 
 # We now use Smart::Comments in place of the old DEBUG framework.
@@ -109,6 +111,9 @@
     # Pending horizontal space.  A list [ " ", $fontid, $width ],
     # or undef if no space is pending.
     $self->{hspace} = undef;
+
+    # add an encoder object for perl native to Latin1 output
+    $self->{encoder} = find_encoding('iso-8859-1');
 
     $self;
 }
@@ -262,7 +267,9 @@
     my $wx = $self->{wx};
     my $sz = $self->{pointsize};
     for ( unpack( "C*", $_[0] ) ) {
-        $w += $wx->[$_] * $sz    # unless  $_ eq 0xAD; # optional hyphen
+
+        # if the character is outside the table, assume its m sized
+        $w += ( ( $_ > $#{$wx} ) ? $wx->[ ord('m') ] : $wx->[$_] ) * $sz    # unless  $_ eq 0xAD; # optional hyphen
     }
     $w;
 }
@@ -502,13 +509,19 @@
     $str =~ tr/\x01//d;
     return unless length $str;
 
-    $str =~ s/[^\x00-\xff]/\xA4/g;
-
-    # replace any Unicode characters with the otherwise useless
-    #  International Communist Conspiracy money logo!
-
-    $str =~ s/([\(\)\\])/\\$1/g;    # must escape parentheses and backslash
-    $self->{line} .= "($str)S\n";
+    # the string from the parser is normally unicode, and may contain
+    # some punctuation characters in the 'General Punctuation' block
+    # which can be expressed in latin1, but Encode module fails on them
+    # so we will manually hack these...
+    if ( utf8::is_utf8($str) ) {
+        $str =~ tr/\x{2018}\x{2019}\x{201A}/`',/;
+    }
+
+    # must escape parentheses and backslash
+    $str =~ s/([\(\)\\])/\\$1/g;
+
+    # encode output to latin1 when pushing it out
+    $self->{line} .= "(" . $self->{encoder}->encode($str) . ")S\n";
     $self->{showstring} = "";
 }
 
@@ -852,7 +865,7 @@
 
 =head1 VERSION
 
-version 2.07
+version 2.08
 
 =head1 SYNOPSIS
 
@@ -994,6 +1007,19 @@
 
 L<HTML::Formatter>
 
+=over
+
+=item *
+
+Output is in ISO Latin1 format. The underlying HTML parsers tend to
+now work in Unicode (perl native) code points. There is an impedence
+match between these, which may give issues with complex characters
+within HTML.
+
+=back
+
+=head1 ISSUES
+
 =head1 TO DO
 
 =over

Modified: branches/upstream/libhtml-format-perl/current/lib/HTML/FormatRTF.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/lib/HTML/FormatRTF.pm?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/lib/HTML/FormatRTF.pm (original)
+++ branches/upstream/libhtml-format-perl/current/lib/HTML/FormatRTF.pm Fri Jul 15 12:26:10 2011
@@ -13,7 +13,7 @@
 
 use base 'HTML::Formatter';
 
-our $VERSION = '2.07'; # VERSION
+our $VERSION = '2.08'; # VERSION
 our $AUTHORITY = 'cpan:NIGELM'; # AUTHORITY
 
 # ------------------------------------------------------------------------
@@ -509,7 +509,7 @@
 
 =head1 VERSION
 
-version 2.07
+version 2.08
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libhtml-format-perl/current/lib/HTML/FormatText.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/lib/HTML/FormatText.pm?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/lib/HTML/FormatText.pm (original)
+++ branches/upstream/libhtml-format-perl/current/lib/HTML/FormatText.pm Fri Jul 15 12:26:10 2011
@@ -13,7 +13,7 @@
 
 use base 'HTML::Formatter';
 
-our $VERSION = '2.07'; # VERSION
+our $VERSION = '2.08'; # VERSION
 our $AUTHORITY = 'cpan:NIGELM'; # AUTHORITY
 
 # ------------------------------------------------------------------------
@@ -221,7 +221,7 @@
 
 =head1 VERSION
 
-version 2.07
+version 2.08
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libhtml-format-perl/current/lib/HTML/Formatter.pm
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/lib/HTML/Formatter.pm?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/lib/HTML/Formatter.pm (original)
+++ branches/upstream/libhtml-format-perl/current/lib/HTML/Formatter.pm Fri Jul 15 12:26:10 2011
@@ -14,7 +14,7 @@
 # this should be commented out in release versions....
 ##use Smart::Comments;
 
-our $VERSION = '2.07'; # VERSION
+our $VERSION = '2.08'; # VERSION
 our $AUTHORITY = 'cpan:NIGELM'; # AUTHORITY
 
 #
@@ -798,7 +798,7 @@
 
 =head1 VERSION
 
-version 2.07
+version 2.08
 
 =head1 SYNOPSIS
 

Modified: branches/upstream/libhtml-format-perl/current/t/release-pod-spell.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/t/release-pod-spell.t?rev=77464&op=diff
==============================================================================
--- branches/upstream/libhtml-format-perl/current/t/release-pod-spell.t (original)
+++ branches/upstream/libhtml-format-perl/current/t/release-pod-spell.t Fri Jul 15 12:26:10 2011
@@ -14,10 +14,17 @@
 plan skip_all => "Pod::Wordlist::hanekomu required for testing POD spelling"
   if $@;
 
-eval "use Test::Spelling";
-plan skip_all => "Test::Spelling required for testing POD spelling"
+eval "use Test::Spelling 0.12";
+plan skip_all => "Test::Spelling 0.12 required for testing POD spelling"
   if $@;
 
 
-
+add_stopwords(<DATA>);
 all_pod_files_spelling_ok('lib');
+__DATA__
+Nigel
+Metheringham
+Sean
+Burke
+Gisle
+Aas

Added: branches/upstream/libhtml-format-perl/current/t/rt69426.t
URL: http://svn.debian.org/wsvn/pkg-perl/branches/upstream/libhtml-format-perl/current/t/rt69426.t?rev=77464&op=file
==============================================================================
--- branches/upstream/libhtml-format-perl/current/t/rt69426.t (added)
+++ branches/upstream/libhtml-format-perl/current/t/rt69426.t Fri Jul 15 12:26:10 2011
@@ -1,0 +1,57 @@
+use strict;
+use warnings;
+use Test::More 0.96;
+use Data::Dump qw[dump];
+use File::Slurp;
+
+# Bug was that a right single quote character - ’
+# caused a garbage character to go into the output.  This was due to
+# unicode conversion to \x{2109} which was not correctly handled on
+# output.  Fix was to:-
+#  1. Push everything through Encode to the right charset
+#     which fixed the majority of printable characters, however
+#  2. A few punctation characters were incorrectly handled, so
+#     are special cased by the formatter into the ascii part of
+#     the table.
+
+BEGIN { use_ok("HTML::FormatPS"); use_ok("HTML::TreeBuilder"); }
+
+my $obj   = new_ok("HTML::FormatPS");
+my $htree = new_ok("HTML::TreeBuilder");
+
+my $html = '<html><body>it’s an apostrophe.</body></html>';
+ok( $html, 'HTML string containing an apostrophe' );
+
+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;
+    $count = $result =~ tr/\177-\377//;
+}
+
+ok( ( $count == 0 ), 'No unexpected high-bit characters found' );
+
+# same test, this time using a pound symbol (which exists in latin1)
+$html = '<html><body>A £ symbol</body></html>';
+ok( $html, 'HTML string containing a British pound symbol' );
+
+ok( $htree->parse_content($html), 'Parse HTML content' );
+
+$result = $obj->format_string($html);
+ok( $result, 'Converted HTML object' );
+
+# count high bit characters - excluding latin1 pound \243
+{
+    use bytes;
+    $count = $result =~ tr/\177-\242\244-\377//;
+}
+
+ok( ( $count == 0 ), 'No unexpected high-bit characters found' );
+
+# finish up
+done_testing();




More information about the Pkg-perl-cvs-commits mailing list