writerfilter/CustomTarget_source.mk | 6 -
writerfilter/source/ooxml/factory_ns.py | 83 ++++++++++++++++
writerfilter/source/ooxml/factory_ns.xsl | 150 -----------------------------
writerfilter/source/ooxml/factorytools.xsl | 11 --
4 files changed, 86 insertions(+), 164 deletions(-)
New commits:
commit 3f2d6c7f7a6ef825b9431a3d270bc75b84069a32
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Jul 15 21:13:01 2014 +0200
writerfilter: convert factory_ns to Python
Change-Id: I64996b3f96f51ba80ade636c13a2919410672a27
diff --git a/writerfilter/CustomTarget_source.mk
b/writerfilter/CustomTarget_source.mk
index 9fdaf00..b84e235 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -125,9 +125,9 @@ $(writerfilter_WORK)/ooxml/OOXMLFactory%.cxx :
$(writerfilter_SRC)/ooxml/factory
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND)
--stringparam file $@ $< $(writerfilter_GEN_ooxml_Model_processed)) > $@
-$(writerfilter_WORK)/ooxml/OOXMLFactory%.hxx :
$(writerfilter_SRC)/ooxml/factory_ns.xsl
$(writerfilter_GEN_ooxml_Model_processed)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
- $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND)
--stringparam file $@ $< $(writerfilter_GEN_ooxml_Model_processed)) > $@
+$(writerfilter_WORK)/ooxml/OOXMLFactory%.hxx :
$(writerfilter_SRC)/ooxml/factory_ns.py
$(writerfilter_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
+ $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $<
$(writerfilter_GEN_ooxml_Model_processed) $@) > $@
$(call gb_CustomTarget_get_target,writerfilter/source) : $(writerfilter_ALL)
diff --git a/writerfilter/source/ooxml/factory_ns.py
b/writerfilter/source/ooxml/factory_ns.py
new file mode 100644
index 0000000..edd0718
--- /dev/null
+++ b/writerfilter/source/ooxml/factory_ns.py
@@ -0,0 +1,83 @@
+#!/usr/bin/env python
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+from __future__ import print_function
+from xml.dom import minidom
+import sys
+
+
+def createHeader(model, ns):
+ nsToken = ns.replace('-', '_')
+ print("""
+#ifndef INCLUDED_OOXML_FACTORY_%s_HXX
+#define INCLUDED_OOXML_FACTORY_%s_HXX
+#include "ooxml/OOXMLFactory.hxx"
+#include "OOXMLFactory_generated.hxx"
+#include "ooxml/OOXMLnamespaceids.hxx"
+#include "ooxml/resourceids.hxx"
+
+namespace writerfilter {
+namespace ooxml {
+
+/// @cond GENERATED
+""" % (nsToken.upper(), nsToken.upper()))
+
+ print("""class OOXMLFactory_%s : public OOXMLFactory_ns
+{
+public:
+ typedef boost::shared_ptr <OOXMLFactory_ns> Pointer_t;
+
+ static Pointer_t getInstance();
+
+ virtual AttributeToResourceMapPointer createAttributeToResourceMap(Id nId);
+ virtual ListValueMapPointer createListValueMap(Id nId);
+ virtual CreateElementMapPointer createCreateElementMap(Id nId);
+ virtual TokenToIdMapPointer createTokenToIdMap(Id nId);
+#ifdef DEBUG_DOMAINMAPPER
+ virtual string getDefineName(Id nId) const;
+#endif
+""" % nsToken)
+
+ actions = []
+ for nsNode in [i for i in model.getElementsByTagName("namespace") if
i.getAttribute("name") == ns]:
+ for resource in nsNode.getElementsByTagName("resource"):
+ for action in [i.getAttribute("name") for i in resource.childNodes
if i.nodeType == minidom.Node.ELEMENT_NODE and i.tagName == "action"]:
+ if action != "characters" and action not in actions:
+ actions.append(action)
+ for action in actions:
+ print(" void %sAction(OOXMLFastContextHandler* pHandler);" % action)
+
+ print("""virtual void charactersAction(OOXMLFastContextHandler* pHandler,
const OUString & sText);
+ virtual void attributeAction(OOXMLFastContextHandler* pHandler, Token_t
nToken, OOXMLValue::Pointer_t pValue);
+
+#ifdef DEBUG_DOMAINMAPPER
+ virtual string getName() const;
+#endif
+
+
+ virtual ~OOXMLFactory_%s();
+
+protected:
+ static Pointer_t m_pInstance;
+
+ OOXMLFactory_%s();
+};
+""" % (nsToken, nsToken))
+
+ print("""/// @endcond
+}}
+#endif //INCLUDED_OOXML_FACTORY_%s_HXX""" % nsToken.upper())
+
+modelPath = sys.argv[1]
+filePath = sys.argv[2]
+model = minidom.parse(modelPath)
+ns = filePath.split('OOXMLFactory_')[1].split('.hxx')[0]
+createHeader(model, ns)
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/writerfilter/source/ooxml/factory_ns.xsl
b/writerfilter/source/ooxml/factory_ns.xsl
deleted file mode 100644
index 59a2940..0000000
--- a/writerfilter/source/ooxml/factory_ns.xsl
+++ /dev/null
@@ -1,150 +0,0 @@
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
--->
-<xsl:stylesheet
- version="1.0"
- xmlns:xsl="http://www.w3.org/1999/XSL/Transform";
- xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
- xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
- xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
- xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
- xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
- xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
- xmlns:xlink="http://www.w3.org/1999/xlink";
- xmlns:dc="http://purl.org/dc/elements/1.1/";
- xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
- xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
- xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
- xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
- xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
- xmlns:math="http://www.w3.org/1998/Math/MathML";
- xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
- xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
- xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
- xmlns:ooo="http://openoffice.org/2004/office";
- xmlns:ooow="http://openoffice.org/2004/writer";
- xmlns:oooc="http://openoffice.org/2004/calc";
- xmlns:dom="http://www.w3.org/2001/xml-events";
- xmlns:xforms="http://www.w3.org/2002/xforms";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
- xmlns:rng="http://relaxng.org/ns/structure/1.0";
- xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#";
- xmlns:UML = 'org.omg.xmi.namespace.UML' xml:space="default">
- <xsl:output method="text" />
- <xsl:param name="prefix"/>
-
- <xsl:include href="factorytools.xsl"/>
-
-<xsl:template name="factoryactiondecls">
- <xsl:variable name="ns" select="@name"/>
- <xsl:for-each select="resource/action[not(@name='characters')]">
- <xsl:sort select="@name"/>
- <xsl:if test="generate-id(key('actions',
@name)[ancestor::namespace/@name=$ns][1]) = generate-id(.)">
- <xsl:text>
- void </xsl:text>
- <xsl:value-of select="@name"/>
- <xsl:text>Action(OOXMLFastContextHandler * pHandler</xsl:text>
- <xsl:text>);</xsl:text>
- </xsl:if>
- </xsl:for-each>
- <xsl:text>
- virtual void charactersAction(OOXMLFastContextHandler * pHandler, const
OUString & sText);</xsl:text>
-</xsl:template>
-
-<!-- factorydecl -->
-<xsl:template name="factorydecl">
- <xsl:variable name="classname">
- <xsl:call-template name="factoryclassname"/>
- </xsl:variable>
- <xsl:text>
-class </xsl:text>
- <xsl:value-of select="$classname"/>
- <xsl:text> : public OOXMLFactory_ns
-{
-public:
- typedef boost::shared_ptr < OOXMLFactory_ns > Pointer_t;
-
- static Pointer_t getInstance();
-
- virtual AttributeToResourceMapPointer createAttributeToResourceMap(Id nId);
- virtual ListValueMapPointer createListValueMap(Id nId);
- virtual CreateElementMapPointer createCreateElementMap(Id nId);
- virtual TokenToIdMapPointer createTokenToIdMap(Id nId);
-#ifdef DEBUG_DOMAINMAPPER
- virtual string getDefineName(Id nId) const;</xsl:text>
-#endif
- <xsl:call-template name="factoryactiondecls"/>
- virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t
nToken, OOXMLValue::Pointer_t pValue);
-
-#ifdef DEBUG_DOMAINMAPPER
- virtual string getName() const;
-#endif
- <xsl:text>
-
- virtual ~</xsl:text>
- <xsl:value-of select="$classname"/>
- <xsl:text>();
-
-protected:
- static Pointer_t m_pInstance;
-
- </xsl:text>
- <xsl:value-of select="$classname"/>
- <xsl:text>();
-};
- </xsl:text>
-</xsl:template>
-
- <xsl:template match="/">
- <xsl:variable name="ns" select="substring-before(substring-after($file,
'OOXMLFactory_'), '.hxx')"/>
- <xsl:variable name="incguard">
- <xsl:text>INCLUDED_OOXML_FACTORY_</xsl:text>
- <xsl:value-of select="translate($ns, 'abcdefghijklmnopqrstuvwxyz-',
'ABCDEFGHIJKLMNOPQRSTUVWXYZ_')"/>
- <xsl:text>_HXX</xsl:text>
- </xsl:variable>
- <xsl:call-template name="licenseheader"/>
- <xsl:text>
-#ifndef </xsl:text>
- <xsl:value-of select="$incguard"/>
- <xsl:text>
-#define </xsl:text>
- <xsl:value-of select="$incguard"/>
- <xsl:text>
-#include "ooxml/OOXMLFactory.hxx"
-#include "OOXMLFactory_generated.hxx"
-#include "ooxml/OOXMLnamespaceids.hxx"
-#include "ooxml/resourceids.hxx"
-
-namespace writerfilter {
-namespace ooxml {
-
-/// @cond GENERATED
- </xsl:text>
- <xsl:for-each select="/model/namespace[@name=$ns]">
- <xsl:call-template name="factorydecl"/>
- </xsl:for-each>
- <xsl:text>
-/// @endcond
-}}
-#endif //</xsl:text>
- <xsl:value-of select="$incguard"/>
- <xsl:text>
</xsl:text>
-</xsl:template>
-
-</xsl:stylesheet>
diff --git a/writerfilter/source/ooxml/factorytools.xsl
b/writerfilter/source/ooxml/factorytools.xsl
index 337d258..e99669a 100644
--- a/writerfilter/source/ooxml/factorytools.xsl
+++ b/writerfilter/source/ooxml/factorytools.xsl
@@ -71,17 +71,6 @@
<xsl:key name="same-token-name" match="rng:element|rng:attribute"
use="@localname"/>
-<!-- license header -->
-<xsl:template name="licenseheader">
- <xsl:text>
-/*
-
- THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT!
-
-*/
-
</xsl:text>
-</xsl:template>
-
<!--
IDENTIFIERs
-->
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
