Amélioration de l'articulation entre URL et date de consultation et priorité de DOI sur URL, désormais exclusifs l'un de l'autre

This commit is contained in:
Bastien Dumont
2020-12-24 12:30:54 +01:00
parent 1a6c039eb3
commit 65a18865b4
2 changed files with 153 additions and 134 deletions

View File

@ -191,13 +191,20 @@ interview ; Interview
</macro>
<macro name="digitalReference">
<group delimiter=" ">
<group delimiter=", ">
<text macro="digitalDOI"/>
<text macro="digitalLink"/>
</group>
<text macro="digitalAccessed"/>
</group>
<choose>
<if type="webpage post-weblog" match="any">
<group delimiter=" ">
<text macro="digitalLocation"/>
<text macro="digitalAccessed"/>
</group>
</if>
<else>
<group delimiter=", ">
<text macro="digitalLocation"/>
<text macro="digitalAccessed"/>
</group>
</else>
</choose>
</macro>
<macro name="sourceAuthor">
@ -558,20 +565,6 @@ interview ; Interview
</choose>
</macro>
<macro name="digitalLink">
<choose>
<if type="webpage post-weblog" match="none">
<group delimiter=" : ">
<text term="online"/>
<text variable="URL"/>
</group>
</if>
<else>
<text variable="URL"/>
</else>
</choose>
</macro>
<macro name="digitalAccessed">
<choose>
<if type="webpage post-weblog" match="none">
@ -588,11 +581,36 @@ interview ; Interview
</else>
</choose>
</macro>
<macro name="digitalLocation">
<choose>
<if variable="DOI">
<text macro="digitalDOI"/>
</if>
<else>
<text macro="digitalLink"/>
</else>
</choose>
</macro>
<macro name="digitalDOI">
<text variable="DOI" prefix="DOI : "/>
</macro>
<macro name="digitalLink">
<choose>
<if type="webpage post-weblog" match="none">
<group delimiter=" : ">
<text term="online"/>
<text variable="URL"/>
</group>
</if>
<else>
<text variable="URL"/>
</else>
</choose>
</macro>
<macro name="shortTitle">
<choose>
<if variable="title-short">