From 27c92f322f4dd3822a7e7e1813d69ce61dd80a01 Mon Sep 17 00:00:00 2001 From: github actions Date: Sat, 15 Aug 2020 02:13:10 +0000 Subject: [PATCH] Squashed 'src/main/resources/csl-styles/' changes from 827b986621..eb0d37e0ff eb0d37e0ff Create natbib-plainnat-author-dat.csl (#4967) fb1592a1cd Update journal-of-fish-biology.csl (#4969) f6876cbe0f Update .travis.yml (#4970) d6d400b207 Create london-review-of-international-law.csl (#4966) d2a5ae1b16 Update harvard-stellenbosch-university.csl (#4965) 9c62141a40 Create phytopathologia-mediterranea.csl (#4964) 8ca2ea1a9c Update historical-materialism.csl (#4960) 80456dc749 Update historical-materialism.csl be2d91090c Update historical-materialism.csl 1d1cf095a6 Create atlande.csl (#4930) 89f41d404d Create juristische-zitierweise-oeffentliches-recht.csl (#4944) 8c677a08c5 Create korean-journal-of-gastroenterology.csl (#4954) eadb9508dd Create historical-materialism.csl (#4955) 5553dcdc9c Create revista-materia.csl (#4957) d23a3abd79 Bug fix in APA 6 original publication macro (#4959) 66f9974980 Always print publisher in APA 6th edition (#4899) 868809c063 Create agora.csl (#4940) 99c19c397e Update anthropologie-et-societes.csl (#4952) ee17423a93 Create critical-reviews-in-solid-state-and-materials-science.csl (#4951) 7a13a7d59e Create korean-journal-of-internal-medicine.csl (#4953) git-subtree-dir: src/main/resources/csl-styles git-subtree-split: eb0d37e0ff253e7c6d256b619e4831af306a28cf --- .travis.yml | 4 +- Gemfile | 2 +- Gemfile.lock | 4 +- agora.csl | 266 +++++++++++ anthropologie-et-societes.csl | 26 +- apa-6th-edition-no-ampersand.csl | 115 +++-- apa-6th-edition.csl | 115 +++-- apa-no-doi-no-issue.csl | 131 +++--- apa-old-doi-prefix.csl | 115 +++-- atlande.csl | 338 ++++++++++++++ ...-in-solid-state-and-materials-sciences.csl | 187 ++++++++ harvard-stellenbosch-university.csl | 1 + historical-materialism.csl | 371 +++++++++++++++ journal-of-fish-biology.csl | 110 +++-- ...stische-zitierweise-offentliches-recht.csl | 429 ++++++++++++++++++ london-review-of-international-law.csl | 323 +++++++++++++ natbib-plainnat-author-date.csl | 276 +++++++++++ phytopathologia-mediterranea.csl | 201 ++++++++ revista-materia.csl | 343 ++++++++++++++ the-korean-journal-of-gastroenterology.csl | 204 +++++++++ the-korean-journal-of-internal-medicine.csl | 166 +++++++ 21 files changed, 3460 insertions(+), 267 deletions(-) create mode 100644 agora.csl create mode 100644 atlande.csl create mode 100644 critical-reviews-in-solid-state-and-materials-sciences.csl create mode 100644 historical-materialism.csl create mode 100644 juristische-zitierweise-offentliches-recht.csl create mode 100644 london-review-of-international-law.csl create mode 100644 natbib-plainnat-author-date.csl create mode 100644 phytopathologia-mediterranea.csl create mode 100644 revista-materia.csl create mode 100644 the-korean-journal-of-gastroenterology.csl create mode 100644 the-korean-journal-of-internal-medicine.csl diff --git a/.travis.yml b/.travis.yml index 44a11d7aac9..724298fd1ef 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,8 @@ -dist: bionic +dist: focal language: ruby cache: bundler rvm: -- 2.6.5 +- 2.7.1 install: - bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle} - bundle update sheldon diff --git a/Gemfile b/Gemfile index 65bb4267142..17b2c314a33 100644 --- a/Gemfile +++ b/Gemfile @@ -1,4 +1,4 @@ -ruby '2.6.5' +ruby '2.7.1' source 'https://rubygems.org' gem 'rake' diff --git a/Gemfile.lock b/Gemfile.lock index d41b71a1f32..b0baba6eaa8 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -64,7 +64,7 @@ DEPENDENCIES sheldon! RUBY VERSION - ruby 2.6.5p114 + ruby 2.7.1 BUNDLED WITH - 1.17.3 + 2.1.4 diff --git a/agora.csl b/agora.csl new file mode 100644 index 00000000000..fd0a065ab82 --- /dev/null +++ b/agora.csl @@ -0,0 +1,266 @@ + + diff --git a/anthropologie-et-societes.csl b/anthropologie-et-societes.csl index 3a8ba466a67..f61e510a708 100644 --- a/anthropologie-et-societes.csl +++ b/anthropologie-et-societes.csl @@ -8,13 +8,12 @@ Patrick O'Brien, PhD - obrienpat86@gmail.com 0702-8997 1703-7921 - 2018-09-05T13:51:00+00:00 + 2020-07-31T08:06:37+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -115,14 +114,15 @@ - + + - + @@ -167,24 +167,24 @@ - + - - - - + + - - - - + + + + + + diff --git a/apa-6th-edition-no-ampersand.csl b/apa-6th-edition-no-ampersand.csl index 86ccc7e7845..c3b16aabf24 100644 --- a/apa-6th-edition-no-ampersand.csl +++ b/apa-6th-edition-no-ampersand.csl @@ -503,19 +503,10 @@ - - - - - - - - - @@ -796,6 +787,25 @@ + + + + + + + + + + + + + + + + + + + @@ -1386,6 +1396,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1492,57 +1542,28 @@ - - + + - + - + - - - - - - - - - - - - - - - - - + + + - + + - - - - - - - - - - - - - - - - diff --git a/apa-6th-edition.csl b/apa-6th-edition.csl index 83c3b70cce6..f49c6b13532 100644 --- a/apa-6th-edition.csl +++ b/apa-6th-edition.csl @@ -502,19 +502,10 @@ - - - - - - - - - @@ -795,6 +786,25 @@ + + + + + + + + + + + + + + + + + + + @@ -1385,6 +1395,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1491,57 +1541,28 @@ - - + + - + - + - - - - - - - - - - - - - - - - - + + + - + + - - - - - - - - - - - - - - - - diff --git a/apa-no-doi-no-issue.csl b/apa-no-doi-no-issue.csl index b71c07b4aa7..03ca7ff86be 100644 --- a/apa-no-doi-no-issue.csl +++ b/apa-no-doi-no-issue.csl @@ -460,23 +460,15 @@ - + - - - - - - + - - - - + - + @@ -517,19 +509,10 @@ - - - - - - - - - @@ -810,6 +793,25 @@ + + + + + + + + + + + + + + + + + + + @@ -1407,6 +1409,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1513,57 +1555,28 @@ - - + + - + - + - - - - - - - - - - - - - - - - - + + + - + + - - - - - - - - - - - - - - - - diff --git a/apa-old-doi-prefix.csl b/apa-old-doi-prefix.csl index 1bba65f0061..a7ef73be8aa 100644 --- a/apa-old-doi-prefix.csl +++ b/apa-old-doi-prefix.csl @@ -503,19 +503,10 @@ - - - - - - - - - @@ -796,6 +787,25 @@ + + + + + + + + + + + + + + + + + + + @@ -1386,6 +1396,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1492,57 +1542,28 @@ - - + + - + - + - - - - - - - - - - - - - - - - - + + + - + + - - - - - - - - - - - - - - - - diff --git a/atlande.csl b/atlande.csl new file mode 100644 index 00000000000..37051e8c417 --- /dev/null +++ b/atlande.csl @@ -0,0 +1,338 @@ + + diff --git a/critical-reviews-in-solid-state-and-materials-sciences.csl b/critical-reviews-in-solid-state-and-materials-sciences.csl new file mode 100644 index 00000000000..78d9b89214b --- /dev/null +++ b/critical-reviews-in-solid-state-and-materials-sciences.csl @@ -0,0 +1,187 @@ + + diff --git a/harvard-stellenbosch-university.csl b/harvard-stellenbosch-university.csl index 610543553b0..7ac7671b557 100644 --- a/harvard-stellenbosch-university.csl +++ b/harvard-stellenbosch-university.csl @@ -280,6 +280,7 @@ + diff --git a/historical-materialism.csl b/historical-materialism.csl new file mode 100644 index 00000000000..0d31db251cb --- /dev/null +++ b/historical-materialism.csl @@ -0,0 +1,371 @@ + + diff --git a/journal-of-fish-biology.csl b/journal-of-fish-biology.csl index 275532a225b..1db13f2a61b 100644 --- a/journal-of-fish-biology.csl +++ b/journal-of-fish-biology.csl @@ -16,7 +16,7 @@ 0022-1112 1095-8649 The style for the Journal of Fish Biology. - 2019-11-05T09:32:12+00:00 + 2020-08-13T10:48:28+00:00 This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License @@ -36,16 +36,10 @@ - - - - - - - - + + + @@ -73,18 +67,28 @@ - - - - + + + + + + + + + + + + + + - + - + @@ -98,23 +102,13 @@ - + + - - - - - - - - - - - - - - + @@ -141,10 +135,16 @@ + + + + + - + @@ -191,14 +191,16 @@ - - + + - + - - - + + + + + @@ -211,9 +213,12 @@ - - - + + + + + + @@ -236,15 +241,22 @@ - + + + + + + + + + + + + + + - - - diff --git a/juristische-zitierweise-offentliches-recht.csl b/juristische-zitierweise-offentliches-recht.csl new file mode 100644 index 00000000000..288261aa758 --- /dev/null +++ b/juristische-zitierweise-offentliches-recht.csl @@ -0,0 +1,429 @@ + + diff --git a/london-review-of-international-law.csl b/london-review-of-international-law.csl new file mode 100644 index 00000000000..f2a7c649526 --- /dev/null +++ b/london-review-of-international-law.csl @@ -0,0 +1,323 @@ + + diff --git a/natbib-plainnat-author-date.csl b/natbib-plainnat-author-date.csl new file mode 100644 index 00000000000..cde2857f70f --- /dev/null +++ b/natbib-plainnat-author-date.csl @@ -0,0 +1,276 @@ + + diff --git a/phytopathologia-mediterranea.csl b/phytopathologia-mediterranea.csl new file mode 100644 index 00000000000..964231e1334 --- /dev/null +++ b/phytopathologia-mediterranea.csl @@ -0,0 +1,201 @@ + + diff --git a/revista-materia.csl b/revista-materia.csl new file mode 100644 index 00000000000..8625641642f --- /dev/null +++ b/revista-materia.csl @@ -0,0 +1,343 @@ + + diff --git a/the-korean-journal-of-gastroenterology.csl b/the-korean-journal-of-gastroenterology.csl new file mode 100644 index 00000000000..72a7a71a938 --- /dev/null +++ b/the-korean-journal-of-gastroenterology.csl @@ -0,0 +1,204 @@ + + diff --git a/the-korean-journal-of-internal-medicine.csl b/the-korean-journal-of-internal-medicine.csl new file mode 100644 index 00000000000..62da01eef13 --- /dev/null +++ b/the-korean-journal-of-internal-medicine.csl @@ -0,0 +1,166 @@ + +