New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update universite-du-quebec-a-montreal.csl #3665

Merged
merged 5 commits into from Feb 15, 2019

Conversation

Projects
None yet
4 participants
@jjrondeau
Copy link
Contributor

jjrondeau commented Aug 28, 2018

The changes bring the style into line with the September 2018 edition of the Thesis Writing Guide. In addition, new document types are now supported by style.

@csl-bot

This comment has been minimized.

Copy link

csl-bot commented Aug 28, 2018

Awesome! You just created a pull request to the Citation Styles Language styles repository. One of our human volunteers will try to get in touch soon (usually within a week). In the meantime, I will run some automated checks. You should be notified of the results in a few minutes.

If you haven't done so yet, please make sure your style validates and follows all our other Style Requirements.

To update this pull request, visit the "Files changed" tab above, and click on the pencil icon (see below) in the top-right corner of your style to start editing.

If you have any questions, please leave a comment and we'll get back to you. While we usually respond in English, feel free to write in whatever language you're most comfortable.

@csl-bot

This comment has been minimized.

Copy link

csl-bot commented Aug 28, 2018

😃 Your submission passed all our automated tests.

@csl-bot

This comment has been minimized.

Copy link

csl-bot commented Sep 3, 2018

😃 Your submission passed all our automated tests.

<term name="in press">sous presse</term>
<term name="director" form="short">réal.</term>
<term name="chapter" form="short">chap. </term>
<term name="scale">Échelle : </term>

This comment has been minimized.

@rmzelle

rmzelle Sep 3, 2018

Member

@jjrondeau, when you define translations, you shouldn't include any separating delimiters (like " : " in this case). So you'd want to replace <term name="scale">Échelle : </term> by <term name="scale">Échelle</term>.

It also looks like you currently don't use this term yet. Instead of

<text variable="scale" prefix=". Échelle : "/>

it would be better to use:

<group prefix=". " delimiter=" : ">
  <text term="scale"/>
  <text variable="scale"/>
</group>

(the group here prevents the "scale" term from being printed when the "scale" variable is empty)

This comment has been minimized.

@jjrondeau

jjrondeau Sep 6, 2018

Author Contributor

Yes, you're right. I will correct this.

@@ -52,9 +52,6 @@
<multiple>éditions</multiple>
</term>
<term name="edition" form="short">éd.</term>
<term name="ordinal">&lt;sup&gt;e&lt;/sup&gt;</term>
<term name="ordinal-01" gender-form="feminine" match="whole-number">&lt;sup&gt;re&lt;/sup&gt;</term>
<term name="ordinal-01" gender-form="masculine" match="whole-number">&lt;sup&gt;er&lt;/sup&gt;</term>

This comment has been minimized.

@rmzelle

rmzelle Sep 3, 2018

Member

@jjrondeau, @adam3smith already removed these lines from your submission, but we don't allow HTML tags like this for superscript.

The best solution we currently have is to use superscript characters. See the French CSL locale for an example: https://github.com/citation-style-language/locales/blob/b8c370c8a978790d2aeefa302f05f3bfb1478e75/locales-fr-FR.xml#L74

This comment has been minimized.

@jjrondeau

jjrondeau Sep 6, 2018

Author Contributor

Thank you for the example. I will use it.

@rmzelle

This comment has been minimized.

Copy link
Member

rmzelle commented Sep 3, 2018

(see 4862ee7#r214747469 as well)

@adam3smith
Copy link
Member

adam3smith left a comment

Some specific comments, but also, this style has turned quite large with, to be frank, rather poor coding (lots of duplication, e.g.). I'd much prefer some systematic clean-up for a style of this size, both for reliability and to allow future maintenance.

I would also really want to urge you to rethink your reliance on the note variable (let alone annote). You're setting users up to make poor use of reference managers if you require style-specific data entry to this extent.

</terms>
</locale>
<macro name="container-contributors">
<choose>
<if type="chapter paper-conference entry-encyclopedia entry-dictionary" match="any">
<if type="chapter paper-conference entry-encyclopedia entry-dictionary map interview webpage" match="any">
<names variable="editor container-author" delimiter=", " suffix=", ">
<name and="text" initialize-with=". " delimiter=", "/>
<label form="short" prefix=" (" text-case="title" suffix=")"/>

This comment has been minimized.

@adam3smith

adam3smith Sep 4, 2018

Member

this isn't your addition, but these two labels can't possibly be right?

This comment has been minimized.

@jjrondeau

jjrondeau Oct 26, 2018

Author Contributor

Yes, I will delete one

@@ -55,7 +68,7 @@
</macro>
<macro name="secondary-contributors">
<choose>
<if type="article-journal book chapter paper-conference entry-encyclopedia entry-dictionary" match="none">
<if type="article-journal book chapter paper-conference entry-encyclopedia entry-dictionary map" match="none">
<names variable="editor" delimiter=", " prefix=" (" suffix=")">
<name name-as-sort-order="all" and="text" sort-separator=", " initialize-with=". " delimiter=", " delimiter-precedes-last="never"/>
<label form="short" prefix=", " text-case="title"/>

This comment has been minimized.

@adam3smith

adam3smith Sep 4, 2018

Member

ditto here

This comment has been minimized.

@jjrondeau

jjrondeau Oct 26, 2018

Author Contributor

Yes, I will delete one.

@@ -74,6 +87,22 @@
<names variable="author"/>
<text variable="title"/>
</if>
<else-if type="manuscript legislation bill legal_case treaty" match="any">

This comment has been minimized.

@adam3smith

adam3smith Sep 4, 2018

Member

this seems way to complex. Wouldn't

<names variable="editor"/>
<names variable="translator"/>
<text macro="title"/>

or something like that work?

</if>
</choose>
</substitute>
</names>
<names variable="composer">
<name and="text" delimiter-precedes-last="never" et-al-min="8" et-al-use-first="6" et-al-subsequent-min="8" et-al-subsequent-use-first="6" et-al-use-last="true" initialize-with="." name-as-sort-order="all"/>

This comment has been minimized.

@adam3smith

adam3smith Sep 4, 2018

Member

we prefer the et al settings in the bibliography/citation line unless you really need to differentiate et al within citations or the bibliography.

This comment has been minimized.

@jjrondeau

jjrondeau Oct 26, 2018

Author Contributor

Understood.

</macro>
<macro name="author-short">
<names variable="author">
<name form="short" and="text" initialize-with=". "/>
<name form="short" and="text" et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" initialize-with=". "/>

This comment has been minimized.

@adam3smith

This comment has been minimized.

@jjrondeau

jjrondeau Oct 26, 2018

Author Contributor

Understood.

<group delimiter=" " prefix="de ">
<text variable="source" suffix=" "/>
<text variable="URL"/>
</group>
</group>
</else-if>
<else>
<choose>
<if type="article-journal" match="all">

This comment has been minimized.

@adam3smith

adam3smith Sep 4, 2018

Member

why not just continue these with else-if. Also, does the style really need that many different URL forms? Can't we simplify this?

This comment has been minimized.

@jjrondeau

jjrondeau Oct 26, 2018

Author Contributor

Correction made.

<choose>
<if type="post post-weblog" match="any" variable="container-title">
<group delimiter=". ">
<text variable="number" font-style="italic" prefix="Bill " suffix=": "/>

This comment has been minimized.

@adam3smith

adam3smith Sep 4, 2018

Member

what is this for? Seems quite odd.

<text variable="genre" prefix="[" suffix="]"/>
<text variable="scale" prefix="Échelle : "/>
<text variable="number"/>
<text variable="annote"/>

This comment has been minimized.

@adam3smith

adam3smith Sep 4, 2018

Member

now you're using both note and annote? You're really not doing users a favor by making them use a style that requires data entry that breaks everything else.

This comment has been minimized.

@jjrondeau

jjrondeau Oct 26, 2018

Author Contributor

I will delete "annote" and make minimal use of "note".

</date>
<text variable="year-suffix"/>
</group>
</macro>
<citation et-al-min="3" et-al-use-first="1" et-al-subsequent-min="3" et-al-subsequent-use-first="1" disambiguate-add-names="true" disambiguate-add-givenname="true" disambiguate-add-year-suffix="true" givenname-disambiguation-rule="primary-name" collapse="year">

This comment has been minimized.

@adam3smith

adam3smith Sep 4, 2018

Member

don't duplicate the subsequent et al here.

This comment has been minimized.

@jjrondeau

jjrondeau Oct 26, 2018

Author Contributor

OK

@@ -738,28 +1151,65 @@
</group>
</layout>
</citation>
<bibliography hanging-indent="true" et-al-min="8" et-al-use-first="6" et-al-subsequent-min="8" et-al-subsequent-use-first="6" et-al-use-last="true" entry-spacing="0" line-spacing="1">
<bibliography et-al-min="8" et-al-use-first="6" et-al-subsequent-min="8" et-al-subsequent-use-first="6" et-al-use-last="true" entry-spacing="0" hanging-indent="true">

This comment has been minimized.

@adam3smith

adam3smith Sep 4, 2018

Member

subsequent et al makes no sense for bibliography; remove.

This comment has been minimized.

@jjrondeau

jjrondeau Oct 26, 2018

Author Contributor

Understood.

Update universite-du-quebec-a-montreal.csl
I made changes to answer as much as possible to your comments. I tried to remove as much duplications as possible. UQAM style is quite complex and manage a large number of different documents. There are a lot of differences in punctuation that can explain why it is often hard to merge several types of documents under the same rules. It is also written to work with both Zotero and Mendeley. This is why sometimes it could look weird and is longer because Mendeley has less document types and less fields.
Your comments are always welcome.
@csl-bot

This comment has been minimized.

Copy link

csl-bot commented Oct 26, 2018

😃 Your submission passed all our automated tests.

@rmzelle

This comment has been minimized.

Copy link
Member

rmzelle commented Dec 15, 2018

@adam3smith, since you reviewed this initially, can you give this another look?

@csl-bot

This comment has been minimized.

Copy link

csl-bot commented Jan 3, 2019

😃 Your submission passed all our automated tests.

@adam3smith
Copy link
Member

adam3smith left a comment

OK -- I'm still concerned that this style is unmanageably complex and requires exceedingly specific data entry to produce desired results, but we'll just send users with problems your way ;). A couple of small remaining issues inline.

<group delimiter=": ">
<else-if type="speech" match="any">
<group delimiter=", ">
<text variable="abstract"/>

This comment has been minimized.

@adam3smith

adam3smith Jan 3, 2019

Member

This is odd -- why would you add the whole abstract for a speech/presentation. I'd reconsider that.

This comment has been minimized.

@jjrondeau

jjrondeau Jan 24, 2019

Author Contributor

I agree. This was for Mendeley as there is no field mapped to event variable. I will change this for publisher variable.

<text variable="medium"/>
<text variable="genre"/>
</group>
<text variable="number" prefix="(épisode " suffix=")"/>

This comment has been minimized.

@adam3smith

adam3smith Jan 3, 2019

Member

the episode label here seems highly specific and particularly odd for a musical_score type (I guess you have some sort of podcast in mind?) I don't think you're doing your users a favor by being overly specific with this.

This comment has been minimized.

@jjrondeau

jjrondeau Jan 24, 2019

Author Contributor

Yes, this is quite specific. I have added these lines based on what is described in the APA style blog for podcast: see comment at the end of the page: https://blog.apastyle.org/apastyle/2012/10/how-to-cite-a-podcast.html#comment-6a01157041f4e3970b01b8d210f59a970c
I don't expect this will be used often, but as there is an Episode Number field in Zotero for podcast (but not for audio recording or musical score), I thought it could be a good idea.

<if type="song musical_score" match="any">
<choose>
<if match="any" variable="container-title">
<text variable="medium" prefix=" [" suffix="]"/>

This comment has been minimized.

@adam3smith

adam3smith Jan 3, 2019

Member

the two consecutive square brackets here seem wrong. What you have above, with the square brackets set on a group, is almost certainly better.

This comment has been minimized.

@jjrondeau

jjrondeau Jan 24, 2019

Author Contributor

I agree. Will add a group there.

<if match="any" variable="container-title">
<text variable="medium" prefix=" [" suffix="]"/>
<text variable="genre" prefix=" [" suffix="]"/>
<text variable="number" prefix=" (épisode " suffix=")"/>

This comment has been minimized.

@adam3smith

adam3smith Jan 3, 2019

Member

ditto on the concern with episode

This comment has been minimized.

@jjrondeau

jjrondeau Jan 24, 2019

Author Contributor

As said above, this is based on APA style blog. I would like to keep it if you agree.

@csl-bot

This comment has been minimized.

Copy link

csl-bot commented Jan 24, 2019

😃 Your submission passed all our automated tests.

@adam3smith adam3smith merged commit 4750896 into citation-style-language:master Feb 15, 2019

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@adam3smith

This comment has been minimized.

Copy link
Member

adam3smith commented Feb 15, 2019

Thanks & sorry for the slow review process!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment