Skip to content

/styles

Permalink
Browse files

Reindent/reorder styles

  • Loading branch information...
@rmzelle
rmzelle committed Dec 5, 2014
1 parent b81b7ce commit 556c2a4cd8a35deca00acfb6f9927faea1f577df
Unified Split
Showing with 293 additions and 307 deletions.
  1. +1 −1 archiv-fur-die-civilistische-praxis.csl
  2. +1 −1 association-for-computing-machinery.csl
  3. +1 −1 australian-critical-care.csl
  4. +5 −5 chicago-author-date-fr.csl
  5. +4 −4 chicago-fullnote-bibliography-fr.csl
  6. +1 −1 complementary-therapies-in-medicine.csl
  7. +13 −13 council-of-science-editors-alphabetical.csl
  8. +12 −12 council-of-science-editors-author-date.csl
  9. +13 −13 council-of-science-editors.csl
  10. +1 −1 dependent/journal-of-international-marketing.csl
  11. +1 −1 dependent/journal-of-marketing-research.csl
  12. +1 −1 dependent/journal-of-marketing.csl
  13. +1 −1 dependent/journal-of-public-policy-and-marketing.csl
  14. +26 −26 ets-ecole-de-technologie-superieure.csl
  15. +16 −16 exercer.csl
  16. +1 −1 gesellschaft-fur-popularmusikforschung.csl
  17. +1 −1 harvard-bournemouth-university.csl
  18. +1 −1 harvard-cardiff-university-biosi.csl
  19. +1 −1 harvard-cite-them-right.csl
  20. +5 −5 harvard-edge-hill-university.csl
  21. +9 −9 harvard-manchester-metropolitan-university.csl
  22. +1 −2 harvard-southampton-solent-university.csl
  23. +1 −1 harvard-university-of-brighton-school-of-environment-and-technology.csl
  24. +1 −2 harvard-university-of-kent.csl
  25. +1 −1 harvard-university-of-the-west-of-scotland.csl
  26. +1 −1 health-and-social-care-in-the-community.csl
  27. +2 −2 hypertension-research.csl
  28. +1 −1 international-journal-of-infectious-diseases.csl
  29. +2 −3 international-journal-of-obstetric-anesthesia.csl
  30. +3 −3 journal-of-applied-entomology.csl
  31. +3 −3 journal-of-biological-chemistry.csl
  32. +1 −1 journal-of-endodontics.csl
  33. +1 −1 journal-of-infection.csl
  34. +1 −1 journal-of-minimally-invasive-gynecology.csl
  35. +1 −1 journal-of-phycology.csl
  36. +2 −2 mastozoologia-neotropical.csl
  37. +51 −61 neue-juristische-wochenschrift.csl
  38. +1 −1 neuroimaging-clinics-of-north-america.csl
  39. +1 −1 new-testament-studies.csl
  40. +1 −1 phycological-research.csl
  41. +1 −1 primary-care-clinics-in-office-practice.csl
  42. +61 −61 revue-archeologique-du-centre-de-la-france.csl
  43. +4 −4 revue-archeologique.csl
  44. +1 −1 royal-society-of-chemistry.csl
  45. +1 −1 seizure-european-journal-of-epilepsy.csl
  46. +1 −1 studia-bas.csl
  47. +5 −2 the-astrophysical-journal.csl
  48. +3 −3 universita-pontificia-salesiana-en.csl
  49. +3 −3 universita-pontificia-salesiana-es.csl
  50. +3 −3 universita-pontificia-salesiana-fr.csl
  51. +1 −1 universita-pontificia-salesiana-it.csl
  52. +3 −3 universita-pontificia-salesiana-pt-br.csl
  53. +3 −3 universita-pontificia-salesiana.csl
  54. +3 −3 universitat-mainz-geographisches-institut.csl
  55. +2 −4 vancouver-imperial-college-london.csl
  56. +1 −2 vietnam-ministry-of-education-and-training-en.csl
  57. +2 −3 vietnam-ministry-of-education-and-training-vi.csl
  58. +4 −4 zeszyty-prawnicze-bas.csl
View file
2 archiv-fur-die-civilistische-praxis.csl
@@ -16,7 +16,7 @@
<category field="law"/>
<issn>0003-8997</issn>
<eissn>1868-7113</eissn>
<summary>Use type entry-encopledia for part of &quot;Gesetzeskommentar&quot;. The style does not need any bibliography, but for completeness (preview) it shows here the appearance of the footnotes.</summary>
<summary>Use type entry-encopledia for part of "Gesetzeskommentar". The style does not need any bibliography, but for completeness (preview) it shows here the appearance of the footnotes.</summary>
<updated>2014-11-15T20:40:58+00:00</updated>
<rights license="http://creativecommons.org/licenses/by-sa/3.0/">This work is licensed under a Creative Commons Attribution-ShareAlike 3.0 License</rights>
</info>
View file
2 association-for-computing-machinery.csl
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<style xmlns="http://purl.org/net/xbiblio/csl" class="in-text" version="1.0" demote-non-dropping-particle="sort-only" default-locale="en-US">
<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
<!-- This style was edited with the Visual CSL Editor (http://editor.citationstyles.org/visualEditor/) -->
<info>
<title>Association for Computing Machinery</title>
<title-short>ACM</title-short>
View file
2 australian-critical-care.csl
@@ -55,7 +55,7 @@
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="year" form="long" range-delimiter="–"/>
<date-part name="year" form="long" range-delimiter="&#8211;"/>
</date>
</if>
<else>
View file
10 chicago-author-date-fr.csl
@@ -495,7 +495,7 @@
</if>
</choose>
</if>
<else-if type="article-journal article-magazine">
<else-if type="article-journal article-magazine" match="any">
<group delimiter=" ">
<choose>
<if locator="page" match="none">
@@ -537,7 +537,7 @@
</macro>
<macro name="locators-journal-join-with-colon">
<choose>
<if type="article-journal article-magazine">
<if type="article-journal article-magazine" match="any">
<choose>
<if variable="volume issue" match="any">
<text variable="page"/>
@@ -548,7 +548,7 @@
</macro>
<macro name="locators-journal-join-with-comma">
<choose>
<if type="article-journal article-magazine">
<if type="article-journal article-magazine" match="any">
<choose>
<if variable="volume issue" match="none">
<text variable="page"/>
@@ -786,7 +786,7 @@
</group>
</layout>
</citation>
<bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
<bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
<sort>
<key macro="contributors-sort"/>
<key variable="issued" sort="descending"/>
@@ -859,4 +859,4 @@
</choose>
</layout>
</bibliography>
</style>
</style>
View file
8 chicago-fullnote-bibliography-fr.csl
@@ -749,7 +749,7 @@
</if>
</choose>
</if>
<else-if type="article-journal article-magazine">
<else-if type="article-journal article-magazine" match="any">
<group delimiter=" ">
<choose>
<if locator="page" match="none">
@@ -791,7 +791,7 @@
</macro>
<macro name="locators-journal-join-with-colon">
<choose>
<if type="article-journal article-magazine">
<if type="article-journal article-magazine" match="any">
<choose>
<if variable="volume issue" match="any">
<text variable="page"/>
@@ -802,7 +802,7 @@
</macro>
<macro name="locators-journal-join-with-comma">
<choose>
<if type="article-journal article-magazine">
<if type="article-journal article-magazine" match="any">
<choose>
<if variable="volume issue" match="none">
<text variable="page"/>
@@ -1220,7 +1220,7 @@
</choose>
</layout>
</citation>
<bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="———" entry-spacing="0">
<bibliography hanging-indent="true" et-al-min="11" et-al-use-first="7" subsequent-author-substitute="&#8212;&#8212;&#8212;" entry-spacing="0">
<sort>
<key macro="contributors-sort"/>
<key variable="issued" sort="descending"/>
View file
2 complementary-therapies-in-medicine.csl
@@ -55,7 +55,7 @@
<choose>
<if variable="issued">
<date variable="issued">
<date-part name="year" form="long" range-delimiter="–"/>
<date-part name="year" form="long" range-delimiter="&#8211;"/>
</date>
</if>
<else>
View file
26 council-of-science-editors-alphabetical.csl
@@ -159,21 +159,21 @@
<macro name="collection">
<choose>
<if type="report">
<group prefix=" " suffix="." delimiter=" ">
<text variable="collection-title"/>
<text variable="number" prefix=" Report No.: "/>
</group>
<group prefix=" " suffix="." delimiter=" ">
<text variable="collection-title"/>
<text variable="number" prefix=" Report No.: "/>
</group>
</if>
<else>
<group prefix=" (" suffix=")." delimiter=" ">
<names variable="collection-editor" suffix=". ">
<name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
<label prefix=", "/>
</names>
<text variable="collection-title"/>
</group>
</else>
</choose>
<group prefix=" (" suffix=")." delimiter=" ">
<names variable="collection-editor" suffix=". ">
<name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
<label prefix=", "/>
</names>
<text variable="collection-title"/>
</group>
</else>
</choose>
</macro>
<citation collapse="citation-number">
<sort>
View file
24 council-of-science-editors-author-date.csl
@@ -170,20 +170,20 @@
<choose>
<if type="report">
<group prefix=" " suffix="." delimiter=" ">
<text variable="collection-title"/>
<text variable="number" prefix=" Report No.: "/>
</group>
<text variable="collection-title"/>
<text variable="number" prefix=" Report No.: "/>
</group>
</if>
<else>
<group prefix=" (" suffix=")." delimiter=" ">
<names variable="collection-editor" suffix=". ">
<name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
<label prefix=", "/>
</names>
<text variable="collection-title"/>
</group>
</else>
</choose>
<group prefix=" (" suffix=")." delimiter=" ">
<names variable="collection-editor" suffix=". ">
<name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
<label prefix=", "/>
</names>
<text variable="collection-title"/>
</group>
</else>
</choose>
</macro>
<citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
<sort>
View file
26 council-of-science-editors.csl
@@ -154,21 +154,21 @@
<macro name="collection">
<choose>
<if type="report">
<group prefix=" " suffix="." delimiter=" ">
<text variable="collection-title"/>
<text variable="number" prefix=" Report No.: "/>
</group>
<group prefix=" " suffix="." delimiter=" ">
<text variable="collection-title"/>
<text variable="number" prefix=" Report No.: "/>
</group>
</if>
<else>
<group prefix=" (" suffix=")." delimiter=" ">
<names variable="collection-editor" suffix=". ">
<name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
<label prefix=", "/>
</names>
<text variable="collection-title"/>
</group>
</else>
</choose>
<group prefix=" (" suffix=")." delimiter=" ">
<names variable="collection-editor" suffix=". ">
<name delimiter-precedes-last="always" initialize-with="" name-as-sort-order="all" sort-separator=" "/>
<label prefix=", "/>
</names>
<text variable="collection-title"/>
</group>
</else>
</choose>
</macro>
<citation collapse="citation-number">
<sort>
View file
2 dependent/journal-of-international-marketing.csl
@@ -5,8 +5,8 @@
<title-short>JIM</title-short>
<id>http://www.zotero.org/styles/journal-of-international-marketing</id>
<link href="http://www.zotero.org/styles/journal-of-international-marketing" rel="self"/>
<link href="https://www.ama.org/publications/JournalOfInternationalMarketing/Pages/JIM_Accepted_Ms.aspx#references" rel="documentation"/>
<link href="http://www.zotero.org/styles/american-marketing-association" rel="independent-parent"/>
<link href="https://www.ama.org/publications/JournalOfInternationalMarketing/Pages/JIM_Accepted_Ms.aspx#references" rel="documentation"/>
<category citation-format="author-date"/>
<category field="social_science"/>
<category field="communications"/>
View file
2 dependent/journal-of-marketing-research.csl
@@ -5,8 +5,8 @@
<title-short>JMR</title-short>
<id>http://www.zotero.org/styles/journal-of-marketing-research</id>
<link href="http://www.zotero.org/styles/journal-of-marketing-research" rel="self"/>
<link href="https://www.ama.org/publications/JournalOfMarketingResearch/Pages/JMR_Accepted_Ms.aspx#references" rel="documentation"/>
<link href="http://www.zotero.org/styles/american-marketing-association" rel="independent-parent"/>
<link href="https://www.ama.org/publications/JournalOfMarketingResearch/Pages/JMR_Accepted_Ms.aspx#references" rel="documentation"/>
<category citation-format="author-date"/>
<category field="social_science"/>
<category field="communications"/>
View file
2 dependent/journal-of-marketing.csl
@@ -5,8 +5,8 @@
<title-short>JM</title-short>
<id>http://www.zotero.org/styles/journal-of-marketing</id>
<link href="http://www.zotero.org/styles/journal-of-marketing" rel="self"/>
<link href="https://www.ama.org/Publications/JournalofMarketing/Pages/JMAccepted.aspx#3" rel="documentation"/>
<link href="http://www.zotero.org/styles/american-marketing-association" rel="independent-parent"/>
<link href="https://www.ama.org/Publications/JournalofMarketing/Pages/JMAccepted.aspx#3" rel="documentation"/>
<category citation-format="author-date"/>
<category field="social_science"/>
<category field="communications"/>
View file
2 dependent/journal-of-public-policy-and-marketing.csl
@@ -4,8 +4,8 @@
<title>Journal of Public Policy &amp; Marketing</title>
<id>http://www.zotero.org/styles/journal-of-public-policy-and-marketing</id>
<link href="http://www.zotero.org/styles/journal-of-public-policy-and-marketing" rel="self"/>
<link href="https://www.ama.org/publications/JournalOfPublicPolicyAndMarketing/Pages/JPPMAccepted.aspx" rel="documentation"/>
<link href="http://www.zotero.org/styles/american-marketing-association" rel="independent-parent"/>
<link href="https://www.ama.org/publications/JournalOfPublicPolicyAndMarketing/Pages/JPPMAccepted.aspx" rel="documentation"/>
<category citation-format="author-date"/>
<category field="social_science"/>
<category field="communications"/>
View file
52 ets-ecole-de-technologie-superieure.csl
@@ -5,8 +5,8 @@
<title-short>ÉTS</title-short>
<id>http://www.zotero.org/styles/ets-ecole-de-technologie-superieure</id>
<link href="http://www.zotero.org/styles/ets-ecole-de-technologie-superieure" rel="self"/>
<link href="http://etsmtl.ca/Etudiants-actuels/Cycles-sup/Realisation-etudes/Guides-gabarits/Guide_redaction" rel="documentation"/>
<link href="http://www.zotero.org/styles/universite-laval-departement-dinformation-et-de-communication" rel="template"/>
<link href="http://etsmtl.ca/Etudiants-actuels/Cycles-sup/Realisation-etudes/Guides-gabarits/Guide_redaction" rel="documentation"/>
<author>
<name>Félix Langevin Harnois</name>
<email>felix.langevin-harnois@etsmtl.ca</email>
@@ -136,11 +136,11 @@
<text variable="issue" prefix=" "/>
</macro>
<citation et-al-min="4" et-al-use-first="1" disambiguate-add-year-suffix="true" disambiguate-add-names="true" disambiguate-add-givenname="true">
<layout prefix=" (" suffix=")" delimiter=" ; ">
<layout prefix=" (" suffix=")" delimiter="&#160;; ">
<group delimiter=", ">
<text macro="author-short"/>
<text macro="year-date"/>
<text variable="locator" prefix="p. "/>
<text variable="locator" prefix="p. "/>
</group>
</layout>
</citation>
@@ -180,20 +180,20 @@
</group>
</else-if>
<else-if type="patent">
<group delimiter=". " prefix=". ">
<text variable="number"/>
<date variable="issued">
<date-part name="day" suffix=" "/>
<date-part name="month" suffix=" "/>
<date-part name="year"/>
</date>
</group>
<group delimiter=". " prefix=". ">
<text variable="number"/>
<date variable="issued">
<date-part name="day" suffix=" "/>
<date-part name="month" suffix=" "/>
<date-part name="year"/>
</date>
</group>
</else-if>
<else-if type="chapter" match="any">
<group delimiter=". " prefix=". ">
<group delimiter=", ">
<group prefix=" ">
<text value="In" text-case="capitalize-first" suffix=" "/>
<text value="In" text-case="capitalize-first" suffix="&#160;"/>
<text macro="journal-title"/>
</group>
<text macro="editor" prefix="sous la dir. de "/>
@@ -241,21 +241,21 @@
<text variable="page" prefix="p. "/>
</group>
</else-if>
<else-if type="article-newspaper">
<group delimiter=", " prefix=". ">
<text macro="journal-title"/>
<date variable="issued">
<date-part name="day" suffix=" "/>
<date-part name="month" suffix=" "/>
<date-part name="year" suffix="."/>
</date>
<text variable="page" prefix="p. "/>
</group>
</else-if>
<else-if type="article-newspaper">
<group delimiter=", " prefix=". ">
<text macro="journal-title"/>
<date variable="issued">
<date-part name="day" suffix=" "/>
<date-part name="month" suffix=" "/>
<date-part name="year" suffix="."/>
</date>
<text variable="page" prefix="p. "/>
</group>
</else-if>
<else>
<group delimiter=", " prefix=". ">
<text macro="journal-title"/>
</group>
<group delimiter=", " prefix=". ">
<text macro="journal-title"/>
</group>
</else>
</choose>
</layout>
Oops, something went wrong.

1 comment on commit 556c2a4

@rmzelle

This comment has been minimized.

Sign in to view
Copy link
Member Author

commented on 556c2a4 Dec 16, 2014

@adam3smith, any thoughts about whether it's okay to combine my reindent/reorder commits with adding match="any"? I'm using the same logic as in #1134. I checked all cases here were the attribute was added, and I didn't see any problematic cases (it's all conditionals with type and multiple values).

Going forward, it's probably cleaner to separate reindentation/reordering from any real changes made to the styles. That should make review easier as well. Alternatively, I could change the logic to only add match for the type attribute with multiple values (which can never be true).

I'm also wondering why there are relatively many cases here. citeproc-js currently uses the correct default, right, so people should see problems if they use <if type="type-a type-b"/> without "match", no? Maybe people just edited old styles that are still floating around.
Please sign in to comment.
You can’t perform that action at this time.