Merge pull request #1486 from JabRef/word-shorttitle

Fixes #1485 Export shorttitle as standard field
JabRef · Jun 9, 2016 · b7c17df · b7c17df
2 parents 81399f0 + b423189
commit b7c17df
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ## [Unreleased]
 
 ### Changed
+- [#1485](https://github.com/JabRef/jabref/issues/1485) Biblatex field shorttitle is now exported/imported as standard field ShortTitle to Word bibliography
 
 ### Fixed
 - Fixed [#405](https://github.com/JabRef/jabref/issues/405): Added more {} around capital letters in Unicode/HTML to LaTeX conversion to preserve them

diff --git a/src/main/java/net/sf/jabref/logic/msbib/MSBibMapping.java b/src/main/java/net/sf/jabref/logic/msbib/MSBibMapping.java
@@ -34,7 +34,7 @@ public class MSBibMapping {
         bibtexToMSBib.put("institution", "Institution");
         bibtexToMSBib.put("doi", "DOI");
         bibtexToMSBib.put("url", "URL");
-        // BibTeX only fields
+        // BibTeX/Biblatex only fields
         bibtexToMSBib.put("series", BIBTEX_PREFIX + "Series");
         bibtexToMSBib.put("abstract", BIBTEX_PREFIX + "Abstract");
         bibtexToMSBib.put("keywords", BIBTEX_PREFIX + "KeyWords");
@@ -47,8 +47,8 @@ public class MSBibMapping {
         bibtexToMSBib.put("size", BIBTEX_PREFIX + "Size");
         bibtexToMSBib.put("intype", BIBTEX_PREFIX + "InType");
         bibtexToMSBib.put("paper", BIBTEX_PREFIX + "Paper");
+        bibtexToMSBib.put("shorttitle", "ShortTitle");
         // MSBib only fields
-        bibtexToMSBib.put(MSBIB_PREFIX + "shorttitle", "ShortTitle");
         bibtexToMSBib.put(MSBIB_PREFIX + "numberofvolume", "NumberVolumes");
         bibtexToMSBib.put(MSBIB_PREFIX + "periodical", "PeriodicalTitle");
         //bibtexToMSBib.put(MSBIB_PREFIX + "day", "Day");

diff --git a/src/test/resources/net/sf/jabref/exporter/MsBibExportFormatTest1.bib b/src/test/resources/net/sf/jabref/exporter/MsBibExportFormatTest1.bib
@@ -12,11 +12,12 @@ @unpublished{
   crossref =                    {cross},
   edition =                     {10},
   howpublished =                {how},
+  shorttitle =            {Turing},
   isbn = {‎978-3-16-148410-0},
   intype = {intype},
   paper = {paper},
   editor = {Alfred},
-  sourceType ={Interview}, 
+  sourceType ={Interview},
   institution =                 {Institution},
   msbib-abbreviatedcasenumber = {abb},
   msbib-accessed =              {12.10.2015},
@@ -32,7 +33,6 @@ @unpublished{
   msbib-recordingnumber =       {record},
   msbib-reporter =              {rep},
   msbib-periodical = {peri},
-  msbib-shorttitle =            {Turing},
   msbib-station =               {stat},
   msbib-theater =               {th},
   msbib-type =                  {type},

diff --git a/src/test/resources/net/sf/jabref/exporter/MsBibShorttitle.bib b/src/test/resources/net/sf/jabref/exporter/MsBibShorttitle.bib
@@ -0,0 +1,4 @@
+@Article{,
+  shorttitle = {Title}
+}
+
diff --git a/src/test/resources/net/sf/jabref/exporter/MsBibShorttitle.xml b/src/test/resources/net/sf/jabref/exporter/MsBibShorttitle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<b:Sources xmlns:b="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" xmlns="http://schemas.openxmlformats.org/officeDocument/2006/bibliography" SelectedStyle="">
+<b:Source>
+<b:SourceType>JournalArticle</b:SourceType>
+<b:ShortTitle>Title</b:ShortTitle>
+<b:Author/>
+<b:BIBTEX_Entry>article</b:BIBTEX_Entry>
+</b:Source>
+</b:Sources>
diff --git a/src/test/resources/net/sf/jabref/importer/fileformat/MsBibImporterTest2.bib b/src/test/resources/net/sf/jabref/importer/fileformat/MsBibImporterTest2.bib
@@ -14,6 +14,7 @@ @Article{
   language =                    {english},
   howpublished =                {how},
   institution =                 {Institution},
+  shorttitle =            {Turing},
   msbib-abbreviatedcasenumber = {abb},
   msbib-accessed =              {July 3, 2010},
   msbib-broadcaster =           {broad},
@@ -26,7 +27,6 @@ @Article{
   msbib-productioncompany =     {produktion},
   msbib-recordingnumber =       {record},
   msbib-reporter =              {rep},
-  msbib-shorttitle =            {Turing},
   msbib-station =               {stat},
   msbib-theater =               {th},
   msbib-type =                  {type},