Added support for optional explanation parameter to the \versionadded
macro.
Refactored do_cmd_versionadded() and do_cmd_versionchanged() to do most
of the work in a helper function, with the do_cmd_*() wrappers just supplying
a portion of the replacement text.
diff --git a/Doc/perl/python.perl b/Doc/perl/python.perl
index 20615cc..4674f90 100644
--- a/Doc/perl/python.perl
+++ b/Doc/perl/python.perl
@@ -344,24 +344,25 @@
. $_);
}
-sub do_cmd_versionadded{
- # one parameter: \versionadded{version}
- local($_) = @_;
+sub versionnote{
+ # one or two parameters: \versionnote[explanation]{version}
+ my $type = @_[0];
+ local $_ = @_[1];
+ my $explanation = next_optional_argument();
my $release = next_argument();
- return ("\n<span class='versionnote'>New in version $release.</span>\n"
- . $_);
+ my $text = "$type in version $release.";
+ if ($explanation) {
+ $text = "$type in version $release:\n$explanation.";
+ }
+ return "\n<span class='versionnote'>$text</span>\n" . $_;
+}
+
+sub do_cmd_versionadded{
+ return versionnote('New', @_);
}
sub do_cmd_versionchanged{
- # one parameter: \versionchanged{version}
- local($_) = @_;
- my $explanation = next_optional_argument();
- my $release = next_argument();
- my $text = "Changed in version $release.";
- if ($explanation) {
- $text = "Changed in version $release:\n$explanation.";
- }
- return "\n<span class='versionnote'>$text</span>\n" . $_;
+ return versionnote('Changed', @_);
}
#