Skip to content
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.

Sign up for GitHub

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

Delete adjacent space in remaining cases - Part 3 #1357

Merged
merged 2 commits into from
Jan 24, 2015
Merged

Delete adjacent space in remaining cases - Part 3 #1357

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ca96b7
Delete adjacent space in remaining cases - Part 2
zuphilip Jan 24, 2015
f6b0f6e
Update and add fix for theory-culture-and-society.csl
zuphilip Jan 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions documents-d-archeologie-francaise.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -595,22 +595,26 @@
</group>
</else-if>
<else>
<group>
<text macro="responsability" suffix=", "/>
<text macro="year-date" suffix=". "/>
<text macro="title" suffix=". "/>
<text macro="medium" suffix=". "/>
<text macro="genre" suffix=". "/>
<text macro="date" suffix=". "/>
<text macro="edition" suffix=". "/>
<text macro="publisher-place" suffix="&#160;: "/>
<text macro="publisher" suffix=". "/>
<text macro="accessed" suffix=". "/>
<text macro="collection" suffix=". "/>
<text macro="page" suffix=". "/>
<text macro="isbn" suffix=". "/>
<text macro="url" suffix=". "/>
<text macro="archive" prefix=" (" suffix=")."/>
<group suffix="." delimiter=", ">
<text macro="responsability"/>
<group delimiter=". ">
<text macro="year-date"/>
<text macro="title"/>
<text macro="medium"/>
<text macro="genre"/>
<text macro="date"/>
<text macro="edition"/>
<group delimiter="&#160;: ">
<text macro="publisher-place"/>
<text macro="publisher"/>
</group>
<text macro="accessed"/>
<text macro="collection"/>
<text macro="page"/>
<text macro="isbn"/>
<text macro="url"/>
<text macro="archive" prefix=" (" suffix=")"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is an extra space, too, right? remove.

</group>
</group>
</else>
</choose>
Expand Down
18 changes: 9 additions & 9 deletions harvard-kings-college-london.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,8 @@
</group>
</else-if>
<else-if type="chapter paper-conference" match="any">
<text macro="title" prefix=" '" suffix="', "/>
<group prefix=" " delimiter=" ">
<text macro="title" prefix="'" suffix="',"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could you change this to quotes="true" (the style is already en-GB, so they'll be single quotes with comma outside)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understand correctly that would then be

<text macro="title" quotes="true" suffix=","/>

Is this correct?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes

<text term="in"/>
<text macro="editor"/>
<text variable="container-title" font-style="italic" suffix="."/>
Expand All @@ -265,19 +265,19 @@
</group>
</else-if>
<else>
<group suffix=".">
<text macro="title" prefix=" "/>
<text macro="editor" prefix=" "/>
<group suffix=". " prefix=" " delimiter=" ">
<text macro="title"/>
<text macro="editor"/>
</group>
<text variable="container-title" prefix=" "/>
<text macro="access" prefix=" " suffix=". "/>
<group prefix=" " suffix=".">
<group prefix=" ">
<text variable="container-title" suffix=" "/>
<text macro="access" suffix=". "/>
<group suffix="." delimiter=" ">
<group>
<text variable="volume"/>
<text variable="issue" prefix=" (" suffix=")"/>
<text macro="issued"/>
</group>
<group prefix=" ">
<group>
<label variable="locator" form="short"/>
<text macro="pages"/>
</group>
Expand Down
6 changes: 3 additions & 3 deletions harvard-university-of-gloucestershire.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@
</group>
</else-if>
<else>
<group suffix=", ">
<text macro="title" prefix=" "/>
<text macro="editor-translator" prefix=" "/>
<group suffix=", " prefix=" " delimiter=" ">
<text macro="title"/>
<text macro="editor-translator"/>
</group>
<group prefix=" " suffix=" ">
<text variable="container-title" font-style="italic"/>
Expand Down
32 changes: 17 additions & 15 deletions harvard-university-of-the-west-of-england.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,8 @@
</group>
</else-if>
<else-if type="chapter paper-conference" match="any">
<text macro="title" prefix=" " suffix=". "/>
<group prefix=" " delimiter=" ">
<text macro="title" suffix="."/>
<text term="in" text-case="capitalize-first" suffix=":"/>
<text macro="editor" suffix=". "/>
<text variable="container-title" font-style="italic" suffix="."/>
Expand All @@ -236,21 +236,23 @@
</group>
</else-if>
<else>
<group suffix=".">
<text macro="title" prefix=" "/>
<text macro="editor" prefix=" "/>
</group>
<text variable="container-title" font-style="italic" prefix=" " suffix="."/>
<text macro="online" prefix=" " suffix=". "/>
<group prefix=" " suffix=".">
<group prefix=" ">
<text variable="volume"/>
<text variable="issue" prefix=" (" suffix=")"/>
<text macro="issued"/>
<group prefix=" " suffix="." delimiter=". ">
<group delimiter=" ">
<text macro="title"/>
<text macro="editor"/>
</group>
<group prefix=" ">
<label variable="locator" form="short"/>
<text macro="pages"/>
<text variable="container-title" font-style="italic"/>
<text macro="online"/>
<group>
<group prefix=" ">
<text variable="volume"/>
<text variable="issue" prefix=" (" suffix=")"/>
<text macro="issued"/>
</group>
<group prefix=" ">
<label variable="locator" form="short"/>
<text macro="pages"/>
</group>
</group>
</group>
</else>
Expand Down
6 changes: 3 additions & 3 deletions norma-portuguesa-405.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@
<date-part name="month" form="short" suffix=". " text-case="lowercase"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

while we're at it, the parentheses should really be set as a prefix/suffix on the date in case any of the date-part are missing.

<date-part name="year" suffix="). "/>
</date>
<text variable="volume" prefix=" " suffix=":"/>
<text variable="issue" suffix=" "/>
<text variable="volume" suffix=":"/>
<text variable="issue"/>
<text variable="page" prefix=" "/>
</else-if>
<else-if type="webpage" match="any">
Expand Down Expand Up @@ -355,7 +355,7 @@
<text macro="container-contributors" suffix=". "/>
<text macro="medium"/>
<text macro="locators" suffix=" "/>
<text macro="access" prefix=" "/>
<text macro="access"/>
</group>
</if>
<else-if type="map">
Expand Down
2 changes: 1 addition & 1 deletion nucleic-acids-research.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
</group>
</if>
<else-if type="chapter paper-conference" match="any">
<text macro="title" prefix=" " suffix=". "/>
<group prefix=" " delimiter=" " suffix=".">
<text macro="title" suffix="."/>
<text term="in" text-case="capitalize-first"/>
<group delimiter=", ">
<text macro="editor"/>
Expand Down
2 changes: 1 addition & 1 deletion oxford-studies-on-the-roman-economy.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@
</else-if>
<else-if type="chapter paper-conference" match="any">
<text macro="title" quotes="true" prefix=" " suffix=", "/>
<group prefix=" ">
<group>
<text term="in" suffix=" "/>
<text macro="editor-bib" suffix=", "/>
<text variable="container-title" font-style="italic"/>
Expand Down
6 changes: 3 additions & 3 deletions padagogische-hochschule-fachhochschule-nordwestschweiz.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,9 +266,9 @@

<if type="article-newspaper">
<group prefix=" " delimiter=", ">
<group>
<text variable="edition" suffix=" "/>
<text term="edition" prefix=" "/>
<group delimiter=" ">
<text variable="edition"/>
<text term="edition"/>
</group>
<group prefix="(" suffix=")">
<text term="section" form="short" suffix=" " />
Expand Down
6 changes: 3 additions & 3 deletions palaeontologia-electronica.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@
<else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<group delimiter=", ">
<text macro="edition"/>
<group>
<text term="volume" form="short" plural="true" text-case="capitalize-first" suffix=" "/>
<number variable="number-of-volumes" form="numeric" prefix=" 1-"/>
<group delimiter=" ">
<text term="volume" form="short" plural="true" text-case="capitalize-first"/>
<number variable="number-of-volumes" form="numeric" prefix="1-"/>
</group>
<group>
<number variable="volume" form="numeric"/>
Expand Down
2 changes: 1 addition & 1 deletion palaios.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
</else-if>
<else>
<text variable="title" prefix=" " suffix=": "/>
<group prefix=" " delimiter=", " suffix=".">
<group delimiter=", " suffix=".">
<text macro="editor-translator"/>
<text variable="container-title"/>
<text variable="volume" prefix="v. "/>
Expand Down
16 changes: 8 additions & 8 deletions philosophia-scientiae.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<if variable="author">
<names variable="editor translator" delimiter=". ">
<label form="short" text-case="capitalize-first" suffix=" "/>
<name and="text" prefix=" " delimiter=", " initialize-with=". "/>
<name and="text" delimiter=", " initialize-with=". "/>
</names>
</if>
</choose>
Expand All @@ -58,7 +58,7 @@
<group>
<names variable="container-author">
<label form="verb-short" prefix=" " suffix=" " strip-periods="true"/>
<name and="text" prefix=" " delimiter=", " initialize-with=". "/>
<name and="text" delimiter=", " initialize-with=". "/>
</names>
</group>
</if>
Expand Down Expand Up @@ -280,9 +280,9 @@
<text term="volume" form="short" suffix=" "/>
<number variable="volume" form="numeric"/>
</group>
<group suffix="; ">
<number variable="number-of-volumes" form="numeric" suffix=" "/>
<text term="volume" form="short" prefix=" " suffix=" " plural="true"/>
<group suffix=" ; " delimiter=" ">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That space there isn't actually right given the styleguide:

Boltzmann, Ludwig [1909], Wissenschaftliche Abhandlungen von Ludwig Boltzmann, 3 volumes; New York: Chelsea Publishing Company, 1968.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

also, delete the form="short" as per the same example.

<number variable="number-of-volumes" form="numeric"/>
<text term="volume" form="short" plural="true"/>
</group>
</group>
</if>
Expand All @@ -291,9 +291,9 @@
<text variable="collection-title"/>
<text variable="collection-number" prefix=" "/>
</group>
<group suffix="; ">
<number variable="number-of-volumes" form="numeric" suffix=" "/>
<text term="volume" form="short" prefix=" " suffix=" " plural="true"/>
<group suffix=" ; " delimiter=" ">
<number variable="number-of-volumes" form="numeric"/>
<text term="volume" form="short" plural="true"/>
</group>
<choose>
<if variable="page" match="none">
Expand Down
4 changes: 2 additions & 2 deletions pisa-university-press.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,12 +268,12 @@
<else-if type="chapter paper-conference" match="any">
<text variable="title" suffix=", " quotes="true"/>
<text macro="container" suffix=" "/>
<text variable="publisher-place" prefix=" (" suffix=": "/>
<text variable="publisher-place" prefix="(" suffix=": "/>
<group delimiter=", " suffix=")">
<text variable="publisher"/>
<text macro="issuance"/>
</group>
<text variable="volume" prefix=" vol. " suffix=" "/>
<text variable="volume" prefix=" vol. "/>
<text variable="page" prefix=" "/>
</else-if>
<else-if type="bill book graphic legal_case legislation motion_picture report song" match="any">
Expand Down
12 changes: 6 additions & 6 deletions preslia.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,9 @@
</group>
</else-if>
<else-if type="article-journal">
<group suffix=". ">
<text macro="title" prefix=" "/>
<text macro="editor-translator" prefix=" "/>
<group suffix=". " prefix=" " delimiter=" ">
<text macro="title"/>
<text macro="editor-translator"/>
</group>
<choose>
<if variable="issue">
Expand All @@ -149,9 +149,9 @@
</choose>
</else-if>
<else>
<group suffix=". ">
<text macro="title" prefix=" "/>
<text macro="editor-translator" prefix=" "/>
<group suffix=". " prefix=" " delimiter=" ">
<text macro="title"/>
<text macro="editor-translator"/>
</group>
<group delimiter=" " suffix=".">
<text variable="container-title" font-style="italic" suffix="."/>
Expand Down
6 changes: 2 additions & 4 deletions proceedings-of-the-royal-society-b.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@
</macro>
<macro name="publisher">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

given how popular this style is, we should also do the publisher/publisher place thing right, i.e. with a group with delimiter=": "

<text variable="publisher-place" suffix=": "/>
<text variable="publisher" suffix="."/>
<group suffix=". ">
<text macro="accessed-date" prefix=" "/>
</group>
<text variable="publisher" suffix=". "/>
<text macro="accessed-date" suffix=". "/>
</macro>
<macro name="accessed-date">
<choose>
Expand Down
6 changes: 3 additions & 3 deletions revista-ciencias-tecnicas-agropecuarias.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@
<text macro="translator" suffix=", "/>
<text macro="editor" suffix=", "/>
<text variable="container-title" font-style="italic" suffix=", "/>
<text variable="collection-title" prefix=" ser. " suffix=", "/>
<text variable="collection-title" prefix="ser. " suffix=", "/>
<text macro="collection-editor" prefix="edit. ser. " suffix=", "/>
<text macro="edition" suffix=", "/>
<text macro="isbn" suffix=", "/>
Expand All @@ -449,7 +449,7 @@
<text macro="title" prefix="¨" suffix="¨, "/>
<text macro="online" font-style="italic"/>
<text variable="event" prefix="En: " suffix=", " font-style="italic"/>
<text variable="collection-title" prefix=" ser. " suffix=", "/>
<text variable="collection-title" prefix="ser. " suffix=", "/>
<text macro="isbn" suffix=", "/>
<text macro="doi" suffix=", "/>
<text macro="page" prefix="pp. " suffix=", "/>
Expand Down Expand Up @@ -534,7 +534,7 @@
<text macro="title" prefix="¨" suffix="¨, "/>
<text macro="online" font-style="italic"/>
<text variable="container-title" font-style="italic" suffix=", "/>
<text variable="collection-title" prefix=" ser. " suffix=", "/>
<text variable="collection-title" prefix="ser. " suffix=", "/>
<text variable="event" prefix="En: " suffix=", "/>
<text macro="medium" suffix=", "/>
<text macro="genre" suffix=", "/>
Expand Down
10 changes: 6 additions & 4 deletions revista-virtual-de-quimica.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,12 @@
</choose>
</macro>
<macro name="publisher">
<group>
<text variable="publisher" strip-periods="false"/>
<text variable="publisher-place" prefix=": " suffix=", "/>
<text macro="year-date" prefix=" "/>
<group delimiter=", ">
<group delimiter=": ">
<text variable="publisher" strip-periods="false"/>
<text variable="publisher-place"/>
</group>
<text macro="year-date"/>
</group>
</macro>
<macro name="edition">
Expand Down
4 changes: 2 additions & 2 deletions revue-archeologique-du-centre-de-la-france.csl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@
<choose>
<if type="thesis">
<text variable="genre" suffix=". "/>
<text macro="publisher" prefix=" "/>
<text macro="publisher"/>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

while I was looking at this style -- we should run a sed script to remove all empty affixes (i.e. prefix="" and suffix="") Since those never do anything, that can just be scripted and separate. @rmzelle might even consider including it in his general maintenance script?

<text variable="number-of-pages" suffix=" p."/>
</if>
<else-if type="bill book graphic legal_case legislation motion_picture report song manuscript" match="any">
Expand All @@ -303,7 +303,7 @@
<text macro="journal-title" prefix=", "/>
</group>
<text variable="collection-title" prefix="" suffix=", "/>
<text macro="publisher" prefix=" "/>
<text macro="publisher"/>
<text variable="page" prefix=" p. " suffix="."/>
</else-if>
<else-if type="webpage" match="any">
Expand Down
Loading