Skip to content
Please note that GitHub no longer supports your web browser.

We recommend upgrading to the latest Google Chrome or Firefox.

Learn more
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

Require et-al-min to be greater than et-al-use-first (fix) #2777

Merged
merged 5 commits into from Jul 3, 2017

Conversation

@rmzelle
Copy link
Member

rmzelle commented Jun 29, 2017

Fix small bug in testing of et-al attribute values. (et-al(-subsequent)-min should have a higher value than et-al(-subsequent)-use-first)

(original code from #2207)

@csl-bot

This comment has been minimized.

Copy link

csl-bot commented Jun 29, 2017

Awesome! You've created a pull request to the Citation Styles Language styles repository. We'll get in touch soon (usually within a day or two). In the meantime, our automated test system will go ahead and run some checks on your pull request. In a few minutes you'll be notified of the test results.

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

To update the current 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.

image

If you need assistance at any point, please leave a comment and we'll get back to you (feel free to write in Dutch, English, French, German, Portuguese, or Spanish).

@csl-bot

This comment has been minimized.

Copy link

csl-bot commented Jun 29, 2017

😟 There are some issues with your submission. Please check the test report for details.

@rmzelle

This comment has been minimized.

Copy link
Member Author

rmzelle commented Jun 29, 2017

@adam3smith, just 70 styles! :)

(guesswork involved for some styles)
@csl-bot

This comment has been minimized.

Copy link

csl-bot commented Jun 30, 2017

😟 There are some issues with your submission. Please check the test report for details.

@csl-bot

This comment has been minimized.

Copy link

csl-bot commented Jul 1, 2017

😟 There are some issues with your submission. Please check the test report for details.

@csl-bot

This comment has been minimized.

Copy link

csl-bot commented Jul 2, 2017

😃 Your submission passed all our automated tests.

@rmzelle rmzelle requested a review from adam3smith Jul 2, 2017
@@ -44,7 +44,7 @@
</else>
</choose>
</macro>
<citation et-al-min="1" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
<citation et-al-min="2" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">

This comment has been minimized.

Copy link
@rmzelle

rmzelle Jul 2, 2017

Author Member

@adam3smith, I assume this doesn't break anything. Also, any idea whether people actually use this style?

This comment has been minimized.

Copy link
@adam3smith

adam3smith Jul 3, 2017

Member

yes, some people do use this and yes, the change is fine.

@rmzelle

This comment has been minimized.

Copy link
Member Author

rmzelle commented Jul 2, 2017

@adam3smith, I checked the instructions to authors as much as possible for these styles, although I had to guess some styles. Anyway, I think this is good to go. Please squash and merge.

@adam3smith adam3smith merged commit e1e9929 into master Jul 3, 2017
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@adam3smith

This comment has been minimized.

Copy link
Member

adam3smith commented Jul 3, 2017

Cool, thanks. No concerns from my end. Obviously I didn't double-check the actual et-al values, but I have all confidence that you did this as well or better than I'd be able to.

@rmzelle rmzelle deleted the et-al-attributes-test-fix branch Jul 3, 2017
@rmzelle

This comment has been minimized.

Copy link
Member Author

rmzelle commented Jul 3, 2017

Thanks!

@ukyoi

This comment has been minimized.

Copy link
Contributor

ukyoi commented Feb 14, 2018

I'm sorry for my rudeness since I'm not a native English speaker, but did you made a mistake when editing chinese-gb7714-1987-numeric.csl and chinese-gb7714-2005-numeric.csl?

In GB/T 7714-1987 and GB/T 7714-2005, the standard specified that the value "et-al-use-first" is ought to be "3". But in this commit you just changed it to 1. Did you mean changing et-al-min to "4" and leaving et-al-use-first unchanged?

Here is a reference of Chinese GB/T 7714-2005 (in Chinese Simplified)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.