From 6ec2f9aaf9637bb6d427fcf7ad7551dff3e8066b Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Mon, 26 Dec 2016 11:27:09 -0500
Subject: [PATCH] Fix newlines in note HTML files

---
 resource/tinymce/integration.html |  94 ++++++++--------
 resource/tinymce/note.html        | 173 +++++++++++++++---------------
 2 files changed, 134 insertions(+), 133 deletions(-)
diff --git a/resource/tinymce/integration.html b/resource/tinymce/integration.html
index 69f59e96e..f703e15aa 100644
--- a/resource/tinymce/integration.html
+++ b/resource/tinymce/integration.html
@@ -1,47 +1,47 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<style>
-html, body {
-	height: 100%;
-	margin: 0;
-}
-
-#tinymce_parent {
-	display: block;
-	height: 100%;
-	min-height: 130px;
-}
-
-#noScriptWarning {
-	padding: 10px 8px 4px;
-	font-family: sans-serif;
-	font-size: 12px;
-}
-</style>
-
-<script type="text/javascript" src="tinymce.js"></script>
-<script type="text/javascript" src="locale.js"></script>
-<script type="text/javascript">
-	tinyMCE.init({
-		content_css: "css/integration-content.css",
-		
-		toolbar: "bold italic underline | sub sup | removeformat",
-		toolbar_items_size: 'small',
-		menubar: false,
-		resize: false,
-		statusbar: false,
-		
-		init_instance_callback: function (ed) {
-			setLocale(ed);
-			zoteroInit(ed);
-		}
-	});
-	tinyMCE.execCommand("mceAddEditor", true, "tinymce");
-</script>
-</head>
-<body>
-<div id="tinymce"></div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<style>
+html, body {
+	height: 100%;
+	margin: 0;
+}
+
+#tinymce_parent {
+	display: block;
+	height: 100%;
+	min-height: 130px;
+}
+
+#noScriptWarning {
+	padding: 10px 8px 4px;
+	font-family: sans-serif;
+	font-size: 12px;
+}
+</style>
+
+<script type="text/javascript" src="tinymce.js"></script>
+<script type="text/javascript" src="locale.js"></script>
+<script type="text/javascript">
+	tinyMCE.init({
+		content_css: "css/integration-content.css",
+		
+		toolbar: "bold italic underline | sub sup | removeformat",
+		toolbar_items_size: 'small',
+		menubar: false,
+		resize: false,
+		statusbar: false,
+		
+		init_instance_callback: function (ed) {
+			setLocale(ed);
+			zoteroInit(ed);
+		}
+	});
+	tinyMCE.execCommand("mceAddEditor", true, "tinymce");
+</script>
+</head>
+<body>
+<div id="tinymce"></div>
+</body>
+</html>
diff --git a/resource/tinymce/note.html b/resource/tinymce/note.html
index 7396e928d..db4067940 100644
--- a/resource/tinymce/note.html
+++ b/resource/tinymce/note.html
@@ -1,86 +1,87 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link type="text/css" rel="stylesheet" href="css/note-ui.css"/>
-<script type="text/javascript" src="tinymce.js"></script>
-<script type="text/javascript" src="locale.js"></script>
-<script type="text/javascript">
-	tinymce.init({
-		body_id: "zotero-tinymce-note",
-		content_css: "css/note-content.css",
-		entities: "160,nbsp",
-		browser_spellcheck: true,
-		convert_urls: false,
-		fix_list_elements: true,
-		
-		plugins: "autolink,code,contextmenu,directionality,link,lists,paste,searchreplace",
-		
-		toolbar1: "bold italic underline strikethrough | subscript superscript | forecolor backcolor | blockquote link | %DIR% | removeformat",
-		toolbar2: "formatselect | alignleft aligncenter alignright | bullist numlist outdent indent | searchreplace",
-		toolbar_items_size: 'small',
-		menubar: false,
-		resize: false,
-		statusbar: false,
-		
-		contextmenu: "link | code",
-		
-		link_context_toolbar: true,
-		link_assume_external_targets: true,
-		
-		setup: function (ed) {
-			setLocale(ed);
-			
-			// Set text direction
-			var dir = window.location.href.match(/dir=(ltr|rtl)/)[1];
-			ed.settings.directionality = dir;
-			// Include button for opposite direction, to function as a toggle
-			ed.settings.toolbar1 = ed.settings.toolbar1.replace(
-				"%DIR%",
-				dir.split("").reverse().join("")
-			);
-		},
-		
-		init_instance_callback: function (ed) {
-			zoteroInit(ed);
-			
-			['Change', 'KeyDown', 'KeyPress', 'Undo', 'Redo'].forEach(eventName =>
-				ed.on(eventName, event => zoteroHandleEvent(event))
-			);
-			
-			["Cut", "Copy", "Paste"].forEach(function (command) {
-				let cmd = command;
-				ed.addCommand(command, function (ui, value) {
-					zoteroExecCommand(ed.getDoc(), cmd, ui, value);
-				});
-			});
-		},
-		
-		// More restrictive version of default set, with JS/etc. removed
-		valid_elements: "@[id|class|style|title|dir<ltr?rtl|lang|xml::lang],"
-			+ "a[rel|rev|charset|hreflang|tabindex|accesskey|type|"
-			+ "name|href|target|title|class],strong/b,em/i,strike,u,"
-			+ "#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|"
-			+ "src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,"
-			+ "-blockquote[cite],-table[border=0|cellspacing|cellpadding|width|frame|rules|"
-			+ "height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|"
-			+ "height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,"
-			+ "#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor"
-			+ "|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,"
-			+ "-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face"
-			+ "|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],"
-			+ "object[classid|width|height|codebase|type],param[name|value|_value],"
-			+ "map[name],area[shape|coords|href|alt|target],bdo,"
-			+ "button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|"
-			+ "valign|width],dfn,fieldset,"
-			+ "kbd,label[for],legend,optgroup[label|disabled],option[disabled|label|selected|value],"
-			+ "q[cite],samp,select[disabled|multiple|name|size],small,"
-			+ "textarea[cols|rows|disabled|name|readonly],tt,var,big"
-	});
-	tinymce.execCommand("mceAddEditor", true, "tinymce");
-</script>
-</head>
-<body>
-<div id="tinymce"></div>
-</body>
-</html>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<link type="text/css" rel="stylesheet" href="css/note-ui.css"/>
+<script type="text/javascript" src="tinymce.js"></script>
+<script type="text/javascript" src="locale.js"></script>
+<script type="text/javascript">
+	tinymce.init({
+		body_id: "zotero-tinymce-note",
+		content_css: "css/note-content.css",
+		entities: "160,nbsp",
+
+		browser_spellcheck: true,
+		convert_urls: false,
+		fix_list_elements: true,
+		
+		plugins: "autolink,code,contextmenu,directionality,link,lists,paste,searchreplace",
+		
+		toolbar1: "bold italic underline strikethrough | subscript superscript | forecolor backcolor | blockquote link | %DIR% | removeformat",
+		toolbar2: "formatselect | alignleft aligncenter alignright | bullist numlist outdent indent | searchreplace",
+		toolbar_items_size: 'small',
+		menubar: false,
+		resize: false,
+		statusbar: false,
+		
+		contextmenu: "link | code",
+		
+		link_context_toolbar: true,
+		link_assume_external_targets: true,
+		
+		setup: function (ed) {
+			setLocale(ed);
+			
+			// Set text direction
+			var dir = window.location.href.match(/dir=(ltr|rtl)/)[1];
+			ed.settings.directionality = dir;
+			// Include button for opposite direction, to function as a toggle
+			ed.settings.toolbar1 = ed.settings.toolbar1.replace(
+				"%DIR%",
+				dir.split("").reverse().join("")
+			);
+		},
+		
+		init_instance_callback: function (ed) {
+			zoteroInit(ed);
+			
+			['Change', 'KeyDown', 'KeyPress', 'Undo', 'Redo'].forEach(eventName =>
+				ed.on(eventName, event => zoteroHandleEvent(event))
+			);
+			
+			["Cut", "Copy", "Paste"].forEach(function (command) {
+				let cmd = command;
+				ed.addCommand(command, function (ui, value) {
+					zoteroExecCommand(ed.getDoc(), cmd, ui, value);
+				});
+			});
+		},
+		
+		// More restrictive version of default set, with JS/etc. removed
+		valid_elements: "@[id|class|style|title|dir<ltr?rtl|lang|xml::lang],"
+			+ "a[rel|rev|charset|hreflang|tabindex|accesskey|type|"
+			+ "name|href|target|title|class],strong/b,em/i,strike,u,"
+			+ "#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|"
+			+ "src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,"
+			+ "-blockquote[cite],-table[border=0|cellspacing|cellpadding|width|frame|rules|"
+			+ "height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|"
+			+ "height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,"
+			+ "#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor"
+			+ "|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,"
+			+ "-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face"
+			+ "|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],"
+			+ "object[classid|width|height|codebase|type],param[name|value|_value],"
+			+ "map[name],area[shape|coords|href|alt|target],bdo,"
+			+ "button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|"
+			+ "valign|width],dfn,fieldset,"
+			+ "kbd,label[for],legend,optgroup[label|disabled],option[disabled|label|selected|value],"
+			+ "q[cite],samp,select[disabled|multiple|name|size],small,"
+			+ "textarea[cols|rows|disabled|name|readonly],tt,var,big"
+	});
+	tinymce.execCommand("mceAddEditor", true, "tinymce");
+</script>
+</head>
+<body>
+<div id="tinymce"></div>
+</body>
+</html>
