r71446 - in /trunk/libpod-markdown-perl: Changes META.json META.yml Makefile.PL README bin/pod2markdown debian/changelog debian/compat debian/control lib/Pod/Markdown.pm t/misc.t

jawnsy-guest at users.alioth.debian.org jawnsy-guest at users.alioth.debian.org
Tue Mar 15 02:33:18 UTC 2011


Author: jawnsy-guest
Date: Tue Mar 15 02:33:09 2011
New Revision: 71446

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=71446
Log:
* New upstream release
* Bump to debhelper compat 8

Modified:
    trunk/libpod-markdown-perl/Changes
    trunk/libpod-markdown-perl/META.json
    trunk/libpod-markdown-perl/META.yml
    trunk/libpod-markdown-perl/Makefile.PL
    trunk/libpod-markdown-perl/README
    trunk/libpod-markdown-perl/bin/pod2markdown
    trunk/libpod-markdown-perl/debian/changelog
    trunk/libpod-markdown-perl/debian/compat
    trunk/libpod-markdown-perl/debian/control
    trunk/libpod-markdown-perl/lib/Pod/Markdown.pm
    trunk/libpod-markdown-perl/t/misc.t

Modified: trunk/libpod-markdown-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-markdown-perl/Changes?rev=71446&op=diff
==============================================================================
--- trunk/libpod-markdown-perl/Changes (original)
+++ trunk/libpod-markdown-perl/Changes Tue Mar 15 02:33:09 2011
@@ -1,4 +1,7 @@
 Revision history for Perl extension Pod-Markdown
+
+1.110730  2011-03-14 10:11:52 Europe/Vienna
+    - make bulleted lists work at least minimally (thanks ap)
 
 1.103491  2010-12-15 23:03:02 Europe/Vienna
     - added Ryan C. Thompson's email address

Modified: trunk/libpod-markdown-perl/META.json
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-markdown-perl/META.json?rev=71446&op=diff
==============================================================================
--- trunk/libpod-markdown-perl/META.json (original)
+++ trunk/libpod-markdown-perl/META.json Tue Mar 15 02:33:09 2011
@@ -3,10 +3,11 @@
    "author" : [
       "Marcel Gruenauer <marcel at cpan.org>",
       "Victor Moral <victor at taquiones.net>",
-      "Ryan C. Thompson <rct at thompsonclan d0t org>"
+      "Ryan C. Thompson <rct at thompsonclan d0t org>",
+      "Aristotle Pagaltzis <pagaltzis at gmx.de>"
    ],
    "dynamic_config" : 0,
-   "generated_by" : "Dist::Zilla version 4.200000, CPAN::Meta::Converter version 2.102400",
+   "generated_by" : "Dist::Zilla version 4.200004, CPAN::Meta::Converter version 2.110580",
    "license" : [
       "perl_5"
    ],
@@ -43,7 +44,7 @@
    "provides" : {
       "Pod::Markdown" : {
          "file" : "lib/Pod/Markdown.pm",
-         "version" : "1.103491"
+         "version" : "1.110730"
       }
    },
    "release_status" : "stable",
@@ -59,6 +60,6 @@
          "web" : "http://github.com/hanekomu/Pod-Markdown"
       }
    },
-   "version" : "1.103491"
+   "version" : "1.110730"
 }
 

Modified: trunk/libpod-markdown-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-markdown-perl/META.yml?rev=71446&op=diff
==============================================================================
--- trunk/libpod-markdown-perl/META.yml (original)
+++ trunk/libpod-markdown-perl/META.yml Tue Mar 15 02:33:09 2011
@@ -4,6 +4,7 @@
   - 'Marcel Gruenauer <marcel at cpan.org>'
   - 'Victor Moral <victor at taquiones.net>'
   - 'Ryan C. Thompson <rct at thompsonclan d0t org>'
+  - 'Aristotle Pagaltzis <pagaltzis at gmx.de>'
 build_requires:
   Carp: 0
   English: 0
@@ -15,7 +16,7 @@
 configure_requires:
   ExtUtils::MakeMaker: 6.31
 dynamic_config: 0
-generated_by: 'Dist::Zilla version 4.200000, CPAN::Meta::Converter version 2.102400'
+generated_by: 'Dist::Zilla version 4.200004, CPAN::Meta::Converter version 2.110580'
 license: perl
 meta-spec:
   url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -24,7 +25,7 @@
 provides:
   Pod::Markdown:
     file: lib/Pod/Markdown.pm
-    version: 1.103491
+    version: 1.110730
 requires:
   Pod::Parser: 0
   parent: 0
@@ -33,4 +34,4 @@
   bugtracker: http://rt.cpan.org/Public/Dist/Display.html?Name=Pod-Markdown
   homepage: http://search.cpan.org/dist/Pod-Markdown/
   repository: git://github.com/hanekomu/Pod-Markdown.git
-version: 1.103491
+version: 1.110730

Modified: trunk/libpod-markdown-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-markdown-perl/Makefile.PL?rev=71446&op=diff
==============================================================================
--- trunk/libpod-markdown-perl/Makefile.PL (original)
+++ trunk/libpod-markdown-perl/Makefile.PL Tue Mar 15 02:33:09 2011
@@ -10,7 +10,7 @@
 
 my %WriteMakefileArgs = (
   'ABSTRACT' => 'Convert POD to Markdown',
-  'AUTHOR' => 'Marcel Gruenauer <marcel at cpan.org>, Victor Moral <victor at taquiones.net>, Ryan C. Thompson <rct at thompsonclan d0t org>',
+  'AUTHOR' => 'Marcel Gruenauer <marcel at cpan.org>, Victor Moral <victor at taquiones.net>, Ryan C. Thompson <rct at thompsonclan d0t org>, Aristotle Pagaltzis <pagaltzis at gmx.de>',
   'BUILD_REQUIRES' => {
     'Carp' => '0',
     'English' => '0',
@@ -33,7 +33,7 @@
     'Pod::Parser' => '0',
     'parent' => '0'
   },
-  'VERSION' => '1.103491',
+  'VERSION' => '1.110730',
   'test' => {
     'TESTS' => 't/*.t'
   }

Modified: trunk/libpod-markdown-perl/README
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-markdown-perl/README?rev=71446&op=diff
==============================================================================
--- trunk/libpod-markdown-perl/README (original)
+++ trunk/libpod-markdown-perl/README Tue Mar 15 02:33:09 2011
@@ -2,7 +2,7 @@
     Pod::Markdown - Convert POD to Markdown
 
 VERSION
-    version 1.103491
+    version 1.110730
 
 SYNOPSIS
         my $parser = Pod::Markdown->new;
@@ -55,7 +55,7 @@
     CPAN site near you, or see <http://search.cpan.org/dist/Pod-Markdown/>.
 
     The development version lives at
-    <http://github.com/hanekomu/Pod-Markdown.git> and may be cloned from
+    <http://github.com/hanekomu/Pod-Markdown> and may be cloned from
     <git://github.com/hanekomu/Pod-Markdown.git>. Instead of sending
     patches, please fork this project using the standard git and github
     infrastructure.
@@ -67,6 +67,8 @@
 
     *   Ryan C. Thompson <rct at thompsonclan d0t org>
 
+    *   Aristotle Pagaltzis <pagaltzis at gmx.de>
+
 COPYRIGHT AND LICENSE
     This software is copyright (c) 2004 by Marcel Gruenauer.
 

Modified: trunk/libpod-markdown-perl/bin/pod2markdown
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-markdown-perl/bin/pod2markdown?rev=71446&op=diff
==============================================================================
--- trunk/libpod-markdown-perl/bin/pod2markdown (original)
+++ trunk/libpod-markdown-perl/bin/pod2markdown Tue Mar 15 02:33:09 2011
@@ -23,7 +23,7 @@
 
 =head1 VERSION
 
-version 1.103491
+version 1.110730
 
 =head1 SYNOPSIS
 
@@ -55,7 +55,7 @@
 Archive Network (CPAN). Visit L<http://www.perl.com/CPAN/> to find a CPAN
 site near you, or see L<http://search.cpan.org/dist/Pod-Markdown/>.
 
-The development version lives at L<http://github.com/hanekomu/Pod-Markdown.git>
+The development version lives at L<http://github.com/hanekomu/Pod-Markdown>
 and may be cloned from L<git://github.com/hanekomu/Pod-Markdown.git>.
 Instead of sending patches, please fork this project using the standard
 git and github infrastructure.
@@ -76,6 +76,10 @@
 
 Ryan C. Thompson <rct at thompsonclan d0t org>
 
+=item *
+
+Aristotle Pagaltzis <pagaltzis at gmx.de>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libpod-markdown-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-markdown-perl/debian/changelog?rev=71446&op=diff
==============================================================================
--- trunk/libpod-markdown-perl/debian/changelog (original)
+++ trunk/libpod-markdown-perl/debian/changelog Tue Mar 15 02:33:09 2011
@@ -1,3 +1,10 @@
+libpod-markdown-perl (1.110730-1) UNRELEASED; urgency=low
+
+  * New upstream release
+  * Bump to debhelper compat 8
+
+ -- Jonathan Yu <jawnsy at cpan.org>  Mon, 14 Mar 2011 22:55:32 -0400
+
 libpod-markdown-perl (1.103491-1) unstable; urgency=low
 
   * New upstream release

Modified: trunk/libpod-markdown-perl/debian/compat
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-markdown-perl/debian/compat?rev=71446&op=diff
==============================================================================
--- trunk/libpod-markdown-perl/debian/compat (original)
+++ trunk/libpod-markdown-perl/debian/compat Tue Mar 15 02:33:09 2011
@@ -1,1 +1,1 @@
-7
+8

Modified: trunk/libpod-markdown-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-markdown-perl/debian/control?rev=71446&op=diff
==============================================================================
--- trunk/libpod-markdown-perl/debian/control (original)
+++ trunk/libpod-markdown-perl/debian/control Tue Mar 15 02:33:09 2011
@@ -1,9 +1,10 @@
 Source: libpod-markdown-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7)
-Build-Depends-Indep: perl, libtest-differences-perl,
- perl (>= 5.11.1) | libtest-simple-perl (>= 0.94),
+Build-Depends: debhelper (>= 8)
+Build-Depends-Indep: perl,
+ libtest-differences-perl,
+ libtest-simple-perl (>= 0.94) | perl (>= 5.11.1),
  perl (>= 5.10.1) | libparent-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
 Uploaders: Jonathan Yu <jawnsy at cpan.org>, Nathan Handler <nhandler at ubuntu.com>
@@ -14,7 +15,8 @@
 
 Package: libpod-markdown-perl
 Architecture: all
-Depends: ${perl:Depends}, ${misc:Depends}, perl (>= 5.10.1) | libparent-perl
+Depends: ${perl:Depends}, ${misc:Depends},
+ perl (>= 5.10.1) | libparent-perl
 Description: module to convert POD to the Markdown file format
  Pod::Markdown is a Perl module that parses Plain Old Documentation (POD) and
  converts it into the Markdown text format. It subclasses Pod::Parser, so it

Modified: trunk/libpod-markdown-perl/lib/Pod/Markdown.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-markdown-perl/lib/Pod/Markdown.pm?rev=71446&op=diff
==============================================================================
--- trunk/libpod-markdown-perl/lib/Pod/Markdown.pm (original)
+++ trunk/libpod-markdown-perl/lib/Pod/Markdown.pm Tue Mar 15 02:33:09 2011
@@ -4,7 +4,7 @@
 
 package Pod::Markdown;
 BEGIN {
-  $Pod::Markdown::VERSION = '1.103491';
+  $Pod::Markdown::VERSION = '1.110730';
 }
 # ABSTRACT: Convert POD to Markdown
 use parent qw(Pod::Parser);
@@ -22,7 +22,7 @@
         Text      => [],       # final text
         Indent    => 0,        # list indent levels counter
         ListType  => '-',      # character on every item
-        searching => undef,    # what are we searching for? (title, author etc.)
+        searching => ''   ,    # what are we searching for? (title, author etc.)
         Title     => undef,    # page title
         Author    => undef,    # page author
     };
@@ -58,6 +58,12 @@
     $text = $parser->_indent_text($text);
     push @{ $data->{Text} }, $text;
     return;
+}
+
+sub _unsave {
+    my $parser = shift;
+    my $data = $parser->_private;
+    return pop @{ $data->{Text} };
 }
 
 sub _indent_text {
@@ -100,7 +106,7 @@
             } elsif ($paragraph =~ m{AUTHOR}xmsi) {
                 $data->{searching} = 'author';
             } else {
-                $data->{searching} = undef;
+                $data->{searching} = '';
             }
         }
     }
@@ -116,9 +122,21 @@
 
         # decrement indent level
         $data->{Indent}--;
+        $data->{searching} = '';
     } elsif ($command =~ m{item}xms) {
-        $parser->_save(sprintf '%s %s',
-            $data->{ListType}, $parser->interpolate($paragraph, $line_num));
+        $paragraph = $parser->interpolate($paragraph, $line_num);
+        $paragraph =~ s{^\h* \* \h*}{}xms;
+
+        if ($data->{searching} eq 'listpara') {
+            $data->{searching} = 'listheadhuddled';
+        }
+        else {
+            $data->{searching} = 'listhead';
+        }
+
+        if (length $paragraph) {
+            $parser->textblock($paragraph, $line_num);
+        }
     }
 
     # ignore other commands
@@ -141,11 +159,18 @@
     $paragraph = $parser->_clean_text($paragraph);
 
     # searching ?
-    if ($data->{searching}) {
-        if ($data->{searching} =~ m{title|author}xms) {
-            $data->{ ucfirst $data->{searching} } = $paragraph;
-            $data->{searching} = undef;
-        }
+    if ($data->{searching} =~ m{title|author}xms) {
+        $data->{ ucfirst $data->{searching} } = $paragraph;
+        $data->{searching} = '';
+    } elsif ($data->{searching} =~ m{listhead(huddled)?$}xms) {
+        my $is_huddled = $1;
+        $paragraph = sprintf '%s %s', $data->{ListType}, $paragraph;
+        if ($is_huddled) {
+            $paragraph = $parser->_unsave() . "\n" . $paragraph;
+        }
+        $data->{searching} = 'listpara';
+    } elsif ($data->{searching} eq 'listpara') {
+        $data->{searching} = '';
     }
 
     # save the text
@@ -208,7 +233,7 @@
 __END__
 =pod
 
-=for stopwords textblock thompsonclan
+=for stopwords textblock thompsonclan Pagaltzis
 
 =head1 NAME
 
@@ -216,7 +241,7 @@
 
 =head1 VERSION
 
-version 1.103491
+version 1.110730
 
 =head1 SYNOPSIS
 
@@ -279,7 +304,7 @@
 Archive Network (CPAN). Visit L<http://www.perl.com/CPAN/> to find a CPAN
 site near you, or see L<http://search.cpan.org/dist/Pod-Markdown/>.
 
-The development version lives at L<http://github.com/hanekomu/Pod-Markdown.git>
+The development version lives at L<http://github.com/hanekomu/Pod-Markdown>
 and may be cloned from L<git://github.com/hanekomu/Pod-Markdown.git>.
 Instead of sending patches, please fork this project using the standard
 git and github infrastructure.
@@ -300,6 +325,10 @@
 
 Ryan C. Thompson <rct at thompsonclan d0t org>
 
+=item *
+
+Aristotle Pagaltzis <pagaltzis at gmx.de>
+
 =back
 
 =head1 COPYRIGHT AND LICENSE

Modified: trunk/libpod-markdown-perl/t/misc.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libpod-markdown-perl/t/misc.t?rev=71446&op=diff
==============================================================================
--- trunk/libpod-markdown-perl/t/misc.t (original)
+++ trunk/libpod-markdown-perl/t/misc.t Tue Mar 15 02:33:09 2011
@@ -37,6 +37,19 @@
 ## _Italics_, __Bold__, `Code`, and [Links](http://search.cpan.org/perldoc?Links) should work in headers
 
 _Italics_, __Bold__, `Code`, and [Links](http://search.cpan.org/perldoc?Links) should work in body text.
+
+- This
+- is
+- a
+
+basic
+
+- bulleted
+
+item
+
+- list
+- test
 EOMARKDOWN
 
 1 while chomp $markdown;
@@ -73,3 +86,29 @@
 =head2 I<Italics>, B<Bold>, C<Code>, and L<Links> should work in headers
 
 I<Italics>, B<Bold>, C<Code>, and L<Links> should work in body text.
+
+=over 4
+
+=item *
+
+This
+
+=item * is
+
+=item * a
+
+basic
+
+=item *
+
+bulleted
+
+item
+
+=item *
+
+list
+
+=item * test
+
+=back




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