summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--THANKS1
-rw-r--r--debian/changelog6
-rwxr-xr-xhelp2man.PL6
4 files changed, 11 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index bd8f8c9..a779b85 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
-Version 1.45 March 23, 2014
+Version 1.45 March 24, 2014
* Add recognition of explicit section headings indicated with *Heading*.
+ * Improve handling of tagged paragraphs when the body is on a following
+ line.
Version 1.44 February 2, 2014
diff --git a/THANKS b/THANKS
index 1944912..0efe924 100644
--- a/THANKS
+++ b/THANKS
@@ -10,6 +10,7 @@ Karl Berry <karl@freefriends.org>
Mario Blättermann <mario.blaettermann@gmail.com>
Jakub Bogusz <qboosh@pld-linux.org>
Paolo Bonzini <bonzini@gnu.org>
+Brian Campbell <brian.campbell@editshare.com>
Felipe Castro <fefcas@gmail.com>
Yuri Chornoivan <yurchor@ukr.net>
Mo DeJong <mdejong@cygnus.com>
diff --git a/debian/changelog b/debian/changelog
index edf5620..77a63c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-help2man (1.45.1) unstable; urgency=medium
+help2man (1.45.1) unstable; urgency=low
* Skip additional blank lines following sections, and provide an
explicit method of adding sections (thanks to Mischa Williamson).
+ * Improve handling of tagged paragraphs when the body is on a following
+ line (thanks to Brian Campbell).
- -- Brendan O'Dea <bod@debian.org> Sun, 23 Mar 2014 13:43:25 +1100
+ -- Brendan O'Dea <bod@debian.org> Mon, 24 Mar 2014 21:31:01 +1100
help2man (1.44.1) unstable; urgency=low
diff --git a/help2man.PL b/help2man.PL
index 70c04d4..1b809b6 100755
--- a/help2man.PL
+++ b/help2man.PL
@@ -639,11 +639,11 @@ while (length)
}
# Indented paragraph with tag.
- elsif (s/^( +(\S.*?) +)(\S.*)\n//)
+ elsif (s/^( +(\S.*?))(?:( +)|\n( {20,}))(\S.*)\n//)
{
$matched .= $& if %append_match;
- $indent = length $1;
- $content = ".TP\n\x84$2\n\x84$3\n";
+ $indent = length ($4 || "$1$3");
+ $content = ".TP\n\x84$2\n\x84$5\n";
}
# Indented paragraph.