Skip to content

[BUGFIX] CiteStyle fixes #81

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

Merged
sebastianstein merged 6 commits into from
Jan 27, 2026
Merged

[BUGFIX] CiteStyle fixes #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e452d73
[BUGFIX] Add missing spaces in Citestyles
YKWeyer Jan 21, 2026
653189f
[CLEANUP] Remove non-breaking spaces in conditions
YKWeyer Jan 21, 2026
fc4c29d
[BUGFIX] Always translate "Editor"
YKWeyer Jan 21, 2026
0bfa1d5
[CLEANUP] Use editor_volume_series section when possible
YKWeyer Jan 21, 2026
706053c
[BUGFIX] Remove duplicated outputs
YKWeyer Jan 21, 2026
f28c509
[BUGFIX] Remove line of dots
YKWeyer Jan 21, 2026
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
28 changes: 10 additions & 18 deletions Resources/Private/Partials/List/Citestyle/Citestyle0.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@
<f:render section="authors" arguments="{_all}"/>
<f:render section="title" arguments="{_all}"/>

<f:if condition="{publication.editor} || {publication.volume} || {publication.series}">
<br/>
<f:if condition="{publication.editor}">In {publication.editor}, Editor</f:if><f:if condition="{publication.editor} && {publication.volume}">,</f:if>
<f:if condition="{publication.volume}"><f:translate key="citestyle0.volume"/> {publication.volume}</f:if>
<f:if condition="{publication.series}"><f:translate key="citestyle0.from"/> <i>{publication.series}</i></f:if>
</f:if>
<f:render section="editor_volume_series" arguments="{_all}"/>

<f:render section="publisher" arguments="{_all}"/>
<f:render section="edition" arguments="{_all}"/>
Expand All @@ -40,7 +35,7 @@
<f:render section="title" arguments="{_all}"/>

<f:if
condition="{publication.journal} || {publication.volume} || {publication.number} || {publication.pages} || {publication.affiliation}">
condition="{publication.journal} || {publication.volume} || {publication.number} || {publication.pages} || {publication.affiliation}">
<br/>
{publication.journal}<f:if condition="{publication.journal} && {publication.volume}">,</f:if>
<f:if condition="{publication.volume}"><strong>{publication.volume}</strong></f:if>
Expand Down Expand Up @@ -69,7 +64,6 @@
<f:render section="howpublished" arguments="{_all}"/>
<f:render section="publisher" arguments="{_all}"/>
<f:render section="date_year-month" arguments="{_all}"/>
<f:render section="howpublished" arguments="{_all}"/>
<f:render section="affiliation" arguments="{_all}"/>
<f:render section="linkblock" arguments="{_all}"/>
</f:section>
Expand All @@ -80,9 +74,9 @@
<f:render section="authors" arguments="{_all}"/>
<f:render section="title" arguments="{_all}"/>

<f:if condition="{publication.booktitle} || {publication.volume} || {publication.series} || {publication.pages}">
<f:if condition="{publication.booktitle} || {publication.volume} || {publication.series} || {publication.pages}">
<br/>
{publication.booktitle}<f:if condition="{publication.volume}"><f:translate key="citestyle0.volume"/> {publication.volume}</f:if><f:if condition="{publication.series}"><f:translate key="citestyle0.from"/> <i>{publication.series}</i></f:if><f:if condition="{publication.booktitle} || {publication.volume} || {publication.series} && {publication.pages}">,</f:if>
{publication.booktitle}<f:if condition="{publication.volume}"> <f:translate key="citestyle0.volume"/> {publication.volume}</f:if><f:if condition="{publication.series}"> <f:translate key="citestyle0.from"/> <i>{publication.series}</i></f:if><f:if condition="{publication.booktitle} || {publication.volume} || {publication.series} && {publication.pages}">,</f:if>
<f:if condition="{publication.pages}"><f:translate key="citestyle0.page"/> {publication.pages}</f:if>
</f:if>

Expand Down Expand Up @@ -125,9 +119,9 @@
<f:render section="authors" arguments="{_all}"/>
<f:render section="title" arguments="{_all}"/>

<f:if condition="{publication.editor} || {publication.booktitle} || {publication.volume} || {publication.series}">
<f:if condition="{publication.editor} || {publication.booktitle} || {publication.volume} || {publication.series}">
<br/>
<f:if condition="{publication.editor}">In {publication.editor}, Editor</f:if><f:if condition="{publication.editor} && {publication.booktitle} || {publication.volume}">,</f:if>
<f:if condition="{publication.editor}">In {publication.editor}, <f:translate key="citestyle0.editor"/></f:if><f:if condition="{publication.editor} && {publication.booktitle} || {publication.volume}">,</f:if>
{publication.booktitle}
<f:if condition="{publication.volume}"><f:translate key="citestyle0.volume"/> {publication.volume}</f:if>
<f:if condition="{publication.series}"><f:translate key="citestyle0.from"/> <i>{publication.series}</i></f:if>
Expand Down Expand Up @@ -155,18 +149,17 @@
<f:render section="title" arguments="{_all}"/>

<f:if
condition="{publication.editor} || {publication.booktitle} || {publication.volume} || {publication.series} || {publication.pages}">
condition="{publication.editor} || {publication.booktitle} || {publication.volume} || {publication.series} || {publication.pages}">
<br/>
<f:if condition="{publication.editor}">In {publication.editor}, <f:translate key="citestyle0.editor"/></f:if><f:if condition="{publication.editor} && {publication.booktitle} || {publication.volume}">,</f:if>
{publication.booktitle}<f:if condition="{publication.volume}"><f:translate key="citestyle0.volume"/>{publication.volume}</f:if><f:if condition="{publication.series}"><f:translate key="citestyle0.from"/><i>{publication.series}</i></f:if><f:if condition="({publication.editor} || {publication.booktitle} || {publication.volume} || {publication.series}) && {publication.pages}">,</f:if>
<f:if condition="{publication.editor}">In {publication.editor}, <f:translate key="citestyle0.editor"/></f:if><f:if condition="{publication.editor} && {publication.booktitle} || {publication.volume}">,</f:if>
{publication.booktitle}<f:if condition="{publication.volume}"> <f:translate key="citestyle0.volume"/> {publication.volume}</f:if><f:if condition="{publication.series}"> <f:translate key="citestyle0.from"/> <i>{publication.series}</i></f:if><f:if condition="({publication.editor} || {publication.booktitle} || {publication.volume} || {publication.series}) && {publication.pages}">,</f:if>
<f:if condition="{publication.pages}"><f:translate key="citestyle0.page"/> {publication.pages}</f:if>
</f:if>

<f:render section="eventname" arguments="{_all}"/>
<f:render section="eventplace" arguments="{_all}"/>
<f:render section="eventdate" arguments="{_all}"/>
<f:render section="organization" arguments="{_all}"/>
<f:render section="editor_simple" arguments="{_all}"/>
Comment thread
sebastianstein marked this conversation as resolved.
<f:render section="publisher" arguments="{_all}"/>
<f:render section="edition" arguments="{_all}"/>
<f:render section="date_year-month" arguments="{_all}"/>
Expand Down Expand Up @@ -248,7 +241,6 @@
<f:render section="language" arguments="{_all}"/>
<f:render section="authors" arguments="{_all}"/>
<f:render section="title" arguments="{_all}"/>
<f:render section="editor_simple" arguments="{_all}"/>
<f:render section="affiliation" arguments="{_all}"/>
<f:render section="organization" arguments="{_all}"/>
<f:render section="pages" arguments="{_all}"/>
Expand Down Expand Up @@ -516,7 +508,7 @@
</f:section>

<f:section name="editor_volume_series">
<f:if condition="{publication.editor} || {publication.volume} || {publication.series}">
<f:if condition="{publication.editor} || {publication.volume} || {publication.series}">
<br/>
<f:if condition="{publication.editor}">In {publication.editor}, <f:translate key="citestyle0.editor"/></f:if><f:if condition="{publication.editor} && {publication.volume}">,</f:if>
<f:if condition="{publication.volume}"><f:translate key="citestyle0.volume"/> {publication.volume}</f:if>
Expand Down
7 changes: 4 additions & 3 deletions Resources/Private/Partials/List/Citestyle/Citestyle1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@

<f:section name="bibtype_book">
<f:if condition="{publication.language}">[{publication.language}]</f:if>
<f:render section="authors" arguments="{_all}"/><f:if condition="{publication.title}"><i>{publication.title}.</i></f:if>
Comment thread
sebastianstein marked this conversation as resolved.
....
<f:render section="authors" arguments="{_all}"/>
<f:if condition="{publication.title}"><i>{publication.title}.</i></f:if>
<f:if condition="{publication.edition}">{publication.edition}</f:if>
<f:if condition="{publication.address}">{publication.address}<f:if condition="{publication.publisher}"><f:then>:</f:then><f:else><f:if condition="{publication.month} || {publication.year}"><f:then>,</f:then><f:else>.</f:else></f:if></f:else></f:if></f:if>
<f:if condition="{publication.publisher}">{publication.publisher}<f:if condition="{publication.month} || {publication.year}"><f:then>,</f:then><f:else>.</f:else></f:if></f:if>
Expand Down Expand Up @@ -152,7 +152,8 @@

<f:section name="bibtype_misc">
<f:if condition="{publication.language}">[{publication.language}]</f:if>
<f:render section="authors" arguments="{_all}"/><f:if condition="{publication.title}"><i>{publication.title}</i><f:if condition="{publication.month} || {publication.year}"><f:then>,</f:then><f:else>.</f:else></f:if></f:if>
<f:render section="authors" arguments="{_all}"/>
<f:if condition="{publication.title}"><i>{publication.title}</i><f:if condition="{publication.month} || {publication.year}"><f:then>,</f:then><f:else>.</f:else></f:if></f:if>
<f:if condition="{publication.month} || {publication.year}">
<publications:format.monthNameFromNumber month="{publication.month}" limit="3"/>
{publication.year}.
Expand Down
Loading