Skip to content

Commit

Permalink
Bug fix in APA 6 original publication macro (JabRef#4959)
Browse files Browse the repository at this point in the history 
I had forgotten that macro output is not suppressed when a group is otherwise empty.
  • Loading branch information
@bwiernik
bwiernik committed Aug 7, 2020
1 parent 66f9974 commit d23a3ab
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 56 deletions.
32 changes: 18 additions & 14 deletions apa-6th-edition-no-ampersand.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1409,20 +1409,24 @@
<text variable="references"/>
</if>
<else>
<group delimiter=" ">
<text macro="original-published"/>
<choose>
<if is-uncertain-date="original-date">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else>
<text macro="original-date"/>
</else>
</choose>
</group>
<choose>
<if variable="original-date">
<group delimiter=" ">
<text macro="original-published"/>
<choose>
<if is-uncertain-date="original-date">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else>
<text macro="original-date"/>
</else>
</choose>
</group>
</if>
</choose>
</else>
</choose>
</group>
Expand Down
32 changes: 18 additions & 14 deletions apa-6th-edition.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1408,20 +1408,24 @@
<text variable="references"/>
</if>
<else>
<group delimiter=" ">
<text macro="original-published"/>
<choose>
<if is-uncertain-date="original-date">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else>
<text macro="original-date"/>
</else>
</choose>
</group>
<choose>
<if variable="original-date">
<group delimiter=" ">
<text macro="original-published"/>
<choose>
<if is-uncertain-date="original-date">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else>
<text macro="original-date"/>
</else>
</choose>
</group>
</if>
</choose>
</else>
</choose>
</group>
Expand Down
32 changes: 18 additions & 14 deletions apa-no-doi-no-issue.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1422,20 +1422,24 @@
<text variable="references"/>
</if>
<else>
<group delimiter=" ">
<text macro="original-published"/>
<choose>
<if is-uncertain-date="original-date">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else>
<text macro="original-date"/>
</else>
</choose>
</group>
<choose>
<if variable="original-date">
<group delimiter=" ">
<text macro="original-published"/>
<choose>
<if is-uncertain-date="original-date">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else>
<text macro="original-date"/>
</else>
</choose>
</group>
</if>
</choose>
</else>
</choose>
</group>
Expand Down
32 changes: 18 additions & 14 deletions apa-old-doi-prefix.csl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1409,20 +1409,24 @@
<text variable="references"/>
</if>
<else>
<group delimiter=" ">
<text macro="original-published"/>
<choose>
<if is-uncertain-date="original-date">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else>
<text macro="original-date"/>
</else>
</choose>
</group>
<choose>
<if variable="original-date">
<group delimiter=" ">
<text macro="original-published"/>
<choose>
<if is-uncertain-date="original-date">
<group prefix="[" suffix="]" delimiter=" ">
<text term="circa" form="short"/>
<text macro="original-date"/>
</group>
</if>
<else>
<text macro="original-date"/>
</else>
</choose>
</group>
</if>
</choose>
</else>
</choose>
</group>
Expand Down

0 comments on commit d23a3ab

Please sign in to comment.