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.

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

Add volume-title support to MHRA #7350

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 19 additions & 16 deletions modern-humanities-research-association-3rd-edition.csl
Original file line number Diff line number Diff line change
Expand Up @@ -148,14 +148,14 @@
</macro>
<macro name="secondary-contributors-note">
<choose>
<if type="chapter paper-conference" match="none">
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
<text macro="editor-translator"/>
</if>
</choose>
</macro>
<macro name="container-contributors-note">
<choose>
<if type="chapter paper-conference" match="any">
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<text macro="editor-translator"/>
</if>
</choose>
Expand All @@ -182,7 +182,7 @@
<text variable="issue"/>
</group>
</if>
<else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<else-if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
<group delimiter=", ">
<text macro="edition-note"/>
<group>
Expand All @@ -201,7 +201,7 @@
<text variable="issue"/>
</group>
</if>
<else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<else-if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
<group delimiter=", ">
<text macro="edition-note"/>
<group>
Expand Down Expand Up @@ -246,29 +246,31 @@
</macro>
<macro name="locators-specific-note">
<choose>
<if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<choose>
<if is-numeric="volume">
<number variable="volume" form="roman" font-variant="small-caps"/>
</if>
<else>
<text variable="volume" font-variant="small-caps"/>
</else>
</choose>
<if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
<group delimiter=", ">
<choose>
<if is-numeric="volume">
<number variable="volume" form="roman" font-variant="small-caps"/>
</if>
<else>
<text variable="volume" font-variant="small-caps"/>
</else>
</choose>
</group>
</if>
</choose>
</macro>
<macro name="container-title-note">
<choose>
<if type="chapter paper-conference" match="any">
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<text term="in" suffix=" "/>
</if>
</choose>
<text variable="container-title" text-case="title" font-style="italic"/>
</macro>
<macro name="edition-note">
<choose>
<if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
<choose>
<if is-numeric="edition">
<group delimiter=" ">
Expand Down Expand Up @@ -376,6 +378,7 @@
</choose>
</macro>
<macro name="point-locators">
<text variable="volume-title" text-case="title" font-style="italic" prefix=", "/>
<text macro="pages"/>
<choose>
<if variable="page">
Expand Down Expand Up @@ -404,7 +407,7 @@
<macro name="access-note">
<group delimiter=", ">
<choose>
<if type="article-journal bill chapter legal_case legislation paper-conference" match="none">
<if type="article-journal bill chapter entry-dictionary entry-encyclopedia legal_case legislation paper-conference" match="none">
<text macro="archive-note" prefix=", "/>
</if>
</choose>
Expand Down
28 changes: 17 additions & 11 deletions modern-humanities-research-association-author-date.csl
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</if>
</choose>
</if>
<else-if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<else-if type="bill book graphic legal_case motion_picture report song chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<group delimiter=", ">
<text macro="edition-note"/>
<group>
Expand Down Expand Up @@ -130,26 +130,32 @@
</macro>
<macro name="locators-specific-note">
<choose>
<if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<choose>
<if is-numeric="volume">
<number variable="volume" form="roman" font-variant="small-caps"/>
</if>
</choose>
<if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
<group delimiter=", ">
<choose>
<if is-numeric="volume">
<number variable="volume" form="roman" font-variant="small-caps"/>
</if>
<else>
<text variable="volume" font-variant="small-caps"/>
</else>
</choose>
<text variable="volume-title" text-case="title" font-style="italic"/>
</group>
</if>
</choose>
</macro>
<macro name="container-title-note">
<choose>
<if type="chapter paper-conference" match="any">
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<text term="in" suffix=" "/>
</if>
</choose>
<text variable="container-title" text-case="title" font-style="italic"/>
</macro>
<macro name="edition-note">
<choose>
<if type="bill book graphic legal_case motion_picture report song chapter paper-conference" match="any">
<if type="bill book graphic legal_case motion_picture report song chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<choose>
<if is-numeric="edition">
<group delimiter=" ">
Expand Down Expand Up @@ -201,7 +207,7 @@
<date-part name="year"/>
</date>
</if>
<else-if type="bill book graphic legal_case motion_picture report song thesis chapter paper-conference" match="any">
<else-if type="bill book graphic legal_case motion_picture report song thesis chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<date variable="issued">
<date-part name="year"/>
</date>
Expand Down Expand Up @@ -253,7 +259,7 @@
<if type="graphic report" match="any">
<text macro="archive-note" prefix=", "/>
</if>
<else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter paper-conference" match="none">
<else-if type="bill book graphic legal_case motion_picture report song article-journal article-magazine article-newspaper thesis chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
<text macro="archive-note" prefix=", "/>
</else-if>
</choose>
Expand Down
35 changes: 19 additions & 16 deletions modern-humanities-research-association.csl
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,14 @@
</macro>
<macro name="secondary-contributors-note">
<choose>
<if type="chapter paper-conference" match="none">
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="none">
<text macro="editor-translator"/>
</if>
</choose>
</macro>
<macro name="container-contributors-note">
<choose>
<if type="chapter paper-conference" match="any">
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<text macro="editor-translator"/>
</if>
</choose>
Expand All @@ -181,7 +181,7 @@
<text variable="issue"/>
</group>
</if>
<else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<else-if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
<group delimiter=", ">
<text macro="edition-note"/>
<group>
Expand All @@ -200,7 +200,7 @@
<text variable="issue"/>
</group>
</if>
<else-if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<else-if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
<group delimiter=", ">
<text macro="edition-note"/>
<group>
Expand Down Expand Up @@ -245,29 +245,31 @@
</macro>
<macro name="locators-specific-note">
<choose>
<if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<choose>
<if is-numeric="volume">
<number variable="volume" form="roman" font-variant="small-caps"/>
</if>
<else>
<text variable="volume" font-variant="small-caps"/>
</else>
</choose>
<if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
<group delimiter=", ">
<choose>
<if is-numeric="volume">
<number variable="volume" form="roman" font-variant="small-caps"/>
</if>
<else>
<text variable="volume" font-variant="small-caps"/>
</else>
</choose>
</group>
</if>
</choose>
</macro>
<macro name="container-title-note">
<choose>
<if type="chapter paper-conference" match="any">
<if type="chapter entry-dictionary entry-encyclopedia paper-conference" match="any">
<text term="in" suffix=" "/>
</if>
</choose>
<text variable="container-title" text-case="title" font-style="italic"/>
</macro>
<macro name="edition-note">
<choose>
<if type="bill book chapter graphic legal_case legislation motion_picture paper-conference report song" match="any">
<if type="bill book chapter entry-dictionary entry-encyclopedia graphic legal_case legislation motion_picture paper-conference report song" match="any">
<choose>
<if is-numeric="edition">
<group delimiter=" ">
Expand Down Expand Up @@ -375,6 +377,7 @@
</choose>
</macro>
<macro name="point-locators">
<text variable="volume-title" text-case="title" font-style="italic" prefix=", "/>
<text macro="pages"/>
<choose>
<if variable="page">
Expand Down Expand Up @@ -403,7 +406,7 @@
<macro name="access-note">
<group delimiter=", ">
<choose>
<if type="article-journal bill chapter legal_case legislation paper-conference" match="none">
<if type="article-journal bill chapter entry-dictionary entry-encyclopedia legal_case legislation paper-conference" match="none">
<text macro="archive-note" prefix=", "/>
</if>
</choose>
Expand Down
Loading