Merge branch 'master' into importTextAsCurves

Author: janbender

AddinUtilities.cs

@@ -373,14 +373,14 @@ public static bool executePs2Pdf(LatexEquation equation)
             return true;
         }
 
-        public static bool createLatexPng(LatexEquation equation, bool usePreview, bool firstRun)
+        public static bool createLatexPng(LatexEquation equation, bool firstRun)
         {
             // Check paths
             SettingsManager mgr = SettingsManager.getCurrent();            
 
             string appPath = AddinUtilities.getAppDataLocation();
             Directory.SetCurrentDirectory(appPath);
-            LatexFileGenerator.writeTexFile(appPath + "\\teximport.tex", equation, usePreview);
+            LatexFileGenerator.writeTexFile(appPath + "\\teximport.tex", equation);
             if (!executeMikTex())
                 return false;
             if (!executeDviPng(equation, firstRun))
@@ -396,7 +396,7 @@ public static bool createLatexPdf(LatexEquation equation)
 
             string appPath = AddinUtilities.getAppDataLocation();
             Directory.SetCurrentDirectory(appPath);
-            LatexFileGenerator.writeTexFile(appPath + "\\teximport.tex", equation, false);
+            LatexFileGenerator.writeTexFile(appPath + "\\teximport.tex", equation);
             if (!executeMikTex())
                 return false;
             if (!executeDviPs(equation))

DockerUI.xaml.cs

@@ -38,7 +38,6 @@ public DockerUI(corel.Application app)
 
             AddinUtilities.initFonts();
             AddinUtilities.copyLatexTemplate("LatexTemplate.txt", Properties.Resources.LatexTemplate);
-            AddinUtilities.copyLatexTemplate("LatexInlineTemplate.txt", Properties.Resources.LatexInlineTemplate);
 
             m_dialog = new LatexDialog();
             SettingsManager mgr = SettingsManager.getCurrent();

Latex4CorelDraw.csproj

@@ -117,6 +117,7 @@
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
@@ -129,7 +130,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <None Include="Resources\Language.xml" />
-    <None Include="Resources\LatexInlineTemplate.txt" />
     <None Include="Resources\LatexTemplate.txt" />
     <Content Include="UserUI.xslt">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

LatexDialog.cs

@@ -231,13 +231,13 @@ private bool generateEquation(bool createShape)
             // Run once with preview to get depth value
             m_finishedSuccessfully = true;
             if (!createShape)
-                m_finishedSuccessfully = AddinUtilities.createLatexPng(m_latexEquation, true, true);            
+                m_finishedSuccessfully = AddinUtilities.createLatexPng(m_latexEquation, true);            
 
             if (m_finishedSuccessfully)
             {
                 // Run once without to get correct tight image
                 if (!createShape)
-                    m_finishedSuccessfully = AddinUtilities.createLatexPng(m_latexEquation, false, false);
+                    m_finishedSuccessfully = AddinUtilities.createLatexPng(m_latexEquation, false);
                 else
                 {
                     m_finishedSuccessfully = AddinUtilities.createLatexPdf(m_latexEquation);

LatexFileGenerator.cs

@@ -48,15 +48,11 @@ public LatexEquation(string latexCode, float fontSize, string textColor, LatexFo
     }
 
     public class LatexFileGenerator
-    {       
-        public static void writeTexFile(string fileName, LatexEquation equation, bool usePreview)
+    {
+        public static void writeTexFile(string fileName, LatexEquation equation)
         {
             string templateText = "";
-            string templateFileName;
-            if (usePreview)
-                templateFileName = AddinUtilities.getAppDataLocation() + "\\LatexInlineTemplate.txt";
-            else
-                templateFileName = AddinUtilities.getAppDataLocation() + "\\LatexTemplate.txt";
+            string templateFileName = AddinUtilities.getAppDataLocation() + "\\LatexTemplate.txt";
 
             // Use resource template, if no file exists
             if (!File.Exists(templateFileName))
@@ -83,76 +79,15 @@ public static void writeTexFile(string fileName, LatexEquation equation, bool us
             }
 
             string content = "";
-            if (usePreview)
-                content += "\\begin{preview}\n";
             content += "\\definecolor{txtcolor}{rgb}{" + equation.m_color + "}\n"; ;
             content += "\\color{txtcolor}\n";
             content += "\\changefont{" + equation.m_font.latexFontName + "}{" +
                                          equation.m_fontSeries.latexFontSeries + "}{" +
                                          equation.m_fontShape.latexFontShape + "}{" +
                                          equation.m_fontSize.ToString() + "}{" +
-                                         ((equation.m_fontSize*1.2)).ToString(System.Globalization.CultureInfo.InvariantCulture) + "}\n";
+                                         ((equation.m_fontSize * 1.2)).ToString(System.Globalization.CultureInfo.InvariantCulture) + "}\n";
             content += equation.m_code;
-            if (usePreview)
-                content += "\n\\end{preview}\n";
-
-            templateText = templateText.Replace("${Content}", content);
 
-            // Write Latex file
-            try
-            {
-                StreamWriter sw = File.CreateText(fileName);
-                sw.Write(templateText);
-                sw.Close();
-            }
-            catch (Exception ex)
-            {
-                MessageBox.Show("Exception: \n" + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
-        }
-
-
-        public static void writeTexFile(string fileName, List<LatexEquation> equations)
-        {
-            string templateText = "";
-            string templateFileName = AddinUtilities.getAppDataLocation() + "\\LatexInlineTemplate.txt";
-
-            // Use resource template, if no file exists
-            if (!File.Exists(templateFileName))
-            {
-                templateText = Properties.Resources.LatexInlineTemplate;
-            }
-            else  // Otherwise use the file
-            {
-                // Read template
-                try
-                {
-                    SettingsManager mgr = SettingsManager.getCurrent();
-
-                    StreamReader sr;
-                    sr = File.OpenText(templateFileName);
-                    templateText = sr.ReadToEnd();
-                    sr.Close();
-                }
-                catch (Exception ex)
-                {
-                    MessageBox.Show("Exception: \n" + ex.Message, "Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-
-            // Fill all equations in file
-            string content = "";
-            foreach (LatexEquation equation in equations)
-            {
-                content += "\\begin{preview}\n";
-                content += "\\definecolor{txtcolor}{rgb}{" + equation.m_color + "}\n"; ;
-                content += "\\color{txtcolor}\n";
-                content += "\\changefont{" + equation.m_font.latexFontName + "}{" +
-                                             equation.m_fontSeries.latexFontSeries + "}{" +
-                                             equation.m_fontShape.latexFontShape + "}\n";
-                content += equation.m_code;
-                content += "\n\\end{preview}\n";
-            }
             templateText = templateText.Replace("${Content}", content);
 
             // Write Latex file

Properties/Resources.Designer.cs

@@ -121,9 +121,6 @@
   <data name="Language" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Language.xml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>
-  <data name="LatexInlineTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\LatexInlineTemplate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
-  </data>
   <data name="LatexTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\LatexTemplate.txt;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;Windows-1252</value>
   </data>

Properties/Resources.resx

@@ -16,7 +16,8 @@ The included project file was made with Visual Studio 2015. You have to adapt th
 2. Right-click and open "Properties" for each DLL file in the folder. If you see the following text, you have to unblock the file:
 "Security: This file came from another computer and might be blocked to help protect this computer."
 3. Activate docker window "Latex" in the menu "Windows".
-4. If you have a better solution for step 2, write me an email ;-)
+4. Import once an arbitrary PS file manually and select import text as curves. This seems to be the only way that CorelDraw stores this option and there is no API functionality to do it. 
+5. If you have a better solution for step 2, write me an email ;-)
 
 ## Screenshots
 

README.md

@@ -1,5 +1,7 @@
-\documentclass[12pt,a4paper,ngerman]{article}
+\documentclass[12pt,a4paper]{article}
 \usepackage{amsmath} 
+\usepackage{amsfonts}
+\usepackage{amssymb}
 \usepackage[utf8]{inputenc} 
 \usepackage{bbm} 
 \usepackage{ae,aecompl}