writerfilter/CustomTarget_source.mk | 8 +-
writerfilter/source/ooxml/qnametostr.py | 54 +++++++++++++++++
writerfilter/source/ooxml/qnametostr.xsl | 94 -------------------------------
3 files changed, 58 insertions(+), 98 deletions(-)
New commits:
commit 483a36f49230f53b291ba1307c8a3ffcc24a3b12
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat Jul 5 11:04:48 2014 +0200
writerfilter: convert qnametostr to Python
Change-Id: Ie72afbb1a7d384386d3189dae8276444767aac53
diff --git a/writerfilter/CustomTarget_source.mk
b/writerfilter/CustomTarget_source.mk
index d991b47..a7413d0 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -77,7 +77,7 @@
writerfilter_SRC_ooxml_GperfFastTokenHandler_py=$(writerfilter_SRC)/ooxml/gperff
writerfilter_SRC_ooxml_Model=$(writerfilter_SRC)/ooxml/model.xml
writerfilter_SRC_ooxml_NamespaceIds_xsl=$(writerfilter_SRC)/ooxml/namespaceids.xsl
writerfilter_SRC_ooxml_Preprocess_py=$(writerfilter_SRC)/ooxml/modelpreprocess.py
-writerfilter_SRC_ooxml_QNameToStr_xsl=$(writerfilter_SRC)/ooxml/qnametostr.xsl
+writerfilter_SRC_ooxml_QNameToStr_py=$(writerfilter_SRC)/ooxml/qnametostr.py
writerfilter_SRC_ooxml_ResourceIds_py=$(writerfilter_SRC)/ooxml/resourceids.py
$(writerfilter_GEN_ooxml_Factory_cxx) :
$(writerfilter_SRC)/ooxml/factoryimpl.xsl
$(writerfilter_GEN_ooxml_Model_processed)
@@ -109,9 +109,9 @@ $(writerfilter_GEN_ooxml_NamespaceIds_hxx) :
$(writerfilter_SRC_ooxml_NamespaceI
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND)
$(writerfilter_SRC_ooxml_NamespaceIds_xsl)
$(writerfilter_GEN_ooxml_Model_processed)) > $@
-$(writerfilter_GEN_ooxml_QNameToStr_cxx):
$(writerfilter_SRC_ooxml_QNameToStr_xsl)
$(writerfilter_SRC_ooxml_FactoryTools_xsl)
$(writerfilter_GEN_ooxml_Model_processed)
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,XSL,1)
- $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND)
$(writerfilter_SRC_ooxml_QNameToStr_xsl)
$(writerfilter_GEN_ooxml_Model_processed)) > $@
+$(writerfilter_GEN_ooxml_QNameToStr_cxx):
$(writerfilter_SRC_ooxml_QNameToStr_py)
$(writerfilter_GEN_ooxml_Model_processed)
+ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
+ $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND)
$(writerfilter_SRC_ooxml_QNameToStr_py)
$(writerfilter_GEN_ooxml_Model_processed)) > $@
$(writerfilter_GEN_ooxml_ResourceIds_hxx) :
$(writerfilter_SRC_ooxml_ResourceIds_py)
$(writerfilter_GEN_ooxml_Model_processed) | $(writerfilter_WORK)/ooxml/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
diff --git a/writerfilter/source/ooxml/qnametostr.py
b/writerfilter/source/ooxml/qnametostr.py
new file mode 100644
index 0000000..520f135
--- /dev/null
+++ b/writerfilter/source/ooxml/qnametostr.py
@@ -0,0 +1,54 @@
+#!/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
+import xml.sax
+import sys
+
+
+class ContentHandler(xml.sax.handler.ContentHandler):
+ def __init__(self):
+ self.tokens = []
+
+ def startDocument(self):
+ print("""
+#include "ooxml/resourceids.hxx"
+#include "resourcemodel/QNameToString.hxx"
+
+namespace writerfilter
+{
+
+void QNameToString::init_ooxml()
+{
+#ifdef DEBUG_DOMAINMAPPER
+ /* ooxml */
+""")
+
+ def endDocument(self):
+ print("""#endif
+}
+
+}
+""")
+
+ def startElement(self, name, attrs):
+ pass
+ for k, v in list(attrs.items()):
+ if k == "tokenid":
+ if v.startswith("ooxml:"):
+ token = v.replace('ooxml:', '')
+ if token not in self.tokens:
+ print(""" mMap[NS_ooxml::LN_%s] = "ooxml:%s";""" %
(token, token))
+ self.tokens.append(token)
+
+parser = xml.sax.make_parser()
+parser.setContentHandler(ContentHandler())
+parser.parse(sys.argv[1])
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/writerfilter/source/ooxml/qnametostr.xsl
b/writerfilter/source/ooxml/qnametostr.xsl
deleted file mode 100644
index 8aec26d..0000000
--- a/writerfilter/source/ooxml/qnametostr.xsl
+++ /dev/null
@@ -1,94 +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:xalan="http://xml.apache.org/xalan";
- xmlns:UML = 'org.omg.xmi.namespace.UML'
- exclude-result-prefixes = "xalan"
- xml:space="default">
- <xsl:output method="text" />
-
- <xsl:include href="factorytools.xsl"/>
-
- <!--
- Generates mapping from tokenids to strings. (DEBUG)
- -->
- <xsl:template name="qnametostr">
- <xsl:text>
-void QNameToString::init_ooxml()
-{
-#ifdef DEBUG_DOMAINMAPPER
- /* ooxml */
- </xsl:text>
- <xsl:for-each select="//@tokenid">
- <xsl:if test="generate-id(.) = generate-id(key('tokenids', .)[1]) and
contains(., 'ooxml:')">
- <xsl:text>
- mMap[</xsl:text>
- <xsl:call-template name="idtoqname">
- <xsl:with-param name="id" select="."/>
- </xsl:call-template>
- <xsl:text>] = "</xsl:text>
- <xsl:value-of select="."/>
- <xsl:text>";</xsl:text>
- </xsl:if>
- </xsl:for-each>
- <xsl:text>
-#endif
-}
- </xsl:text>
- </xsl:template>
-
- <xsl:template match="/">
-#include "ooxml/resourceids.hxx"
-#include "resourcemodel/QNameToString.hxx"
-
-namespace writerfilter
-{
- <xsl:call-template name="qnametostr"/>
-}
- </xsl:template>
-
-</xsl:stylesheet>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
