文件处理

HTEXLib/DOCX/OpenXmlTool/WmlToHtmlConverter.cs

@@ -564,7 +564,7 @@ namespace OpenXmlPowerTools
 
                 return element.Elements().Select(e => ConvertToHtmlTransform(wordDoc, settings, e, false, currentMarginLeft));
             }
-
+           
             // Ignore element.
             return null;
         }
@@ -3080,7 +3080,7 @@ namespace OpenXmlPowerTools
         // It actually works, but is not recommended.
         private static readonly List<string> ImageContentTypes = new List<string>
         {
-            "image/png", "image/gif", "image/tiff", "image/jpeg","image/x-wmf"
+            "image/png", "image/gif", "image/tiff", "image/jpeg","image/x-wmf","image/x-emf","application/vnd.openxmlformats-officedocument.oleObject"
         };
 
 

HTEXLib/Translator/DOXC2HTMLTranslator.cs

@@ -54,6 +54,11 @@ namespace HTEXLib.Translator
                                 extension = "wmf";
                                 imageFormat = ImageFormat.Wmf;
                             }
+                            else if (extension.Equals("x-emf"))
+                            {
+                                extension = "emf";
+                                imageFormat = ImageFormat.Emf;
+                            }
 
                             if (imageFormat == null) return null;
                             string base64 = null;
@@ -68,6 +73,9 @@ namespace HTEXLib.Translator
                                     mimeType = "image/svg+xml";
                                     shaCode = ShaHashHelper.GetSHA1(new MemoryStream(buffer));
                                 }
+                               else if (extension.Equals("emf"))
+                                {
+                                }
                                 else
                                 {
                                     ImageFormat format = imageInfo.Bitmap.RawFormat;

HTEXLib/Translator/HTML2ITEMTranslator.cs

@@ -203,7 +203,7 @@ namespace HTEXLib.Translator
                 }
 
 
-                string optsHtml = Regex.Match(testInfo.question, optsRgex).Value.Replace(" ","");
+                string optsHtml = Regex.Match(testInfo.question, optsRgex).Value;
                 //HtmlDocument doc = new HtmlDocument(); +".*";
                 //doc.LoadHtml(optsHtml);
                 //optsHtml = doc.DocumentNode.InnerText;