Fixed caption docx tags

markdown-to-latex · May 1, 2023 · c38afdf · c38afdf
1 parent cca90a2
commit c38afdf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/printers/docx/src/printer.ts b/printers/docx/src/printer.ts
@@ -386,16 +386,17 @@ export async function createWordPicture(
 
 export function createWordPictureLabel(
     index: number,
-    text: string,
+    text: docx.XmlComponent[],
 ): PrinterFunctionResult {
     return {
         result: [
             new Paragraph({
                 style: 'picture-caption',
                 children: [
                     new docx.TextRun({
-                        text: `Рисунок ${index} – ${text}`,
+                        text: `Рисунок ${index} – `,
                     }),
+                    ...text,
                 ],
             }),
         ],

diff --git a/printers/docx/src/visitors.ts b/printers/docx/src/visitors.ts
@@ -133,9 +133,11 @@ export const processingVisitors: ProcessingVisitors = {
 
     [NodeType.Code]: internalUnparsableNodeType,
     [ProcessedNodeType.CodeProcessed]: async (printer, node) => {
+        const resultName = await printer.processNodeList(printer, node.name);
+
         const resultCaption = createWordPictureLabel(
             node.index + 1,
-            node.label.text,
+            resultName.result,
         );
 
         return {
@@ -167,7 +169,7 @@ export const processingVisitors: ProcessingVisitors = {
                 }),
                 ...resultCaption.result,
             ],
-            diagnostic: [...resultCaption.diagnostic],
+            diagnostic: [...resultName.diagnostic, ...resultCaption.diagnostic],
         };
     },
     [NodeType.Heading]: async (printer, node) => {
@@ -322,10 +324,12 @@ export const processingVisitors: ProcessingVisitors = {
     [NodeType.Link]: internalTODO,
     [NodeType.Image]: internalUnparsableNodeType,
     [ProcessedNodeType.PictureProcessed]: async (printer, node) => {
+        const resultName = await printer.processNodeList(printer, node.name);
+
         const resultPicture = await createWordPicture(node);
         const resultCaption = createWordPictureLabel(
             node.index + 1,
-            node.label.text,
+            resultName.result,
         );
 
         return {
@@ -338,6 +342,7 @@ export const processingVisitors: ProcessingVisitors = {
                 ...resultCaption.result,
             ],
             diagnostic: [
+                ...resultName.diagnostic,
                 ...resultPicture.diagnostic,
                 ...resultCaption.diagnostic,
             ],