Merge

Feature/docbuilder

Common/3dParty/v8/fetch.bat

@@ -5,6 +5,9 @@ if exist "depot_tools" (
 	echo "depot_tools already fetched"
 ) else (
 	call git clone https://chromium.googlesource.com/chromium/tools/depot_tools.git
+	CD depot_tools
+	git reset --hard e29cf7cb78009c80b04ddeab04763e8d218937c2
+	CD ../
 	call powershell -File .\fix-depot_tools.ps1
 )
 

DesktopEditor/doctrenderer/docbuilder_p.h

@@ -546,6 +546,7 @@ namespace NSDoctRenderer
         std::wstring m_strFilePath;
 
         std::wstring m_strAllFonts;
+        bool m_bIsNotUseConfigAllFontsDir;
 
         std::wstring m_sTmpFolder;
         std::wstring m_sFileDir;
@@ -585,6 +586,8 @@ namespace NSDoctRenderer
 
             m_sGlobalVariable = "";
             m_bIsGlobalVariableUse = false;
+
+            m_bIsNotUseConfigAllFontsDir = false;
         }
 
         void Init()
@@ -634,7 +637,7 @@ namespace NSDoctRenderer
                         oNodes.GetAt(i, _node);
                         std::wstring strFilePath = _node.GetText();
 
-                        if (std::wstring::npos != strFilePath.find(L"AllFonts.js"))
+                        if (std::wstring::npos != strFilePath.find(L"AllFonts.js") && !m_bIsNotUseConfigAllFontsDir)
                         {
                             m_strAllFonts = strFilePath;
 
@@ -1717,6 +1720,11 @@ namespace NSDoctRenderer
             m_pInternal->m_bIsCacheScript = (std::wstring(value) == L"true");
         else if (sParam == "--save-use-only-names")
             m_pInternal->m_sFolderForSaveOnlyUseNames = std::wstring(value);
+        else if (sParam == "--all-fonts-path")
+        {
+            m_pInternal->m_strAllFonts = std::wstring(value);
+            m_pInternal->m_bIsNotUseConfigAllFontsDir = true;
+        }
         else if (sParam == "--argument")
         {
             std::wstring sArg(value);

Makefile

@@ -43,9 +43,11 @@ endif
 TARGET := $(PLATFORM)_$(ARCHITECTURE)
 
 LIBDIR := build/lib/$(TARGET)
+BINDIR := build/bin/$(TARGET)
 
 ALLFONTSGEN := build/bin/AllFontsGen/$(TARGET)$(EXEC_EXT)
-X2T := build/bin/$(TARGET)/x2t$(EXEC_EXT)
+X2T := $(BINDIR)/x2t$(EXEC_EXT)
+DOCBUILDER := $(BINDIR)/docbuilder$(EXEC_EXT)
 HTMLFILEINTERNAL := $(LIBDIR)/HtmlFileInternal$(EXEC_EXT)
 XLSFORMATLIB := $(LIBDIR)/$(LIB_PREFIX)XlsFormatLib$(LIB_EXT)
 ODFFILEWRITERLIB := $(LIBDIR)/$(LIB_PREFIX)OdfFileWriterLib$(LIB_EXT)
@@ -75,6 +77,7 @@ HUNSPELL := $(LIBDIR)/$(LIB_PREFIX)hunspell$(SHARED_EXT)
 
 TARGETS += $(ALLFONTSGEN)
 TARGETS += $(X2T)
+TARGETS += $(DOCBUILDER)
 TARGETS += $(HTMLFILEINTERNAL)
 TARGETS += $(XLSFORMATLIB)
 TARGETS += $(ODFFILEWRITERLIB)
@@ -105,6 +108,7 @@ TARGETS += $(HUNSPELL)
 X2T_PRO := $(abspath X2tConverter/build/Qt/X2tSLN.pro)
 HTMLFILEINTERNAL_PRO := $(abspath ../desktop-sdk/HtmlFile/Internal/Internal.pro)
 ALLFONTSGEN_PRO := $(abspath DesktopEditor/AllFontsGen/AllFontsGen.pro)
+DOCBUILDER_PRO := $(abspath ../core-ext/docbuilder/test_builder/docbuilder.pro)
 XLSFORMATLIB_PRO := $(abspath ASCOfficeXlsFile2/source/linux/XlsFormatLib.pro)
 ODFFILEWRITERLIB_PRO := $(abspath ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro)
 ODFFILEREADERLIB_PRO := $(abspath ASCOfficeOdfFile/linux/OdfFileReaderLib.pro)
@@ -157,6 +161,7 @@ HUNSPELL_PRO := $(abspath DesktopEditor/hunspell-1.3.3/src/qt/hunspell.pro)
 QT_PROJ += X2T
 QT_PROJ += HTMLFILEINTERNAL
 QT_PROJ += ALLFONTSGEN
+QT_PROJ += DOCBUILDER
 QT_PROJ += XLSFORMATLIB
 QT_PROJ += ODFFILEWRITERLIB
 QT_PROJ += ODFFILEREADERLIB
@@ -214,6 +219,8 @@ ALLFONTSGEN_DEP += $(GRAPHICS)
 ALLFONTSGEN_DEP += $(OFFICEUTILS)
 ALLFONTSGEN_DEP += $(UNICODECONVERTER)
 
+DOCBUILDER_DEP += $(DOCTRENDERER)
+
 HTMLFILE_DEP += $(UNICODECONVERTER)
 
 RTFFORMATLIB_DEP += $(UNICODECONVERTER)
@@ -271,7 +278,7 @@ bin: $(X2T) $(ALLFONTSGEN)
 
 lib: $(PDFWRITER) $(DOCTRENDERER) $(HTMLRENDERER) $(PDFREADER) $(DJVUFILE) $(XPSFILE) $(HTMLFILE) $(UNICODECONVERTER)
 
-ext: $(ASCDOCUMENTSCORE) $(HTMLFILEINTERNAL)
+ext: $(ASCDOCUMENTSCORE) $(HTMLFILEINTERNAL) $(DOCBUILDER)
 
 $(foreach proj, $(QT_PROJ), $(eval $(call build_proj_tmpl, $(proj))))
 
@@ -283,6 +290,8 @@ $(XPSFILE): $(XPSFILE_DEP)
 
 $(ALLFONTSGEN): $(ALLFONTSGEN_DEP)
 
+$(DOCBUILDER): $(DOCBUILDER_DEP)
+
 $(HTMLFILE): $(HTMLFILE_DEP)
 
 $(RTFFORMATLIB): $(RTFFORMATLIB_DEP)

X2tConverter/src/cextracttools.h

@@ -471,11 +471,13 @@ namespace NExtractTools
 						std::wstring sName = oXmlNode.GetName();
 						if(_T("m_oMailMergeSend") == sName)
 						{
+							RELEASEOBJECT(m_oMailMergeSend);
 							m_oMailMergeSend = new InputParamsMailMerge();
 							m_oMailMergeSend->FromXmlNode(oXmlNode);
 						}
 						else if(_T("m_oThumbnail") == sName)
 						{
+							RELEASEOBJECT(m_oThumbnail);
 							m_oThumbnail = new InputParamsThumbnail();
 							m_oThumbnail->FromXmlNode(oXmlNode);
 						}
@@ -485,49 +487,107 @@ namespace NExtractTools
 							if(oXmlNode.GetTextIfExist(sValue))
 							{
 								if(_T("m_sKey") == sName)
+								{
+									RELEASEOBJECT(m_sKey);
 									m_sKey = new std::wstring(sValue);
+								}
 								else if(_T("m_sFileFrom") == sName)
+								{
+									RELEASEOBJECT(m_sFileFrom);
 									m_sFileFrom = new std::wstring(sValue);
+								}
 								else if(_T("m_sFileTo") == sName)
+								{
+									RELEASEOBJECT(m_sFileTo);
 									m_sFileTo = new std::wstring(sValue);
+								}
 								else if(_T("m_nFormatFrom") == sName)
+								{
+									RELEASEOBJECT(m_nFormatFrom);
 									m_nFormatFrom = new int(XmlUtils::GetInteger(sValue));
+								}
 								else if(_T("m_nFormatTo") == sName)
+								{
+									RELEASEOBJECT(m_nFormatTo);
 									m_nFormatTo = new int(XmlUtils::GetInteger(sValue));
+								}
 								else if(_T("m_nCsvTxtEncoding") == sName)
+								{
+									RELEASEOBJECT(m_nCsvTxtEncoding);
 									m_nCsvTxtEncoding = new int(XmlUtils::GetInteger(sValue));
+								}
 								else if(_T("m_nCsvDelimiter") == sName)
+								{
+									RELEASEOBJECT(m_nCsvDelimiter);
 									m_nCsvDelimiter = new int(XmlUtils::GetInteger(sValue));
+								}
 								else if(_T("m_nCsvDelimiterChar") == sName)
+								{
+									RELEASEOBJECT(m_sCsvDelimiterChar);
 									m_sCsvDelimiterChar = new std::wstring(sValue);
+								}
 								else if(_T("m_bPaid") == sName)
+								{
+									RELEASEOBJECT(m_bPaid);
 									m_bPaid = new bool(XmlUtils::GetBoolean2(sValue));
+								}
 								else if(_T("m_bFromChanges") == sName)
+								{
+									RELEASEOBJECT(m_bFromChanges);
 									m_bFromChanges = new bool(XmlUtils::GetBoolean2(sValue));
+								}
 								else if(_T("m_sAllFontsPath") == sName)
+								{
+									RELEASEOBJECT(m_sAllFontsPath);
 									m_sAllFontsPath = new std::wstring(sValue);
+								}
 								else if(_T("m_sFontDir") == sName)
+								{
+									RELEASEOBJECT(m_sFontDir);
 									m_sFontDir = new std::wstring(sValue);
+								}
 								else if(_T("m_sThemeDir") == sName)
+								{
+									RELEASEOBJECT(m_sThemeDir);
 									m_sThemeDir = new std::wstring(sValue);
+								}
 								else if(_T("m_bDontSaveAdditional") == sName)
+								{
+									RELEASEOBJECT(m_bDontSaveAdditional);
 									m_bDontSaveAdditional = new bool(XmlUtils::GetBoolean2(sValue));
+								}
 								else if(_T("m_nDoctParams") == sName)
+								{
+									RELEASEOBJECT(m_nDoctParams);
 									m_nDoctParams = new int(XmlUtils::GetInteger(sValue));
+								}
 								else if(_T("m_sHtmlFileInternalPath") == sName)
+								{
+									RELEASEOBJECT(m_sHtmlFileInternalPath);
 									m_sHtmlFileInternalPath = new std::wstring(sValue);
+								}
 								else if(_T("m_sPassword") == sName)
+								{
+									RELEASEOBJECT(m_sPassword);
 									m_sPassword = new std::wstring(sValue);
+								}
 								else if(_T("m_sTempDir") == sName)
+								{
+									RELEASEOBJECT(m_sTempDir);
 									m_sTempDir = new std::wstring(sValue);
+								}
 								else if(_T("m_bIsNoBase64") == sName)
+								{
+									RELEASEOBJECT(m_bIsNoBase64);
 									m_bIsNoBase64 = new bool(XmlUtils::GetBoolean2(sValue));
+								}
 							}
 							else if(_T("m_nCsvDelimiterChar") == sName)
 							{
 								std::wstring sNil;
 								if (!oXmlNode.GetAttributeIfExist(L"xsi:nil", sNil))
 								{
+									RELEASEOBJECT(m_sCsvDelimiterChar);
 									m_sCsvDelimiterChar = new std::wstring(L"");
 								}
 							}

X2tConverter/src/main.cpp

@@ -104,33 +104,41 @@ static std::wstring utf8_to_unicode(const char *src)
 
         return getReturnErrorCode(AVS_FILEUTILS_ERROR_CONVERT_PARAMS);
     }
-    std::wstring sArg1, sExePath;
+	std::wstring sArg1, sArg2, sExePath;
 
 #if !defined(_WIN32) && !defined (_WIN64)
     sExePath    = utf8_to_unicode(argv [0]);
     sArg1       = utf8_to_unicode(argv [1]);
+	if (argc >= 3) sArg2   = utf8_to_unicode(argv [2]);
 #else
 	sExePath	= std::wstring(argv [0]);
     sArg1		= std::wstring(argv [1]);
+	if (argc >= 3) sArg2 = std::wstring(argv [2]);
 #endif
 
 	int result = 0;
     std::wstring sXmlExt = _T(".xml");
     if(sXmlExt == sArg1.substr(sArg1.length() - sXmlExt.length(), sXmlExt.length()))
 	{
-		result = NExtractTools::FromFile(sArg1);
+		NExtractTools::InputParams oInputParams;
+		if (oInputParams.FromXmlFile(sArg1) && (sArg2.empty() || oInputParams.FromXml(sArg2)))
+		{
+			result = NExtractTools::fromInputParams(oInputParams);
+		}
+		else
+		{
+			result = AVS_FILEUTILS_ERROR_CONVERT_PARAMS;
+		}
 	}
 	else
 	{
-		std::wstring sArg2, sArg3, sArg4, sArg5;
+		std::wstring sArg3, sArg4, sArg5;
 
 #if !defined(_WIN32) && !defined (_WIN64)
-		if (argc >= 3) sArg2   = utf8_to_unicode(argv [2]);
 		if (argc >= 4) sArg3   = utf8_to_unicode(argv [3]);
 		if (argc >= 5) sArg4   = utf8_to_unicode(argv [4]);
 		if (argc >= 6) sArg5   = utf8_to_unicode(argv [5]);
 #else
-		if (argc >= 3) sArg2 = std::wstring(argv [2]);
 		if (argc >= 4) sArg3 = std::wstring(argv [3]);
 		if (argc >= 5) sArg4 = std::wstring(argv [4]);
 		if (argc >= 6) sArg5 = std::wstring(argv [5]);