Merge pull request #327 from evolvedbinary/bugfix/remove-image-hack

Revert temp workaround for the mixed content condition

packages/lwdita-ast/src/nodes/base.ts

@@ -295,7 +295,9 @@ export abstract class AbstractBaseNode implements BaseNode {
   }
 
   allowsMixedContent(): boolean {
-    return this.canAdd("text");
+    //This is a temporary solution REMOVE the alt node as it's not mixed content
+    // by YB, signed-off by AR.
+    return this.canAdd("text") || this.canAdd("alt");
   }
 }
 

packages/lwdita-xdita/src/xdita-serializer.ts

@@ -15,7 +15,7 @@ You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { AbstractBaseNode, AltNode, CDataNode, DocumentNode, TextNode } from "@evolvedbinary/lwdita-ast";
+import { AbstractBaseNode, CDataNode, DocumentNode, TextNode } from "@evolvedbinary/lwdita-ast";
 import { TextSimpleOutputStream } from "./stream";
 
 /**
@@ -49,23 +49,14 @@ export class XditaSerializer {
     this.EOL = '\n';
   }
 
-  // Temporary fix for the serializer of images and fallback nodes see:
-  // https://evolvedbinaryltd.kanbanize.com/ctrl_board/16/cards/3516/details/
-  private serializeMixedContent(node: AbstractBaseNode) {
-    //This is a temporary solution REMOVE the alt node as it's not mixed content
-    // by YB, signed-off by AR.
-    const alt = new AltNode();
-    return node.allowsMixedContent() || node.canAddNode(alt);
-  }
-
   /**
    * Emit the indentation to the output stream
    * 
    * @param node - the node to check if indentation can be added
    */
   private serializeIndentation(node?: AbstractBaseNode): void {
     if (!this.indent || !node) return;
-    if (this.serializeMixedContent(node)) return;
+    if (node.allowsMixedContent()) return;
     this.outputStream.emit(this.indentation.repeat(this.depth * this.tabSize));
   }
 
@@ -76,7 +67,7 @@ export class XditaSerializer {
    */
   private serializeEOL(node?: AbstractBaseNode): void {
     if (!this.indent || !node) return;
-    if (this.serializeMixedContent(node)) return;
+    if (node.allowsMixedContent()) return;
     this.outputStream.emit(this.EOL);
   }