writerfilter/CustomTarget_source.mk | 8 +-
writerfilter/source/ooxml/factory_values.py | 59 ++++++++++++++++++
writerfilter/source/ooxml/factory_values.xsl | 85 ---------------------------
3 files changed, 63 insertions(+), 89 deletions(-)
New commits:
commit 3b8ab58008fcbca3c581ef827e5af07eb72b23ee
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sun Jun 29 10:53:49 2014 +0200
writerfilter: convert factory_values to Python
Change-Id: I4dca13159a25ed137153c2a7a66ca4f87f612e87
diff --git a/writerfilter/CustomTarget_source.mk
b/writerfilter/CustomTarget_source.mk
index a52445b..39270a4 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -71,7 +71,7 @@
writerfilter_GEN_ooxml_QNameToStr_cxx=$(writerfilter_WORK)/ooxml/qnametostr.cxx
writerfilter_GEN_ooxml_ResourceIds_hxx=$(writerfilter_WORK)/ooxml/resourceids.hxx
writerfilter_GEN_ooxml_Token_xml=$(writerfilter_WORK)/ooxml/token.xml
writerfilter_SRC_ooxml_FactoryTools_xsl=$(writerfilter_SRC)/ooxml/factorytools.xsl
-writerfilter_SRC_ooxml_FactoryValues_xsl=$(writerfilter_SRC)/ooxml/factory_values.xsl
+writerfilter_SRC_ooxml_FactoryValues_py=$(writerfilter_SRC)/ooxml/factory_values.py
writerfilter_SRC_ooxml_FastTokens_py=$(writerfilter_SRC)/ooxml/fasttokens.py
writerfilter_SRC_ooxml_GperfFastTokenHandler_py=$(writerfilter_SRC)/ooxml/gperffasttokenhandler.py
writerfilter_SRC_ooxml_Model=$(writerfilter_SRC)/ooxml/model.xml
@@ -88,9 +88,9 @@ $(writerfilter_GEN_ooxml_Factory_hxx) :
$(writerfilter_SRC)/ooxml/factoryinc.py
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) $<
$(writerfilter_GEN_ooxml_Model_processed)) > $@
-$(writerfilter_GEN_ooxml_FactoryValues_hxx) :
$(writerfilter_SRC_ooxml_FactoryValues_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_FactoryValues_xsl)
$(writerfilter_GEN_ooxml_Model_processed)) > $@
+$(writerfilter_GEN_ooxml_FactoryValues_hxx) :
$(writerfilter_SRC_ooxml_FactoryValues_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_FactoryValues_py)
$(writerfilter_GEN_ooxml_Model_processed)) > $@
$(writerfilter_GEN_ooxml_FastTokens_hxx) :
$(writerfilter_SRC_ooxml_FastTokens_py) $(writerfilter_GEN_ooxml_Token_xml) |
$(writerfilter_WORK)/ooxml/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
diff --git a/writerfilter/source/ooxml/factory_values.py
b/writerfilter/source/ooxml/factory_values.py
new file mode 100644
index 0000000..1279e9d
--- /dev/null
+++ b/writerfilter/source/ooxml/factory_values.py
@@ -0,0 +1,59 @@
+#!/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 string
+import sys
+
+
+class ContentHandler(xml.sax.handler.ContentHandler):
+ def __init__(self):
+ self.inValue = False
+ self.defines = []
+ self.chars = []
+
+ def __escape(self, name):
+ return name.replace('-', 'm').replace('+', 'p').replace(' ',
'_').replace(',', '_')
+
+ def startDocument(self):
+ print('''
+#ifndef INCLUDED_FACTORY_VALUES
+#include <rtl/ustring.hxx>
+
+#define OOXMLValueString_ ""''')
+
+ def endDocument(self):
+ print("""
+#endif // INCLUDED_FACTORY_VALUES""")
+
+ def startElement(self, name, attrs):
+ if name == "value":
+ self.inValue = True
+
+ def endElement(self, name):
+ if name == "value":
+ self.inValue = False
+ characters = "".join(self.chars)
+ self.chars = []
+ if len(characters):
+ define = '#define OOXMLValueString_%s "%s"' %
(self.__escape(characters), characters)
+ if not define in self.defines:
+ self.defines.append(define)
+ print(define)
+
+ def characters(self, chars):
+ if self.inValue:
+ self.chars.append(chars)
+
+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/factory_values.xsl
b/writerfilter/source/ooxml/factory_values.xsl
deleted file mode 100644
index 5f76b22..0000000
--- a/writerfilter/source/ooxml/factory_values.xsl
+++ /dev/null
@@ -1,85 +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"/>
-
- <!--
- Generates constant declarations for attribute values.
- -->
- <xsl:template name="valueconstants">
- <xsl:text>#define </xsl:text>
- <xsl:call-template name="valuestringname">
- <xsl:with-param name="string"></xsl:with-param>
- </xsl:call-template>
- <xsl:text> ""
-</xsl:text>
- <xsl:for-each select="//rng:value[generate-id(key('value-with-content',
text())[1]) = generate-id(.)]">
- <xsl:text>#define </xsl:text>
- <xsl:call-template name="valuestringname">
- <xsl:with-param name="string" select="."/>
- </xsl:call-template>
- <xsl:text> "</xsl:text>
- <xsl:value-of select="."/>
- <xsl:text>"
-</xsl:text>
- </xsl:for-each>
- </xsl:template>
-
- <xsl:template match="/">
- <xsl:text>
-#ifndef INCLUDED_FACTORY_VALUES</xsl:text>
-#include <rtl/ustring.hxx>
-
-<xsl:call-template name="valueconstants"/>
-<xsl:text>
-#endif // INCLUDED_FACTORY_VALUES
</xsl:text>
- </xsl:template>
-</xsl:stylesheet>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
