feat: add add reference part

but set h/w to a constant value

Author: CSUwangj

.gitignore

@@ -6,6 +6,7 @@
 *.user
 *.userosscache
 *.sln.docstates
+*.vscode
 
 # User-specific files (MonoDevelop/Xamarin Studio)
 *.userprefs

examples/config.json

@@ -188,14 +188,31 @@
       "段前分页": false,
       "段前后空行": 1,
       "行距": 0
+    },
+    {
+      "名称": "Image Title",
+      "英文字体": "Times New Roman",
+      "中文字体": "黑体",
+      "字体大小": "五号",
+      "对齐方式": "居中",
+      "录入大纲": false,
+      "大纲等级": 0,
+      "加粗": false,
+      "斜体": false,
+      "下划线": false,
+      "删除线": false,
+      "首行缩进": 0,
+      "段前分页": false,
+      "段前后空行": 0,
+      "行距": 0
     }
   ],
   "对应关系": {
     "正文": "bodytext",
     "一级标题": "heading 1",
     "二级标题": "heading 2",
     "三级标题": "heading 3",
-    "代码段": "Code",
+    "代码段": "code",
     "引用": "reference"
   },
   "可选部分": {
@@ -204,7 +221,6 @@
     "目录": true,
     "页眉": true,
     "页脚": true,
-    "结束语": true,
     "延迟样式": true
   }
 }

md2docx/GeneratedCode.cs

@@ -2068,5 +2068,92 @@ public static void GenerateFontTablePartContent(FontTablePart fontTablePart1)
             fontTablePart1.Fonts = fonts1;
         }
 
+        public static Run GenerateImageReference(int id)
+        {
+            Run run1 = new Run();
+
+            RunProperties runProperties1 = new RunProperties();
+            NoProof noProof1 = new NoProof();
+
+            runProperties1.Append(noProof1);
+
+            Drawing drawing1 = new Drawing();
+
+            Wp.Inline inline1 = new Wp.Inline() { DistanceFromTop = (UInt32Value)0U, DistanceFromBottom = (UInt32Value)0U, DistanceFromLeft = (UInt32Value)0U, DistanceFromRight = (UInt32Value)0U, AnchorId = "06C249DF", EditId = "66989579" };
+            Wp.Extent extent1 = new Wp.Extent() { Cx = 1104900L, Cy = 1047750L };
+            Wp.EffectExtent effectExtent1 = new Wp.EffectExtent() { LeftEdge = 0L, TopEdge = 0L, RightEdge = 0L, BottomEdge = 0L };
+            Wp.DocProperties docProperties1 = new Wp.DocProperties() { Id = (UInt32Value)1U, Name = $"图片 {id}" };
+
+            Wp.NonVisualGraphicFrameDrawingProperties nonVisualGraphicFrameDrawingProperties1 = new Wp.NonVisualGraphicFrameDrawingProperties();
+
+            A.GraphicFrameLocks graphicFrameLocks1 = new A.GraphicFrameLocks() { NoChangeAspect = true };
+            graphicFrameLocks1.AddNamespaceDeclaration("a", "http://schemas.openxmlformats.org/drawingml/2006/main");
+
+            nonVisualGraphicFrameDrawingProperties1.Append(graphicFrameLocks1);
+
+            A.Graphic graphic1 = new A.Graphic();
+            graphic1.AddNamespaceDeclaration("a", "http://schemas.openxmlformats.org/drawingml/2006/main");
+
+            A.GraphicData graphicData1 = new A.GraphicData() { Uri = "http://schemas.openxmlformats.org/drawingml/2006/picture" };
+
+            Pic.Picture picture1 = new Pic.Picture();
+            picture1.AddNamespaceDeclaration("pic", "http://schemas.openxmlformats.org/drawingml/2006/picture");
+
+            Pic.NonVisualPictureProperties nonVisualPictureProperties1 = new Pic.NonVisualPictureProperties();
+            Pic.NonVisualDrawingProperties nonVisualDrawingProperties1 = new Pic.NonVisualDrawingProperties() { Id = (UInt32Value)1U, Name = "" };
+            Pic.NonVisualPictureDrawingProperties nonVisualPictureDrawingProperties1 = new Pic.NonVisualPictureDrawingProperties();
+
+            nonVisualPictureProperties1.Append(nonVisualDrawingProperties1);
+            nonVisualPictureProperties1.Append(nonVisualPictureDrawingProperties1);
+
+            Pic.BlipFill blipFill1 = new Pic.BlipFill();
+            A.Blip blip1 = new A.Blip() { Embed = $"rId{id}" };
+
+            A.Stretch stretch1 = new A.Stretch();
+            A.FillRectangle fillRectangle1 = new A.FillRectangle();
+
+            stretch1.Append(fillRectangle1);
+
+            blipFill1.Append(blip1);
+            blipFill1.Append(stretch1);
+
+            Pic.ShapeProperties shapeProperties1 = new Pic.ShapeProperties();
+
+            A.Transform2D transform2D1 = new A.Transform2D();
+            A.Offset offset1 = new A.Offset() { X = 0L, Y = 0L };
+            A.Extents extents1 = new A.Extents() { Cx = 1104900L, Cy = 1047750L };
+
+            transform2D1.Append(offset1);
+            transform2D1.Append(extents1);
+
+            A.PresetGeometry presetGeometry1 = new A.PresetGeometry() { Preset = A.ShapeTypeValues.Rectangle };
+            A.AdjustValueList adjustValueList1 = new A.AdjustValueList();
+
+            presetGeometry1.Append(adjustValueList1);
+
+            shapeProperties1.Append(transform2D1);
+            shapeProperties1.Append(presetGeometry1);
+
+            picture1.Append(nonVisualPictureProperties1);
+            picture1.Append(blipFill1);
+            picture1.Append(shapeProperties1);
+
+            graphicData1.Append(picture1);
+
+            graphic1.Append(graphicData1);
+
+            inline1.Append(extent1);
+            inline1.Append(effectExtent1);
+            inline1.Append(docProperties1);
+            inline1.Append(nonVisualGraphicFrameDrawingProperties1);
+            inline1.Append(graphic1);
+
+            drawing1.Append(inline1);
+
+            run1.Append(runProperties1);
+            run1.Append(drawing1);
+
+            return run1;
+        }
     }
 }

md2docx/md2docx.cs

@@ -187,12 +187,11 @@ private static void GenerateCoverImage(ImagePart imagePart1)
         /// </summary>
         /// <param name="rp">Current Run Properties, because special style may be nesting so we need keep it</param>
         /// <param name="inline">Current Inline element</param>
-        /// <param name="docPara">In which we append out text</param>
-        private static void CovertMDInlines(RunProperties rp, IList<MarkdownInline> inlines, ref Paragraph docPara)
+        /// <param name="paragraph">In which we append out text</param>
+        private static void CovertMDInlines(RunProperties rp, IList<MarkdownInline> inlines, ref Paragraph paragraph,ref List<Paragraph> paragraphs)
         {
             foreach(MarkdownInline inline in inlines)
             {
-
                 switch (inline)
                 {
                     case TextRunInline mtxt:
@@ -201,7 +200,7 @@ private static void CovertMDInlines(RunProperties rp, IList<MarkdownInline> inli
                         Text dtext = new Text { Text = mtxt.Text, Space = SpaceProcessingModeValues.Preserve };
                         trun.Append(newtrp);
                         trun.Append(dtext);
-                        docPara.Append(trun);
+                        paragraph.Append(trun);
                         break;
                     case CodeInline mcode:
                         RunProperties newcrp = (RunProperties)rp.Clone();
@@ -210,34 +209,51 @@ private static void CovertMDInlines(RunProperties rp, IList<MarkdownInline> inli
                         Text dcode = new Text { Text = mcode.Text };
                         crun.Append(newcrp);
                         crun.Append(dcode);
-                        docPara.Append(crun);
+                        paragraph.Append(crun);
                         break;
                     case BoldTextInline bd:
                         RunProperties newbrp = (RunProperties)rp.Clone();
                         newbrp.Bold = new Bold();
                         newbrp.BoldComplexScript = new BoldComplexScript();
-                        CovertMDInlines(newbrp, bd.Inlines, ref docPara);
+                        CovertMDInlines(newbrp, bd.Inlines, ref paragraph, ref paragraphs);
                         break;
                     case ItalicTextInline it:
                         RunProperties newirp = (RunProperties)rp.Clone();
                         newirp.Italic = new Italic();
                         newirp.ItalicComplexScript = new ItalicComplexScript();
-                        CovertMDInlines(newirp, it.Inlines, ref docPara);
+                        CovertMDInlines(newirp, it.Inlines, ref paragraph, ref paragraphs);
                         break;
                     case StrikethroughTextInline st:
                         RunProperties newstrp = (RunProperties)rp.Clone();
                         newstrp.Strike = new Strike();
-                        CovertMDInlines(newstrp, st.Inlines, ref docPara);
+                        CovertMDInlines(newstrp, st.Inlines, ref paragraph, ref paragraphs);
                         break;
                     case SubscriptTextInline sb:
                         RunProperties newsbrp = (RunProperties)rp.Clone();
                         newsbrp.VerticalTextAlignment = new VerticalTextAlignment() { Val = VerticalPositionValues.Subscript };
-                        CovertMDInlines(newsbrp, sb.Inlines, ref docPara);
+                        CovertMDInlines(newsbrp, sb.Inlines, ref paragraph, ref paragraphs);
                         break;
                     case SuperscriptTextInline sp:
                         RunProperties newsprp = (RunProperties)rp.Clone();
                         newsprp.VerticalTextAlignment = new VerticalTextAlignment() { Val = VerticalPositionValues.Superscript };
-                        CovertMDInlines(newsprp, sp.Inlines, ref docPara);
+                        CovertMDInlines(newsprp, sp.Inlines, ref paragraph, ref paragraphs);
+                        break;
+                    case ImageInline img:
+                        ParagraphProperties newpp = (ParagraphProperties)paragraph.ParagraphProperties.Clone();
+                        paragraphs.Add(paragraph);
+                        paragraph = new Paragraph
+                        {
+                            ParagraphProperties = new ParagraphProperties
+                            {
+                                ParagraphStyleId = new ParagraphStyleId { Val = "Image Title" }
+                            }
+                        };
+                        Run run = new Run();
+                        Text txt = new Text { Text = img.Tooltip, Space = SpaceProcessingModeValues.Preserve };
+                        run.Append(txt);
+                        paragraph.Append(run);
+                        paragraphs.Add(paragraph);
+                        paragraph = new Paragraph { ParagraphProperties = newpp };
                         break;
                     default:
                         Console.WriteLine(inline.ToString());
@@ -251,31 +267,32 @@ private static void CovertMDInlines(RunProperties rp, IList<MarkdownInline> inli
         /// </summary>
         /// <param name="block">Paragraph block, when block is not paragraph block, it throw a exception</param>
         /// <param name="docBody">In which we append our text</param>
-        private static void CovertQuoteRefer(MarkdownBlock block, ref Body docBody)
+        private static List<Paragraph> CovertQuoteRefer(QuoteBlock refer)
         {
-            if (!(block is ParagraphBlock))
-            {
-                throw new Exception($"Rendering {block.GetType()} in reference in quote not support");
-            }
-            Paragraph docPara = new Paragraph
+            List<Paragraph> paragraphs = new List<Paragraph>();
+
+            foreach (MarkdownBlock block in refer.Blocks)
             {
-                ParagraphProperties = new ParagraphProperties
+
+                if (!(block is ParagraphBlock))
                 {
-                    ParagraphStyleId = new ParagraphStyleId { Val = correspondecs["引用"] }
+                    throw new Exception($"Rendering {block.GetType()} in reference in quote not support");
                 }
-            };
-            Run run = new Run
-            {
-                RunProperties = new RunProperties()
-            };
-            Text txt = new Text
-            {
-                Text = block.ToString(),
-                Space = SpaceProcessingModeValues.Preserve
-            };
-            run.Append(txt);
-            docPara.Append(run);
-            docBody.Append(docPara);
+                Paragraph paragraph = new Paragraph
+                {
+                    ParagraphProperties = new ParagraphProperties
+                    {
+                        ParagraphStyleId = new ParagraphStyleId { Val = correspondecs["引用"] }
+                    }
+                };
+                Run run = new Run { RunProperties = new RunProperties() };
+                Text txt = new Text { Text = block.ToString(), Space = SpaceProcessingModeValues.Preserve };
+                run.Append(txt);
+                paragraph.Append(run);
+                paragraphs.Add(paragraph);
+            }
+
+            return paragraphs;
         }
 
         private static List<Paragraph> CovertCodeBlock(CodeBlock code)
@@ -314,8 +331,12 @@ private static void CovertMarkdownBlock(MarkdownBlock block, ref Body docBody)
                         ParagraphStyleId = new ParagraphStyleId { Val = correspondecs["正文"] }
                     }
                 };
-                CovertMDInlines(new RunProperties(), mpara.Inlines, ref docPara);
-                docBody.Append(docPara);
+                List<Paragraph> paragraphs = new List<Paragraph>();
+                CovertMDInlines(new RunProperties(), mpara.Inlines, ref docPara, ref paragraphs);
+                foreach (Paragraph paragraph in paragraphs)
+                {
+                    docBody.Append(paragraph);
+                }
             }
             else if (block is CodeBlock mcode)
             {
@@ -328,6 +349,7 @@ private static void CovertMarkdownBlock(MarkdownBlock block, ref Body docBody)
             else if (block is HeaderBlock mhead)
             {
                 Paragraph docPara = new Paragraph { ParagraphProperties = new ParagraphProperties() };
+                List<Paragraph> paragraphs = new List<Paragraph>();
                 switch (mhead.HeaderLevel)
                 {
                     case int i when i < 10:
@@ -336,14 +358,19 @@ private static void CovertMarkdownBlock(MarkdownBlock block, ref Body docBody)
                     default:
                         throw new Exception($"Rendering {block.GetType()} not implement yet");
                 }
-                CovertMDInlines(new RunProperties(), mhead.Inlines, ref docPara);
-                docBody.Append(docPara);
+                CovertMDInlines(new RunProperties(), mhead.Inlines, ref docPara, ref paragraphs);
+                paragraphs.Add(docPara);
+                foreach (Paragraph paragraph in paragraphs)
+                {
+                    docBody.Append(paragraph);
+                }
             }
             else if (block is QuoteBlock refer)
             {
-                foreach (var e in refer.Blocks)
+                List<Paragraph> paragraphs = CovertQuoteRefer(refer);
+                foreach (Paragraph paragraph in paragraphs)
                 {
-                    CovertQuoteRefer(e, ref docBody);
+                    docBody.Append(paragraph);
                 }
             }
             else if (!(block is YamlHeaderBlock))