Skip to content
Permalink
Browse files

Allow separate paragraphs in release items.

The first paragraph should match the first line of the commit message as closely as possible.  The following paragraphs add more information.

Release items have been updated back to 2.01.
  • Loading branch information...
dwsteele committed May 21, 2019
1 parent e3fe343 commit 936b8a289c4884dd22f7ff0d3d624d6e70980512
Showing with 97 additions and 28 deletions.
  1. +18 −1 doc/lib/BackRestDoc/Custom/DocCustomRelease.pm
  2. +1 −1 doc/xml/dtd/doc.dtd
  3. +78 −26 doc/xml/release.xml
@@ -417,7 +417,23 @@ sub docGet
foreach my $oReleaseFeature ($oRelease->nodeGet($strSectionType)->
nodeGet($strItemType)->nodeList('release-item'))
{
my $oReleaseItemText = $oReleaseFeature->nodeGet('p')->textGet();
my @rhyReleaseItemP = $oReleaseFeature->nodeList('p');
my $oReleaseItemText = $rhyReleaseItemP[0]->textGet();

# Append the rest of the text
if (@rhyReleaseItemP > 1)
{
shift(@rhyReleaseItemP);

push(@{$oReleaseItemText->{oDoc}{children}}, ' ');

foreach my $rhReleaseItemP (@rhyReleaseItemP)
{
push(@{$oReleaseItemText->{oDoc}{children}}, @{$rhReleaseItemP->textGet()->{oDoc}{children}});
}
}

# Append contributor info
my $strContributorText = $self->contributorTextGet($oReleaseFeature, $$hItemType{$strItemType}{type});

if (defined($strContributorText))
@@ -428,6 +444,7 @@ sub docGet
push(@{$oReleaseItemText->{oDoc}{children}}, ')');
}

# Add the list item
$oList->nodeAdd('list-item')->textSet($oReleaseItemText);
}
}
@@ -168,7 +168,7 @@
<!ELEMENT release-improvement-list (release-item+)>
<!ELEMENT release-development-list (release-item+)>

<!ELEMENT release-item (release-item-contributor-list?, p)*>
<!ELEMENT release-item (release-item-contributor-list?, p+)>

<!ELEMENT release-item-contributor-list (release-item-ideator*, release-item-contributor*, release-item-reviewer*)>

0 comments on commit 936b8a2

Please sign in to comment.
You can’t perform that action at this time.