Fix harvard exporter by changing AuthorsFormatter (#7355)

* fix harvard exporter extension * Fix Harvard Exporter by changing AuthorsFormatter * add changelog * Update harvard.layout fix missing space * Update harvard.mastersthesis.layout fix missing space * Update harvard.phdthesis.layout fix missing space * Update harvard.article.layout add missing space * Update harvard.book.layout add missing space * Update harvard.inbook.layout add missing space * Update harvard.incollection.layout add missing space * Update harvard.inproceedings.layout add missing year * Update harvard.inproceedings.layout fix braces * Update harvard.proceedings.layout add missing space * Update harvard.inproceedings.layout add missing comma * Update harvard.layout remove extra brace
JabRef · Jan 18, 2021 · deda8a2 · deda8a2
1 parent 46c5d73
commit deda8a2
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -29,6 +29,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

diff --git a/src/main/java/org/jabref/logic/exporter/ExporterFactory.java b/src/main/java/org/jabref/logic/exporter/ExporterFactory.java
@@ -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));

diff --git a/src/main/resources/resource/layout/harvard/harvard.article.layout b/src/main/resources/resource/layout/harvard/harvard.article.layout
@@ -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}{

diff --git a/src/main/resources/resource/layout/harvard/harvard.book.layout b/src/main/resources/resource/layout/harvard/harvard.book.layout
@@ -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}

diff --git a/src/main/resources/resource/layout/harvard/harvard.inbook.layout b/src/main/resources/resource/layout/harvard/harvard.inbook.layout
@@ -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}

diff --git a/src/main/resources/resource/layout/harvard/harvard.incollection.layout b/src/main/resources/resource/layout/harvard/harvard.incollection.layout
@@ -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}

diff --git a/src/main/resources/resource/layout/harvard/harvard.inproceedings.layout b/src/main/resources/resource/layout/harvard/harvard.inproceedings.layout
@@ -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}

diff --git a/src/main/resources/resource/layout/harvard/harvard.layout b/src/main/resources/resource/layout/harvard/harvard.layout
@@ -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}{
@@ -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}

diff --git a/src/main/resources/resource/layout/harvard/harvard.mastersthesis.layout b/src/main/resources/resource/layout/harvard/harvard.mastersthesis.layout
@@ -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}

diff --git a/src/main/resources/resource/layout/harvard/harvard.phdthesis.layout b/src/main/resources/resource/layout/harvard/harvard.phdthesis.layout
@@ -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}

diff --git a/src/main/resources/resource/layout/harvard/harvard.proceedings.layout b/src/main/resources/resource/layout/harvard/harvard.proceedings.layout
@@ -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}