Skip to content

Commit d23a3ab

Browse files
bwiernikbwiernik
authored
Bug fix in APA 6 original publication macro (JabRef#4959)
I had forgotten that macro output is not suppressed when a group is otherwise empty.
1 parent 66f9974 commit d23a3ab

4 files changed

+72
-56
lines changed

Diff for: ‎apa-6th-edition-no-ampersand.csl

+18-14
Original file line numberDiff line numberDiff line change
@@ -1409,20 +1409,24 @@
14091409
<text variable="references"/>
14101410
</if>
14111411
<else>
1412-
<group delimiter=" ">
1413-
<text macro="original-published"/>
1414-
<choose>
1415-
<if is-uncertain-date="original-date">
1416-
<group prefix="[" suffix="]" delimiter=" ">
1417-
<text term="circa" form="short"/>
1418-
<text macro="original-date"/>
1419-
</group>
1420-
</if>
1421-
<else>
1422-
<text macro="original-date"/>
1423-
</else>
1424-
</choose>
1425-
</group>
1412+
<choose>
1413+
<if variable="original-date">
1414+
<group delimiter=" ">
1415+
<text macro="original-published"/>
1416+
<choose>
1417+
<if is-uncertain-date="original-date">
1418+
<group prefix="[" suffix="]" delimiter=" ">
1419+
<text term="circa" form="short"/>
1420+
<text macro="original-date"/>
1421+
</group>
1422+
</if>
1423+
<else>
1424+
<text macro="original-date"/>
1425+
</else>
1426+
</choose>
1427+
</group>
1428+
</if>
1429+
</choose>
14261430
</else>
14271431
</choose>
14281432
</group>

Diff for: ‎apa-6th-edition.csl

+18-14
Original file line numberDiff line numberDiff line change
@@ -1408,20 +1408,24 @@
14081408
<text variable="references"/>
14091409
</if>
14101410
<else>
1411-
<group delimiter=" ">
1412-
<text macro="original-published"/>
1413-
<choose>
1414-
<if is-uncertain-date="original-date">
1415-
<group prefix="[" suffix="]" delimiter=" ">
1416-
<text term="circa" form="short"/>
1417-
<text macro="original-date"/>
1418-
</group>
1419-
</if>
1420-
<else>
1421-
<text macro="original-date"/>
1422-
</else>
1423-
</choose>
1424-
</group>
1411+
<choose>
1412+
<if variable="original-date">
1413+
<group delimiter=" ">
1414+
<text macro="original-published"/>
1415+
<choose>
1416+
<if is-uncertain-date="original-date">
1417+
<group prefix="[" suffix="]" delimiter=" ">
1418+
<text term="circa" form="short"/>
1419+
<text macro="original-date"/>
1420+
</group>
1421+
</if>
1422+
<else>
1423+
<text macro="original-date"/>
1424+
</else>
1425+
</choose>
1426+
</group>
1427+
</if>
1428+
</choose>
14251429
</else>
14261430
</choose>
14271431
</group>

Diff for: ‎apa-no-doi-no-issue.csl

+18-14
Original file line numberDiff line numberDiff line change
@@ -1422,20 +1422,24 @@
14221422
<text variable="references"/>
14231423
</if>
14241424
<else>
1425-
<group delimiter=" ">
1426-
<text macro="original-published"/>
1427-
<choose>
1428-
<if is-uncertain-date="original-date">
1429-
<group prefix="[" suffix="]" delimiter=" ">
1430-
<text term="circa" form="short"/>
1431-
<text macro="original-date"/>
1432-
</group>
1433-
</if>
1434-
<else>
1435-
<text macro="original-date"/>
1436-
</else>
1437-
</choose>
1438-
</group>
1425+
<choose>
1426+
<if variable="original-date">
1427+
<group delimiter=" ">
1428+
<text macro="original-published"/>
1429+
<choose>
1430+
<if is-uncertain-date="original-date">
1431+
<group prefix="[" suffix="]" delimiter=" ">
1432+
<text term="circa" form="short"/>
1433+
<text macro="original-date"/>
1434+
</group>
1435+
</if>
1436+
<else>
1437+
<text macro="original-date"/>
1438+
</else>
1439+
</choose>
1440+
</group>
1441+
</if>
1442+
</choose>
14391443
</else>
14401444
</choose>
14411445
</group>

Diff for: ‎apa-old-doi-prefix.csl

+18-14
Original file line numberDiff line numberDiff line change
@@ -1409,20 +1409,24 @@
14091409
<text variable="references"/>
14101410
</if>
14111411
<else>
1412-
<group delimiter=" ">
1413-
<text macro="original-published"/>
1414-
<choose>
1415-
<if is-uncertain-date="original-date">
1416-
<group prefix="[" suffix="]" delimiter=" ">
1417-
<text term="circa" form="short"/>
1418-
<text macro="original-date"/>
1419-
</group>
1420-
</if>
1421-
<else>
1422-
<text macro="original-date"/>
1423-
</else>
1424-
</choose>
1425-
</group>
1412+
<choose>
1413+
<if variable="original-date">
1414+
<group delimiter=" ">
1415+
<text macro="original-published"/>
1416+
<choose>
1417+
<if is-uncertain-date="original-date">
1418+
<group prefix="[" suffix="]" delimiter=" ">
1419+
<text term="circa" form="short"/>
1420+
<text macro="original-date"/>
1421+
</group>
1422+
</if>
1423+
<else>
1424+
<text macro="original-date"/>
1425+
</else>
1426+
</choose>
1427+
</group>
1428+
</if>
1429+
</choose>
14261430
</else>
14271431
</choose>
14281432
</group>

0 commit comments

Comments
 (0)