added a variableReplace with custom delimiters

src/main/java/org/docx4j/XmlUtils.java

@@ -507,7 +507,12 @@ public static Object unmarshallFromTemplate(String wmlTemplateString,
 	   }
 
 
-	 private static StringBuilder replace(String wmlTemplateString, int offset, StringBuilder strB, 
+	public static Object unmarshallFromTemplate(String wmlTemplateString, java.util.Map<String, ?> mappings, JAXBContext jc, String startVar, String endVar) throws JAXBException {
+		String wmlString = replace(wmlTemplateString, 0, new StringBuilder(), mappings, startVar, endVar).toString();
+		return unmarshalString(wmlString, jc);
+	}
+
+	 private static StringBuilder replace(String wmlTemplateString, int offset, StringBuilder strB,
 			 java.util.Map<String, ?> mappings) {
 
 	    int startKey = wmlTemplateString.indexOf("${", offset);
@@ -528,6 +533,27 @@ private static StringBuilder replace(String wmlTemplateString, int offset, Strin
 	    }
 	 }
 
+	private static StringBuilder replace(String wmlTemplateString, int offset, StringBuilder strB,
+										 java.util.Map<String, ?> mappings, String startVar, String endVar) {
+
+		int startKey = wmlTemplateString.indexOf(startVar, offset);
+		if (startKey == -1)
+			return strB.append(wmlTemplateString.substring(offset));
+		else {
+			strB.append(wmlTemplateString.substring(offset, startKey));
+			int keyEnd = wmlTemplateString.indexOf(endVar, startKey);
+			String key = wmlTemplateString.substring(startKey + startVar.length(), keyEnd);
+			String val = mappings.get(key).toString();
+			if (val==null) {
+				log.warn("Invalid key '" + key + "' or key not mapped to a value");
+				strB.append(key);
+			} else {
+				strB.append(val);
+			}
+			return replace(wmlTemplateString, keyEnd + 1, strB, mappings, startVar, endVar);
+		}
+	}
+
 	/**
 	 * Marshal this object to a String, pretty printed, and without an XML declaration.
 	 * Useful for debugging.
@@ -1466,4 +1492,4 @@ public static void treeCopy( Node sourceNode, Node destParent ) {
         }
     }
 
-}
+}

src/main/java/org/docx4j/openpackaging/parts/JaxbXmlPart.java

@@ -264,7 +264,44 @@ public void variableReplace(java.util.HashMap<String, String> mappings) throws J
 							XmlUtils.unmarshallFromTemplate(wmlTemplateString, mappings, jc));
 
 	}
-
+
+	public void variableReplace(java.util.HashMap<String, String> mappings, String startVar, String endVar) throws JAXBException, Docx4JException {
+
+		// Get the contents as a string
+		String wmlTemplateString = null;
+		if (jaxbElement==null) {
+
+			PartStore partStore = this.getPackage().getSourcePartStore();
+			String name = this.getPartName().getName();
+			InputStream is = partStore.loadPart(
+					name.substring(1));
+			if (is==null) {
+				log.warn(name + " missing from part store");
+				throw new Docx4JException(name + " missing from part store");
+			} else {
+				log.info("Lazily unmarshalling " + name);
+//				wmlTemplateString = convertStreamToString(is);
+
+				// This seems to be about 5% faster than the Scanner approach
+				try {
+					wmlTemplateString = IOUtils.toString(is, "UTF-8");
+				} catch (IOException e) {
+					throw new Docx4JException(e.getMessage(), e);
+				}
+			}
+
+		} else {
+
+			wmlTemplateString = XmlUtils.marshaltoString(jaxbElement, true, false, jc);
+
+		}
+
+		// Do the replacement
+		jaxbElement = (E)XmlUtils.unwrap(
+				XmlUtils.unmarshallFromTemplate(wmlTemplateString, mappings, jc, startVar, endVar));
+
+	}
+
 //	private static String convertStreamToString(java.io.InputStream is) {
 //	    java.util.Scanner s = new java.util.Scanner(is).useDelimiter("\\A");
 //	    return s.hasNext() ? s.next() : "";