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

Fix harvard exporter by changing AuthorsFormatter #7355

Merged
merged 16 commits into from
Jan 18, 2021
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve
- We fixed an issue where the option "Move file to file directory" was disabled in the entry editor for all files [#7194](https://github.com/JabRef/jabref/issues/7194)
- We fixed an issue where application dialogs were opening in the wrong display when using multiple screens [#7273](https://github.com/JabRef/jabref/pull/7273)
- We fixed an issue where an exception would be displayed for previewing and preferences when a custom theme has been configured but is missing [#7177](https://github.com/JabRef/jabref/issues/7177)
- We fixed an issue where the Harvard RTF exporter used the wrong default file extension. [4508](https://github.com/JabRef/jabref/issues/4508)
- We fixed an issue where the Harvard RTF exporter did not use the new authors formatter and therefore did not export "organization" authors correctly. [4508](https://github.com/JabRef/jabref/issues/4508)
- We fixed an issue where the field `urldate` was not exported to the corresponding fields `YearAccessed`, `MonthAccessed`, `DayAccessed` in MS Office XML [#7354](https://github.com/JabRef/jabref/issues/7354)

### Removed
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public static ExporterFactory create(List<TemplateExporter> customFormats,
exporters.add(new TemplateExporter(Localization.lang("HTML table"), "tablerefs", "tablerefs", "tablerefs", StandardFileType.HTML, layoutPreferences, savePreferences));
exporters.add(new TemplateExporter(Localization.lang("HTML list"), "listrefs", "listrefs", "listrefs", StandardFileType.HTML, layoutPreferences, savePreferences));
exporters.add(new TemplateExporter(Localization.lang("HTML table (with Abstract & BibTeX)"), "tablerefsabsbib", "tablerefsabsbib", "tablerefsabsbib", StandardFileType.HTML, layoutPreferences, savePreferences));
exporters.add(new TemplateExporter("Harvard RTF", "harvard", "harvard", "harvard", StandardFileType.RDF, layoutPreferences, savePreferences));
exporters.add(new TemplateExporter("Harvard RTF", "harvard", "harvard", "harvard", StandardFileType.RTF, layoutPreferences, savePreferences));
exporters.add(new TemplateExporter("ISO 690 RTF", "iso690rtf", "iso690RTF", "iso690rtf", StandardFileType.RTF, layoutPreferences, savePreferences));
exporters.add(new TemplateExporter("ISO 690", "iso690txt", "iso690", "iso690txt", StandardFileType.TXT, layoutPreferences, savePreferences));
exporters.add(new TemplateExporter("Endnote", "endnote", "EndNote", "endnote", StandardFileType.TXT, layoutPreferences, savePreferences));
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\format[RTFChars,AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author} (\year),
\format[Authors(LastFirst,Initials,FullPunc,Comma,And),RTFChars]{\author} (\year),
'\format[RTFChars]{\title}', }{\\i \format[RTFChars]{\journal}}{
\begin{volume}
}{\\b \volume}{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
\begin{author}
\format[RTFChars,AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author}
\format[Authors(LastFirst,Initials,FullPunc,Comma,And,inf),RTFChars]{\author}
\end{author}
\begin{editor}
\format[RTFChars,AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\editor}, ed. \end{editor}
\format[FirstFirst,FullName,NoPunc,And,RTFChars]{\editor}, ed., \end{editor}
(\year),
}{\\i \format[RTFChars]{\title}}{
\begin{volume}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
\begin{author}
\format[RTFChars,AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author}
\format[Authors(LastFirst,Initials,FullPunc,Comma,And,inf),RTFChars]{\author}
\end{author}
\begin{editor}
\format[RTFChars,AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\editor}, ed., \end{editor}
\format[Authors(FirstFirst,FullName,NoPunc,And),RTFChars]{\editor}, ed., \end{editor}
(\year),
}{\\i \format[RTFChars]{\title}}{
\begin{publisher}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
\format[RTFChars,AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author} (\year),
\format[Authors(LastFirst,Initials,FullPunc,Comma,And,inf),RTFChars]{\author} (\year),
}{\format[RTFChars]{\title}}{
\begin{editor}
, }{\\i in }{\format[RTFChars,AuthorFirstFirst,AuthorAndsReplacer]{\editor}, ed., \end{editor}
, }{\\i in }{\format[Authors(FirstFirst,FullName,NoPunc,And),RTFChars]{\editor}, ed., \end{editor}
\begin{booktitle}
'\format[RTFChars]{\booktitle}'
\end{booktitle}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
\format[RTFChars,AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author} (\year),
\format[Authors(LastFirst,Initials,FullPunc,Comma,And,inf),RTFChars]{\author} (\year),
\format[RTFChars]{\title}
, }{\\i in }{
\begin{editor}
\format[RTFChars,AuthorFirstFirst,AuthorAndsReplacer]{\editor}, ed., \end{editor}
\format[Authors(FirstFirst,FullName,NoPunc,And),RTFChars]{\editor}, ed., \end{editor}
\begin{booktitle}
'\format[RTFChars]{\booktitle}'
\end{booktitle}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/resource/layout/harvard/harvard.layout
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\format[AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer,RTFChars]{\author} (\year),
\format[Authors(LastFirst,Initials,FullPunc,Comma,And,inf),RTFChars]{\author} (\year),
'\format[RTFChars]{\title}'
\begin{journal}
, }{\\i \format[RTFChars]{\journal}} {\\b \volume}{
Expand All @@ -7,7 +7,7 @@
(\number)
\end{number}
\begin{editor}
, }{\\i in }{\format[AuthorFirstFirst,AuthorAndsReplacer,RTFChars]{\editor}, ed., \end{editor}
, }{\\i in }{\format[Authors(FirstFirst,FullName,NoPunc,And),RTFChars]{\editor}, ed., \end{editor}
\begin{booktitle}
'\format[RTFChars]{\booktitle}'
\end{booktitle}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\format[RTFChars,AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author} (\year),
\format[Authors(LastFirst,Initials,FullPunc,Comma,And,inf),RTFChars]{\author} (\year),
'\format[RTFChars]{\title}'
\begin{school}
, Master's thesis, \format[RTFChars]{\school}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
\format[RTFChars,AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author} (\year),
\format[Authors(LastFirst,Initials,FullPunc,Comma,And,inf),RTFChars]{\author} (\year),
'\format[RTFChars]{\title}'
\begin{school}
, PhD thesis, \format[RTFChars]{\school}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
\begin{author}
\format[RTFChars,AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\author}
\format[Authors(LastFirst,Initials,FullPunc,Comma,And,inf),RTFChars]{\author}
\end{author}
\begin{editor}
\format[RTFChars,AuthorLastFirst,AuthorAbbreviator,AuthorAndsReplacer]{\editor}, ed., \end{editor}
\format[Authors(FirstFirst,FullName,NoPunc,And),RTFChars]{\editor}, ed., \end{editor}
(\year),
}{\\i \format[RTFChars]{\title}}{
\begin{volume}
Expand Down