added handShift

src/components/FZTextView.js

@@ -204,6 +204,25 @@ const formatDiplomaticText = (diplomatic: Array) => {
     });
   }
 
+  const formatHandShift = (element) => {
+    return(
+      <span className="tei-instr-pencil">
+        {element.map((node, index) => {
+          if (typeof node === 'string') return <span key={index}>{node}</span>
+          if (typeof node === 'object') {
+            if (node.nodeType === 'unclear') {
+              return <span key={index} className="tei-unclear-hi">{node["#text"]}</span>
+            }
+            if (node.nodeType === 'del') {
+              let delClass = getDelType(node);
+              return <span key={index} className={delClass + ' tei-instr-pencil'}>{node["#text"]}</span>
+            }
+          }
+        })}
+      </span>
+    );
+  }
+
   diplomatic.forEach((element, index) => {
     let key = shortid.generate();
     if ( element instanceof Object) {
@@ -220,6 +239,10 @@ const formatDiplomaticText = (diplomatic: Array) => {
           doDeletion(element, formatted);
           break;
 
+        case 'handShift':
+          formatted.push(formatHandShift(element));
+          break;
+
         case 'subst':
           let subst = [];
           if (element.del) {
@@ -232,9 +255,9 @@ const formatDiplomaticText = (diplomatic: Array) => {
           formatted.push(<span key={key} className="tei-subst">{subst}</span>);
           break;
 
-        case 'handShift':
+        /*case 'handShift':
             formatted.push(<span key={key} className="tei-instr-pencil">{element["text"]}</span>);
-            break;
+            break;*/
 
         default:
           break;

src/middleware/file-loader.js

@@ -2,16 +2,23 @@
 
 function xmlToJson(xml) {
 	// Handshift and unclear as objects with #text instead of arrays of text
-	
+
 	// Create the return object
 	var obj = {};
-	if (xml.nodeType == 1) { // element
+	if (xml.nodeType === 1) { // element
 		// do attributes
 		let nodeName = xml.nodeName;
 		obj.nodeType = nodeName;
 		if (xml.hasChildNodes()) {
-			if (xml.attributes.length > 0) {
-			obj["attributes"] = {};
+			if (nodeName === 'handShift') {
+				let elements = [];
+				xml.childNodes.forEach((child) => {
+					elements.push(xmlToJson(child));
+				});
+				obj[nodeName] = elements;
+			}
+			else if (xml.attributes.length > 0) {
+				obj["attributes"] = {};
 				for (var j = 0; j < xml.attributes.length; j++) {
 					var attribute = xml.attributes.item(j);
 					obj["attributes"][attribute.nodeName] = attribute.nodeValue;
@@ -33,7 +40,6 @@ function xmlToJson(xml) {
 	} else if (xml.nodeType === 3) { // text
 		obj = xml.nodeValue;
 	}
-	/* TODO change stage and diplomatic from { elementName: Array } to Array<Object(element)> */
 	// do children
 	if (xml.hasChildNodes()) {
 		let stages = [];
@@ -78,6 +84,10 @@ function xmlToJson(xml) {
 			}
 		}
 	}
+	if (obj.nodeType === 'handShift') {
+		obj = obj.handShift;
+		obj.nodeType = 'handShift';
+	}
 	return obj;
 };
 

src/utils/data-utils.js

@@ -26,9 +26,8 @@ export const normalizeZone = (zone: Object): Object => {
       return undefined;
     }
   }
-
   return {
-    // Need to somehow put vspace into linegroups array 
+    // Need to somehow put vspace into linegroups array
     id: shortid.generate(),
     points: zone.attributes.points,
     type: zone.attributes.type,