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

Space before citations in Openoffice/Libreoffice integration #10843

Merged
merged 2 commits into from
Jan 30, 2024
Merged
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Note that this project **does not** adhere to [Semantic Versioning](https://semv
- We added a fetcher for [ISIDORE](https://isidore.science/), simply paste in the link into the text field or the last 6 digits in the link that identify that paper. [#10423](https://github.com/JabRef/jabref/issues/10423)
- When importing entries form the "Citation relations" tab, the field [cites](https://docs.jabref.org/advanced/entryeditor/entrylinks) is now filled according to the relationship between the entries. [#10572](https://github.com/JabRef/jabref/pull/10752)
- We added a new group icon column to the main table showing the icons of the entry's groups. [#10801](https://github.com/JabRef/jabref/pull/10801)
- We added a new boolean to the style files for Openoffice/Libreoffice integration to switch between ZERO_WIDTH_SPACE (default) and no space. [#10843](https://github.com/JabRef/jabref/pull/10843)

### Changed

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,11 @@ public static void fillCitationMarkInCursor(XTextDocument doc,

if (withText) {
OOText citationText2 = style.decorateCitationMarker(citationText);
// inject a ZERO_WIDTH_SPACE to hold the initial character format
final String ZERO_WIDTH_SPACE = "\u200b";
String ZERO_WIDTH_SPACE = "";
if (style.spaceBeforeCitation()) {
// inject a ZERO_WIDTH_SPACE to hold the initial character format
ZERO_WIDTH_SPACE = "\u200b";
}
citationText2 = OOText.fromString(ZERO_WIDTH_SPACE + citationText2.toString());
OOTextIntoOO.write(doc, cursor, citationText2);
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ public class OOBibStyle implements Comparable<OOBibStyle> {
private static final String AUTHOR_FIELD = "AuthorField";
private static final String BRACKET_AFTER = "BracketAfter";
private static final String BRACKET_BEFORE = "BracketBefore";
private static final String SPACE_BEFORE = "SpaceBefore";
private static final String IS_NUMBER_ENTRIES = "IsNumberEntries";
private static final String IS_SORT_BY_POSITION = "IsSortByPosition";
private static final String SORT_ALGORITHM = "SortAlgorithm";
Expand Down Expand Up @@ -203,6 +204,7 @@ private void setDefaultProperties() {
citProperties.put(IN_TEXT_YEAR_SEPARATOR, " ");
citProperties.put(BRACKET_BEFORE, "(");
citProperties.put(BRACKET_AFTER, ")");
citProperties.put(SPACE_BEFORE, Boolean.TRUE);
citProperties.put(CITATION_SEPARATOR, "; ");
citProperties.put(PAGE_INFO_SEPARATOR, "; ");
citProperties.put(GROUPED_NUMBERS_SEPARATOR, "-");
Expand Down Expand Up @@ -493,6 +495,10 @@ public boolean isFormatCitations() {
return (Boolean) citProperties.get(FORMAT_CITATIONS);
}

public boolean spaceBeforeCitation() {
return (Boolean) citProperties.get(SPACE_BEFORE);
}

public boolean isCitationKeyCiteMarkers() {
return (Boolean) citProperties.get(CITATION_KEY_CITATIONS);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ FormatCitations="false"
CitationCharacterFormat="Default"
PageInfoSeparator="; "
OxfordComma=","
SpaceBefore="true"

LAYOUT
article=<b>\format[Authors(LastFirst,Semicolon)]{\author}</b> (<b>\year\uniq</b>). <i>\title</i>, \journal \volume\begin{pages} : \format[FormatPagesForHTML]{\pages}\end{pages}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ FormatCitations="false"
CitationCharacterFormat="Default"
PageInfoSeparator="; "
OxfordComma=","
SpaceBefore="true"

LAYOUT

Expand Down
Loading