Correctly convert BibTeX entries containing a carriage return

Fixes #23
michel-kraemer · Nov 20, 2016 · 729ca2c · chriba · Nov 21, 2016 · michel-kraemer
1 parent f05e1bf
commit 729ca2c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/citeproc-java/src/main/java/de/undercouch/citeproc/bibtex/BibTeXConverter.java b/citeproc-java/src/main/java/de/undercouch/citeproc/bibtex/BibTeXConverter.java
@@ -175,7 +175,7 @@ public CSLItemData toItemData(BibTeXEntry e) {
 		//get all fields from the BibTeX entry
 		Map<String, String> entries = new HashMap<>();
 		for (Map.Entry<Key, Value> field : e.getFields().entrySet()) {
-			String us = field.getValue().toUserString();
+			String us = field.getValue().toUserString().replaceAll("\\r", "");
 
 			//convert LaTeX string to normal text
 			try {

diff --git a/citeproc-java/src/test/java/de/undercouch/citeproc/bibtex/BibTeXConverterTest.java b/citeproc-java/src/test/java/de/undercouch/citeproc/bibtex/BibTeXConverterTest.java
@@ -22,6 +22,7 @@
 import org.jbibtex.BibTeXDatabase;
 import org.jbibtex.BibTeXEntry;
 import org.jbibtex.Key;
+import org.jbibtex.StringValue;
 import org.junit.Test;
 
 import de.undercouch.citeproc.csl.CSLItemData;
@@ -122,4 +123,18 @@ public void allEntries() throws Exception {
 		assertEquals("The UNIX Time-Sharing System", cid.getTitle());
 		assertArrayEquals(new int[][] { new int[] { 1974, 7 } }, cid.getIssued().getDateParts());
 	}
+
+	/**
+	 * Test if a BibTeX entry whose title contains a CR character (\r) can
+	 * be converted correctly.
+	 */
+	@Test
+	public void carriageReturnInTitle() {
+		BibTeXEntry e = new BibTeXEntry(new Key("article"), new Key("a"));
+		e.addField(new Key("title"), new StringValue(
+				"syst\\`emes\r\ndiff\\'erentiels", StringValue.Style.QUOTED));
+		BibTeXConverter conv = new BibTeXConverter();
+		CSLItemData i = conv.toItemData(e);
+		assertEquals("systèmes différentiels", i.getTitle());
+	}
 }