r22162 by jghali -

scribus-commit scribus-commit at lists.scribus.net
Fri Sep 22 00:16:09 UTC 2017 

Author: jghali
Date: Fri Sep 22 00:16:09 2017
New Revision: 22162

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=22162
Log:
#14995: add Zoner Draw/Callisto import (using libzmf) <dtardon>

Added:
    trunk/Scribus/scribus/plugins/import/zmf/
    trunk/Scribus/scribus/plugins/import/zmf/CMakeLists.txt
    trunk/Scribus/scribus/plugins/import/zmf/importzmf.cpp
    trunk/Scribus/scribus/plugins/import/zmf/importzmf.h
    trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.cpp
    trunk/Scribus/scribus/plugins/import/zmf/importzmfplugin.h
    trunk/Scribus/win32/msvc2015/zmfimport/
    trunk/Scribus/win32/msvc2015/zmfimport/zmfimport.vcxproj
    trunk/Scribus/win32/msvc2015/zmfimport/zmfimport.vcxproj.filters
Modified:
    trunk/Scribus/README
    trunk/Scribus/scribus/plugins/import/CMakeLists.txt
    trunk/Scribus/win32/msvc2015/Scribus-build-props.props
    trunk/Scribus/win32/msvc2015/Scribus.sln

Modified: trunk/Scribus/README
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22162&path=/trunk/Scribus/README
==============================================================================
--- trunk/Scribus/README	(original)
+++ trunk/Scribus/README	Fri Sep 22 00:16:09 2017
@@ -118,6 +118,7 @@
 - Xara Designer (XAR): Xara Designer (formerly known as Xara Xtreme) is known as one of the most powerful vector drawing programs. Its file format (XAR) is well-documented, and thanks to many contributions from professional Xara users, the Scribus Team has been able to create an excellent XAR filter, whose implementation resulted in the addition of many new features in Scribus.
 - XML Paper Specification (XPS, OXPS): XPS is an alternative to PDF originally developed by Microsoft and now maintained and updated by ECMA International. Scribus 1.5 can import both the original Microsoft version (XPS) and the modified versions as standardized by ECMA (OXPS).
 - XPress Tags (XTG): XTG is a format created by Quark to exchange text layouts between documents. Scribus 1.5 provides an import filter for XTG files created by Quark XPress, which works almost flawlessly. Note that XPress Tags is not identical to Xtags, which is an enhanced version of XPress Tags provided by a third party via an XPress plug-in. 
+- Zoner Draw/Callisto (ZMF): An importer for Zoner Draw files has been made possible by the creation of libzmf, wich is also used for Zoner Draw import into LibreOffice. It is supposed to import at least Zoner Draw versions 4–5.
 
 ==PDF Features==
 

Modified: trunk/Scribus/scribus/plugins/import/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22162&path=/trunk/Scribus/scribus/plugins/import/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/import/CMakeLists.txt	Fri Sep 22 00:16:09 2017
@@ -1,33 +1,34 @@
-add_subdirectory(ai)
-add_subdirectory(cdr)
-add_subdirectory(cgm)
-add_subdirectory(cvg)
-add_subdirectory(drw)
-add_subdirectory(emf)
-add_subdirectory(fh)
-add_subdirectory(idml)
-add_subdirectory(odg)
-add_subdirectory(oodraw)
-add_subdirectory(pages)
-add_subdirectory(pct)
-if(HAVE_POPPLER)
-	add_subdirectory(pdf)
-else()
-	add_subdirectory(ps)
-endif()
-# add_subdirectory(pgs)
-# add_subdirectory(ppp)
-add_subdirectory(pm)
-add_subdirectory(pub)
-add_subdirectory(shape)
-add_subdirectory(sml)
-add_subdirectory(svg)
-add_subdirectory(svm)
-add_subdirectory(uniconvertor)
-add_subdirectory(viva)
-add_subdirectory(vsd)
-add_subdirectory(wmf)
-add_subdirectory(wpg)
-add_subdirectory(xar)
-add_subdirectory(xfig)
-add_subdirectory(xps)
+add_subdirectory(ai)
+add_subdirectory(cdr)
+add_subdirectory(cgm)
+add_subdirectory(cvg)
+add_subdirectory(drw)
+add_subdirectory(emf)
+add_subdirectory(fh)
+add_subdirectory(idml)
+add_subdirectory(odg)
+add_subdirectory(oodraw)
+add_subdirectory(pages)
+add_subdirectory(pct)
+if(HAVE_POPPLER)
+	add_subdirectory(pdf)
+else()
+	add_subdirectory(ps)
+endif()
+# add_subdirectory(pgs)
+# add_subdirectory(ppp)
+add_subdirectory(pm)
+add_subdirectory(pub)
+add_subdirectory(shape)
+add_subdirectory(sml)
+add_subdirectory(svg)
+add_subdirectory(svm)
+add_subdirectory(uniconvertor)
+add_subdirectory(viva)
+add_subdirectory(vsd)
+add_subdirectory(wmf)
+add_subdirectory(wpg)
+add_subdirectory(xar)
+add_subdirectory(xfig)
+add_subdirectory(xps)
+add_subdirectory(zmf)

Modified: trunk/Scribus/win32/msvc2015/Scribus-build-props.props
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22162&path=/trunk/Scribus/win32/msvc2015/Scribus-build-props.props
==============================================================================
--- trunk/Scribus/win32/msvc2015/Scribus-build-props.props	(original)
+++ trunk/Scribus/win32/msvc2015/Scribus-build-props.props	Fri Sep 22 00:16:09 2017
@@ -94,6 +94,12 @@
 	<LIBPAGEMAKER_LIB_DIR>$(LIBPAGEMAKER_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBPAGEMAKER_LIB_DIR>
 	<LIBPAGEMAKER_LIB Condition="'$(Configuration)' == 'Debug'">libpagemaker_d.lib</LIBPAGEMAKER_LIB>
 	<LIBPAGEMAKER_LIB Condition="'$(Configuration)' == 'Release'">libpagemaker.lib</LIBPAGEMAKER_LIB>
+	<!-- Libpng -->
+	<LIBPNG_DIR>$(SCRIBUS_LIB_ROOT)\libpng-1.6.32</LIBPNG_DIR>
+	<LIBPNG_INCLUDE_DIR>$(LIBPNG_DIR)</LIBPNG_INCLUDE_DIR>
+	<LIBPNG_LIB_DIR>$(LIBPNG_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBPNG_LIB_DIR>
+	<LIBPNG_LIB Condition="'$(Configuration)' == 'Debug'">libpng16_d.lib</LIBPNG_LIB>
+	<LIBPNG_LIB Condition="'$(Configuration)' == 'Release'">libpng16.lib</LIBPNG_LIB>
 	<!-- Librevenge -->
 	<LIBREVENGE_DIR>$(SCRIBUS_LIB_ROOT)\librevenge-0.0.4</LIBREVENGE_DIR>
 	<LIBREVENGE_INCLUDE_DIR>$(LIBREVENGE_DIR)\inc</LIBREVENGE_INCLUDE_DIR>
@@ -122,6 +128,11 @@
 	<LIBXML2_LIB_DIR>$(LIBXML2_DIR)\lib\$(Platform)-$(PlatformToolset)</LIBXML2_LIB_DIR>
 	<LIBXML2_LIB Condition="'$(Configuration)' == 'Debug'">libxml2_d.lib</LIBXML2_LIB>
 	<LIBXML2_LIB Condition="'$(Configuration)' == 'Release'">libxml2.lib</LIBXML2_LIB>
+	<!-- Libzmf -->
+    <LIBZMF_INCLUDE_DIR>$(SCRIBUS_LIB_ROOT)\libzmf-0.0.2\inc</LIBZMF_INCLUDE_DIR>
+	<LIBZMF_LIB_DIR>$(SCRIBUS_LIB_ROOT)\libzmf-0.0.2\lib\$(Platform)-$(PlatformToolset)</LIBZMF_LIB_DIR>
+    <LIBZMF_LIB Condition="'$(Configuration)' == 'Debug'">libzmf_d.lib</LIBZMF_LIB>
+    <LIBZMF_LIB Condition="'$(Configuration)' == 'Release'">libzmf.lib</LIBZMF_LIB>
 	<!-- OpenSSL -->
 	<OPENSSL_DIR>$(SCRIBUS_LIB_ROOT)\openssl-1.0.2l</OPENSSL_DIR>
 	<OPENSSL_INCLUDE_DIR>$(OPENSSL_DIR)\include</OPENSSL_INCLUDE_DIR>
@@ -135,7 +146,7 @@
 	<PODOFO_LIB Condition="'$(Configuration)' == 'Debug'">podofo_d.lib</PODOFO_LIB>
 	<PODOFO_LIB Condition="'$(Configuration)' == 'Release'">podofo.lib</PODOFO_LIB>
 	<!-- Poppler -->
-	<POPPLER_DIR>$(SCRIBUS_LIB_ROOT)\poppler-0.56.0</POPPLER_DIR>
+	<POPPLER_DIR>$(SCRIBUS_LIB_ROOT)\poppler-0.59.0</POPPLER_DIR>
 	<POPPLER_INCLUDE_DIR>$(POPPLER_DIR)\include</POPPLER_INCLUDE_DIR>
 	<POPPLER_LIB_DIR>$(POPPLER_DIR)\lib\$(Platform)-$(PlatformToolset)</POPPLER_LIB_DIR>
 	<POPPLER_LIB Condition="'$(Configuration)' == 'Debug'">poppler_staticD.lib</POPPLER_LIB>

Modified: trunk/Scribus/win32/msvc2015/Scribus.sln
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=22162&path=/trunk/Scribus/win32/msvc2015/Scribus.sln
==============================================================================
--- trunk/Scribus/win32/msvc2015/Scribus.sln	(original)
+++ trunk/Scribus/win32/msvc2015/Scribus.sln	Fri Sep 22 00:16:09 2017
@@ -348,6 +348,11 @@
 	ProjectSection(ProjectDependencies) = postProject
 		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
 		{6CC39EED-B1E2-4209-8F65-0E6242EE63E5} = {6CC39EED-B1E2-4209-8F65-0E6242EE63E5}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zmfimport", "zmfimport\zmfimport.vcxproj", "{2ED8F6D8-AB32-401F-B662-6F91A00849FC}"
+	ProjectSection(ProjectDependencies) = postProject
+		{B17FCD80-7978-4544-93C4-2FE1AC6FE9F3} = {B17FCD80-7978-4544-93C4-2FE1AC6FE9F3}
 	EndProjectSection
 EndProject
 Global
@@ -918,6 +923,14 @@
 		{0BD408F0-C2D5-4DAF-AA82-99F406884BA9}.Release|Win32.Build.0 = Release|Win32
 		{0BD408F0-C2D5-4DAF-AA82-99F406884BA9}.Release|x64.ActiveCfg = Release|x64
 		{0BD408F0-C2D5-4DAF-AA82-99F406884BA9}.Release|x64.Build.0 = Release|x64
+		{2ED8F6D8-AB32-401F-B662-6F91A00849FC}.Debug|Win32.ActiveCfg = Debug|Win32
+		{2ED8F6D8-AB32-401F-B662-6F91A00849FC}.Debug|Win32.Build.0 = Debug|Win32
+		{2ED8F6D8-AB32-401F-B662-6F91A00849FC}.Debug|x64.ActiveCfg = Debug|x64
+		{2ED8F6D8-AB32-401F-B662-6F91A00849FC}.Debug|x64.Build.0 = Debug|x64
+		{2ED8F6D8-AB32-401F-B662-6F91A00849FC}.Release|Win32.ActiveCfg = Release|Win32
+		{2ED8F6D8-AB32-401F-B662-6F91A00849FC}.Release|Win32.Build.0 = Release|Win32
+		{2ED8F6D8-AB32-401F-B662-6F91A00849FC}.Release|x64.ActiveCfg = Release|x64
+		{2ED8F6D8-AB32-401F-B662-6F91A00849FC}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

More information about the scribus-commit mailing list