diff --git a/libmscore/rest.cpp b/libmscore/rest.cpp
index 1d3a4080d8..75d49f4152 100644
--- a/libmscore/rest.cpp
+++ b/libmscore/rest.cpp
@@ -453,7 +453,7 @@ int Rest::computeLineOffset()
                   }
             }
 #if 0
-      if (offsetVoices && staff()->mergeMatchingRests())
+      if (offsetVoices && staff()->mergeMatchingRests()) {
             // automatically merge matching rests in voices 1 & 2 if nothing in any other voice
             // this is not always the right thing to do do, but is useful in choral music
             // and perhaps could be made enabled via a staff property
diff --git a/mscore/helpBrowser.cpp b/mscore/helpBrowser.cpp
index e3dd08edb9..7b51e9bc4e 100644
--- a/mscore/helpBrowser.cpp
+++ b/mscore/helpBrowser.cpp
@@ -20,100 +20,96 @@ namespace Ms {
 
 //    manual css style sheets:
 
-static const char* css = R"XXXX(
-body {
-	font-family:	Arial, Helvetica, FreeSans, "DejaVu Sans", sans-serif;
-	font-size:		11pt;
-	margin:		15px;
-      }
-h2, h3 {
-	font-size:		24px;
-	padding:		6px 0 6px 48px;
-	/*background:		#dcdcdc left center no-repeat url('mscore.png');*/
-	background-size:32px 32px;
-      }
-h4 {
-	margin:  10px 0 8px 16px;
-      }
-table {
-	border-collapse:collapse;
-      }
-td {
-	padding:		2px 12px 2px 0;
-	vertical-align:	text-top;
-      }
-.class-description {
-	margin:			0 0 16px 0;
-      }
-.class-inherit {
-	margin:			0 0 16px 0;
-	font-size:		0.8em;
-      }
-.method {
-	font-family:	"Lucida Console", Monaco, "DejaVu Sans Mono", monospace;
-	font-size:		0.8em;
-      }
-.prop-odd {
-	background:		#dcdcdc;
-      }
-.prop-name {
-	font-weight:	bold;
-      }
-.prop-type {
-	font-style:		italic
-      }
-.prop-desc {
-      }
-.footer {
-	margin-top:		24px;
-	background:		#dcdcdc;
-	padding:		16px;
-	text-align:		center;
-	font-size:		0.8em;
-      }
-)XXXX";
+static const char* css = "body {"
+"	font-family:	Arial, Helvetica, FreeSans, \"DejaVu Sans\", sans-serif;"
+"	font-size:		11pt;"
+"	margin:		15px;"
+"      }"
+"h2, h3 {"
+"	font-size:		24px;"
+"	padding:		6px 0 6px 48px;"
+"	/*background:		#dcdcdc left center no-repeat url('mscore.png');*/"
+"	background-size:32px 32px;"
+"      }"
+"h4 {"
+"	margin:  10px 0 8px 16px;"
+"      }"
+"table {"
+"	border-collapse:collapse;"
+"      }"
+"td {"
+"	padding:		2px 12px 2px 0;"
+"	vertical-align:	text-top;"
+"      }"
+".class-description {"
+"	margin:			0 0 16px 0;"
+"      }"
+".class-inherit {"
+"	margin:			0 0 16px 0;"
+"	font-size:		0.8em;"
+"      }"
+".method {"
+"	font-family:	\"Lucida Console\", Monaco, \"DejaVu Sans Mono\", monospace;"
+"	font-size:		0.8em;"
+"     }"
+".prop-odd {"
+"	background:		#dcdcdc;"
+"      }"
+".prop-name {"
+"	font-weight:	bold;"
+"      }"
+".prop-type {"
+"	font-style:		italic"
+"      }"
+".prop-desc {"
+"      }"
+".footer {"
+"	margin-top:		24px;"
+"	background:		#dcdcdc;"
+"	padding:		16px;"
+"	text-align:		center;"
+"	font-size:		0.8em;"
+"     }";
 
-static const char* cssDark = R"XXXX(
-body {
-	font-family:	Arial, Helvetica, FreeSans, "DejaVu Sans", sans-serif;
-	font-size:		11pt;
-	margin-left:	15px;
-      }
-h1, h2, h3 {
-      }
-h4 {
-	margin-left:      0px;
-      }
-table {
-	border-collapse:collapse;
-      }
-td {
-	padding:		2px 12px 2px 0;
-	vertical-align:	text-top;
-      }
-.class-description {
-	margin-top:		16px;
-      }
-.class-inherit {
-	margin-top:		16px;
-	font-size:		0.8em;
-      }
-.method {
-	font-family:	"Lucida Console", Monaco, "DejaVu Sans Mono", monospace;
-	font-size:		0.7em;
-      }
-.prop-odd {
-	background:		#989898;
-      }
-.prop-name {
-	font-weight:	bold;
-      }
-.prop-type {
-	font-style:		italic;
-      }
-.prop-desc {
-      }
-)XXXX";
+static const char* cssDark = "body {"
+"	font-family:	Arial, Helvetica, FreeSans, \"DejaVu Sans\", sans-serif;"
+"	font-size:		11pt;"
+"	margin-left:	15px;"
+"     }"
+"h1, h2, h3 {"
+"      }"
+"h4 {"
+"	margin-left:      0px;"
+"      }"
+"table {"
+"	border-collapse:collapse;"
+"      }"
+"td {"
+"	padding:		2px 12px 2px 0;"
+"	vertical-align:	text-top;"
+"      }"
+".class-description {"
+"	margin-top:		16px;"
+"      }"
+".class-inherit {"
+"	margin-top:		16px;"
+"	font-size:		0.8em;"
+"      }"
+".method {"
+"	font-family:	\"Lucida Console\", Monaco, \"DejaVu Sans Mono\", monospace;"
+"	font-size:		0.7em;"
+"      }"
+".prop-odd {"
+"	background:		#989898;"
+"      }"
+".prop-name {"
+"	font-weight:	bold;"
+"      }"
+".prop-type {"
+"	font-style:		italic;"
+"      }"
+".prop-desc {"
+"      }";
 
 
 //---------------------------------------------------------