use external directory for fonts

DesktopEditor/doctrenderer/docbuilder_p.h

@@ -637,12 +637,20 @@ namespace NSDoctRenderer
                         oNodes.GetAt(i, _node);
                         std::wstring strFilePath = _node.GetText();
 
-                        if (std::wstring::npos != strFilePath.find(L"AllFonts.js") && !m_bIsNotUseConfigAllFontsDir)
+                        if (std::wstring::npos != strFilePath.find(L"AllFonts.js"))
                         {
-                            m_strAllFonts = strFilePath;
+                            if (!m_bIsNotUseConfigAllFontsDir)
+                            {
+                                m_strAllFonts = strFilePath;
 
-                            if (!NSFile::CFileBinary::Exists(m_strAllFonts) || NSFile::CFileBinary::Exists(sConfigDir + m_strAllFonts))
-                                m_strAllFonts = sConfigDir + m_strAllFonts;
+                                if (!NSFile::CFileBinary::Exists(m_strAllFonts) || NSFile::CFileBinary::Exists(sConfigDir + m_strAllFonts))
+                                    m_strAllFonts = sConfigDir + m_strAllFonts;
+                            }
+                            else
+                            {
+                                m_arrFiles.Add(m_strAllFonts);
+                                continue;
+                            }
                         }
 
                         if (NSFile::CFileBinary::Exists(strFilePath) && !NSFile::CFileBinary::Exists(sConfigDir + strFilePath))
@@ -947,9 +955,24 @@ namespace NSDoctRenderer
             oBuilder.WriteString(L"</m_sFileFrom><m_sFileTo>");
             oBuilder.WriteEncodeXmlString(m_sFileDir);
             oBuilder.WriteString(L"/Editor.bin</m_sFileTo><m_nFormatTo>8192</m_nFormatTo>");
-            oBuilder.WriteString(L"<m_sFontDir>");
-            oBuilder.WriteEncodeXmlString(m_sX2tPath + L"/sdkjs/common");
-            oBuilder.WriteString(L"</m_sFontDir>");
+
+            if (!m_bIsNotUseConfigAllFontsDir)
+            {
+                oBuilder.WriteString(L"<m_sFontDir>");
+                oBuilder.WriteEncodeXmlString(m_sX2tPath + L"/sdkjs/common");
+                oBuilder.WriteString(L"</m_sFontDir>");
+            }
+            else
+            {
+                oBuilder.WriteString(L"<m_sFontDir>");
+                oBuilder.WriteEncodeXmlString(NSCommon::GetDirectoryName(m_strAllFonts));
+                oBuilder.WriteString(L"</m_sFontDir>");
+
+                oBuilder.WriteString(L"<m_sAllFontsPath>");
+                oBuilder.WriteEncodeXmlString(m_strAllFonts);
+                oBuilder.WriteString(L"</m_sAllFontsPath>");
+            }
+
             oBuilder.WriteString(L"<m_bIsNoBase64>true</m_bIsNoBase64>");
             oBuilder.WriteString(L"<m_sThemeDir>./sdkjs/slide/themes</m_sThemeDir><m_bDontSaveAdditional>true</m_bDontSaveAdditional>");
             oBuilder.WriteString(params);
@@ -1147,9 +1170,23 @@ namespace NSDoctRenderer
             else
                 oBuilder.WriteString(L"</m_sThemeDir><m_bFromChanges>true</m_bFromChanges><m_bDontSaveAdditional>true</m_bDontSaveAdditional>");
             oBuilder.WriteString(L"<m_nCsvTxtEncoding>46</m_nCsvTxtEncoding><m_nCsvDelimiter>4</m_nCsvDelimiter>");
-            oBuilder.WriteString(L"<m_sFontDir>");
-            oBuilder.WriteEncodeXmlString(m_sX2tPath + L"/sdkjs/common");
-            oBuilder.WriteString(L"</m_sFontDir>");
+
+            if (!m_bIsNotUseConfigAllFontsDir)
+            {
+                oBuilder.WriteString(L"<m_sFontDir>");
+                oBuilder.WriteEncodeXmlString(m_sX2tPath + L"/sdkjs/common");
+                oBuilder.WriteString(L"</m_sFontDir>");
+            }
+            else
+            {
+                oBuilder.WriteString(L"<m_sFontDir>");
+                oBuilder.WriteEncodeXmlString(NSCommon::GetDirectoryName(m_strAllFonts));
+                oBuilder.WriteString(L"</m_sFontDir>");
+
+                oBuilder.WriteString(L"<m_sAllFontsPath>");
+                oBuilder.WriteEncodeXmlString(m_strAllFonts);
+                oBuilder.WriteString(L"</m_sAllFontsPath>");
+            }
 
             int nDoctRendererParam = 0;
             //if (true) // печать пдф (лист = страница)