Index: lams_central/web/authoring/svgGenerator.jsp
===================================================================
diff -u -r3eab31a1109437bc25679e6ebe38be0a350e17ac -r54a3c302d29d64b55efa18189083dadd13c51708
--- lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision 3eab31a1109437bc25679e6ebe38be0a350e17ac)
+++ lams_central/web/authoring/svgGenerator.jsp	(.../svgGenerator.jsp)	(revision 54a3c302d29d64b55efa18189083dadd13c51708)
@@ -22,27 +22,28 @@
 			LABELS = {
 				// ActivityLib
 				<fmt:message key="authoring.fla.default.group.title" var="DEFAULT_GROUPING_TITLE_VAR"/>
-				DEFAULT_GROUPING_TITLE : '<c:out value="${DEFAULT_GROUPING_TITLE_VAR}" />',
+				DEFAULT_GROUPING_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_GROUPING_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.group.prefix" var="DEFAULT_GROUP_PREFIX_VAR"/>
-				DEFAULT_GROUP_PREFIX : '<c:out value="${DEFAULT_GROUP_PREFIX_VAR}" />',
+				DEFAULT_GROUP_PREFIX : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_GROUP_PREFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.branching.title" var="DEFAULT_BRANCHING_TITLE_VAR"/>
-				DEFAULT_BRANCHING_TITLE : '<c:out value="${DEFAULT_BRANCHING_TITLE_VAR}" />',
+				DEFAULT_BRANCHING_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_BRANCHING_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.branch.prefix" var="DEFAULT_BRANCH_PREFIX_VAR"/>
-				DEFAULT_BRANCH_PREFIX : '<c:out value="${DEFAULT_BRANCH_PREFIX_VAR}" />',
+				DEFAULT_BRANCH_PREFIX : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_BRANCH_PREFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.default.optional.activity.title" var="DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR"/>
-				DEFAULT_OPTIONAL_ACTIVITY_TITLE : '<c:out value="${DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR}" />',
+				DEFAULT_OPTIONAL_ACTIVITY_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_OPTIONAL_ACTIVITY_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.support.activity.title" var="SUPPORT_ACTIVITY_TITLE_VAR"/>
-				SUPPORT_ACTIVITY_TITLE : '<c:out value="${SUPPORT_ACTIVITY_TITLE_VAR}" />',
+				SUPPORT_ACTIVITY_TITLE : '<spring:escapeBody javaScriptEscape="true">${SUPPORT_ACTIVITY_TITLE_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.gate.activity.label" var="GATE_ACTIVITY_LABEL_VAR"/>
-				GATE_ACTIVITY_LABEL : '<c:out value="${GATE_ACTIVITY_LABEL_VAR}" />',
+				GATE_ACTIVITY_LABEL : '<spring:escapeBody javaScriptEscape="true">${GATE_ACTIVITY_LABEL_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branching.start.suffix" var="BRANCHING_START_SUFFIX_VAR"/>
-				BRANCHING_START_SUFFIX : '<c:out value="${BRANCHING_START_SUFFIX_VAR}" />',
+				BRANCHING_START_SUFFIX : '<spring:escapeBody javaScriptEscape="true">${BRANCHING_START_SUFFIX_VAR}</spring:escapeBody>',
 				<fmt:message key="authoring.fla.branching.end.suffix" var="BRANCHING_END_SUFFIX_VAR"/>
-				BRANCHING_END_SUFFIX : '<c:out value="${BRANCHING_END_SUFFIX_VAR}" />',
-				
+				BRANCHING_END_SUFFIX : '<spring:escapeBody javaScriptEscape="true">${BRANCHING_END_SUFFIX_VAR}</spring:escapeBody>',
+
 				// DecorationLib
 				<fmt:message key="authoring.fla.default.annotation.label.title" var="DEFAULT_ANNOTATION_LABEL_TITLE_VAR"/>
-				DEFAULT_ANNOTATION_LABEL_TITLE : '<c:out value="${DEFAULT_ANNOTATION_LABEL_TITLE_VAR}" />'
+				DEFAULT_ANNOTATION_LABEL_TITLE : '<spring:escapeBody javaScriptEscape="true">${DEFAULT_ANNOTATION_LABEL_TITLE_VAR}</spring:escapeBody>'
+
 			},
 			
 			paperMinWidth = 1000,