DOI avant localisateur si autre que page web ou blog

This commit is contained in:
Bastien Dumont 2021-06-28 17:11:09 +02:00
parent 07d8263afc
commit 3c6684a7fd
2 changed files with 45 additions and 47 deletions

View File

@ -101,6 +101,7 @@
<text macro="publicationReference"/>
<text macro="digitalReference" prefix="(" suffix=")"/>
</group>
<text macro="publicationLocators"/>
</if>
<else>
<text macro="publicationReference"/>
@ -116,12 +117,12 @@
<choose>
<if variable="annote"> <!-- = primary source title -->
<group delimiter=", ">
<text macro="sourceAuthor"/>
<group delimiter=" ">
<text macro="sourceTitle"/>
<text macro="sourceIdentifier"/>
</group>
<text macro="sourceDivisionLocator"/>
<text macro="sourceAuthor"/>
<group delimiter=" ">
<text macro="sourceTitle"/>
<text macro="sourceIdentifier"/>
</group>
<text macro="sourceDivisionLocator"/>
</group>
</if>
</choose>
@ -129,23 +130,20 @@
<macro name="publicationReference">
<group delimiter=", ">
<group delimiter=" ">
<group delimiter=", ">
<group delimiter=" ">
<group delimiter=", ">
<text macro="publicationAuthors"/>
<text macro="publicationTitle"/>
<text macro="publicationContainer"/>
</group>
<text macro="publicationCollection"/>
</group>
<text macro="translationNotice"/>
<text macro="volumeLocator"/>
<group delimiter=" ">
<text macro="publicationPublisher"/>
<text macro="publicationDateWithReedition"/>
</group>
<text macro="publicationAuthors"/>
<text macro="publicationTitle"/>
<text macro="publicationContainer"/>
</group>
<text macro="publicationLocators"/>
<text macro="publicationCollection"/>
</group>
<text macro="translationNotice"/>
<text macro="volumeLocator"/>
<group delimiter=" ">
<text macro="publicationPublisher"/>
<text macro="publicationDateWithReedition"/>
</group>
</group>
</macro>
@ -169,24 +167,24 @@
<macro name="sourceAuthor">
<choose>
<if position="subsequent">
<text macro="sourceAuthorShort"/>
<text macro="sourceAuthorShort"/>
</if>
<else>
<text macro="sourceAuthorLong"/>
</else>
</choose>
</choose>
</macro>
<macro name="sourceAuthorLong">
<names variable="author">
<name form="long" initialize="false">
<name-part name="given" font-variant="small-caps"/>
<name-part name="family" font-variant="small-caps"/>
</name>
<name form="long" initialize="false">
<name-part name="given" font-variant="small-caps"/>
<name-part name="family" font-variant="small-caps"/>
</name>
</names>
</macro>
<macro name="sourceAuthorShort">
<macro name="sourceAuthorShort">
<names variable="author">
<name form="short">
<name-part name="family" font-variant="small-caps"/>
@ -250,13 +248,13 @@
<macro name="simplePublicationAuthors">
<group delimiter=", ">
<names variable="author">
<name>
<name-part name="family" font-variant="small-caps"/>
</name>
</names>
<text macro="collectiveBookEditors"/>
<text macro="collaborator"/>
<names variable="author">
<name>
<name-part name="family" font-variant="small-caps"/>
</name>
</names>
<text macro="collectiveBookEditors"/>
<text macro="collaborator"/>
</group>
</macro>
@ -300,8 +298,8 @@
</else-if>
<else-if type="thesis">
<group delimiter=", ">
<text macro="bookWithVolume"/>
<text variable="genre"/>
<text macro="bookWithVolume"/>
<text variable="genre"/>
</group>
</else-if>
<else-if type="manuscript" match="none">
@ -312,11 +310,11 @@
<macro name="multivolumeNamedBook">
<group delimiter=", ">
<group delimiter=". ">
<text variable="container-title" font-style="italic"/>
<text macro="bookVolume"/>
</group>
<text variable="title" font-style="italic"/>
<group delimiter=". ">
<text variable="container-title" font-style="italic"/>
<text macro="bookVolume"/>
</group>
<text variable="title" font-style="italic"/>
</group>
</macro>
@ -499,7 +497,7 @@
<text variable="event-place"/>
</else-if>
<else-if type="thesis">
<text variable="publisher"/> <!-- University -->
<text variable="publisher"/> <!-- University -->
</else-if>
</choose>
</macro>
@ -590,8 +588,8 @@
<text variable="page" font-variant="small-caps"/>
</else-if>
<else-if variable="chapter-number">
<text term="column" form="short"/>
<text variable="chapter-number" font-variant="small-caps"/>
<text term="column" form="short"/>
<text variable="chapter-number" font-variant="small-caps"/>
</else-if>
</choose>
</group>
@ -653,7 +651,7 @@
<text variable="DOI" prefix="DOI : "/>
</macro>
<macro name="digitalLink">
<macro name="digitalLink">
<choose>
<if type="webpage post-weblog" match="none">
<group delimiter=" : ">

View File

@ -576,7 +576,7 @@ N. de la <span class="smallcaps">Particule</span>, N. de l<span class="smal
<li id="fn52" role="doc-endnote"><p><span class="smallcaps">Nom Auteurdelasource</span>, <em>Nom de la source</em>, éd. N. <span class="smallcaps">Éditeur</span>, <em>Source dont le nom de lauteur est composé dun prénom et dun nom</em>, Lieu de publication 2000.<a href="#fnref52" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
<li id="fn53" role="doc-endnote"><p>N. <span class="smallcaps">Auteur</span>, <em>Volume non nommé dun livre en plusieurs volumes</em>, II, Lieu de publication 2000.<a href="#fnref53" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
<li id="fn54" role="doc-endnote"><p><em>Répertoire (p. ex. prosopographie)</em>.<a href="#fnref54" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
<li id="fn55" role="doc-endnote"><p>N. <span class="smallcaps">Auteur</span>, Article avec DOI, <em>Titre de la revue</em> 4, 1990, p. <span class="smallcaps">33-35</span> (DOI : <a href="https://doi.org/10.0000/placeholder.suffix" role="doc-biblioref">10.0000/placeholder.suffix</a>).<a href="#fnref55" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
<li id="fn55" role="doc-endnote"><p>N. <span class="smallcaps">Auteur</span>, Article avec DOI, <em>Titre de la revue</em> 4, 1990 (DOI : <a href="https://doi.org/10.0000/placeholder.suffix" role="doc-biblioref">10.0000/placeholder.suffix</a>), p. <span class="smallcaps">33-35</span>.<a href="#fnref55" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
<li id="fn56" role="doc-endnote"><p><span class="smallcaps">Nom Auteurdelasource</span>, <em>Titre de la source</em>, VI, 5, 4, éd. N. <span class="smallcaps">Éditeur</span>, <em>Source dont on repère le passage cité par des divisions internes</em>, Lieu de publication 1980, p. 57.<a href="#fnref56" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
<li id="fn57" role="doc-endnote"><p>N. <span class="smallcaps">Auteur</span>, <em>Livre en plusieurs volumes dont on cite un volume</em>, II, Lieu de publication 1987, p. 56.<a href="#fnref57" class="footnote-back" role="doc-backlink">↩︎</a></p></li>
<li id="fn58" role="doc-endnote"><p>Ville de conservation, Institution, Collection 34 (Répertoire 001).<a href="#fnref58" class="footnote-back" role="doc-backlink">↩︎</a></p></li>