upload libetonyek 0.1.3

(cherry picked from commit ee3d40b3) Change-Id: I451f02ee93a798c9c1712082d59a7ff96b0d4a4e Reviewed-on: https://gerrit.libreoffice.org/16508Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>

upload libetonyek 0.1.3
(cherry picked from commit ee3d40b3) Change-Id: I451f02ee93a798c9c1712082d59a7ff96b0d4a4e Reviewed-on: https://gerrit.libreoffice.org/16508Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
60e38140 · David Tardon · Michael Stahl · b50c60e9 · 60e38140 · b50c60e9
Kaydet (Commit) 60e38140 authored Haz 02, 2015 tarafından David Tardon Kaydeden (comit) Michael Stahl Haz 26, 2015
18 changed files
--- a/download.lst
+++ b/download.lst
@@ -34,8 +34,8 @@ export DBGHELP_DLL := 13fbc2e8b37ddf28181dd6d8081c2b8e-dbghelp.dll
 export EBOOK_MD5SUM := 6b48eda57914e6343efebc9381027b78
 export EBOOK_TARBALL := libe-book-0.1.2.tar.bz2
 export EPM_TARBALL := 3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz
-export ETONYEK_MD5SUM := 1704a75df7621d8073b921f8b6506951
+export ETONYEK_MD5SUM := e5947373dd7834f27e93f1636faa419f
-export ETONYEK_VERSION_MICRO := 2
+export ETONYEK_VERSION_MICRO := 3
 export ETONYEK_TARBALL := libetonyek-0.1.$(ETONYEK_VERSION_MICRO).tar.bz2
 export EXPAT_TARBALL := dd7dab7a5fea97d2a6a43f511449b7cd-expat-2.1.0.tar.gz
 export FIREBIRD_MD5SUM := 21154d2004e025c8a3666625b0357bb5

--- a/external/libetonyek/0001-add-missing-breaks.patch.1
+++ b/external/libetonyek/0001-add-missing-breaks.patch.1
-From 54c63c653deb070c49621bea8acbc18f76118238 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Tue, 26 May 2015 16:56:56 +0200
-Subject: [PATCH 1/2] add missing breaks
-Change-Id: I6a6afd517e61aff89319348de5af3aa97093bd1d
---
- src/lib/KEY2Parser.cpp | 3 +++
- 1 file changed, 3 insertions(+)
-diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp
-index bb58efd..4ba70d2 100644
--- a/src/lib/KEY2Parser.cpp
-+++ b/src/lib/KEY2Parser.cpp
-@@ -261,8 +261,10 @@ void PointElement::attribute(const int name, const char *const value)
-   {
-   case IWORKToken::NS_URI_SFA | IWORKToken::x :
-     m_point.first = lexical_cast<double>(value);
-+    break;
-   case IWORKToken::NS_URI_SFA | IWORKToken::y :
-     m_point.second = lexical_cast<double>(value);
-+    break;
-   }
- }
-@@ -358,6 +360,7 @@ void PointPathElement::attribute(const int name, const char *const value)
-       ETONYEK_DEBUG_MSG(("unknown point path type: %s\n", value));
-       break;
-     }
-+    break;
-   }
-   default :
-     KEY2XMLElementContextBase::attribute(name, value);
-- 
-2.4.1
--- a/external/libetonyek/0001-add-missing-include.patch.1
+++ b/external/libetonyek/0001-add-missing-include.patch.1
+From 00f7e36ce2a3996ebef672561014ab101eee7f3a Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 25 Jun 2015 12:00:49 +0200
+Subject: [PATCH] add missing include
+Change-Id: I8bfcacb064b3d0f9d7d5db9d2f32108b0ceea792
+---
+ src/lib/IWORKTypes_fwd.h | 1 +
+ 1 file changed, 1 insertion(+)
+diff --git a/src/lib/IWORKTypes_fwd.h b/src/lib/IWORKTypes_fwd.h
+index f7a4fb2..1096df8 100644
+--- a/src/lib/IWORKTypes_fwd.h
+++ b/src/lib/IWORKTypes_fwd.h
+@@ -9,6 +9,7 @@
+ #ifndef IWORKTYPES_FWD_H_INCLUDED
+ #define IWORKTYPES_FWD_H_INCLUDED
+#include <deque>
+ #include <string>
+ #include <boost/shared_ptr.hpp>
+-- 
+2.4.2
--- a/external/libetonyek/0001-missing-include.patch.1
+++ b/external/libetonyek/0001-missing-include.patch.1
-From 3663b7b44646e1ed1218598aeb0bdf7326934029 Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Tue, 19 May 2015 18:44:53 +0200
-Subject: [PATCH] missing include
-Change-Id: Ie7a733b49a5b9a056671f4274b5194c3891569ae
---
- src/lib/IWORKText.cpp | 1 +
- 1 file changed, 1 insertion(+)
-diff --git a/src/lib/IWORKText.cpp b/src/lib/IWORKText.cpp
-index 3413ef3..c37b1bc 100644
--- a/src/lib/IWORKText.cpp
-+++ b/src/lib/IWORKText.cpp
-@@ -11,6 +11,7 @@
- #include <cassert>
- #include <string>
-+#include <vector>
- #include <boost/algorithm/string/classification.hpp>
- #include <boost/algorithm/string/predicate.hpp>
-- 
-2.4.0
--- a/external/libetonyek/0001-try-to-fix-build-on-Windows.patch.1
+++ b/external/libetonyek/0001-try-to-fix-build-on-Windows.patch.1
+From f7ca931e581f2d63f73bcd324da50f5ee3ae1f59 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Thu, 25 Jun 2015 18:09:17 +0200
+Subject: [PATCH] try to fix build on Windows
+Change-Id: Iff2aa943aef9c23c60e400f092f884fc00de4ccf
+---
+ src/lib/IWORKPath.cpp | 14 +-------------
+ 1 file changed, 1 insertion(+), 13 deletions(-)
+diff --git a/src/lib/IWORKPath.cpp b/src/lib/IWORKPath.cpp
+index 0600106..cb33097 100644
+--- a/src/lib/IWORKPath.cpp
+++ b/src/lib/IWORKPath.cpp
+@@ -266,18 +266,6 @@ void CurveTo::write(RVNGPropertyList &element) const
+ }
+-namespace
+-{
+-
+-void doAppendCurveTo(IWORKPath *const path, const std::vector<double> &points)
+-{
+-  assert(path);
+-  assert(points.size() == 6);
+-  path->appendCurveTo(points[0], points[1], points[2], points[3], points[4], points[5]);
+-}
+-
+-}
+-
+ IWORKPath::Element::~Element()
+ {
+ }
+@@ -301,7 +289,7 @@ IWORKPath::IWORKPath(const std::string &path)
+   const qi::rule<string::const_iterator, ascii::space_type> rule =
+     +(
+-      ('C' >> qi::repeat(6)[double_])[bind(&doAppendCurveTo, this, qi::_1)]
+      ('C' >> double_ >> double_ >> double_ >> double_ >> double_ >> double_)[bind(&IWORKPath::appendCurveTo, this, qi::_1, qi::_2, qi::_3, qi::_4, qi::_5, qi::_6)]
+       | ('M' >> double_ >> double_)[bind(&IWORKPath::appendMoveTo, this, qi::_1, qi::_2)]
+       | ('L' >> double_ >> double_)[bind(&IWORKPath::appendLineTo, this, qi::_1, qi::_2)]
+       | qi::char_('Z')[bind(&IWORKPath::appendClose, this)]
+-- 
+2.4.2
--- a/external/libetonyek/0002-remove-surplus-breaks.patch.1
+++ b/external/libetonyek/0002-remove-surplus-breaks.patch.1
-From 91d39222d9f120211c0189f69299898702a65d3d Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon@redhat.com>
-Date: Tue, 26 May 2015 17:01:22 +0200
-Subject: [PATCH 2/2] remove surplus breaks
-Change-Id: Ib98a4a5bcd7d9f9eb03874f0715b45bb141ef12d
---
- src/lib/KEY2Parser.cpp                  | 1 -
- src/lib/contexts/IWORKStylesContext.cpp | 1 -
- 2 files changed, 2 deletions(-)
-diff --git a/src/lib/KEY2Parser.cpp b/src/lib/KEY2Parser.cpp
-index 4ba70d2..9a37dcd 100644
--- a/src/lib/KEY2Parser.cpp
-+++ b/src/lib/KEY2Parser.cpp
-@@ -124,7 +124,6 @@ IWORKXMLContextPtr_t StylesContext::element(const int name)
-     return makeContext<KEY2StyleContext>(getState(), name);
-   case IWORKToken::NS_URI_SF | IWORKToken::layoutstyle_ref :
-    break;
-     return makeContext<KEY2StyleRefContext>(getState(), name, false, m_anonymous);
-   }
-diff --git a/src/lib/contexts/IWORKStylesContext.cpp b/src/lib/contexts/IWORKStylesContext.cpp
-index ef3041b..24efa1d 100644
--- a/src/lib/contexts/IWORKStylesContext.cpp
-+++ b/src/lib/contexts/IWORKStylesContext.cpp
-@@ -43,7 +43,6 @@ IWORKXMLContextPtr_t IWORKStylesContext::element(const int name)
-   case IWORKToken::NS_URI_SF | IWORKToken::liststyle_ref :
-   case IWORKToken::NS_URI_SF | IWORKToken::paragraphstyle_ref :
-   case IWORKToken::NS_URI_SF | IWORKToken::vector_style_ref :
-    break;
-     return makeContext<IWORKStyleRefContext>(getState(), name, false, m_anonymous);
-   }
-- 
-2.4.1
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -19,6 +19,7 @@ $(eval $(call gb_ExternalProject_use_externals,libetonyek,\
 	boost_headers \
 	glm_headers \
 	libxml2 \
+	mdds_headers \
 	revenge \
 	zlib \
 ))
@@ -40,7 +41,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 			$(if $(filter LINUX,$(OS)), \
 				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
 					-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN') \
-			BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+			CPPFLAGS="$(CPPFLAGS) $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			XML_CFLAGS="$(LIBXML_CFLAGS)" \
 			XML_LIBS="$(LIBXML_LIBS)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \

--- a/external/libetonyek/Library_etonyek.mk
+++ b/external/libetonyek/Library_etonyek.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_Library_use_externals,etonyek,\
    boost_headers \
    glm_headers \
 	libxml2 \
+	mdds_headers \
 	revenge \
 	zlib \
 ))
@@ -25,7 +26,6 @@ $(eval $(call gb_Library_set_include,etonyek,\
 	-I$(call gb_UnpackedTarball_get_dir,libetonyek)/inc \
 	-I$(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib \
 	-I$(call gb_UnpackedTarball_get_dir,libetonyek)/src/lib/contexts \
-	-I$(SRCDIR)/external/libetonyek/generated \
 	$$(INCLUDE) \
 ))
@@ -43,9 +43,12 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/IWORKChainedTokenizer \
 	UnpackedTarball/libetonyek/src/lib/IWORKCollector \
 	UnpackedTarball/libetonyek/src/lib/IWORKDictionary \
+	UnpackedTarball/libetonyek/src/lib/IWORKDiscardContext \
 	UnpackedTarball/libetonyek/src/lib/IWORKDocumentInterface \
+	UnpackedTarball/libetonyek/src/lib/IWORKFormula \
 	UnpackedTarball/libetonyek/src/lib/IWORKMemoryStream \
 	UnpackedTarball/libetonyek/src/lib/IWORKOutputElements \
+	UnpackedTarball/libetonyek/src/lib/IWORKOutputManager \
 	UnpackedTarball/libetonyek/src/lib/IWORKParser \
 	UnpackedTarball/libetonyek/src/lib/IWORKPath \
 	UnpackedTarball/libetonyek/src/lib/IWORKPresentationRedirector \
@@ -68,7 +71,6 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/IWORKXMLContextBase \
 	UnpackedTarball/libetonyek/src/lib/IWORKXMLParserState \
 	UnpackedTarball/libetonyek/src/lib/IWORKZlibStream \
-	UnpackedTarball/libetonyek/src/lib/IWORKZoneManager \
 	UnpackedTarball/libetonyek/src/lib/KEY1Parser \
 	UnpackedTarball/libetonyek/src/lib/KEY1Token \
 	UnpackedTarball/libetonyek/src/lib/KEY2Parser \
@@ -87,23 +89,45 @@ $(eval $(call gb_Library_add_generated_exception_objects,etonyek,\
 	UnpackedTarball/libetonyek/src/lib/PAG1Token \
 	UnpackedTarball/libetonyek/src/lib/PAGCollector \
 	UnpackedTarball/libetonyek/src/lib/PAGDictionary \
+	UnpackedTarball/libetonyek/src/lib/PAGProperties \
+	UnpackedTarball/libetonyek/src/lib/PAGTypes \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKBezierElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKBrContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKColorElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKDataElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKGeometryElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKHeaderFooterContext \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKImageContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKLayoutElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKLinkElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKMediaElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKMetadataElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKNumberConverter \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKPElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKPathElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKPositionElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKPropertyContextBase \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKPropertyMapElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKRefContext \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKShapeContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKSizeElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKSpanElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKStringElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKStyleContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKStyleRefContext \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKStylesContext \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKStylesheetBase \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabsElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTabularInfoElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTextBodyElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTextElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/IWORKTextStorageElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/IWORKUnfilteredElement \
 	UnpackedTarball/libetonyek/src/lib/contexts/KEY2StyleContext \
-	UnpackedTarball/libetonyek/src/lib/contexts/KEY2StyleRefContext \
+	UnpackedTarball/libetonyek/src/lib/contexts/PAG1FootnotesElement \
+	UnpackedTarball/libetonyek/src/lib/contexts/PAG1StyleContext \
+	UnpackedTarball/libetonyek/src/lib/contexts/PAG1TextStorageElement \
 	UnpackedTarball/libetonyek/src/lib/libetonyek_utils \
 	UnpackedTarball/libetonyek/src/lib/libetonyek_xml \
 ))

--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -15,12 +15,11 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
 	external/libetonyek/assert.patch \
-	external/libetonyek/0001-missing-include.patch.1 \
 	external/libetonyek/win_build.patch.1 \
 	external/libetonyek/ubsan.patch \
-	external/libetonyek/0001-add-missing-breaks.patch.1 \
-	external/libetonyek/0002-remove-surplus-breaks.patch.1 \
 	external/libetonyek/rpath.patch \
+	external/libetonyek/0001-add-missing-include.patch.1 \
+	external/libetonyek/0001-try-to-fix-build-on-Windows.patch.1 \
 ))
 ifeq ($(COM_GCC_IS_CLANG),TRUE)

--- a/external/libetonyek/assert.patch
+++ b/external/libetonyek/assert.patch
 --- src/lib/EtonyekDocument.cpp
 +++ src/lib/EtonyekDocument.cpp
-@@ -7,6 +7,8 @@
- #include <libetonyek/libetonyek.h>
-+#include <cassert>
-+
- #include <boost/scoped_ptr.hpp>
- #include <boost/shared_ptr.hpp>
- #include <boost/logic/tribool.hpp>
 @@ -179,7 +181,7 @@
     info.input->seek(0, RVNG_SEEK_SET);
   }
-  assert(!isGzipped);
+-  assert(isGzipped == false);
 +  assert(bool(!isGzipped));
   return probeXMLImpl(info.input, probe, type, info);

--- a/external/libetonyek/generated/IWORKToken.inc
+++ b/external/libetonyek/generated/IWORKToken.inc
--- a/external/libetonyek/generated/KEY1Token.inc
+++ b/external/libetonyek/generated/KEY1Token.inc
--- a/external/libetonyek/generated/KEY2Token.inc
+++ b/external/libetonyek/generated/KEY2Token.inc
-/* C++ code produced by gperf version 3.0.4 */
-/* Command-line: /usr/bin/gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ KEY2Token.gperf  */
-/* Computed positions: -k'1,4-5' */
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-#line 10 "KEY2Token.gperf"
-#if defined __GNUC__
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-using namespace KEY2Token;
-#line 18 "KEY2Token.gperf"
-struct Token
-{
-  const char *name;
-  int id;
-};
-#include <string.h>
-/* maximum key range = 66, duplicates = 0 */
-class Perfect_Hash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct Token *in_word_set (const char *str, unsigned int len);
-};
-inline unsigned int
-Perfect_Hash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67,  5, 67, 67,  5, 10,
-      15, 67, 20, 15, 67, 10,  0,  0,  0, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67,  0,  0,  0,
-      15,  5, 67, 67, 15,  5, 67,  0,  5,  0,
-      30, 67,  5, 67, 15,  0,  0, 67, 20, 67,
-      67,  0, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
-      67, 67, 67, 67, 67, 67
-    };
-  register int hval = len;
-  switch (hval)
-    {
-      default:
-        hval += asso_values[(unsigned char)str[4]];
-      /*FALLTHROUGH*/
-      case 4:
-        hval += asso_values[(unsigned char)str[3]];
-      /*FALLTHROUGH*/
-      case 3:
-      case 2:
-      case 1:
-        hval += asso_values[(unsigned char)str[0]];
-        break;
-    }
-  return hval;
-}
-const struct Token *
-Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 31,
-      MIN_WORD_LENGTH = 1,
-      MAX_WORD_LENGTH = 46,
-      MIN_HASH_VALUE = 1,
-      MAX_HASH_VALUE = 66
-    };
-  static const struct Token wordlist[] =
-    {
-      {(char*)0},
-#line 30 "KEY2Token.gperf"
-      {"c",c},
-      {(char*)0},
-#line 35 "KEY2Token.gperf"
-      {"key",key},
-#line 50 "KEY2Token.gperf"
-      {"text",text},
-      {(char*)0},
-#line 34 "KEY2Token.gperf"
-      {"i",i},
-      {(char*)0}, {(char*)0},
-#line 43 "KEY2Token.gperf"
-      {"size",size},
-#line 51 "KEY2Token.gperf"
-      {"theme",theme},
-#line 47 "KEY2Token.gperf"
-      {"sticky-note",sticky_note},
-#line 48 "KEY2Token.gperf"
-      {"sticky-notes",sticky_notes},
-      {(char*)0},
-#line 40 "KEY2Token.gperf"
-      {"page",page},
-#line 52 "KEY2Token.gperf"
-      {"theme-list",theme_list},
-#line 28 "KEY2Token.gperf"
-      {"92008102400",VERSION_STR_5},
-#line 36 "KEY2Token.gperf"
-      {"master-slide",master_slide},
-#line 37 "KEY2Token.gperf"
-      {"master-slides",master_slides},
-#line 46 "KEY2Token.gperf"
-      {"star",star},
-#line 49 "KEY2Token.gperf"
-      {"stylesheet",stylesheet},
-#line 29 "KEY2Token.gperf"
-      {"body-placeholder",body_placeholder},
-#line 41 "KEY2Token.gperf"
-      {"presentation",presentation},
-#line 38 "KEY2Token.gperf"
-      {"metadata",metadata},
-      {(char*)0},
-#line 44 "KEY2Token.gperf"
-      {"slide",slide},
-#line 31 "KEY2Token.gperf"
-      {"double",double_},
-#line 53 "KEY2Token.gperf"
-      {"title-placeholder",title_placeholder},
-      {(char*)0}, {(char*)0},
-#line 45 "KEY2Token.gperf"
-      {"slide-list",slide_list},
-      {(char*)0},
-#line 54 "KEY2Token.gperf"
-      {"version",version},
-      {(char*)0}, {(char*)0},
-#line 42 "KEY2Token.gperf"
-      {"right",right},
-#line 27 "KEY2Token.gperf"
-      {"72007061400",VERSION_STR_4},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 39 "KEY2Token.gperf"
-      {"notes",notes},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 25 "KEY2Token.gperf"
-      {"2005092101",COMPATIBLE_VERSION_STR_3,},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 26 "KEY2Token.gperf"
-      {"2005112100",VERSION_STR_3},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 24 "KEY2Token.gperf"
-      {"2004102100",VERSION_STR_2},
-      {(char*)0},
-#line 32 "KEY2Token.gperf"
-      {"headlineParagraphStyle",headlineParagraphStyle},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 33 "KEY2Token.gperf"
-      {"http://developer.apple.com/namespaces/keynote2",NS_URI_KEY}
-    };
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-          if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-#line 55 "KEY2Token.gperf"
--- a/external/libetonyek/generated/NUM1Token.inc
+++ b/external/libetonyek/generated/NUM1Token.inc
-/* C++ code produced by gperf version 3.0.4 */
-/* Command-line: /usr/bin/gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ NUM1Token.gperf  */
-/* Computed positions: -k'1' */
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-#line 10 "NUM1Token.gperf"
-#if defined __GNUC__
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-using namespace NUM1Token;
-#line 18 "NUM1Token.gperf"
-struct Token
-{
-  const char *name;
-  int id;
-};
-#include <string.h>
-/* maximum key range = 34, duplicates = 0 */
-class Perfect_Hash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct Token *in_word_set (const char *str, unsigned int len);
-};
-inline unsigned int
-Perfect_Hash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41,  0, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-       0, 41, 41, 41,  0, 41, 41, 41, 41, 41,
-      41, 41,  5, 41, 41,  0, 41, 41,  0,  0,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-const struct Token *
-Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 8,
-      MIN_WORD_LENGTH = 7,
-      MAX_WORD_LENGTH = 40,
-      MIN_HASH_VALUE = 7,
-      MAX_HASH_VALUE = 40
-    };
-  static const struct Token wordlist[] =
-    {
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 31 "NUM1Token.gperf"
-      {"version",version},
-#line 26 "NUM1Token.gperf"
-      {"document",document},
-#line 29 "NUM1Token.gperf"
-      {"workspace",workspace},
-#line 28 "NUM1Token.gperf"
-      {"stylesheet",stylesheet},
-#line 24 "NUM1Token.gperf"
-      {"92008102400",VERSION_STR_2},
-      {(char*)0}, {(char*)0},
-#line 27 "NUM1Token.gperf"
-      {"page-info",page_info},
-#line 30 "NUM1Token.gperf"
-      {"workspace-array",workspace_array},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 25 "NUM1Token.gperf"
-      {"http://developer.apple.com/namespaces/ls",NS_URI_LS}
-    };
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-          if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-#line 32 "NUM1Token.gperf"
--- a/external/libetonyek/generated/NUMToken.inc
+++ b/external/libetonyek/generated/NUMToken.inc
-/* C++ code produced by gperf version 3.0.4 */
-/* Command-line: /usr/bin/gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ NUMToken.gperf  */
-/* Computed positions: -k'1' */
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-#line 10 "NUMToken.gperf"
-#if defined __GNUC__
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-using namespace NUMToken;
-#line 18 "NUMToken.gperf"
-struct Token
-{
-  const char *name;
-  int id;
-};
-#include <string.h>
-/* maximum key range = 34, duplicates = 0 */
-class Perfect_Hash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct Token *in_word_set (const char *str, unsigned int len);
-};
-inline unsigned int
-Perfect_Hash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41,  0, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41,  0, 41, 41, 41, 41, 41,
-      41, 41,  5, 41, 41,  0, 41, 41,  0,  0,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-const struct Token *
-Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 7,
-      MIN_WORD_LENGTH = 7,
-      MAX_WORD_LENGTH = 40,
-      MIN_HASH_VALUE = 7,
-      MAX_HASH_VALUE = 40
-    };
-  static const struct Token wordlist[] =
-    {
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0},
-#line 30 "NUMToken.gperf"
-      {"version",version},
-      {(char*)0},
-#line 28 "NUMToken.gperf"
-      {"workspace",workspace},
-#line 27 "NUMToken.gperf"
-      {"stylesheet",stylesheet},
-#line 24 "NUMToken.gperf"
-      {"92008102400",VERSION_STR_2},
-      {(char*)0}, {(char*)0},
-#line 26 "NUMToken.gperf"
-      {"page-info",page_info},
-#line 29 "NUMToken.gperf"
-      {"workspace-array",workspace_array},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 25 "NUMToken.gperf"
-      {"http://developer.apple.com/namespaces/ls",NS_URI_LS}
-    };
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-          if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-#line 31 "NUMToken.gperf"
--- a/external/libetonyek/generated/PAG1Token.inc
+++ b/external/libetonyek/generated/PAG1Token.inc
-/* C++ code produced by gperf version 3.0.4 */
-/* Command-line: /usr/bin/gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ PAG1Token.gperf  */
-/* Computed positions: -k'1' */
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-#line 10 "PAG1Token.gperf"
-#if defined __GNUC__
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-using namespace PAG1Token;
-#line 18 "PAG1Token.gperf"
-struct Token
-{
-  const char *name;
-  int id;
-};
-#include <string.h>
-/* maximum key range = 37, duplicates = 0 */
-class Perfect_Hash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct Token *in_word_set (const char *str, unsigned int len);
-};
-inline unsigned int
-Perfect_Hash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41,  5, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 10,  5,
-       5, 41,  0, 41,  0, 41, 41, 41,  5, 41,
-       0, 41, 41, 41, 41,  0,  5, 41,  0, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-const struct Token *
-Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 13,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 40,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 40
-    };
-  static const struct Token wordlist[] =
-    {
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 32 "PAG1Token.gperf"
-      {"note",note},
-      {(char*)0},
-#line 29 "PAG1Token.gperf"
-      {"header",header},
-#line 36 "PAG1Token.gperf"
-      {"version",version},
-#line 28 "PAG1Token.gperf"
-      {"footnote",footnote},
-#line 26 "PAG1Token.gperf"
-      {"cell",cell},
-#line 34 "PAG1Token.gperf"
-      {"stylesheet",stylesheet},
-#line 31 "PAG1Token.gperf"
-      {"layout",layout},
-#line 35 "PAG1Token.gperf"
-      {"textbox",textbox},
-#line 27 "PAG1Token.gperf"
-      {"document",document},
-#line 25 "PAG1Token.gperf"
-      {"body",body},
-      {(char*)0},
-#line 24 "PAG1Token.gperf"
-      {"92008102400",VERSION_STR_4},
-      {(char*)0},
-#line 33 "PAG1Token.gperf"
-      {"section-prototypes",section_prototypes},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0},
-#line 30 "PAG1Token.gperf"
-      {"http://developer.apple.com/namespaces/sl",NS_URI_SL}
-    };
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-          if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-#line 37 "PAG1Token.gperf"
--- a/external/libetonyek/generated/PAGToken.inc
+++ b/external/libetonyek/generated/PAGToken.inc
-/* C++ code produced by gperf version 3.0.4 */
-/* Command-line: /usr/bin/gperf --compare-strncmp --enum --null-strings --readonly-tables --language C++ PAGToken.gperf  */
-/* Computed positions: -k'1' */
-#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
-      && ('%' == 37) && ('&' == 38) && ('\'' == 39) && ('(' == 40) \
-      && (')' == 41) && ('*' == 42) && ('+' == 43) && (',' == 44) \
-      && ('-' == 45) && ('.' == 46) && ('/' == 47) && ('0' == 48) \
-      && ('1' == 49) && ('2' == 50) && ('3' == 51) && ('4' == 52) \
-      && ('5' == 53) && ('6' == 54) && ('7' == 55) && ('8' == 56) \
-      && ('9' == 57) && (':' == 58) && (';' == 59) && ('<' == 60) \
-      && ('=' == 61) && ('>' == 62) && ('?' == 63) && ('A' == 65) \
-      && ('B' == 66) && ('C' == 67) && ('D' == 68) && ('E' == 69) \
-      && ('F' == 70) && ('G' == 71) && ('H' == 72) && ('I' == 73) \
-      && ('J' == 74) && ('K' == 75) && ('L' == 76) && ('M' == 77) \
-      && ('N' == 78) && ('O' == 79) && ('P' == 80) && ('Q' == 81) \
-      && ('R' == 82) && ('S' == 83) && ('T' == 84) && ('U' == 85) \
-      && ('V' == 86) && ('W' == 87) && ('X' == 88) && ('Y' == 89) \
-      && ('Z' == 90) && ('[' == 91) && ('\\' == 92) && (']' == 93) \
-      && ('^' == 94) && ('_' == 95) && ('a' == 97) && ('b' == 98) \
-      && ('c' == 99) && ('d' == 100) && ('e' == 101) && ('f' == 102) \
-      && ('g' == 103) && ('h' == 104) && ('i' == 105) && ('j' == 106) \
-      && ('k' == 107) && ('l' == 108) && ('m' == 109) && ('n' == 110) \
-      && ('o' == 111) && ('p' == 112) && ('q' == 113) && ('r' == 114) \
-      && ('s' == 115) && ('t' == 116) && ('u' == 117) && ('v' == 118) \
-      && ('w' == 119) && ('x' == 120) && ('y' == 121) && ('z' == 122) \
-      && ('{' == 123) && ('|' == 124) && ('}' == 125) && ('~' == 126))
-/* The character set is not based on ISO-646.  */
-#error "gperf generated tables don't work with this execution character set. Please report a bug to <bug-gnu-gperf@gnu.org>."
-#endif
-#line 10 "PAGToken.gperf"
-#if defined __GNUC__
-#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
-#endif
-using namespace PAGToken;
-#line 18 "PAGToken.gperf"
-struct Token
-{
-  const char *name;
-  int id;
-};
-#include <string.h>
-/* maximum key range = 37, duplicates = 0 */
-class Perfect_Hash
-{
-private:
-  static inline unsigned int hash (const char *str, unsigned int len);
-public:
-  static const struct Token *in_word_set (const char *str, unsigned int len);
-};
-inline unsigned int
-Perfect_Hash::hash (register const char *str, register unsigned int len)
-{
-  static const unsigned char asso_values[] =
-    {
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41,  5, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 10,  5,
-       5, 41,  0, 41,  0, 41, 41, 41,  5, 41,
-       0, 41, 41, 41, 41,  0,  5, 41,  0, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41, 41, 41, 41, 41,
-      41, 41, 41, 41, 41, 41
-    };
-  return len + asso_values[(unsigned char)str[0]];
-}
-const struct Token *
-Perfect_Hash::in_word_set (register const char *str, register unsigned int len)
-{
-  enum
-    {
-      TOTAL_KEYWORDS = 13,
-      MIN_WORD_LENGTH = 4,
-      MAX_WORD_LENGTH = 40,
-      MIN_HASH_VALUE = 4,
-      MAX_HASH_VALUE = 40
-    };
-  static const struct Token wordlist[] =
-    {
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-#line 32 "PAGToken.gperf"
-      {"note",note},
-      {(char*)0},
-#line 29 "PAGToken.gperf"
-      {"header",header},
-#line 36 "PAGToken.gperf"
-      {"version",version},
-#line 28 "PAGToken.gperf"
-      {"footnote",footnote},
-#line 26 "PAGToken.gperf"
-      {"cell",cell},
-#line 34 "PAGToken.gperf"
-      {"stylesheet",stylesheet},
-#line 31 "PAGToken.gperf"
-      {"layout",layout},
-#line 35 "PAGToken.gperf"
-      {"textbox",textbox},
-#line 27 "PAGToken.gperf"
-      {"document",document},
-#line 25 "PAGToken.gperf"
-      {"body",body},
-      {(char*)0},
-#line 24 "PAGToken.gperf"
-      {"92008102400",VERSION_STR_4},
-      {(char*)0},
-#line 33 "PAGToken.gperf"
-      {"section-prototypes",section_prototypes},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0}, {(char*)0}, {(char*)0}, {(char*)0},
-      {(char*)0},
-#line 30 "PAGToken.gperf"
-      {"http://developer.apple.com/namespaces/sl",NS_URI_SL}
-    };
-  if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
-    {
-      register int key = hash (str, len);
-      if (key <= MAX_HASH_VALUE && key >= 0)
-        {
-          register const char *s = wordlist[key].name;
-          if (s && *str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
-            return &wordlist[key];
-        }
-    }
-  return 0;
-}
-#line 37 "PAGToken.gperf"
--- a/external/libetonyek/ubsan.patch
+++ b/external/libetonyek/ubsan.patch
--- src/lib/contexts/IWORKPropertyMapElement.cpp
+--- src/lib/libetonyek_xml.cpp
-+++ src/lib/contexts/IWORKPropertyMapElement.cpp
+++ src/lib/libetonyek_xml.cpp
-@@ -264,7 +264,7 @@
+@@ -33,7 +33,7 @@
+     unsigned long bytesRead = 0;
+     const unsigned char *const bytes = input->read(len, bytesRead);
- void AlignmentElement::endOfElement()
+-    std::memcpy(buffer, bytes, static_cast<int>(bytesRead));
- {
+    if (bytesRead != 0) std::memcpy(buffer, bytes, static_cast<int>(bytesRead));
-  IWORKAlignment prop;
+     return static_cast<int>(bytesRead);
-+  IWORKAlignment prop = IWORK_ALIGNMENT_LEFT;
+   }
+   catch (...)
-   if (m_value)
-   {