[Libreoffice-commits] core.git: writerfilter/CustomTarget_source.mk writerfilter/source
Miklos Vajna
vmiklos at collabora.co.uk
Wed Jun 11 00:17:22 PDT 2014
writerfilter/CustomTarget_source.mk | 6 -
writerfilter/source/ooxml/gperffasttokenhandler.py | 50 ++++++++++++
writerfilter/source/ooxml/gperffasttokenhandler.xsl | 83 --------------------
3 files changed, 53 insertions(+), 86 deletions(-)
New commits:
commit dd5dfc8e2a0fc3c0307c0a782ae563b79ba8a84e
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Jun 11 09:06:23 2014 +0200
writerfilter: convert gperffasttokenhandler to Python
Change-Id: I56ae09cb89da7d078f64906e15677de58296c119
diff --git a/writerfilter/CustomTarget_source.mk b/writerfilter/CustomTarget_source.mk
index c4ad0a4..e9cc479 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -77,7 +77,7 @@ writerfilter_SRC_ooxml_Analyze_model_xsl=$(writerfilter_SRC)/ooxml/analyzemodel.
writerfilter_SRC_ooxml_FactoryTools_xsl=$(writerfilter_SRC)/ooxml/factorytools.xsl
writerfilter_SRC_ooxml_FactoryValues_xsl=$(writerfilter_SRC)/ooxml/factory_values.xsl
writerfilter_SRC_ooxml_FastTokens_py=$(writerfilter_SRC)/ooxml/fasttokens.py
-writerfilter_SRC_ooxml_GperfFastTokenHandler_xsl=$(writerfilter_SRC)/ooxml/gperffasttokenhandler.xsl
+writerfilter_SRC_ooxml_GperfFastTokenHandler_py=$(writerfilter_SRC)/ooxml/gperffasttokenhandler.py
writerfilter_SRC_ooxml_Model=$(writerfilter_SRC)/ooxml/model.xml
writerfilter_SRC_ooxml_NamespaceIds_xsl=$(writerfilter_SRC)/ooxml/namespaceids.xsl
writerfilter_SRC_ooxml_Preprocess_xsl=$(writerfilter_SRC)/ooxml/modelpreprocess.xsl
@@ -100,9 +100,9 @@ $(writerfilter_GEN_ooxml_FastTokens_hxx) : $(writerfilter_SRC_ooxml_FastTokens_p
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $(writerfilter_SRC_ooxml_FastTokens_py) $(writerfilter_GEN_ooxml_Token_xml)) > $@
-$(writerfilter_GEN_ooxml_GperfFastToken_hxx) : $(writerfilter_SRC_ooxml_GperfFastTokenHandler_xsl) $(writerfilter_GEN_ooxml_Token_xml)
+$(writerfilter_GEN_ooxml_GperfFastToken_hxx) : $(writerfilter_SRC_ooxml_GperfFastTokenHandler_py) $(writerfilter_GEN_ooxml_Token_xml)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,GPF,1)
- $(call gb_Helper_abbreviate_dirs, $(writerfilter_XSLTCOMMAND) $(writerfilter_SRC_ooxml_GperfFastTokenHandler_xsl) $(writerfilter_GEN_ooxml_Token_xml)) \
+ $(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $(writerfilter_SRC_ooxml_GperfFastTokenHandler_py) $(writerfilter_GEN_ooxml_Token_xml)) \
| tr -d '\r' | $(GPERF) -c -E -G -I -LC++ -S1 -t > $@
$(writerfilter_GEN_ooxml_Model_analyzed) : $(writerfilter_SRC_ooxml_Analyze_model_xsl) $(writerfilter_SRC_ooxml_Model) | $(writerfilter_WORK)/ooxml/.dir
diff --git a/writerfilter/source/ooxml/gperffasttokenhandler.py b/writerfilter/source/ooxml/gperffasttokenhandler.py
new file mode 100644
index 0000000..103a944
--- /dev/null
+++ b/writerfilter/source/ooxml/gperffasttokenhandler.py
@@ -0,0 +1,50 @@
+#!/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.inFasttoken = False
+
+ def startElement(self, name, attrs):
+ if name == "fasttoken":
+ self.inFasttoken = True
+
+ def endElement(self, name):
+ if name == "fasttoken":
+ self.inFasttoken = False
+
+ def characters(self, characters):
+ if self.inFasttoken:
+ token = characters.replace('-', '_')
+ print("%s, OOXML_%s" % (token, token))
+
+print("""
+%{
+#include "ooxml/OOXMLFastTokens.hxx"
+
+namespace writerfilter { namespace ooxml { namespace tokenmap {
+%}
+struct token { const char * name; Token_t nToken; };
+%%""")
+
+parser = xml.sax.make_parser()
+parser.setContentHandler(ContentHandler())
+parser.parse(sys.argv[1])
+
+print("""FAST_TOKENS_END, OOXML_FAST_TOKENS_END
+%%
+
+}}}""")
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/writerfilter/source/ooxml/gperffasttokenhandler.xsl b/writerfilter/source/ooxml/gperffasttokenhandler.xsl
deleted file mode 100644
index 15a36ec..0000000
--- a/writerfilter/source/ooxml/gperffasttokenhandler.xsl
+++ /dev/null
@@ -1,83 +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 input for gperf to genreate hash map for OOXMLFastTokenHandler
- -->
- <xsl:template name="gperfinputfasttokenhandler">
- <xsl:text>
-%{
-#include "ooxml/OOXMLFastTokens.hxx"
-
-namespace writerfilter { namespace ooxml { namespace tokenmap {
-%}
-struct token { const char * name; Token_t nToken; };
-%%</xsl:text>
- <xsl:for-each select="/model/fasttoken">
- <xsl:text>
</xsl:text>
- <xsl:value-of select="translate(., '-', '_')"/>
- <xsl:text>, OOXML_</xsl:text>
- <xsl:value-of select="translate(., '-', '_')"/>
- </xsl:for-each>
- <xsl:text>
-FAST_TOKENS_END, OOXML_FAST_TOKENS_END
-%%
</xsl:text>
-}}}
</xsl:template>
-
- <xsl:template match="/">
- <xsl:call-template name="gperfinputfasttokenhandler"/>
- </xsl:template>
-
-</xsl:stylesheet>
\ No newline at end of file
More information about the Libreoffice-commits
mailing list