Merge lp:~qqworini/ubuntu-rssreader-app/fix-crash-rewrite-opml into lp:ubuntu-rssreader-app

[Joey Chan]

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995.

And a new help page.

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995.

And a new help page.

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:424
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/21/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/916/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/21/rebuild

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-autolanding/951/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/5757/console

review: Needs Fixing (continuous-integration)

[lp:~qqworini/ubuntu-rssreader-app/fix-crash-rewrite-opml]

425. By Joey Chan on 2016-06-15

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995. fix Po file conflict. version 2

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

FAILED: Continuous integration, rev:425
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/22/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/923/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/22/rebuild

review: Needs Fixing (continuous-integration)

[lp:~qqworini/ubuntu-rssreader-app/fix-crash-rewrite-opml]

426. By Joey Chan on 2016-06-15

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995. fix Po file conflict. version 2

427. By Joey Chan on 2016-06-15

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995. fix Po file conflict. version 3

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:427
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/23/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/924/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/23/rebuild

review: Approve (continuous-integration)

[lp:~qqworini/ubuntu-rssreader-app/fix-crash-rewrite-opml]

428. By Joey Chan on 2016-06-15

fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995. Update zh_CN Po file conflict. version 4

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

PASSED: Continuous integration, rev:428
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/24/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/925/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/24/rebuild

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2015-07-17 14:42:42 +0000
+++ .bzrignore	2016-06-15 16:13:25 +0000
@@ -1,1 +1,2 @@
 RE:(?i).*\.user
+*.afc62ac

=== modified file 'shorts/po/com.ubuntu.shorts.pot'
--- shorts/po/com.ubuntu.shorts.pot	2016-03-23 01:45:49 +0000
+++ shorts/po/com.ubuntu.shorts.pot	2016-06-15 16:13:25 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-11 20:54+0800\n"
+"POT-Creation-Date: 2016-06-10 14:54+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -18,7 +18,7 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../qml/components/ArticleViewItem.qml:120
+#: ../qml/components/ArticleViewItem.qml:125
 msgid "Select article"
 msgstr ""
 
@@ -50,51 +50,51 @@
 msgid "Confirm"
 msgstr ""
 
-#: ../qml/content/ImportFeeds.qml:305
+#: ../qml/content/ImportFeeds.qml:313
 msgid "Please select an opml file"
 msgstr ""
 
-#: ../qml/content/ImportFeeds.qml:310
+#: ../qml/content/ImportFeeds.qml:318
 msgid "Open"
 msgstr ""
 
-#: ../qml/content/ImportFeeds.qml:293
+#: ../qml/content/ImportFeeds.qml:301
 msgid ""
 "Attention please, before importing opml file, Shorts only support one opml "
 "structure. <br><br>"
 msgstr ""
 
 #: ../qml/nongoogle/AppendNGFeedPage.qml:30 ../qml/pages/AppendFeedPage.qml:31
-#: ../qml/shorts-app.qml:265 ../qml/shorts-app.qml:403
-#: ../qml/shorts-app.qml:411
+#: ../qml/shorts-app.qml:267 ../qml/shorts-app.qml:405
+#: ../qml/shorts-app.qml:413
 msgid "Add feeds"
 msgstr ""
 
-#: ../qml/nongoogle/AppendNGFeedPage.qml:94
+#: ../qml/nongoogle/AppendNGFeedPage.qml:99
 #: ../qml/pages/AppendFeedPage.qml:137
 msgid "Type a keyword or URL"
 msgstr ""
 
-#: ../qml/nongoogle/AppendNGFeedPage.qml:149
+#: ../qml/nongoogle/AppendNGFeedPage.qml:154
 msgid "Feed Title:"
 msgstr ""
 
-#: ../qml/nongoogle/AppendNGFeedPage.qml:157
-#: ../qml/nongoogle/AppendNGFeedPage.qml:172
+#: ../qml/nongoogle/AppendNGFeedPage.qml:162
+#: ../qml/nongoogle/AppendNGFeedPage.qml:177
 msgid "No data"
 msgstr ""
 
-#: ../qml/nongoogle/AppendNGFeedPage.qml:164
+#: ../qml/nongoogle/AppendNGFeedPage.qml:169
 msgid "Feed Description:"
 msgstr ""
 
-#: ../qml/nongoogle/AppendNGFeedPage.qml:197
+#: ../qml/nongoogle/AppendNGFeedPage.qml:202
 #: ../qml/pages/AppendFeedPage.qml:243 ../qml/pages/CreateTopicPage.qml:38
-#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:494
+#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:496
 msgid "Cancel"
 msgstr ""
 
-#: ../qml/nongoogle/AppendNGFeedPage.qml:230
+#: ../qml/nongoogle/AppendNGFeedPage.qml:235
 #: ../qml/pages/AppendFeedPage.qml:276
 msgid "Next"
 msgstr ""
@@ -320,7 +320,7 @@
 msgid "Click here to report a bug"
 msgstr ""
 
-#: ../qml/pages/PageSettings.qml:9 ../qml/shorts-app.qml:249
+#: ../qml/pages/PageSettings.qml:9 ../qml/shorts-app.qml:251
 msgid "Settings"
 msgstr ""
 
@@ -352,7 +352,7 @@
 msgid "Import OPML"
 msgstr ""
 
-#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:229
+#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:231
 msgid "Edit topics"
 msgstr ""
 
@@ -360,47 +360,47 @@
 msgid "Add Feed"
 msgstr ""
 
-#: ../qml/shorts-app.qml:196
+#: ../qml/shorts-app.qml:198
 msgid "Refresh"
 msgstr ""
 
-#: ../qml/shorts-app.qml:203
+#: ../qml/shorts-app.qml:205
 msgid "Grid View"
 msgstr ""
 
-#: ../qml/shorts-app.qml:203
+#: ../qml/shorts-app.qml:205
 msgid "List view"
 msgstr ""
 
-#: ../qml/shorts-app.qml:239
+#: ../qml/shorts-app.qml:241
 msgid "Disable night mode"
 msgstr ""
 
-#: ../qml/shorts-app.qml:239
+#: ../qml/shorts-app.qml:241
 msgid "Enable night mode"
 msgstr ""
 
-#: ../qml/shorts-app.qml:334
+#: ../qml/shorts-app.qml:336
 msgid "Saved"
 msgstr ""
 
-#: ../qml/shorts-app.qml:342 shorts.desktop.in.in.h:1
+#: ../qml/shorts-app.qml:344 shorts.desktop.in.in.h:1
 msgid "Shorts"
 msgstr ""
 
-#: ../qml/shorts-app.qml:486
+#: ../qml/shorts-app.qml:488
 msgid "Checking for new articles"
 msgstr ""
 
-#: ../qml/shorts-app.qml:510
+#: ../qml/shorts-app.qml:512
 msgid "Perhaps some of the channels have not been updated."
 msgstr ""
 
-#: ../qml/shorts-app.qml:511
+#: ../qml/shorts-app.qml:513
 msgid "Errors occurred during the update"
 msgstr ""
 
-#: ../qml/shorts-app.qml:525
+#: ../qml/shorts-app.qml:527
 msgid "Ok"
 msgstr ""
 

=== added file 'shorts/po/zh_CN.po'
--- shorts/po/zh_CN.po	1970-01-01 00:00:00 +0000
+++ shorts/po/zh_CN.po	2016-06-15 16:13:25 +0000
@@ -0,0 +1,458 @@
+# Chinese (Simplified) translation for ubuntu-rssreader-app
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the ubuntu-rssreader-app package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ubuntu-rssreader-app\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2016-06-10 14:54+0000\n"
+"PO-Revision-Date: 2015-06-29 01:52+0000\n"
+"Last-Translator: Ian Li <Unknown>\n"
+"Language-Team: Chinese (Simplified) <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Launchpad-Export-Date: 2016-03-24 06:05+0000\n"
+"X-Generator: Launchpad (build 17958)\n"
+
+#: ../qml/components/ArticleViewItem.qml:125
+msgid "Select article"
+msgstr "选择文章"
+
+#: ../qml/components/ReadingOptions.qml:39
+msgid "Dark"
+msgstr "深色"
+
+#: ../qml/components/ReadingOptions.qml:46
+msgid "Light"
+msgstr "浅色"
+
+#: ../qml/components/ReadingOptions.qml:96
+msgid "Small"
+msgstr "小"
+
+#: ../qml/components/ReadingOptions.qml:98
+msgid "Normal"
+msgstr ""
+
+#: ../qml/components/ReadingOptions.qml:99
+msgid "Large"
+msgstr "大"
+
+#: ../qml/content/ImportFeeds.qml:30
+msgid "Import Feeds"
+msgstr ""
+
+#: ../qml/content/ImportFeeds.qml:42 ../qml/pages/TopicManagement.qml:258
+msgid "Confirm"
+msgstr "确认"
+
+#: ../qml/content/ImportFeeds.qml:313
+msgid "Please select an opml file"
+msgstr ""
+
+#: ../qml/content/ImportFeeds.qml:318
+msgid "Open"
+msgstr ""
+
+#: ../qml/content/ImportFeeds.qml:301
+msgid ""
+"Attention please, before importing opml file, Shorts only support one opml "
+"structure. <br><br>"
+msgstr ""
+
+#: ../qml/nongoogle/AppendNGFeedPage.qml:30 ../qml/pages/AppendFeedPage.qml:31
+#: ../qml/shorts-app.qml:267 ../qml/shorts-app.qml:405
+#: ../qml/shorts-app.qml:413
+msgid "Add feeds"
+msgstr "添加信息源"
+
+#: ../qml/nongoogle/AppendNGFeedPage.qml:99 ../qml/pages/AppendFeedPage.qml:137
+msgid "Type a keyword or URL"
+msgstr "请输入关键字或网址"
+
+#: ../qml/nongoogle/AppendNGFeedPage.qml:154
+msgid "Feed Title:"
+msgstr ""
+
+#: ../qml/nongoogle/AppendNGFeedPage.qml:162
+#: ../qml/nongoogle/AppendNGFeedPage.qml:177
+msgid "No data"
+msgstr ""
+
+#: ../qml/nongoogle/AppendNGFeedPage.qml:169
+msgid "Feed Description:"
+msgstr ""
+
+#: ../qml/nongoogle/AppendNGFeedPage.qml:202
+#: ../qml/pages/AppendFeedPage.qml:243 ../qml/pages/CreateTopicPage.qml:38
+#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:496
+msgid "Cancel"
+msgstr "取消"
+
+#: ../qml/nongoogle/AppendNGFeedPage.qml:235
+#: ../qml/pages/AppendFeedPage.qml:276
+msgid "Next"
+msgstr "下一项"
+
+#: ../qml/pages/AppendFeedPage.qml:69
+msgid "Failed to perform a feed search by keyword"
+msgstr "暂时搜索不到有关该关键词的信息"
+
+#: ../qml/pages/AppendFeedPage.qml:70 ../qml/pages/AppendFeedPage.qml:101
+msgid "Search failed"
+msgstr "哎哟，好像除了点问题。。"
+
+#: ../qml/pages/AppendFeedPage.qml:100
+msgid "Failed to perform a feed search by URL"
+msgstr "暂时搜索不到有关该网址的信息"
+
+#: ../qml/pages/AppendFeedPage.qml:185
+msgid "Search results"
+msgstr "搜索结果"
+
+#: ../qml/pages/AppendFeedPage.qml:305 ../qml/pages/CreateTopicPage.qml:181
+msgid "No feeds"
+msgstr "当前没有信息源"
+
+#: ../qml/pages/ArticleViewPage.qml:47
+msgid "Save"
+msgstr "保存"
+
+#: ../qml/pages/ArticleViewPage.qml:47
+msgid "Remove"
+msgstr "移除"
+
+#: ../qml/pages/ArticleViewPage.qml:60
+msgid "Options"
+msgstr "选项"
+
+#: ../qml/pages/ArticleViewPage.qml:68
+msgid "Open site"
+msgstr "打开网站"
+
+#: ../qml/pages/ArticleViewPage.qml:76
+msgid "Share..."
+msgstr ""
+
+#: ../qml/pages/ChooseTopicPage.qml:13
+msgid "Choose topic"
+msgstr "请选择话题"
+
+#: ../qml/pages/ChooseTopicPage.qml:77
+msgid "Add your new feeds to a topic"
+msgstr "请添加您的信息源到某个话题中"
+
+#: ../qml/pages/ChooseTopicPage.qml:88
+msgid " + New topic"
+msgstr " + 添加新话题"
+
+#: ../qml/pages/ChooseTopicPage.qml:108 ../qml/pages/CreateTopicPage.qml:77
+msgid "A topic with this name already exists"
+msgstr "该话题已经存在"
+
+#: ../qml/pages/ChooseTopicPage.qml:109 ../qml/pages/ChooseTopicPage.qml:122
+#: ../qml/pages/CreateTopicPage.qml:66 ../qml/pages/CreateTopicPage.qml:78
+msgid "Warning"
+msgstr "提示"
+
+#: ../qml/pages/ChooseTopicPage.qml:121 ../qml/pages/CreateTopicPage.qml:65
+msgid "Topic name can't contain only whitespaces"
+msgstr "请不要在话题中包含空格"
+
+#: ../qml/pages/CreateTopicPage.qml:12
+msgid "Create new topic"
+msgstr "创建一个新的话题"
+
+#: ../qml/pages/CreateTopicPage.qml:56 ../qml/pages/TopicManagement.qml:92
+msgid "Add topic"
+msgstr "添加话题"
+
+#: ../qml/pages/CreateTopicPage.qml:126
+msgid "Type topic name"
+msgstr "请输入话题名称"
+
+#: ../qml/pages/CreateTopicPage.qml:142
+msgid "Select feeds (optional)"
+msgstr "请选择信息源"
+
+#: ../qml/pages/EditFeedPage.qml:12
+msgid "Edit Feed"
+msgstr "编辑信息源"
+
+#: ../qml/pages/EditFeedPage.qml:19
+msgid "Done"
+msgstr "完成"
+
+#: ../qml/pages/EditFeedPage.qml:82
+msgid "Title: "
+msgstr "标题： "
+
+#: ../qml/pages/EditFeedPage.qml:103
+msgid "URL: "
+msgstr "地址： "
+
+#: ../qml/pages/EditFeedPage.qml:120
+msgid "Topic: "
+msgstr "话题： "
+
+#: ../qml/pages/PageHelp.qml:15
+msgid "Welcome to Shorts"
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:17
+msgid "View Articles"
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:19
+msgid "Search RSS"
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:21
+msgid "Manage topics and feeds"
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:23
+msgid "Location"
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:25
+msgid "Enjoy"
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:105
+msgid "Shorts is an RSS reader app developed by Canonical & Ubuntu Comunity."
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:110
+msgid ""
+"Shorts provides most primary features which also can be seen in other RSS "
+"reader apps, with a beautiful Ubuntu style user interface."
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:117
+msgid "Swipe left to continue."
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:136
+msgid "Scroll left/right in grid mode or scroll up/down in list mode."
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:163
+msgid ""
+"Swipe up will enter this search page, just type any simple words, or paste a "
+"link."
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:190
+msgid ""
+"Every feed must belong to one topic, swipe one item to delete feed/topic."
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:223
+msgid "Seems you are living in: "
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:232
+msgid ""
+"Some regions/countries(e.g. China) may block Google service, if you're "
+"living there or plan to go there, we suggest to trun off the build-in Google "
+"RSS service in settings page, or nothing you should care."
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:239
+msgid ""
+"We detect that you're living in some region/country(e.g. China) which blocks "
+"Google service, so Shorts disable the build-in Google RSS service by "
+"default. You still can turn it on here or in settings page."
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:250
+msgid "Use Google RSS engine: "
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:287
+msgid "Enjoy !"
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:297
+msgid "Do not show this help page again "
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:316
+msgid "Start using Shorts !"
+msgstr ""
+
+#: ../qml/pages/PageHelp.qml:340
+msgid "Skip"
+msgstr ""
+
+#: ../qml/pages/PageInfo.qml:10
+msgid "About Shorts"
+msgstr ""
+
+#: ../qml/pages/PageInfo.qml:39
+msgid "Author"
+msgstr ""
+
+#: ../qml/pages/PageInfo.qml:53
+msgid "Copyleft"
+msgstr ""
+
+#: ../qml/pages/PageInfo.qml:57
+msgid "License with GPLv3"
+msgstr ""
+
+#: ../qml/pages/PageInfo.qml:62
+msgid ""
+"Ubuntu Shorts App is the official rss reader app for Ubuntu Touch. We follow "
+"an open source model where the code is available to anyone to branch and "
+"hack on. The ubuntu shorts app follows a test driven development (TDD) where "
+"tests are written in parallel to feature implementation to help spot "
+"regressions easier."
+msgstr ""
+
+#: ../qml/pages/PageInfo.qml:68
+msgid "Click here to report a bug"
+msgstr ""
+
+#: ../qml/pages/PageSettings.qml:9 ../qml/shorts-app.qml:251
+msgid "Settings"
+msgstr ""
+
+#: ../qml/pages/PageSettings.qml:15
+msgid "Help"
+msgstr ""
+
+#: ../qml/pages/PageSettings.qml:20
+msgid "Info"
+msgstr ""
+
+#: ../qml/pages/PageSettings.qml:51
+msgid ""
+"Some special regions/countries block Google service, we suggest to turn off "
+"the switch below if living in there."
+msgstr ""
+
+#: ../qml/pages/PageSettings.qml:59
+msgid "Use Google Search: "
+msgstr ""
+
+#: ../qml/pages/PageSettings.qml:84
+msgid ""
+"For those users, who want to import their RSS feeds from other sources, "
+"please press the button below."
+msgstr ""
+
+#: ../qml/pages/PageSettings.qml:94
+msgid "Import OPML"
+msgstr ""
+
+#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:231
+msgid "Edit topics"
+msgstr "编辑话题"
+
+#: ../qml/pages/TopicManagement.qml:274
+msgid "Add Feed"
+msgstr "添加信息源"
+
+#: ../qml/shorts-app.qml:198
+msgid "Refresh"
+msgstr "刷新"
+
+#: ../qml/shorts-app.qml:205
+msgid "Grid View"
+msgstr "网格视图"
+
+#: ../qml/shorts-app.qml:205
+msgid "List view"
+msgstr "列表视图"
+
+#: ../qml/shorts-app.qml:241
+msgid "Disable night mode"
+msgstr ""
+
+#: ../qml/shorts-app.qml:241
+msgid "Enable night mode"
+msgstr ""
+
+#: ../qml/shorts-app.qml:336
+msgid "Saved"
+msgstr "已保存"
+
+#: ../qml/shorts-app.qml:344 shorts.desktop.in.in.h:1
+msgid "Shorts"
+msgstr "摘要阅读"
+
+#: ../qml/shorts-app.qml:488
+msgid "Checking for new articles"
+msgstr "正在查询新的文章"
+
+#: ../qml/shorts-app.qml:512
+msgid "Perhaps some of the channels have not been updated."
+msgstr "部分频道内容可能未更新。"
+
+#: ../qml/shorts-app.qml:513
+msgid "Errors occurred during the update"
+msgstr "更新过程中出错"
+
+#: ../qml/shorts-app.qml:527
+msgid "Ok"
+msgstr "确认"
+
+#: ../qml/tabs/BaseTab.qml:153
+msgid "There are no articles to show"
+msgstr "当前没有文章可显示"
+
+#. TRANSLATORS: this is a time formatting string,
+#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
+#: ../qml/utils/dateutils.js:39
+msgid "MMMM d"
+msgstr "M 月 d 日"
+
+#: ../qml/utils/dateutils.js:54
+#, qt-format
+msgid "Yesterday at %1"
+msgstr "昨天 %1"
+
+#. TRANSLATORS: this is a time formatting string,
+#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
+#: ../qml/utils/dateutils.js:57
+msgid "h:mm AP"
+msgstr "AP h:mm"
+
+#. TRANSLATORS: this is a time formatting string,
+#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
+#: ../qml/utils/dateutils.js:69
+msgid "ddd, h:mm AP"
+msgstr "dddd，AP h:mm"
+
+#: ../qml/utils/dateutils.js:76
+msgid "A few seconds ago..."
+msgstr "刚刚"
+
+#: ../qml/utils/dateutils.js:79
+#, qt-format
+msgid "%1 minute ago"
+msgid_plural "%1 minutes ago"
+msgstr[0] "%1 分钟前"
+
+#: ../qml/utils/dateutils.js:83
+#, qt-format
+msgid "%1 hour ago"
+msgid_plural "%1 hours ago"
+msgstr[0] "%1 小时前"
+
+#: ../qml/utils/dateutils.js:89
+#, qt-format
+msgid "%1 day ago"
+msgid_plural "%1 days ago"
+msgstr[0] "%1 天前"
+
+#: shorts.desktop.in.in.h:2
+msgid "shorts;rss;reader;"
+msgstr "简讯；rss；聚合；阅读；"

=== removed file 'shorts/po/zh_CN.po'
--- shorts/po/zh_CN.po	2016-03-24 06:05:40 +0000
+++ shorts/po/zh_CN.po	1970-01-01 00:00:00 +0000
@@ -1,458 +0,0 @@
-# Chinese (Simplified) translation for ubuntu-rssreader-app
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the ubuntu-rssreader-app package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: ubuntu-rssreader-app\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2016-03-11 20:54+0800\n"
-"PO-Revision-Date: 2015-06-29 01:52+0000\n"
-"Last-Translator: Ian Li <Unknown>\n"
-"Language-Team: Chinese (Simplified) <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2016-03-24 06:05+0000\n"
-"X-Generator: Launchpad (build 17958)\n"
-
-#: ../qml/components/ArticleViewItem.qml:120
-msgid "Select article"
-msgstr "选择文章"
-
-#: ../qml/components/ReadingOptions.qml:39
-msgid "Dark"
-msgstr "深色"
-
-#: ../qml/components/ReadingOptions.qml:46
-msgid "Light"
-msgstr "浅色"
-
-#: ../qml/components/ReadingOptions.qml:96
-msgid "Small"
-msgstr "小"
-
-#: ../qml/components/ReadingOptions.qml:98
-msgid "Normal"
-msgstr ""
-
-#: ../qml/components/ReadingOptions.qml:99
-msgid "Large"
-msgstr "大"
-
-#: ../qml/content/ImportFeeds.qml:30
-msgid "Import Feeds"
-msgstr ""
-
-#: ../qml/content/ImportFeeds.qml:42 ../qml/pages/TopicManagement.qml:258
-msgid "Confirm"
-msgstr "确认"
-
-#: ../qml/content/ImportFeeds.qml:305
-msgid "Please select an opml file"
-msgstr ""
-
-#: ../qml/content/ImportFeeds.qml:310
-msgid "Open"
-msgstr ""
-
-#: ../qml/content/ImportFeeds.qml:293
-msgid ""
-"Attention please, before importing opml file, Shorts only support one opml "
-"structure. <br><br>"
-msgstr ""
-
-#: ../qml/nongoogle/AppendNGFeedPage.qml:30 ../qml/pages/AppendFeedPage.qml:31
-#: ../qml/shorts-app.qml:265 ../qml/shorts-app.qml:403
-#: ../qml/shorts-app.qml:411
-msgid "Add feeds"
-msgstr "添加信息源"
-
-#: ../qml/nongoogle/AppendNGFeedPage.qml:94
-#: ../qml/pages/AppendFeedPage.qml:137
-msgid "Type a keyword or URL"
-msgstr "请输入关键字或网址"
-
-#: ../qml/nongoogle/AppendNGFeedPage.qml:149
-msgid "Feed Title:"
-msgstr ""
-
-#: ../qml/nongoogle/AppendNGFeedPage.qml:157
-#: ../qml/nongoogle/AppendNGFeedPage.qml:172
-msgid "No data"
-msgstr ""
-
-#: ../qml/nongoogle/AppendNGFeedPage.qml:164
-msgid "Feed Description:"
-msgstr ""
-
-#: ../qml/nongoogle/AppendNGFeedPage.qml:197
-#: ../qml/pages/AppendFeedPage.qml:243 ../qml/pages/CreateTopicPage.qml:38
-#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:494
-msgid "Cancel"
-msgstr "取消"
-
-#: ../qml/nongoogle/AppendNGFeedPage.qml:230
-#: ../qml/pages/AppendFeedPage.qml:276
-msgid "Next"
-msgstr "下一项"
-
-#: ../qml/pages/AppendFeedPage.qml:69
-msgid "Failed to perform a feed search by keyword"
-msgstr "暂时搜索不到有关该关键词的信息"
-
-#: ../qml/pages/AppendFeedPage.qml:70 ../qml/pages/AppendFeedPage.qml:101
-msgid "Search failed"
-msgstr "哎哟，好像除了点问题。。"
-
-#: ../qml/pages/AppendFeedPage.qml:100
-msgid "Failed to perform a feed search by URL"
-msgstr "暂时搜索不到有关该网址的信息"
-
-#: ../qml/pages/AppendFeedPage.qml:185
-msgid "Search results"
-msgstr "搜索结果"
-
-#: ../qml/pages/AppendFeedPage.qml:305 ../qml/pages/CreateTopicPage.qml:181
-msgid "No feeds"
-msgstr "当前没有信息源"
-
-#: ../qml/pages/ArticleViewPage.qml:47
-msgid "Save"
-msgstr "保存"
-
-#: ../qml/pages/ArticleViewPage.qml:47
-msgid "Remove"
-msgstr "移除"
-
-#: ../qml/pages/ArticleViewPage.qml:60
-msgid "Options"
-msgstr "选项"
-
-#: ../qml/pages/ArticleViewPage.qml:68
-msgid "Open site"
-msgstr "打开网站"
-
-#: ../qml/pages/ArticleViewPage.qml:76
-msgid "Share..."
-msgstr ""
-
-#: ../qml/pages/ChooseTopicPage.qml:13
-msgid "Choose topic"
-msgstr "请选择话题"
-
-#: ../qml/pages/ChooseTopicPage.qml:77
-msgid "Add your new feeds to a topic"
-msgstr "请添加您的信息源到某个话题中"
-
-#: ../qml/pages/ChooseTopicPage.qml:88
-msgid " + New topic"
-msgstr " + 添加新话题"
-
-#: ../qml/pages/ChooseTopicPage.qml:108 ../qml/pages/CreateTopicPage.qml:77
-msgid "A topic with this name already exists"
-msgstr "该话题已经存在"
-
-#: ../qml/pages/ChooseTopicPage.qml:109 ../qml/pages/ChooseTopicPage.qml:122
-#: ../qml/pages/CreateTopicPage.qml:66 ../qml/pages/CreateTopicPage.qml:78
-msgid "Warning"
-msgstr "提示"
-
-#: ../qml/pages/ChooseTopicPage.qml:121 ../qml/pages/CreateTopicPage.qml:65
-msgid "Topic name can't contain only whitespaces"
-msgstr "请不要在话题中包含空格"
-
-#: ../qml/pages/CreateTopicPage.qml:12
-msgid "Create new topic"
-msgstr "创建一个新的话题"
-
-#: ../qml/pages/CreateTopicPage.qml:56 ../qml/pages/TopicManagement.qml:92
-msgid "Add topic"
-msgstr "添加话题"
-
-#: ../qml/pages/CreateTopicPage.qml:126
-msgid "Type topic name"
-msgstr "请输入话题名称"
-
-#: ../qml/pages/CreateTopicPage.qml:142
-msgid "Select feeds (optional)"
-msgstr "请选择信息源"
-
-#: ../qml/pages/EditFeedPage.qml:12
-msgid "Edit Feed"
-msgstr "编辑信息源"
-
-#: ../qml/pages/EditFeedPage.qml:19
-msgid "Done"
-msgstr "完成"
-
-#: ../qml/pages/EditFeedPage.qml:82
-msgid "Title: "
-msgstr "标题： "
-
-#: ../qml/pages/EditFeedPage.qml:103
-msgid "URL: "
-msgstr "地址： "
-
-#: ../qml/pages/EditFeedPage.qml:120
-msgid "Topic: "
-msgstr "话题： "
-
-#: ../qml/pages/PageHelp.qml:15
-msgid "Welcome to Shorts"
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:17
-msgid "View Articles"
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:19
-msgid "Search RSS"
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:21
-msgid "Manage topics and feeds"
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:23
-msgid "Location"
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:25
-msgid "Enjoy"
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:105
-msgid "Shorts is an RSS reader app developed by Canonical & Ubuntu Comunity."
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:110
-msgid ""
-"Shorts provides most primary features which also can be seen in other RSS "
-"reader apps, with a beautiful Ubuntu style user interface."
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:117
-msgid "Swipe left to continue."
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:136
-msgid "Scroll left/right in grid mode or scroll up/down in list mode."
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:163
-msgid ""
-"Swipe up will enter this search page, just type any simple words, or paste a "
-"link."
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:190
-msgid ""
-"Every feed must belong to one topic, swipe one item to delete feed/topic."
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:223
-msgid "Seems you are living in: "
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:232
-msgid ""
-"Some regions/countries(e.g. China) may block Google service, if you're "
-"living there or plan to go there, we suggest to trun off the build-in Google "
-"RSS service in settings page, or nothing you should care."
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:239
-msgid ""
-"We detect that you're living in some region/country(e.g. China) which blocks "
-"Google service, so Shorts disable the build-in Google RSS service by "
-"default. You still can turn it on here or in settings page."
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:250
-msgid "Use Google RSS engine: "
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:287
-msgid "Enjoy !"
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:297
-msgid "Do not show this help page again "
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:316
-msgid "Start using Shorts !"
-msgstr ""
-
-#: ../qml/pages/PageHelp.qml:340
-msgid "Skip"
-msgstr ""
-
-#: ../qml/pages/PageInfo.qml:10
-msgid "About Shorts"
-msgstr ""
-
-#: ../qml/pages/PageInfo.qml:39
-msgid "Author"
-msgstr ""
-
-#: ../qml/pages/PageInfo.qml:53
-msgid "Copyleft"
-msgstr ""
-
-#: ../qml/pages/PageInfo.qml:57
-msgid "License with GPLv3"
-msgstr ""
-
-#: ../qml/pages/PageInfo.qml:62
-msgid ""
-"Ubuntu Shorts App is the official rss reader app for Ubuntu Touch. We follow "
-"an open source model where the code is available to anyone to branch and "
-"hack on. The ubuntu shorts app follows a test driven development (TDD) where "
-"tests are written in parallel to feature implementation to help spot "
-"regressions easier."
-msgstr ""
-
-#: ../qml/pages/PageInfo.qml:68
-msgid "Click here to report a bug"
-msgstr ""
-
-#: ../qml/pages/PageSettings.qml:9 ../qml/shorts-app.qml:249
-msgid "Settings"
-msgstr ""
-
-#: ../qml/pages/PageSettings.qml:15
-msgid "Help"
-msgstr ""
-
-#: ../qml/pages/PageSettings.qml:20
-msgid "Info"
-msgstr ""
-
-#: ../qml/pages/PageSettings.qml:51
-msgid ""
-"Some special regions/countries block Google service, we suggest to turn off "
-"the switch below if living in there."
-msgstr ""
-
-#: ../qml/pages/PageSettings.qml:59
-msgid "Use Google Search: "
-msgstr ""
-
-#: ../qml/pages/PageSettings.qml:84
-msgid ""
-"For those users, who want to import their RSS feeds from other sources, "
-"please press the button below."
-msgstr ""
-
-#: ../qml/pages/PageSettings.qml:94
-msgid "Import OPML"
-msgstr ""
-
-#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:229
-msgid "Edit topics"
-msgstr "编辑话题"
-
-#: ../qml/pages/TopicManagement.qml:274
-msgid "Add Feed"
-msgstr "添加信息源"
-
-#: ../qml/shorts-app.qml:196
-msgid "Refresh"
-msgstr "刷新"
-
-#: ../qml/shorts-app.qml:203
-msgid "Grid View"
-msgstr "网格视图"
-
-#: ../qml/shorts-app.qml:203
-msgid "List view"
-msgstr "列表视图"
-
-#: ../qml/shorts-app.qml:239
-msgid "Disable night mode"
-msgstr ""
-
-#: ../qml/shorts-app.qml:239
-msgid "Enable night mode"
-msgstr ""
-
-#: ../qml/shorts-app.qml:334
-msgid "Saved"
-msgstr "已保存"
-
-#: ../qml/shorts-app.qml:342 shorts.desktop.in.in.h:1
-msgid "Shorts"
-msgstr "摘要阅读"
-
-#: ../qml/shorts-app.qml:486
-msgid "Checking for new articles"
-msgstr "正在查询新的文章"
-
-#: ../qml/shorts-app.qml:510
-msgid "Perhaps some of the channels have not been updated."
-msgstr "部分频道内容可能未更新。"
-
-#: ../qml/shorts-app.qml:511
-msgid "Errors occurred during the update"
-msgstr "更新过程中出错"
-
-#: ../qml/shorts-app.qml:525
-msgid "Ok"
-msgstr "确认"
-
-#: ../qml/tabs/BaseTab.qml:153
-msgid "There are no articles to show"
-msgstr "当前没有文章可显示"
-
-#. TRANSLATORS: this is a time formatting string,
-#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
-#: ../qml/utils/dateutils.js:39
-msgid "MMMM d"
-msgstr "M 月 d 日"
-
-#: ../qml/utils/dateutils.js:54
-#, qt-format
-msgid "Yesterday at %1"
-msgstr "昨天 %1"
-
-#. TRANSLATORS: this is a time formatting string,
-#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
-#: ../qml/utils/dateutils.js:57
-msgid "h:mm AP"
-msgstr "AP h:mm"
-
-#. TRANSLATORS: this is a time formatting string,
-#. see http://qt-project.org/doc/qt-5.0/qtqml/qml-qtquick2-date.html#details for valid expressions
-#: ../qml/utils/dateutils.js:69
-msgid "ddd, h:mm AP"
-msgstr "dddd，AP h:mm"
-
-#: ../qml/utils/dateutils.js:76
-msgid "A few seconds ago..."
-msgstr "刚刚"
-
-#: ../qml/utils/dateutils.js:79
-#, qt-format
-msgid "%1 minute ago"
-msgid_plural "%1 minutes ago"
-msgstr[0] "%1 分钟前"
-
-#: ../qml/utils/dateutils.js:83
-#, qt-format
-msgid "%1 hour ago"
-msgid_plural "%1 hours ago"
-msgstr[0] "%1 小时前"
-
-#: ../qml/utils/dateutils.js:89
-#, qt-format
-msgid "%1 day ago"
-msgid_plural "%1 days ago"
-msgstr[0] "%1 天前"
-
-#: shorts.desktop.in.in.h:2
-msgid "shorts;rss;reader;"
-msgstr "简讯；rss；聚合；阅读；"

=== modified file 'shorts/qml/components/ArticleViewItem.qml'
--- shorts/qml/components/ArticleViewItem.qml	2016-01-16 10:55:38 +0000
+++ shorts/qml/components/ArticleViewItem.qml	2016-06-15 16:13:25 +0000
@@ -59,6 +59,11 @@
         }
     }
 
+    function escape2Html(str) {
+        var arrEntities={'lt':'<','gt':'>','nbsp':' ','amp':'&','quot':'"'};
+        return str.replace(/&(lt|gt|nbsp|amp|quot);/ig,function(all,t){return arrEntities[t];});
+    }
+
 
     //////////////////////////////////////////////      a listview to show the RSS content
     ListView {
@@ -195,7 +200,7 @@
                 }
 
                 Label {
-                    text: model.content
+                    text: escape2Html(model.content)
 
                     fontSize: {
                         switch(rssListview.contentFontSize) {

=== modified file 'shorts/qml/content/ContentPickerDialog.qml'
--- shorts/qml/content/ContentPickerDialog.qml	2016-01-10 09:04:00 +0000
+++ shorts/qml/content/ContentPickerDialog.qml	2016-06-15 16:13:25 +0000
@@ -29,6 +29,10 @@
     id: picker
     visible: false
 
+    header: PageHeader {
+        visible: false
+    }
+
     property var pickerParent
 
     ContentPeerPicker {

=== modified file 'shorts/qml/content/ImportFeeds.qml'
--- shorts/qml/content/ImportFeeds.qml	2016-01-14 15:35:31 +0000
+++ shorts/qml/content/ImportFeeds.qml	2016-06-15 16:13:25 +0000
@@ -45,7 +45,9 @@
             DB.importOPMLobject(repeaterFeedList.opmlList)
             mainView.reloadViews()
             pageStack.pop()
+            pageStack.pop()
             mainView.refresh()
+//            print ("repeaterFeedList.opmlList: ", JSON.stringify(repeaterFeedList.opmlList[0]))
         }
     }
 
@@ -147,6 +149,7 @@
 
                     ListItem.Empty {
                         id: liStandardRoot
+                        height: units.gu(6.5)
 
                         property var opmlRoot: repeaterFeedList.opmlList == undefined ?
                             undefined : repeaterFeedList.opmlList[index]
@@ -172,6 +175,7 @@
 
                             CheckBox {
                                 id: checkboxRoot
+                                anchors.verticalCenter: parent.verticalCenter
                             }
 
                             Label{
@@ -217,7 +221,8 @@
                     Repeater {
                         id: repeaterFeedsChildren
                         model: liStandardRoot.opmlRoot == undefined ?
-                                   "" : liStandardRoot.opmlRoot.children
+//                                   "" : liStandardRoot.opmlRoot.children
+                                   "" : liStandardRoot.opmlRoot.outline
 
                         ListItem.Standard {
                             id: listitemFeed
@@ -227,7 +232,10 @@
 //                            height: visible ? units.gu(6) : 0
 
                             property var opmlFeed: liStandardRoot.opmlRoot == undefined ?
-                                undefined : liStandardRoot.opmlRoot.children[index]
+                                                       undefined : liStandardRoot.opmlRoot.outline[index]
+//                                undefined : liStandardRoot.opmlRoot.children[index]
+//                                                       undefined : (liStandardRoot.opmlRoot.outline[index] == undefined ?
+//                                                                        liStandardRoot.opmlRoot.outline : liStandardRoot.opmlRoot.outline[index])
 
                             Connections {
                                 target: liStandardRoot

=== modified file 'shorts/qml/content/OpmlParser.qml'
--- shorts/qml/content/OpmlParser.qml	2016-01-10 09:04:00 +0000
+++ shorts/qml/content/OpmlParser.qml	2016-06-15 16:13:25 +0000
@@ -21,16 +21,39 @@
 
 import QtQuick.XmlListModel 2.0
 
-import "../utils/databasemodule_v2.js" as DB
-//import "../."
 
 Item {
     id: opmlParser
 
     property string opmlPath: ""
+    onOpmlPathChanged: {
+        utilities.loadOpml(opmlPath)
+    }
 
     signal parseFinished(var opml)
 
+    Connections {
+        target: utilities
+
+        onSigOpmlJsom: {
+//            print("opml json: ", JSON.stringify(result))
+//            print("opml json: ", /*result.opml.body.outline[0].outline[0].xmlUrl,*/ JSON.stringify(result.opml.body.outline[0].outline))
+
+            // if only one feed in a folder, there's no JS array in it, only one obj, so I add an array in a folder, make the structure compatible
+            for (var i=0; i<result.opml.body.outline.length; i++) {
+                var outLine = result.opml.body.outline[i]
+                if (result.opml.body.outline[i].outline[0] == undefined) {
+                    var tmpobj = result.opml.body.outline[i].outline
+                    var tmparr = new Array
+                    tmparr.push(tmpobj)
+                    result.opml.body.outline[i].outline = tmparr
+                }
+            }
+
+            parseFinished(result.opml.body.outline)
+        }
+    }
+
     XmlListModel {
         id: modelOpml
         property string subTitle
@@ -91,23 +114,23 @@
         }
 
         onStatusChanged: {
-            console.log("model status:", status)
-            if (status == XmlListModel.Ready) {
-                if (!subTitle) {
-                    allRootsCount = count
-                    // get all root object
-                    getAllRootObj()
-                }
-                else {
-                    // load children object one by one
-//                    console.log("children objs: ", JSON.stringify(opmlObj))
-//                    console.log("model count: ", count)
-                    getChildObjsFromOneRoot()
-                }
-            }
-            else if (status == XmlListModel.Error) {
-                console.log("XmlListModel.Error: ", errorString())
-            }
+//            console.log("model status:", status)
+//            if (status == XmlListModel.Ready) {
+//                if (!subTitle) {
+//                    allRootsCount = count
+//                    // get all root object
+//                    getAllRootObj()
+//                }
+//                else {
+//                    // load children object one by one
+////                    console.log("children objs: ", JSON.stringify(opmlObj))
+////                    console.log("model count: ", count)
+//                    getChildObjsFromOneRoot()
+//                }
+//            }
+//            else if (status == XmlListModel.Error) {
+//                console.log("XmlListModel.Error: ", errorString())
+//            }
         }
 
         query: subTitle ? "/opml/body/outline[@text='" + subTitle + "']/outline": "/opml/body/outline"

=== modified file 'shorts/qml/nongoogle/AppendNGFeedPage.qml'
--- shorts/qml/nongoogle/AppendNGFeedPage.qml	2016-01-04 11:13:30 +0000
+++ shorts/qml/nongoogle/AppendNGFeedPage.qml	2016-06-15 16:13:25 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013, 2014
+ * Copyright (C) 2013, 2014, 2015, 2016
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,9 +24,9 @@
 import "../."
 
 Page {
-    id: appendFeedPage
+    id: appendFeedPageNG
 
-    objectName: "appendfeedpage"
+    objectName: "appendFeedPageNG"
     title: i18n.tr("Add feeds")
     flickable: null
     visible: false
@@ -58,15 +58,20 @@
         id: xmlFeedApi
 
         onLoadResult: {
+            if (mainStack.currentPage != appendFeedPageNG) { return }
+
             if (!result.rss) {
                 print("onLoadResult failed")
             }
             else {
-                var f = result.rss.channel
+                var e = result.rss.channel
 
-                feedDesc = f.description ? (f.description["#text"] ? f.description["#text"] : f.description ) : ""
-                feedTitle = f.title ? (f.title["#text"] ? f.title["#text"] : f.title ) : ""
-                feedLink = f.link ? (f.link["#text"] ? f.link["#text"] : f.link) : ""
+                try {
+                feedDesc = e.description == undefined ? "" : e.description["#text"] == undefined ? e.description : e.description["#text"]
+                feedTitle = e.title == undefined ? "" : e.title["#text"] == undefined ? e.title : e.title["#text"]
+                feedLink = e.link == undefined ? "" : e.link["#text"] == undefined ? e.link : e.link["#text"]
+                }
+                catch (err) { ; }
                 feedObj = {
                     "url" : feedUrl,
                     "title" : feedTitle,
@@ -129,8 +134,8 @@
                 var isUrlEntered = (userInput.indexOf(" ") === -1 && userInput.indexOf(".") !== -1)
 
                 if (isUrlEntered) {
-                    if (userInput.indexOf("http://") !== 0)
-                    {userInput = "http://" + userInput}
+//                    if (userInput.indexOf("http://") !== 0)
+//                    {userInput = "http://" + userInput}
                     feedUrl = userInput
                     xmlFeedApi.loadFeed(userInput)
                 }

=== modified file 'shorts/qml/nongoogle/XmlNetwork.qml'
--- shorts/qml/nongoogle/XmlNetwork.qml	2016-03-11 13:04:57 +0000
+++ shorts/qml/nongoogle/XmlNetwork.qml	2016-06-15 16:13:25 +0000
@@ -1,53 +1,66 @@
 import QtQuick 2.4
-import "../utils/xml2json.js" as XJ
 
 QtObject {
     id: rootObject
 
-    property bool inProgress: __doc != null
+//    property bool inProgress: __doc != null
+    property bool inProgress: false
 
     signal findResult(var result)
     signal loadResult(var result)
 
     property var __doc: null
 
+    property variant connObj: Connections {
+        id: connUtilities
+        target: utilities
+
+        onSigResult: {
+            inProgress = false
+            loadResult(result)
+        }
+    }
+
     /* Load feed by URL.
      */
-    function loadFeed(feedUrl, num) {
-        abort(true)
-
-        if (num)
-            num = Math.min(num, 100)
-        else num = 50
-
-        __doc = new XMLHttpRequest()
-        var doc = __doc
-
-        doc.onreadystatechange = function() {
-
-//            print("xmlnetwork onreadystatechange: ", doc.readyState, doc.status, feedUrl)
-            if (doc.readyState === XMLHttpRequest.DONE) {
-
-                var resObj
-//                print ("status & text: ", doc.status, doc.statusText, doc.responseText)
-                if (doc.status == 200) {
-                                        resObj = utilities.xmlToJson(doc.responseText)
-//                    resObj = utilities.xmlToJson(doc.responseText)
-//                    var x2js = new XJ.X2JS();
-//                    resObj = XJ.xmlToJSON.parseString(doc.responseText)    //x2js.xml_str2json( doc.responseText );
-                } else { // Error
-                    resObj = {"responseDetails" : doc.statusText,
-                        "responseStatus" : doc.status}
-                }
-
-                print ("resObj: ", resObj.rss )
-                __doc = null
-                loadResult(resObj)
-            }
-        }
-
-        doc.open("GET", feedUrl, true);
-        doc.send();
+    function loadFeed(feedUrl/*, num*/) {
+//        connUtilities.target = utilities
+//        abort(true)
+        inProgress = true
+        utilities.loadFeed(feedUrl)
+
+//        if (num)
+//            num = Math.min(num, 100)
+//        else num = 50
+
+//        __doc = new XMLHttpRequest()
+//        var doc = __doc
+
+//        doc.onreadystatechange = function() {
+
+////            print("xmlnetwork onreadystatechange: ", doc.readyState, doc.status, feedUrl)
+//            if (doc.readyState === XMLHttpRequest.DONE) {
+
+//                var resObj
+////                print ("status & text: ", doc.status, doc.statusText, doc.responseText)
+//                if (doc.status == 200) {
+//                                        resObj = utilities.xmlToJson(doc.responseText)
+////                    resObj = utilities.xmlToJson(doc.responseText)
+////                    var x2js = new XJ.X2JS();
+////                    resObj = XJ.xmlToJSON.parseString(doc.responseText)    //x2js.xml_str2json( doc.responseText );
+//                } else { // Error
+//                    resObj = {"responseDetails" : doc.statusText,
+//                        "responseStatus" : doc.status}
+//                }
+
+//                print ("resObj: ", resObj.rss )
+//                __doc = null
+//                loadResult(resObj)
+//            }
+//        }
+
+//        doc.open("GET", feedUrl, true);
+//        doc.send();
     }
 
     /* Param "isAbortOnly" used to preserve
@@ -56,11 +69,13 @@
      * additional recalculations.
      */
     function abort(isAbortOnly) {
-        if (__doc != null) {
-            __doc.abort()
-            if (!isAbortOnly)
-                __doc = null
-        }
+//        if (__doc != null) {
+//            __doc.abort()
+//            if (!isAbortOnly)
+//                __doc = null
+//        }
+
+        utilities.abort()
     }
 
     /* Return true if some kind of errors detected.

=== modified file 'shorts/qml/shorts-app.qml'
--- shorts/qml/shorts-app.qml	2016-03-04 13:27:57 +0000
+++ shorts/qml/shorts-app.qml	2016-06-15 16:13:25 +0000
@@ -30,6 +30,8 @@
 
     backgroundColor: "#F5F5F5"
 
+    property alias mainStack: pageStack
+
     Component.onCompleted: {
         // show help page in first use
         if (optionsKeeper.needPopup) {

=== modified file 'shorts/qml/utils/databasemodule_v2.js'
--- shorts/qml/utils/databasemodule_v2.js	2016-03-04 13:27:57 +0000
+++ shorts/qml/utils/databasemodule_v2.js	2016-06-15 16:13:25 +0000
@@ -703,20 +703,20 @@
                 // topic(tag) end,    tagID is the unique id of a topic
 
                 // insert feed start
-                for (var j=0; j<opml[i].children.length; j++) {
-                    if (opml[i].children[j].isSelected) {
+                for (var j=0; j<opml[i].outline.length; j++) {
+                    if (opml[i].outline[j].isSelected) {
                         /* Check uniqueness.
                     */
                         var feedID = -1
-                        var feedResult = tx.executeSql("SELECT * FROM feed WHERE source=?", [opml[i].children[j].xmlUrl])
+                        var feedResult = tx.executeSql("SELECT * FROM feed WHERE source=?", [opml[i].outline[j].xmlUrl])
                         if (feedResult.rows.length > 0) {
-                            console.log("Database, importOPMLobject: already exist feed with source: ", opml[i].children[j].xmlUrl, "ID", feedResult.rows.item(0).id)
+                            console.log("Database, importOPMLobject: already exist feed with source: ", opml[i].outline[j].xmlUrl, "ID", feedResult.rows.item(0).id)
                             feedID = feedResult.rows.item(0).id
                         }
                         else {
                             // insert feed
                             feedResult = tx.executeSql('INSERT INTO feed (title, source) VALUES(?, ?)',
-                                                       [opml[i].children[j].title , opml[i].children[j].xmlUrl])
+                                                       [opml[i].outline[j].title , opml[i].outline[j].xmlUrl])
                             feedID = feedResult.insertId
                             console.log("Database, importOPMLobject: feed INSERT ID: ", feedID)
                         }
@@ -735,6 +735,8 @@
                         }
                     }
                 }
+
+
             }
             else {
                 continue

=== modified file 'shorts/utilities.cpp'
--- shorts/utilities.cpp	2016-03-11 13:04:57 +0000
+++ shorts/utilities.cpp	2016-06-15 16:13:25 +0000
@@ -4,16 +4,22 @@
 Utilities::Utilities(QObject *parent) :
     QObject(parent)
 {
-//    qDebug() << "path: " << QDir::currentPath() ;
-//    QFile xmlFile("xml");
-//    xmlFile.open(QIODevice::ReadOnly | QIODevice::Text);
-
-//    qDebug() << "json: " << xmlToJson(QString(xmlFile.readAll())).size();
+    _internalMgr = new QNetworkAccessManager(this);
+    _loadTimer = new QTimer(this);
+    _loadTimer->setSingleShot(true);
 }
 
-QJsonObject Utilities::xmlToJson(const QString &xml)
+QJsonObject Utilities::xmlToJson(const QByteArray &xml)
 {
-    QByteArray ba = xml.toLocal8Bit();
+    // check if the input doc is an xml doc
+//    QString xmldoc = QString(xml);
+//    if (xmldoc.indexOf("<?xml") != 0)
+//    {
+//        return QJsonDocument::fromJson(QString('{"error":4, "errorString":"not xml doc"}').toLocal8Bit()).object();
+//    }
+
+//    QByteArray ba = xml.toLocal8Bit();
+    QByteArray ba = xml;
     char* ch = ba.data();
     std::string json = "";
     try
@@ -30,6 +36,62 @@
     return QJsonDocument::fromJson(QString::fromStdString(json).toLocal8Bit()).object();
 }
 
+void Utilities::loadFeed(const QString &feedUrl)
+{
+    _loadTimer->stop();
+    connect(_loadTimer, SIGNAL(timeout()), this, SLOT(_internalReplySlot()));
+    _loadTimer->start(20000);
+    _internalReply = this->_internalMgr->get(QNetworkRequest(QUrl(feedUrl)));
+    connect(_internalReply, SIGNAL(finished()), this, SLOT(_internalReplySlot()));
+    connect(_internalReply, SIGNAL(sslErrors(QList<QSslError>)),
+            this, SLOT(slotSslErrors(QList<QSslError>)));
+}
+
+void Utilities::abort()
+{
+//    qDebug() << "abort0 " ;
+    _loadTimer->stop();
+    if (this->_internalReply)
+    {
+//        qDebug() << "abort1 " ;
+        if (this->_internalReply->isRunning())
+        {
+            this->_internalReply->abort();
+//            qDebug() << "abort2 " ;
+        }
+    }
+}
+
+void Utilities::_internalReplySlot()
+{
+    abort() ;
+    if (_internalReply->error() != QNetworkReply::NoError)
+    {
+        QString errString = '{"responseDetails": "pls check error in QNetworkReply::NetworkError","responseStatus":'
+                + QString::number(_internalReply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()) + '}';
+        emit QJsonDocument::fromJson(errString.toLocal8Bit());
+        return ;
+    }
+    qDebug() << "HTTP status code: " << _internalReply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() ;
+//    qDebug() << "redirect url? " << _internalReply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
+    if (_internalReply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 301)
+    {
+        loadFeed(_internalReply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl().toString());
+        return ;
+    }
+//    qDebug() << "feed size: " << _internalReply->size() ;
+//    qDebug() << "feed detail: " << _internalReply->readAll() ;
+    QByteArray data = _internalReply->readAll();
+//    emit sigResult(xmlToJson(QString(data)));
+    emit sigResult(xmlToJson(data));
+//    qDebug() << "signal emitted. " ;
+}
+
+void Utilities::slotSslErrors(QList<QSslError>)
+{
+    this->_internalReply->ignoreSslErrors();
+}
+
 QStringList Utilities::htmlGetImg(const QString &html)
 {
     QRegExp imgTagRegex("\\<img[^\\>]*src\\s*=\\s*\"([^\"]*)\"[^\\>]*\\>", Qt::CaseInsensitive);
@@ -58,11 +120,23 @@
     settings.setValue(key, value);
 }
 
-// QJsonObject Utilities::test()
-// {
-//     QFile xmlFile("xml");
-//     xmlFile.open(QIODevice::ReadOnly | QIODevice::Text);
-// 
-//     QJsonObject obj = xmlToJson(QString(xmlFile.readAll()));
-//     return obj;
-// }
+void Utilities::loadOpml(const QString &opmlUrl)
+{
+    QString tmpUrl = opmlUrl ;
+    tmpUrl        = tmpUrl.replace("file://", "");
+    QFile *file=new QFile(tmpUrl);
+    bool isOpen = file->open(QIODevice::ReadOnly|QIODevice::Text);
+    if (!isOpen)
+    {
+        qDebug() << "error opening opml file ........" ;
+        return ;
+    }
+
+    // get all data & convert to json
+    QByteArray opmldata = file->readAll();
+    QString opmlJsonString = QString(QJsonDocument(xmlToJson(opmldata)).toJson());
+    opmlJsonString = opmlJsonString.replace("@", "");
+//    qDebug() << "after replace @: " << opmlJsonString ;
+    //QJsonDocument::fromJson(QString::fromStdString(json).toLocal8Bit()).object();
+    emit sigOpmlJsom(QJsonDocument::fromJson(opmlJsonString.toLocal8Bit()).object());
+}

=== modified file 'shorts/utilities.h'
--- shorts/utilities.h	2016-03-04 13:27:57 +0000
+++ shorts/utilities.h	2016-06-15 16:13:25 +0000
@@ -2,6 +2,7 @@
 #define UTILITIES_H
 
 #include <QtCore>
+#include <QtNetwork>
 
 class Utilities : public QObject
 {
@@ -9,20 +10,38 @@
 public:
     explicit Utilities(QObject *parent = 0);
 
-    Q_INVOKABLE QJsonObject xmlToJson(const QString &xml);
+    Q_INVOKABLE QJsonObject xmlToJson(const QByteArray &xml);
+    // load feed for non-google usage
+    Q_INVOKABLE void loadFeed(const QString &feedUrl);
+    Q_INVOKABLE void abort();
+
+    //
     Q_INVOKABLE QStringList htmlGetImg(const QString &html);
 
     // get & set settings' values
     Q_INVOKABLE QString getSetting(const QString &key);
     Q_INVOKABLE void setSetting(const QString &key, const QString &value);
 
+    // load opml file from local
+    Q_INVOKABLE void loadOpml(const QString &opmlUrl);
+
     // test only
 //     Q_INVOKABLE QJsonObject test();
 
 signals:
+    void sigResult(QJsonObject result);
+    void sigOpmlJsom(QJsonObject result);
 
 public slots:
 
+private:
+    QNetworkAccessManager *_internalMgr;
+    QNetworkReply *_internalReply;
+    QTimer *_loadTimer;
+
+private slots:
+    void _internalReplySlot();
+    void slotSslErrors(QList<QSslError>);
 };
 
 #endif // UTILITIES_H

=== modified file 'shorts/xml2json/rapidjson/allocators.h'
--- shorts/xml2json/rapidjson/allocators.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/allocators.h	2016-06-15 16:13:25 +0000
@@ -194,6 +194,9 @@
         if (newSize == 0)
             return NULL;
 
+        originalSize = RAPIDJSON_ALIGN(originalSize);
+        newSize = RAPIDJSON_ALIGN(newSize);
+
         // Do not shrink if new size is smaller than original
         if (originalSize >= newSize)
             return originalPtr;
@@ -201,7 +204,6 @@
         // Simply expand it if it is the last allocation and there is sufficient space
         if (originalPtr == reinterpret_cast<char *>(chunkHead_) + RAPIDJSON_ALIGN(sizeof(ChunkHeader)) + chunkHead_->size - originalSize) {
             size_t increment = static_cast<size_t>(newSize - originalSize);
-            increment = RAPIDJSON_ALIGN(increment);
             if (chunkHead_->size + increment <= chunkHead_->capacity) {
                 chunkHead_->size += increment;
                 return originalPtr;

=== modified file 'shorts/xml2json/rapidjson/document.h'
--- shorts/xml2json/rapidjson/document.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/document.h	2016-06-15 16:13:25 +0000
@@ -20,17 +20,21 @@
 #include "reader.h"
 #include "internal/meta.h"
 #include "internal/strfunc.h"
+#include "memorystream.h"
+#include "encodedstream.h"
 #include <new>      // placement new
 
 #ifdef _MSC_VER
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(4127) // conditional expression is constant
+RAPIDJSON_DIAG_OFF(4244) // conversion from kXxxFlags to 'uint16_t', possible loss of data
 #endif
 
 #ifdef __clang__
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(padded)
 RAPIDJSON_DIAG_OFF(switch-enum)
+RAPIDJSON_DIAG_OFF(c++98-compat)
 #endif
 
 #ifdef __GNUC__
@@ -141,6 +145,7 @@
             Otherwise, the copy constructor is implicitly defined.
     */
     GenericMemberIterator(const NonConstIterator & it) : ptr_(it.ptr_) {}
+    Iterator& operator=(const NonConstIterator & it) { ptr_ = it.ptr_; return *this; }
 
     //! @name stepping
     //@{
@@ -293,7 +298,7 @@
      */
 #endif
     explicit GenericStringRef(const CharType* str)
-        : s(str), length(internal::StrLen(str)){ RAPIDJSON_ASSERT(s != NULL); }
+        : s(str), length(internal::StrLen(str)){ RAPIDJSON_ASSERT(s != 0); }
 
     //! Create constant string reference from pointer and length
 #ifndef __clang__ // -Wdocumentation
@@ -305,7 +310,11 @@
      */
 #endif
     GenericStringRef(const CharType* str, SizeType len)
-        : s(str), length(len) { RAPIDJSON_ASSERT(s != NULL); }
+        : s(str), length(len) { RAPIDJSON_ASSERT(s != 0); }
+
+    GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
+
+    GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
 
     //! implicit conversion to plain CharType pointer
     operator const Ch *() const { return s; }
@@ -314,8 +323,6 @@
     const SizeType length; //!< length of the string (excluding the trailing NULL terminator)
 
 private:
-    //! Disallow copy-assignment
-    GenericStringRef operator=(const GenericStringRef&);
     //! Disallow construction from non-const array
     template<SizeType N>
     GenericStringRef(CharType (&str)[N]) /* = delete */;
@@ -394,6 +401,127 @@
 } // namespace internal
 
 ///////////////////////////////////////////////////////////////////////////////
+// TypeHelper
+
+namespace internal {
+
+template <typename ValueType, typename T>
+struct TypeHelper {};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, bool> {
+    static bool Is(const ValueType& v) { return v.IsBool(); }
+    static bool Get(const ValueType& v) { return v.GetBool(); }
+    static ValueType& Set(ValueType& v, bool data) { return v.SetBool(data); }
+    static ValueType& Set(ValueType& v, bool data, typename ValueType::AllocatorType&) { return v.SetBool(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, int> {
+    static bool Is(const ValueType& v) { return v.IsInt(); }
+    static int Get(const ValueType& v) { return v.GetInt(); }
+    static ValueType& Set(ValueType& v, int data) { return v.SetInt(data); }
+    static ValueType& Set(ValueType& v, int data, typename ValueType::AllocatorType&) { return v.SetInt(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, unsigned> {
+    static bool Is(const ValueType& v) { return v.IsUint(); }
+    static unsigned Get(const ValueType& v) { return v.GetUint(); }
+    static ValueType& Set(ValueType& v, unsigned data) { return v.SetUint(data); }
+    static ValueType& Set(ValueType& v, unsigned data, typename ValueType::AllocatorType&) { return v.SetUint(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, int64_t> {
+    static bool Is(const ValueType& v) { return v.IsInt64(); }
+    static int64_t Get(const ValueType& v) { return v.GetInt64(); }
+    static ValueType& Set(ValueType& v, int64_t data) { return v.SetInt64(data); }
+    static ValueType& Set(ValueType& v, int64_t data, typename ValueType::AllocatorType&) { return v.SetInt64(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, uint64_t> {
+    static bool Is(const ValueType& v) { return v.IsUint64(); }
+    static uint64_t Get(const ValueType& v) { return v.GetUint64(); }
+    static ValueType& Set(ValueType& v, uint64_t data) { return v.SetUint64(data); }
+    static ValueType& Set(ValueType& v, uint64_t data, typename ValueType::AllocatorType&) { return v.SetUint64(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, double> {
+    static bool Is(const ValueType& v) { return v.IsDouble(); }
+    static double Get(const ValueType& v) { return v.GetDouble(); }
+    static ValueType& Set(ValueType& v, double data) { return v.SetDouble(data); }
+    static ValueType& Set(ValueType& v, double data, typename ValueType::AllocatorType&) { return v.SetDouble(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, float> {
+    static bool Is(const ValueType& v) { return v.IsFloat(); }
+    static float Get(const ValueType& v) { return v.GetFloat(); }
+    static ValueType& Set(ValueType& v, float data) { return v.SetFloat(data); }
+    static ValueType& Set(ValueType& v, float data, typename ValueType::AllocatorType&) { return v.SetFloat(data); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, const typename ValueType::Ch*> {
+    typedef const typename ValueType::Ch* StringType;
+    static bool Is(const ValueType& v) { return v.IsString(); }
+    static StringType Get(const ValueType& v) { return v.GetString(); }
+    static ValueType& Set(ValueType& v, const StringType data) { return v.SetString(typename ValueType::StringRefType(data)); }
+    static ValueType& Set(ValueType& v, const StringType data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
+};
+
+#if RAPIDJSON_HAS_STDSTRING
+template<typename ValueType> 
+struct TypeHelper<ValueType, std::basic_string<typename ValueType::Ch> > {
+    typedef std::basic_string<typename ValueType::Ch> StringType;
+    static bool Is(const ValueType& v) { return v.IsString(); }
+    static StringType Get(const ValueType& v) { return v.GetString(); }
+    static ValueType& Set(ValueType& v, const StringType& data, typename ValueType::AllocatorType& a) { return v.SetString(data, a); }
+};
+#endif
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::Array> {
+    typedef typename ValueType::Array ArrayType;
+    static bool Is(const ValueType& v) { return v.IsArray(); }
+    static ArrayType Get(ValueType& v) { return v.GetArray(); }
+    static ValueType& Set(ValueType& v, ArrayType data) { return v = data; }
+    static ValueType& Set(ValueType& v, ArrayType data, typename ValueType::AllocatorType&) { return v = data; }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::ConstArray> {
+    typedef typename ValueType::ConstArray ArrayType;
+    static bool Is(const ValueType& v) { return v.IsArray(); }
+    static ArrayType Get(const ValueType& v) { return v.GetArray(); }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::Object> {
+    typedef typename ValueType::Object ObjectType;
+    static bool Is(const ValueType& v) { return v.IsObject(); }
+    static ObjectType Get(ValueType& v) { return v.GetObject(); }
+    static ValueType& Set(ValueType& v, ObjectType data) { return v = data; }
+    static ValueType& Set(ValueType& v, ObjectType data, typename ValueType::AllocatorType&) { v = data; }
+};
+
+template<typename ValueType> 
+struct TypeHelper<ValueType, typename ValueType::ConstObject> {
+    typedef typename ValueType::ConstObject ObjectType;
+    static bool Is(const ValueType& v) { return v.IsObject(); }
+    static ObjectType Get(const ValueType& v) { return v.GetObject(); }
+};
+
+} // namespace internal
+
+// Forward declarations
+template <bool, typename> class GenericArray;
+template <bool, typename> class GenericObject;
+
+///////////////////////////////////////////////////////////////////////////////
 // GenericValue
 
 //! Represents a JSON value. Use Value for UTF8 encoding and default allocator.
@@ -420,17 +548,21 @@
     typedef GenericValue* ValueIterator;            //!< Value iterator for iterating in array.
     typedef const GenericValue* ConstValueIterator; //!< Constant value iterator for iterating in array.
     typedef GenericValue<Encoding, Allocator> ValueType;    //!< Value type of itself.
+    typedef GenericArray<false, ValueType> Array;
+    typedef GenericArray<true, ValueType> ConstArray;
+    typedef GenericObject<false, ValueType> Object;
+    typedef GenericObject<true, ValueType> ConstObject;
 
     //!@name Constructors and destructor.
     //@{
 
     //! Default constructor creates a null value.
-    GenericValue() RAPIDJSON_NOEXCEPT : data_(), flags_(kNullFlag) {}
+    GenericValue() RAPIDJSON_NOEXCEPT : data_() { data_.f.flags = kNullFlag; }
 
 #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
     //! Move constructor in C++11
-    GenericValue(GenericValue&& rhs) RAPIDJSON_NOEXCEPT : data_(rhs.data_), flags_(rhs.flags_) {
-        rhs.flags_ = kNullFlag; // give up contents
+    GenericValue(GenericValue&& rhs) RAPIDJSON_NOEXCEPT : data_(rhs.data_) {
+        rhs.data_.f.flags = kNullFlag; // give up contents
     }
 #endif
 
@@ -455,13 +587,13 @@
         \param type Type of the value.
         \note Default content for number is zero.
     */
-    explicit GenericValue(Type type) RAPIDJSON_NOEXCEPT : data_(), flags_() {
-        static const unsigned defaultFlags[7] = {
+    explicit GenericValue(Type type) RAPIDJSON_NOEXCEPT : data_() {
+        static const uint16_t defaultFlags[7] = {
             kNullFlag, kFalseFlag, kTrueFlag, kObjectFlag, kArrayFlag, kShortStringFlag,
             kNumberAnyFlag
         };
         RAPIDJSON_ASSERT(type <= kNumberType);
-        flags_ = defaultFlags[type];
+        data_.f.flags = defaultFlags[type];
 
         // Use ShortString to store empty string.
         if (type == kStringType)
@@ -486,96 +618,122 @@
      */
 #ifndef RAPIDJSON_DOXYGEN_RUNNING // hide SFINAE from Doxygen
     template <typename T>
-    explicit GenericValue(T b, RAPIDJSON_ENABLEIF((internal::IsSame<T,bool>))) RAPIDJSON_NOEXCEPT
+    explicit GenericValue(T b, RAPIDJSON_ENABLEIF((internal::IsSame<bool, T>))) RAPIDJSON_NOEXCEPT  // See #472
 #else
     explicit GenericValue(bool b) RAPIDJSON_NOEXCEPT
 #endif
-        : data_(), flags_(b ? kTrueFlag : kFalseFlag) {
+        : data_() {
             // safe-guard against failing SFINAE
             RAPIDJSON_STATIC_ASSERT((internal::IsSame<bool,T>::Value));
+            data_.f.flags = b ? kTrueFlag : kFalseFlag;
     }
 
     //! Constructor for int value.
-    explicit GenericValue(int i) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberIntFlag) {
+    explicit GenericValue(int i) RAPIDJSON_NOEXCEPT : data_() {
         data_.n.i64 = i;
-        if (i >= 0)
-            flags_ |= kUintFlag | kUint64Flag;
+        data_.f.flags = (i >= 0) ? (kNumberIntFlag | kUintFlag | kUint64Flag) : kNumberIntFlag;
     }
 
     //! Constructor for unsigned value.
-    explicit GenericValue(unsigned u) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUintFlag) {
+    explicit GenericValue(unsigned u) RAPIDJSON_NOEXCEPT : data_() {
         data_.n.u64 = u; 
-        if (!(u & 0x80000000))
-            flags_ |= kIntFlag | kInt64Flag;
+        data_.f.flags = (u & 0x80000000) ? kNumberUintFlag : (kNumberUintFlag | kIntFlag | kInt64Flag);
     }
 
     //! Constructor for int64_t value.
-    explicit GenericValue(int64_t i64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberInt64Flag) {
+    explicit GenericValue(int64_t i64) RAPIDJSON_NOEXCEPT : data_() {
         data_.n.i64 = i64;
+        data_.f.flags = kNumberInt64Flag;
         if (i64 >= 0) {
-            flags_ |= kNumberUint64Flag;
+            data_.f.flags |= kNumberUint64Flag;
             if (!(static_cast<uint64_t>(i64) & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
-                flags_ |= kUintFlag;
+                data_.f.flags |= kUintFlag;
             if (!(static_cast<uint64_t>(i64) & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-                flags_ |= kIntFlag;
+                data_.f.flags |= kIntFlag;
         }
         else if (i64 >= static_cast<int64_t>(RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-            flags_ |= kIntFlag;
+            data_.f.flags |= kIntFlag;
     }
 
     //! Constructor for uint64_t value.
-    explicit GenericValue(uint64_t u64) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberUint64Flag) {
+    explicit GenericValue(uint64_t u64) RAPIDJSON_NOEXCEPT : data_() {
         data_.n.u64 = u64;
+        data_.f.flags = kNumberUint64Flag;
         if (!(u64 & RAPIDJSON_UINT64_C2(0x80000000, 0x00000000)))
-            flags_ |= kInt64Flag;
+            data_.f.flags |= kInt64Flag;
         if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x00000000)))
-            flags_ |= kUintFlag;
+            data_.f.flags |= kUintFlag;
         if (!(u64 & RAPIDJSON_UINT64_C2(0xFFFFFFFF, 0x80000000)))
-            flags_ |= kIntFlag;
+            data_.f.flags |= kIntFlag;
     }
 
     //! Constructor for double value.
-    explicit GenericValue(double d) RAPIDJSON_NOEXCEPT : data_(), flags_(kNumberDoubleFlag) { data_.n.d = d; }
-
-    //! Constructor for constant string (i.e. do not make a copy of string)
-    GenericValue(const Ch* s, SizeType length) RAPIDJSON_NOEXCEPT : data_(), flags_() { SetStringRaw(StringRef(s, length)); }
-
-    //! Constructor for constant string (i.e. do not make a copy of string)
-    explicit GenericValue(StringRefType s) RAPIDJSON_NOEXCEPT : data_(), flags_() { SetStringRaw(s); }
-
-    //! Constructor for copy-string (i.e. do make a copy of string)
-    GenericValue(const Ch* s, SizeType length, Allocator& allocator) : data_(), flags_() { SetStringRaw(StringRef(s, length), allocator); }
-
-    //! Constructor for copy-string (i.e. do make a copy of string)
-    GenericValue(const Ch*s, Allocator& allocator) : data_(), flags_() { SetStringRaw(StringRef(s), allocator); }
+    explicit GenericValue(double d) RAPIDJSON_NOEXCEPT : data_() { data_.n.d = d; data_.f.flags = kNumberDoubleFlag; }
+
+    //! Constructor for constant string (i.e. do not make a copy of string)
+    GenericValue(const Ch* s, SizeType length) RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(StringRef(s, length)); }
+
+    //! Constructor for constant string (i.e. do not make a copy of string)
+    explicit GenericValue(StringRefType s) RAPIDJSON_NOEXCEPT : data_() { SetStringRaw(s); }
+
+    //! Constructor for copy-string (i.e. do make a copy of string)
+    GenericValue(const Ch* s, SizeType length, Allocator& allocator) : data_() { SetStringRaw(StringRef(s, length), allocator); }
+
+    //! Constructor for copy-string (i.e. do make a copy of string)
+    GenericValue(const Ch*s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
 
 #if RAPIDJSON_HAS_STDSTRING
     //! Constructor for copy-string from a string object (i.e. do make a copy of string)
     /*! \note Requires the definition of the preprocessor symbol \ref RAPIDJSON_HAS_STDSTRING.
      */
-    GenericValue(const std::basic_string<Ch>& s, Allocator& allocator) : data_(), flags_() { SetStringRaw(StringRef(s), allocator); }
+    GenericValue(const std::basic_string<Ch>& s, Allocator& allocator) : data_() { SetStringRaw(StringRef(s), allocator); }
 #endif
 
+    //! Constructor for Array.
+    /*!
+        \param a An array obtained by \c GetArray().
+        \note \c Array is always pass-by-value.
+        \note the source array is moved into this value and the sourec array becomes empty.
+    */
+    GenericValue(Array a) RAPIDJSON_NOEXCEPT : data_(a.value_.data_) {
+        a.value_.data_ = Data();
+        a.value_.data_.f.flags = kArrayFlag;
+    }
+
+    //! Constructor for Object.
+    /*!
+        \param o An object obtained by \c GetObject().
+        \note \c Object is always pass-by-value.
+        \note the source object is moved into this value and the sourec object becomes empty.
+    */
+    GenericValue(Object o) RAPIDJSON_NOEXCEPT : data_(o.value_.data_) {
+        o.value_.data_ = Data();
+        o.value_.data_.f.flags = kObjectFlag;
+    }
+
     //! Destructor.
     /*! Need to destruct elements of array, members of object, or copy-string.
     */
     ~GenericValue() {
         if (Allocator::kNeedFree) { // Shortcut by Allocator's trait
-            switch(flags_) {
+            switch(data_.f.flags) {
             case kArrayFlag:
-                for (GenericValue* v = data_.a.elements; v != data_.a.elements + data_.a.size; ++v)
-                    v->~GenericValue();
-                Allocator::Free(data_.a.elements);
+                {
+                    GenericValue* e = GetElementsPointer();
+                    for (GenericValue* v = e; v != e + data_.a.size; ++v)
+                        v->~GenericValue();
+                    Allocator::Free(e);
+                }
                 break;
 
             case kObjectFlag:
                 for (MemberIterator m = MemberBegin(); m != MemberEnd(); ++m)
                     m->~Member();
-                Allocator::Free(data_.o.members);
+                Allocator::Free(GetMembersPointer());
                 break;
 
             case kCopyStringFlag:
-                Allocator::Free(const_cast<Ch*>(data_.s.str));
+                Allocator::Free(const_cast<Ch*>(GetStringPointer()));
                 break;
 
             default:
@@ -773,20 +931,51 @@
     //!@name Type
     //@{
 
-    Type GetType()  const { return static_cast<Type>(flags_ & kTypeMask); }
-    bool IsNull()   const { return flags_ == kNullFlag; }
-    bool IsFalse()  const { return flags_ == kFalseFlag; }
-    bool IsTrue()   const { return flags_ == kTrueFlag; }
-    bool IsBool()   const { return (flags_ & kBoolFlag) != 0; }
-    bool IsObject() const { return flags_ == kObjectFlag; }
-    bool IsArray()  const { return flags_ == kArrayFlag; }
-    bool IsNumber() const { return (flags_ & kNumberFlag) != 0; }
-    bool IsInt()    const { return (flags_ & kIntFlag) != 0; }
-    bool IsUint()   const { return (flags_ & kUintFlag) != 0; }
-    bool IsInt64()  const { return (flags_ & kInt64Flag) != 0; }
-    bool IsUint64() const { return (flags_ & kUint64Flag) != 0; }
-    bool IsDouble() const { return (flags_ & kDoubleFlag) != 0; }
-    bool IsString() const { return (flags_ & kStringFlag) != 0; }
+    Type GetType()  const { return static_cast<Type>(data_.f.flags & kTypeMask); }
+    bool IsNull()   const { return data_.f.flags == kNullFlag; }
+    bool IsFalse()  const { return data_.f.flags == kFalseFlag; }
+    bool IsTrue()   const { return data_.f.flags == kTrueFlag; }
+    bool IsBool()   const { return (data_.f.flags & kBoolFlag) != 0; }
+    bool IsObject() const { return data_.f.flags == kObjectFlag; }
+    bool IsArray()  const { return data_.f.flags == kArrayFlag; }
+    bool IsNumber() const { return (data_.f.flags & kNumberFlag) != 0; }
+    bool IsInt()    const { return (data_.f.flags & kIntFlag) != 0; }
+    bool IsUint()   const { return (data_.f.flags & kUintFlag) != 0; }
+    bool IsInt64()  const { return (data_.f.flags & kInt64Flag) != 0; }
+    bool IsUint64() const { return (data_.f.flags & kUint64Flag) != 0; }
+    bool IsDouble() const { return (data_.f.flags & kDoubleFlag) != 0; }
+    bool IsString() const { return (data_.f.flags & kStringFlag) != 0; }
+
+    // Checks whether a number can be losslessly converted to a double.
+    bool IsLosslessDouble() const {
+        if (!IsNumber()) return false;
+        if (IsUint64()) {
+            uint64_t u = GetUint64();
+            volatile double d = static_cast<double>(u);
+            return static_cast<uint64_t>(d) == u;
+        }
+        if (IsInt64()) {
+            int64_t i = GetInt64();
+            volatile double d = static_cast<double>(i);
+            return static_cast< int64_t>(d) == i;
+        }
+        return true; // double, int, uint are always lossless
+    }
+
+    // Checks whether a number is a float (possible lossy).
+    bool IsFloat() const  {
+        if ((data_.f.flags & kDoubleFlag) == 0)
+            return false;
+        double d = GetDouble();
+        return d >= -3.4028234e38 && d <= 3.4028234e38;
+    }
+    // Checks whether a number can be losslessly converted to a float.
+    bool IsLosslessFloat() const {
+        if (!IsNumber()) return false;
+        double a = GetDouble();
+        double b = static_cast<double>(static_cast<float>(a));
+        return a >= b && a <= b;    // Prevent -Wfloat-equal
+    }
 
     //@}
 
@@ -800,7 +989,7 @@
     //!@name Bool
     //@{
 
-    bool GetBool() const { RAPIDJSON_ASSERT(IsBool()); return flags_ == kTrueFlag; }
+    bool GetBool() const { RAPIDJSON_ASSERT(IsBool()); return data_.f.flags == kTrueFlag; }
     //!< Set boolean value
     /*! \post IsBool() == true */
     GenericValue& SetBool(bool b) { this->~GenericValue(); new (this) GenericValue(b); return *this; }
@@ -874,16 +1063,16 @@
 
     //! Const member iterator
     /*! \pre IsObject() == true */
-    ConstMemberIterator MemberBegin() const { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(data_.o.members); }
+    ConstMemberIterator MemberBegin() const { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer()); }
     //! Const \em past-the-end member iterator
     /*! \pre IsObject() == true */
-    ConstMemberIterator MemberEnd() const   { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(data_.o.members + data_.o.size); }
+    ConstMemberIterator MemberEnd() const   { RAPIDJSON_ASSERT(IsObject()); return ConstMemberIterator(GetMembersPointer() + data_.o.size); }
     //! Member iterator
     /*! \pre IsObject() == true */
-    MemberIterator MemberBegin()            { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(data_.o.members); }
+    MemberIterator MemberBegin()            { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer()); }
     //! \em Past-the-end member iterator
     /*! \pre IsObject() == true */
-    MemberIterator MemberEnd()              { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(data_.o.members + data_.o.size); }
+    MemberIterator MemberEnd()              { RAPIDJSON_ASSERT(IsObject()); return MemberIterator(GetMembersPointer() + data_.o.size); }
 
     //! Check whether a member exists in the object.
     /*!
@@ -989,20 +1178,21 @@
         RAPIDJSON_ASSERT(IsObject());
         RAPIDJSON_ASSERT(name.IsString());
 
-        Object& o = data_.o;
+        ObjectData& o = data_.o;
         if (o.size >= o.capacity) {
             if (o.capacity == 0) {
                 o.capacity = kDefaultObjectCapacity;
-                o.members = reinterpret_cast<Member*>(allocator.Malloc(o.capacity * sizeof(Member)));
+                SetMembersPointer(reinterpret_cast<Member*>(allocator.Malloc(o.capacity * sizeof(Member))));
             }
             else {
                 SizeType oldCapacity = o.capacity;
                 o.capacity += (oldCapacity + 1) / 2; // grow by factor 1.5
-                o.members = reinterpret_cast<Member*>(allocator.Realloc(o.members, oldCapacity * sizeof(Member), o.capacity * sizeof(Member)));
+                SetMembersPointer(reinterpret_cast<Member*>(allocator.Realloc(GetMembersPointer(), oldCapacity * sizeof(Member), o.capacity * sizeof(Member))));
             }
         }
-        o.members[o.size].name.RawAssign(name);
-        o.members[o.size].value.RawAssign(value);
+        Member* members = GetMembersPointer();
+        members[o.size].name.RawAssign(name);
+        members[o.size].value.RawAssign(value);
         o.size++;
         return *this;
     }
@@ -1181,18 +1371,14 @@
     MemberIterator RemoveMember(MemberIterator m) {
         RAPIDJSON_ASSERT(IsObject());
         RAPIDJSON_ASSERT(data_.o.size > 0);
-        RAPIDJSON_ASSERT(data_.o.members != 0);
+        RAPIDJSON_ASSERT(GetMembersPointer() != 0);
         RAPIDJSON_ASSERT(m >= MemberBegin() && m < MemberEnd());
 
-        MemberIterator last(data_.o.members + (data_.o.size - 1));
-        if (data_.o.size > 1 && m != last) {
-            // Move the last one to this place
-            *m = *last;
-        }
-        else {
-            // Only one left, just destroy
-            m->~Member();
-        }
+        MemberIterator last(GetMembersPointer() + (data_.o.size - 1));
+        if (data_.o.size > 1 && m != last)
+            *m = *last; // Move the last one to this place
+        else
+            m->~Member(); // Only one left, just destroy
         --data_.o.size;
         return m;
     }
@@ -1222,7 +1408,7 @@
     MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) {
         RAPIDJSON_ASSERT(IsObject());
         RAPIDJSON_ASSERT(data_.o.size > 0);
-        RAPIDJSON_ASSERT(data_.o.members != 0);
+        RAPIDJSON_ASSERT(GetMembersPointer() != 0);
         RAPIDJSON_ASSERT(first >= MemberBegin());
         RAPIDJSON_ASSERT(first <= last);
         RAPIDJSON_ASSERT(last <= MemberEnd());
@@ -1260,6 +1446,9 @@
             return false;
     }
 
+    Object GetObject() { RAPIDJSON_ASSERT(IsObject()); return Object(*this); }
+    ConstObject GetObject() const { RAPIDJSON_ASSERT(IsObject()); return ConstObject(*this); }
+
     //@}
 
     //!@name Array
@@ -1267,7 +1456,7 @@
 
     //! Set this value as an empty array.
     /*! \post IsArray == true */
-    GenericValue& SetArray() {  this->~GenericValue(); new (this) GenericValue(kArrayType); return *this; }
+    GenericValue& SetArray() { this->~GenericValue(); new (this) GenericValue(kArrayType); return *this; }
 
     //! Get the number of elements in array.
     SizeType Size() const { RAPIDJSON_ASSERT(IsArray()); return data_.a.size; }
@@ -1284,8 +1473,9 @@
     */
     void Clear() {
         RAPIDJSON_ASSERT(IsArray()); 
-        for (SizeType i = 0; i < data_.a.size; ++i)
-            data_.a.elements[i].~GenericValue();
+        GenericValue* e = GetElementsPointer();
+        for (GenericValue* v = e; v != e + data_.a.size; ++v)
+            v->~GenericValue();
         data_.a.size = 0;
     }
 
@@ -1297,16 +1487,16 @@
     GenericValue& operator[](SizeType index) {
         RAPIDJSON_ASSERT(IsArray());
         RAPIDJSON_ASSERT(index < data_.a.size);
-        return data_.a.elements[index];
+        return GetElementsPointer()[index];
     }
     const GenericValue& operator[](SizeType index) const { return const_cast<GenericValue&>(*this)[index]; }
 
     //! Element iterator
     /*! \pre IsArray() == true */
-    ValueIterator Begin() { RAPIDJSON_ASSERT(IsArray()); return data_.a.elements; }
+    ValueIterator Begin() { RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer(); }
     //! \em Past-the-end element iterator
     /*! \pre IsArray() == true */
-    ValueIterator End() { RAPIDJSON_ASSERT(IsArray()); return data_.a.elements + data_.a.size; }
+    ValueIterator End() { RAPIDJSON_ASSERT(IsArray()); return GetElementsPointer() + data_.a.size; }
     //! Constant element iterator
     /*! \pre IsArray() == true */
     ConstValueIterator Begin() const { return const_cast<GenericValue&>(*this).Begin(); }
@@ -1323,7 +1513,7 @@
     GenericValue& Reserve(SizeType newCapacity, Allocator &allocator) {
         RAPIDJSON_ASSERT(IsArray());
         if (newCapacity > data_.a.capacity) {
-            data_.a.elements = static_cast<GenericValue*>(allocator.Realloc(data_.a.elements, data_.a.capacity * sizeof(GenericValue), newCapacity * sizeof(GenericValue)));
+            SetElementsPointer(reinterpret_cast<GenericValue*>(allocator.Realloc(GetElementsPointer(), data_.a.capacity * sizeof(GenericValue), newCapacity * sizeof(GenericValue))));
             data_.a.capacity = newCapacity;
         }
         return *this;
@@ -1343,7 +1533,7 @@
         RAPIDJSON_ASSERT(IsArray());
         if (data_.a.size >= data_.a.capacity)
             Reserve(data_.a.capacity == 0 ? kDefaultArrayCapacity : (data_.a.capacity + (data_.a.capacity + 1) / 2), allocator);
-        data_.a.elements[data_.a.size++].RawAssign(value);
+        GetElementsPointer()[data_.a.size++].RawAssign(value);
         return *this;
     }
 
@@ -1397,7 +1587,7 @@
     GenericValue& PopBack() {
         RAPIDJSON_ASSERT(IsArray());
         RAPIDJSON_ASSERT(!Empty());
-        data_.a.elements[--data_.a.size].~GenericValue();
+        GetElementsPointer()[--data_.a.size].~GenericValue();
         return *this;
     }
 
@@ -1423,7 +1613,7 @@
     ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) {
         RAPIDJSON_ASSERT(IsArray());
         RAPIDJSON_ASSERT(data_.a.size > 0);
-        RAPIDJSON_ASSERT(data_.a.elements != 0);
+        RAPIDJSON_ASSERT(GetElementsPointer() != 0);
         RAPIDJSON_ASSERT(first >= Begin());
         RAPIDJSON_ASSERT(first <= last);
         RAPIDJSON_ASSERT(last <= End());
@@ -1435,23 +1625,36 @@
         return pos;
     }
 
+    Array GetArray() { RAPIDJSON_ASSERT(IsArray()); return Array(*this); }
+    ConstArray GetArray() const { RAPIDJSON_ASSERT(IsArray()); return ConstArray(*this); }
+
     //@}
 
     //!@name Number
     //@{
 
-    int GetInt() const          { RAPIDJSON_ASSERT(flags_ & kIntFlag);   return data_.n.i.i;   }
-    unsigned GetUint() const    { RAPIDJSON_ASSERT(flags_ & kUintFlag);  return data_.n.u.u;   }
-    int64_t GetInt64() const    { RAPIDJSON_ASSERT(flags_ & kInt64Flag); return data_.n.i64; }
-    uint64_t GetUint64() const  { RAPIDJSON_ASSERT(flags_ & kUint64Flag); return data_.n.u64; }
+    int GetInt() const          { RAPIDJSON_ASSERT(data_.f.flags & kIntFlag);   return data_.n.i.i;   }
+    unsigned GetUint() const    { RAPIDJSON_ASSERT(data_.f.flags & kUintFlag);  return data_.n.u.u;   }
+    int64_t GetInt64() const    { RAPIDJSON_ASSERT(data_.f.flags & kInt64Flag); return data_.n.i64; }
+    uint64_t GetUint64() const  { RAPIDJSON_ASSERT(data_.f.flags & kUint64Flag); return data_.n.u64; }
 
+    //! Get the value as double type.
+    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessDouble() to check whether the converison is lossless.
+    */
     double GetDouble() const {
         RAPIDJSON_ASSERT(IsNumber());
-        if ((flags_ & kDoubleFlag) != 0)                return data_.n.d;   // exact type, no conversion.
-        if ((flags_ & kIntFlag) != 0)                   return data_.n.i.i; // int -> double
-        if ((flags_ & kUintFlag) != 0)                  return data_.n.u.u; // unsigned -> double
-        if ((flags_ & kInt64Flag) != 0)                 return static_cast<double>(data_.n.i64); // int64_t -> double (may lose precision)
-        RAPIDJSON_ASSERT((flags_ & kUint64Flag) != 0);  return static_cast<double>(data_.n.u64); // uint64_t -> double (may lose precision)
+        if ((data_.f.flags & kDoubleFlag) != 0)                return data_.n.d;   // exact type, no conversion.
+        if ((data_.f.flags & kIntFlag) != 0)                   return data_.n.i.i; // int -> double
+        if ((data_.f.flags & kUintFlag) != 0)                  return data_.n.u.u; // unsigned -> double
+        if ((data_.f.flags & kInt64Flag) != 0)                 return static_cast<double>(data_.n.i64); // int64_t -> double (may lose precision)
+        RAPIDJSON_ASSERT((data_.f.flags & kUint64Flag) != 0);  return static_cast<double>(data_.n.u64); // uint64_t -> double (may lose precision)
+    }
+
+    //! Get the value as float type.
+    /*! \note If the value is 64-bit integer type, it may lose precision. Use \c IsLosslessFloat() to check whether the converison is lossless.
+    */
+    float GetFloat() const {
+        return static_cast<float>(GetDouble());
     }
 
     GenericValue& SetInt(int i)             { this->~GenericValue(); new (this) GenericValue(i);    return *this; }
@@ -1459,18 +1662,19 @@
     GenericValue& SetInt64(int64_t i64)     { this->~GenericValue(); new (this) GenericValue(i64);  return *this; }
     GenericValue& SetUint64(uint64_t u64)   { this->~GenericValue(); new (this) GenericValue(u64);  return *this; }
     GenericValue& SetDouble(double d)       { this->~GenericValue(); new (this) GenericValue(d);    return *this; }
+    GenericValue& SetFloat(float f)         { this->~GenericValue(); new (this) GenericValue(f);    return *this; }
 
     //@}
 
     //!@name String
     //@{
 
-    const Ch* GetString() const { RAPIDJSON_ASSERT(IsString()); return ((flags_ & kInlineStrFlag) ? data_.ss.str : data_.s.str); }
+    const Ch* GetString() const { RAPIDJSON_ASSERT(IsString()); return (data_.f.flags & kInlineStrFlag) ? data_.ss.str : GetStringPointer(); }
 
     //! Get the length of string.
     /*! Since rapidjson permits "\\u0000" in the json string, strlen(v.GetString()) may not equal to v.GetStringLength().
     */
-    SizeType GetStringLength() const { RAPIDJSON_ASSERT(IsString()); return ((flags_ & kInlineStrFlag) ? (data_.ss.GetLength()) : data_.s.length); }
+    SizeType GetStringLength() const { RAPIDJSON_ASSERT(IsString()); return ((data_.f.flags & kInlineStrFlag) ? (data_.ss.GetLength()) : data_.s.length); }
 
     //! Set this value as a string without copying source string.
     /*! This version has better performance with supplied length, and also support string containing null character.
@@ -1520,6 +1724,30 @@
 
     //@}
 
+    //!@name Array
+    //@{
+
+    //! Templated version for checking whether this value is type T.
+    /*!
+        \tparam T Either \c bool, \c int, \c unsigned, \c int64_t, \c uint64_t, \c double, \c float, \c const \c char*, \c std::basic_string<Ch>
+    */
+    template <typename T>
+    bool Is() const { return internal::TypeHelper<ValueType, T>::Is(*this); }
+
+    template <typename T>
+    T Get() const { return internal::TypeHelper<ValueType, T>::Get(*this); }
+
+    template <typename T>
+    T Get() { return internal::TypeHelper<ValueType, T>::Get(*this); }
+
+    template<typename T>
+    ValueType& Set(const T& data) { return internal::TypeHelper<ValueType, T>::Set(*this, data); }
+
+    template<typename T>
+    ValueType& Set(const T& data, AllocatorType& allocator) { return internal::TypeHelper<ValueType, T>::Set(*this, data, allocator); }
+
+    //@}
+
     //! Generate events of this value to a Handler.
     /*! This function adopts the GoF visitor pattern.
         Typical usage is to output this JSON value as JSON text via Writer, which is a Handler.
@@ -1535,35 +1763,35 @@
         case kTrueType:     return handler.Bool(true);
 
         case kObjectType:
-            if (!handler.StartObject())
+            if (RAPIDJSON_UNLIKELY(!handler.StartObject()))
                 return false;
             for (ConstMemberIterator m = MemberBegin(); m != MemberEnd(); ++m) {
                 RAPIDJSON_ASSERT(m->name.IsString()); // User may change the type of name by MemberIterator.
-                if (!handler.Key(m->name.GetString(), m->name.GetStringLength(), (m->name.flags_ & kCopyFlag) != 0))
+                if (RAPIDJSON_UNLIKELY(!handler.Key(m->name.GetString(), m->name.GetStringLength(), (m->name.data_.f.flags & kCopyFlag) != 0)))
                     return false;
-                if (!m->value.Accept(handler))
+                if (RAPIDJSON_UNLIKELY(!m->value.Accept(handler)))
                     return false;
             }
             return handler.EndObject(data_.o.size);
 
         case kArrayType:
-            if (!handler.StartArray())
+            if (RAPIDJSON_UNLIKELY(!handler.StartArray()))
                 return false;
-            for (GenericValue* v = data_.a.elements; v != data_.a.elements + data_.a.size; ++v)
-                if (!v->Accept(handler))
+            for (const GenericValue* v = Begin(); v != End(); ++v)
+                if (RAPIDJSON_UNLIKELY(!v->Accept(handler)))
                     return false;
             return handler.EndArray(data_.a.size);
     
         case kStringType:
-            return handler.String(GetString(), GetStringLength(), (flags_ & kCopyFlag) != 0);
+            return handler.String(GetString(), GetStringLength(), (data_.f.flags & kCopyFlag) != 0);
     
         default:
             RAPIDJSON_ASSERT(GetType() == kNumberType);
-            if (IsInt())            return handler.Int(data_.n.i.i);
+            if (IsDouble())         return handler.Double(data_.n.d);
+            else if (IsInt())       return handler.Int(data_.n.i.i);
             else if (IsUint())      return handler.Uint(data_.n.u.u);
             else if (IsInt64())     return handler.Int64(data_.n.i64);
-            else if (IsUint64())    return handler.Uint64(data_.n.u64);
-            else                    return handler.Double(data_.n.d);
+            else                    return handler.Uint64(data_.n.u64);
         }
     }
 
@@ -1572,16 +1800,16 @@
     template <typename, typename, typename> friend class GenericDocument;
 
     enum {
-        kBoolFlag = 0x100,
-        kNumberFlag = 0x200,
-        kIntFlag = 0x400,
-        kUintFlag = 0x800,
-        kInt64Flag = 0x1000,
-        kUint64Flag = 0x2000,
-        kDoubleFlag = 0x4000,
-        kStringFlag = 0x100000,
-        kCopyFlag = 0x200000,
-        kInlineStrFlag = 0x400000,
+        kBoolFlag       = 0x0008,
+        kNumberFlag     = 0x0010,
+        kIntFlag        = 0x0020,
+        kUintFlag       = 0x0040,
+        kInt64Flag      = 0x0080,
+        kUint64Flag     = 0x0100,
+        kDoubleFlag     = 0x0200,
+        kStringFlag     = 0x0400,
+        kCopyFlag       = 0x0800,
+        kInlineStrFlag  = 0x1000,
 
         // Initial flags of different types.
         kNullFlag = kNullType,
@@ -1599,16 +1827,27 @@
         kObjectFlag = kObjectType,
         kArrayFlag = kArrayType,
 
-        kTypeMask = 0xFF    // bitwise-and with mask of 0xFF can be optimized by compiler
+        kTypeMask = 0x07
     };
 
     static const SizeType kDefaultArrayCapacity = 16;
     static const SizeType kDefaultObjectCapacity = 16;
 
+    struct Flag {
+#if RAPIDJSON_48BITPOINTER_OPTIMIZATION
+        char payload[sizeof(SizeType) * 2 + 6];     // 2 x SizeType + lower 48-bit pointer
+#elif RAPIDJSON_64BIT
+        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 6]; // 6 padding bytes
+#else
+        char payload[sizeof(SizeType) * 2 + sizeof(void*) + 2]; // 2 padding bytes
+#endif
+        uint16_t flags;
+    };
+
     struct String {
+        SizeType length;
+        SizeType hashcode;  //!< reserved
         const Ch* str;
-        SizeType length;
-        unsigned hashcode;  //!< reserved
     };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
 
     // implementation detail: ShortString can represent zero-terminated strings up to MaxSize chars
@@ -1617,10 +1856,10 @@
     // to store has the maximal length of MaxSize then str[LenPos] will be 0 and therefore act as
     // the string terminator as well. For getting the string length back from that value just use
     // "MaxSize - str[LenPos]".
-    // This allows to store 11-chars strings in 32-bit mode and 15-chars strings in 64-bit mode
-    // inline (for `UTF8`-encoded strings).
+    // This allows to store 13-chars strings in 32-bit mode, 21-chars strings in 64-bit mode,
+    // 13-chars strings for RAPIDJSON_48BITPOINTER_OPTIMIZATION=1 inline (for `UTF8`-encoded strings).
     struct ShortString {
-        enum { MaxChars = sizeof(String) / sizeof(Ch), MaxSize = MaxChars - 1, LenPos = MaxSize };
+        enum { MaxChars = sizeof(static_cast<Flag*>(0)->payload) / sizeof(Ch), MaxSize = MaxChars - 1, LenPos = MaxSize };
         Ch str[MaxChars];
 
         inline static bool Usable(SizeType len) { return                       (MaxSize >= len); }
@@ -1654,69 +1893,79 @@
         double d;
     };  // 8 bytes
 
-    struct Object {
+    struct ObjectData {
+        SizeType size;
+        SizeType capacity;
         Member* members;
+    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
+
+    struct ArrayData {
         SizeType size;
         SizeType capacity;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
-
-    struct Array {
         GenericValue* elements;
-        SizeType size;
-        SizeType capacity;
     };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
 
     union Data {
         String s;
         ShortString ss;
         Number n;
-        Object o;
-        Array a;
-    };  // 12 bytes in 32-bit mode, 16 bytes in 64-bit mode
+        ObjectData o;
+        ArrayData a;
+        Flag f;
+    };  // 16 bytes in 32-bit mode, 24 bytes in 64-bit mode, 16 bytes in 64-bit with RAPIDJSON_48BITPOINTER_OPTIMIZATION
+
+    RAPIDJSON_FORCEINLINE const Ch* GetStringPointer() const { return RAPIDJSON_GETPOINTER(Ch, data_.s.str); }
+    RAPIDJSON_FORCEINLINE const Ch* SetStringPointer(const Ch* str) { return RAPIDJSON_SETPOINTER(Ch, data_.s.str, str); }
+    RAPIDJSON_FORCEINLINE GenericValue* GetElementsPointer() const { return RAPIDJSON_GETPOINTER(GenericValue, data_.a.elements); }
+    RAPIDJSON_FORCEINLINE GenericValue* SetElementsPointer(GenericValue* elements) { return RAPIDJSON_SETPOINTER(GenericValue, data_.a.elements, elements); }
+    RAPIDJSON_FORCEINLINE Member* GetMembersPointer() const { return RAPIDJSON_GETPOINTER(Member, data_.o.members); }
+    RAPIDJSON_FORCEINLINE Member* SetMembersPointer(Member* members) { return RAPIDJSON_SETPOINTER(Member, data_.o.members, members); }
 
     // Initialize this value as array with initial data, without calling destructor.
     void SetArrayRaw(GenericValue* values, SizeType count, Allocator& allocator) {
-        flags_ = kArrayFlag;
+        data_.f.flags = kArrayFlag;
         if (count) {
-            data_.a.elements = static_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
-            std::memcpy(data_.a.elements, values, count * sizeof(GenericValue));
+            GenericValue* e = static_cast<GenericValue*>(allocator.Malloc(count * sizeof(GenericValue)));
+            SetElementsPointer(e);
+            std::memcpy(e, values, count * sizeof(GenericValue));
         }
         else
-            data_.a.elements = NULL;
+            SetElementsPointer(0);
         data_.a.size = data_.a.capacity = count;
     }
 
     //! Initialize this value as object with initial data, without calling destructor.
     void SetObjectRaw(Member* members, SizeType count, Allocator& allocator) {
-        flags_ = kObjectFlag;
+        data_.f.flags = kObjectFlag;
         if (count) {
-            data_.o.members = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
-            std::memcpy(data_.o.members, members, count * sizeof(Member));
+            Member* m = static_cast<Member*>(allocator.Malloc(count * sizeof(Member)));
+            SetMembersPointer(m);
+            std::memcpy(m, members, count * sizeof(Member));
         }
         else
-            data_.o.members = NULL;
+            SetMembersPointer(0);
         data_.o.size = data_.o.capacity = count;
     }
 
     //! Initialize this value as constant string, without calling destructor.
     void SetStringRaw(StringRefType s) RAPIDJSON_NOEXCEPT {
-        flags_ = kConstStringFlag;
-        data_.s.str = s;
+        data_.f.flags = kConstStringFlag;
+        SetStringPointer(s);
         data_.s.length = s.length;
     }
 
     //! Initialize this value as copy string with initial data, without calling destructor.
     void SetStringRaw(StringRefType s, Allocator& allocator) {
-        Ch* str = NULL;
-        if(ShortString::Usable(s.length)) {
-            flags_ = kShortStringFlag;
+        Ch* str = 0;
+        if (ShortString::Usable(s.length)) {
+            data_.f.flags = kShortStringFlag;
             data_.ss.SetLength(s.length);
             str = data_.ss.str;
         } else {
-            flags_ = kCopyStringFlag;
+            data_.f.flags = kCopyStringFlag;
             data_.s.length = s.length;
             str = static_cast<Ch *>(allocator.Malloc((s.length + 1) * sizeof(Ch)));
-            data_.s.str = str;
+            SetStringPointer(str);
         }
         std::memcpy(str, s, s.length * sizeof(Ch));
         str[s.length] = '\0';
@@ -1725,8 +1974,8 @@
     //! Assignment without calling destructor
     void RawAssign(GenericValue& rhs) RAPIDJSON_NOEXCEPT {
         data_ = rhs.data_;
-        flags_ = rhs.flags_;
-        rhs.flags_ = kNullFlag;
+        // data_.f.flags = rhs.data_.f.flags;
+        rhs.data_.f.flags = kNullFlag;
     }
 
     template <typename SourceAllocator>
@@ -1746,7 +1995,6 @@
     }
 
     Data data_;
-    unsigned flags_;
 };
 
 //! GenericValue with UTF8 encoding
@@ -1869,6 +2117,21 @@
      */
     friend inline void swap(GenericDocument& a, GenericDocument& b) RAPIDJSON_NOEXCEPT { a.Swap(b); }
 
+    //! Populate this document by a generator which produces SAX events.
+    /*! \tparam Generator A functor with <tt>bool f(Handler)</tt> prototype.
+        \param g Generator functor which sends SAX events to the parameter.
+        \return The document itself for fluent API.
+    */
+    template <typename Generator>
+    GenericDocument& Populate(Generator& g) {
+        ClearStackOnExit scope(*this);
+        if (g(*this)) {
+            RAPIDJSON_ASSERT(stack_.GetSize() == sizeof(ValueType)); // Got one and only one root object
+            ValueType::operator=(*stack_.template Pop<ValueType>(1));// Move value from stack to document
+        }
+        return *this;
+    }
+
     //!@name Parse from stream
     //!@{
 
@@ -1967,6 +2230,42 @@
     GenericDocument& Parse(const Ch* str) {
         return Parse<kParseDefaultFlags>(str);
     }
+
+    template <unsigned parseFlags, typename SourceEncoding>
+    GenericDocument& Parse(const typename SourceEncoding::Ch* str, size_t length) {
+        RAPIDJSON_ASSERT(!(parseFlags & kParseInsituFlag));
+        MemoryStream ms(static_cast<const char*>(str), length * sizeof(typename SourceEncoding::Ch));
+        EncodedInputStream<SourceEncoding, MemoryStream> is(ms);
+        ParseStream<parseFlags, SourceEncoding>(is);
+        return *this;
+    }
+
+    template <unsigned parseFlags>
+    GenericDocument& Parse(const Ch* str, size_t length) {
+        return Parse<parseFlags, Encoding>(str, length);
+    }
+    
+    GenericDocument& Parse(const Ch* str, size_t length) {
+        return Parse<kParseDefaultFlags>(str, length);
+    }
+
+#if RAPIDJSON_HAS_STDSTRING
+    template <unsigned parseFlags, typename SourceEncoding>
+    GenericDocument& Parse(const std::basic_string<typename SourceEncoding::Ch>& str) {
+        // c_str() is constant complexity according to standard. Should be faster than Parse(const char*, size_t)
+        return Parse<parseFlags, SourceEncoding>(str.c_str());
+    }
+
+    template <unsigned parseFlags>
+    GenericDocument& Parse(const std::basic_string<Ch>& str) {
+        return Parse<parseFlags, Encoding>(str.c_str());
+    }
+
+    GenericDocument& Parse(const std::basic_string<Ch>& str) {
+        return Parse<kParseDefaultFlags>(str);
+    }
+#endif // RAPIDJSON_HAS_STDSTRING    
+
     //!@}
 
     //!@name Handling parse errors
@@ -2017,9 +2316,10 @@
     };
 
     // callers of the following private Handler functions
-    template <typename,typename,typename> friend class GenericReader; // for parsing
+    // template <typename,typename,typename> friend class GenericReader; // for parsing
     template <typename, typename> friend class GenericValue; // for deep copying
 
+public:
     // Implementation of Handler
     bool Null() { new (stack_.template Push<ValueType>()) ValueType(); return true; }
     bool Bool(bool b) { new (stack_.template Push<ValueType>()) ValueType(b); return true; }
@@ -2029,6 +2329,14 @@
     bool Uint64(uint64_t i) { new (stack_.template Push<ValueType>()) ValueType(i); return true; }
     bool Double(double d) { new (stack_.template Push<ValueType>()) ValueType(d); return true; }
 
+    bool RawNumber(const Ch* str, SizeType length, bool copy) { 
+        if (copy) 
+            new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
+        else
+            new (stack_.template Push<ValueType>()) ValueType(str, length);
+        return true;
+    }
+
     bool String(const Ch* str, SizeType length, bool copy) { 
         if (copy) 
             new (stack_.template Push<ValueType>()) ValueType(str, length, GetAllocator());
@@ -2099,20 +2407,159 @@
         }
         break;
     case kStringType:
-        if (rhs.flags_ == kConstStringFlag) {
-            flags_ = rhs.flags_;
+        if (rhs.data_.f.flags == kConstStringFlag) {
+            data_.f.flags = rhs.data_.f.flags;
             data_  = *reinterpret_cast<const Data*>(&rhs.data_);
         } else {
             SetStringRaw(StringRef(rhs.GetString(), rhs.GetStringLength()), allocator);
         }
         break;
     default:
-        flags_ = rhs.flags_;
+        data_.f.flags = rhs.data_.f.flags;
         data_  = *reinterpret_cast<const Data*>(&rhs.data_);
         break;
     }
 }
 
+//! Helper class for accessing Value of array type.
+/*!
+    Instance of this helper class is obtained by \c GenericValue::GetArray().
+    In addition to all APIs for array type, it provides range-based for loop if \c RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
+*/
+template <bool Const, typename ValueT>
+class GenericArray {
+public:
+    typedef GenericArray<true, ValueT> ConstArray;
+    typedef GenericArray<false, ValueT> Array;
+    typedef ValueT PlainType;
+    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
+    typedef ValueType* ValueIterator;  // This may be const or non-const iterator
+    typedef const ValueT* ConstValueIterator;
+    typedef typename ValueType::AllocatorType AllocatorType;
+    typedef typename ValueType::StringRefType StringRefType;
+
+    template <typename, typename>
+    friend class GenericValue;
+
+    GenericArray(const GenericArray& rhs) : value_(rhs.value_) {}
+    GenericArray& operator=(const GenericArray& rhs) { value_ = rhs.value_; return *this; }
+    ~GenericArray() {}
+
+    SizeType Size() const { return value_.Size(); }
+    SizeType Capacity() const { return value_.Capacity(); }
+    bool Empty() const { return value_.Empty(); }
+    void Clear() const { value_.Clear(); }
+    ValueType& operator[](SizeType index) const {  return value_[index]; }
+    ValueIterator Begin() const { return value_.Begin(); }
+    ValueIterator End() const { return value_.End(); }
+    GenericArray Reserve(SizeType newCapacity, AllocatorType &allocator) const { value_.Reserve(newCapacity, allocator); return *this; }
+    GenericArray PushBack(ValueType& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericArray PushBack(ValueType&& value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericArray PushBack(StringRefType value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (const GenericArray&)) PushBack(T value, AllocatorType& allocator) const { value_.PushBack(value, allocator); return *this; }
+    GenericArray PopBack() const { value_.PopBack(); return *this; }
+    ValueIterator Erase(ConstValueIterator pos) const { return value_.Erase(pos); }
+    ValueIterator Erase(ConstValueIterator first, ConstValueIterator last) const { return value_.Erase(first, last); }
+
+#if RAPIDJSON_HAS_CXX11_RANGE_FOR
+    ValueIterator begin() const { return value_.Begin(); }
+    ValueIterator end() const { return value_.End(); }
+#endif
+
+private:
+    GenericArray();
+    GenericArray(ValueType& value) : value_(value) {}
+    ValueType& value_;
+};
+
+//! Helper class for accessing Value of object type.
+/*!
+    Instance of this helper class is obtained by \c GenericValue::GetObject().
+    In addition to all APIs for array type, it provides range-based for loop if \c RAPIDJSON_HAS_CXX11_RANGE_FOR=1.
+*/
+template <bool Const, typename ValueT>
+class GenericObject {
+public:
+    typedef GenericObject<true, ValueT> ConstObject;
+    typedef GenericObject<false, ValueT> Object;
+    typedef ValueT PlainType;
+    typedef typename internal::MaybeAddConst<Const,PlainType>::Type ValueType;
+    typedef GenericMemberIterator<Const, typename ValueT::EncodingType, typename ValueT::AllocatorType> MemberIterator;  // This may be const or non-const iterator
+    typedef GenericMemberIterator<true, typename ValueT::EncodingType, typename ValueT::AllocatorType> ConstMemberIterator;
+    typedef typename ValueType::AllocatorType AllocatorType;
+    typedef typename ValueType::StringRefType StringRefType;
+    typedef typename ValueType::EncodingType EncodingType;
+    typedef typename ValueType::Ch Ch;
+
+    template <typename, typename>
+    friend class GenericValue;
+
+    GenericObject(const GenericObject& rhs) : value_(rhs.value_) {}
+    GenericObject& operator=(const GenericObject& rhs) { value_ = rhs.value_; return *this; }
+    ~GenericObject() {}
+
+    SizeType MemberCount() const { return value_.MemberCount(); }
+    bool ObjectEmpty() const { return value_.ObjectEmpty(); }
+    template <typename T> ValueType& operator[](T* name) const { return value_[name]; }
+    template <typename SourceAllocator> ValueType& operator[](const GenericValue<EncodingType, SourceAllocator>& name) const { return value_[name]; }
+#if RAPIDJSON_HAS_STDSTRING
+    ValueType& operator[](const std::basic_string<Ch>& name) const { return value_[name]; }
+#endif
+    MemberIterator MemberBegin() const { return value_.MemberBegin(); }
+    MemberIterator MemberEnd() const { return value_.MemberEnd(); }
+    bool HasMember(const Ch* name) const { return value_.HasMember(name); }
+#if RAPIDJSON_HAS_STDSTRING
+    bool HasMember(const std::basic_string<Ch>& name) const { return value_.HasMember(name); }
+#endif
+    template <typename SourceAllocator> bool HasMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.HasMember(name); }
+    MemberIterator FindMember(const Ch* name) const { return value_.FindMember(name); }
+    template <typename SourceAllocator> MemberIterator FindMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.FindMember(name); }
+#if RAPIDJSON_HAS_STDSTRING
+    MemberIterator FindMember(const std::basic_string<Ch>& name) const { return value_.FindMember(name); }
+#endif
+    GenericObject AddMember(ValueType& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(ValueType& name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#if RAPIDJSON_HAS_STDSTRING
+    GenericObject AddMember(ValueType& name, std::basic_string<Ch>& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#endif
+    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (ValueType&)) AddMember(ValueType& name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#if RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericObject AddMember(ValueType&& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(ValueType&& name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(ValueType& name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(StringRefType name, ValueType&& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+#endif // RAPIDJSON_HAS_CXX11_RVALUE_REFS
+    GenericObject AddMember(StringRefType name, ValueType& value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    GenericObject AddMember(StringRefType name, StringRefType value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    template <typename T> RAPIDJSON_DISABLEIF_RETURN((internal::OrExpr<internal::IsPointer<T>, internal::IsGenericValue<T> >), (GenericObject)) AddMember(StringRefType name, T value, AllocatorType& allocator) const { value_.AddMember(name, value, allocator); return *this; }
+    void RemoveAllMembers() { return value_.RemoveAllMembers(); }
+    bool RemoveMember(const Ch* name) const { return value_.RemoveMember(name); }
+#if RAPIDJSON_HAS_STDSTRING
+    bool RemoveMember(const std::basic_string<Ch>& name) const { return value_.RemoveMember(name); }
+#endif
+    template <typename SourceAllocator> bool RemoveMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.RemoveMember(name); }
+    MemberIterator RemoveMember(MemberIterator m) const { return value_.RemoveMember(m); }
+    MemberIterator EraseMember(ConstMemberIterator pos) const { return value_.EraseMember(pos); }
+    MemberIterator EraseMember(ConstMemberIterator first, ConstMemberIterator last) const { return value_.EraseMember(first, last); }
+    bool EraseMember(const Ch* name) const { return value_.EraseMember(name); }
+#if RAPIDJSON_HAS_STDSTRING
+    bool EraseMember(const std::basic_string<Ch>& name) const { return EraseMember(ValueType(StringRef(name))); }
+#endif
+    template <typename SourceAllocator> bool EraseMember(const GenericValue<EncodingType, SourceAllocator>& name) const { return value_.EraseMember(name); }
+
+#if RAPIDJSON_HAS_CXX11_RANGE_FOR
+    MemberIterator begin() const { return value_.MemberBegin(); }
+    MemberIterator end() const { return value_.MemberEnd(); }
+#endif
+
+private:
+    GenericObject();
+    GenericObject(ValueType& value) : value_(value) {}
+    ValueType& value_;
+};
+
 RAPIDJSON_NAMESPACE_END
 
 #ifdef _MSC_VER

=== modified file 'shorts/xml2json/rapidjson/encodedstream.h'
--- shorts/xml2json/rapidjson/encodedstream.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/encodedstream.h	2016-06-15 16:13:25 +0000
@@ -15,7 +15,8 @@
 #ifndef RAPIDJSON_ENCODEDSTREAM_H_
 #define RAPIDJSON_ENCODEDSTREAM_H_
 
-#include "rapidjson.h"
+#include "stream.h"
+#include "memorystream.h"
 
 #ifdef __GNUC__
 RAPIDJSON_DIAG_PUSH
@@ -62,6 +63,34 @@
     Ch current_;
 };
 
+//! Specialized for UTF8 MemoryStream.
+template <>
+class EncodedInputStream<UTF8<>, MemoryStream> {
+public:
+    typedef UTF8<>::Ch Ch;
+
+    EncodedInputStream(MemoryStream& is) : is_(is) {
+        if (static_cast<unsigned char>(is_.Peek()) == 0xEFu) is_.Take();
+        if (static_cast<unsigned char>(is_.Peek()) == 0xBBu) is_.Take();
+        if (static_cast<unsigned char>(is_.Peek()) == 0xBFu) is_.Take();
+    }
+    Ch Peek() const { return is_.Peek(); }
+    Ch Take() { return is_.Take(); }
+    size_t Tell() const { return is_.Tell(); }
+
+    // Not implemented
+    void Put(Ch) {}
+    void Flush() {} 
+    Ch* PutBegin() { return 0; }
+    size_t PutEnd(Ch*) { return 0; }
+
+    MemoryStream& is_;
+
+private:
+    EncodedInputStream(const EncodedInputStream&);
+    EncodedInputStream& operator=(const EncodedInputStream&);
+};
+
 //! Output byte stream wrapper with statically bound encoding.
 /*!
     \tparam Encoding The interpretation of encoding of the stream. Either UTF8, UTF16LE, UTF16BE, UTF32LE, UTF32BE.

=== modified file 'shorts/xml2json/rapidjson/encodings.h'
--- shorts/xml2json/rapidjson/encodings.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/encodings.h	2016-06-15 16:13:25 +0000
@@ -120,6 +120,28 @@
         }
     }
 
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        if (codepoint <= 0x7F) 
+            PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
+        else if (codepoint <= 0x7FF) {
+            PutUnsafe(os, static_cast<Ch>(0xC0 | ((codepoint >> 6) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint & 0x3F))));
+        }
+        else if (codepoint <= 0xFFFF) {
+            PutUnsafe(os, static_cast<Ch>(0xE0 | ((codepoint >> 12) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+        else {
+            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            PutUnsafe(os, static_cast<Ch>(0xF0 | ((codepoint >> 18) & 0xFF)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 12) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | ((codepoint >> 6) & 0x3F)));
+            PutUnsafe(os, static_cast<Ch>(0x80 | (codepoint & 0x3F)));
+        }
+    }
+
     template <typename InputStream>
     static bool Decode(InputStream& is, unsigned* codepoint) {
 #define COPY() c = is.Take(); *codepoint = (*codepoint << 6) | (static_cast<unsigned char>(c) & 0x3Fu)
@@ -261,6 +283,22 @@
         }
     }
 
+
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 2);
+        if (codepoint <= 0xFFFF) {
+            RAPIDJSON_ASSERT(codepoint < 0xD800 || codepoint > 0xDFFF); // Code point itself cannot be surrogate pair 
+            PutUnsafe(os, static_cast<typename OutputStream::Ch>(codepoint));
+        }
+        else {
+            RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+            unsigned v = codepoint - 0x10000;
+            PutUnsafe(os, static_cast<typename OutputStream::Ch>((v >> 10) | 0xD800));
+            PutUnsafe(os, (v & 0x3FF) | 0xDC00);
+        }
+    }
+
     template <typename InputStream>
     static bool Decode(InputStream& is, unsigned* codepoint) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 2);
@@ -386,6 +424,13 @@
         os.Put(codepoint);
     }
 
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_STATIC_ASSERT(sizeof(typename OutputStream::Ch) >= 4);
+        RAPIDJSON_ASSERT(codepoint <= 0x10FFFF);
+        PutUnsafe(os, codepoint);
+    }
+
     template <typename InputStream>
     static bool Decode(InputStream& is, unsigned* codepoint) {
         RAPIDJSON_STATIC_ASSERT(sizeof(typename InputStream::Ch) >= 4);
@@ -501,6 +546,12 @@
         os.Put(static_cast<Ch>(codepoint & 0xFF));
     }
 
+    template<typename OutputStream>
+    static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        RAPIDJSON_ASSERT(codepoint <= 0x7F);
+        PutUnsafe(os, static_cast<Ch>(codepoint & 0xFF));
+    }
+
     template <typename InputStream>
     static bool Decode(InputStream& is, unsigned* codepoint) {
         uint8_t c = static_cast<uint8_t>(is.Take());
@@ -571,6 +622,13 @@
         (*f[os.GetType()])(os, codepoint);
     }
 
+    template<typename OutputStream>
+    RAPIDJSON_FORCEINLINE static void EncodeUnsafe(OutputStream& os, unsigned codepoint) {
+        typedef void (*EncodeFunc)(OutputStream&, unsigned);
+        static const EncodeFunc f[] = { RAPIDJSON_ENCODINGS_FUNC(EncodeUnsafe) };
+        (*f[os.GetType()])(os, codepoint);
+    }
+
     template <typename InputStream>
     RAPIDJSON_FORCEINLINE static bool Decode(InputStream& is, unsigned* codepoint) {
         typedef bool (*DecodeFunc)(InputStream&, unsigned*);
@@ -604,6 +662,15 @@
         return true;
     }
 
+    template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
+        unsigned codepoint;
+        if (!SourceEncoding::Decode(is, &codepoint))
+            return false;
+        TargetEncoding::EncodeUnsafe(os, codepoint);
+        return true;
+    }
+
     //! Validate one Unicode codepoint from an encoded stream.
     template<typename InputStream, typename OutputStream>
     RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
@@ -611,6 +678,10 @@
     }
 };
 
+// Forward declaration.
+template<typename Stream>
+inline void PutUnsafe(Stream& stream, typename Stream::Ch c);
+
 //! Specialization of Transcoder with same source and target encoding.
 template<typename Encoding>
 struct Transcoder<Encoding, Encoding> {
@@ -621,6 +692,12 @@
     }
     
     template<typename InputStream, typename OutputStream>
+    RAPIDJSON_FORCEINLINE static bool TranscodeUnsafe(InputStream& is, OutputStream& os) {
+        PutUnsafe(os, is.Take());  // Just copy one code unit. This semantic is different from primary template class.
+        return true;
+    }
+    
+    template<typename InputStream, typename OutputStream>
     RAPIDJSON_FORCEINLINE static bool Validate(InputStream& is, OutputStream& os) {
         return Encoding::Validate(is, os);  // source/target encoding are the same
     }

=== modified file 'shorts/xml2json/rapidjson/filereadstream.h'
--- shorts/xml2json/rapidjson/filereadstream.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/filereadstream.h	2016-06-15 16:13:25 +0000
@@ -15,7 +15,7 @@
 #ifndef RAPIDJSON_FILEREADSTREAM_H_
 #define RAPIDJSON_FILEREADSTREAM_H_
 
-#include "rapidjson.h"
+#include "stream.h"
 #include <cstdio>
 
 #ifdef __clang__

=== modified file 'shorts/xml2json/rapidjson/filewritestream.h'
--- shorts/xml2json/rapidjson/filewritestream.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/filewritestream.h	2016-06-15 16:13:25 +0000
@@ -15,7 +15,7 @@
 #ifndef RAPIDJSON_FILEWRITESTREAM_H_
 #define RAPIDJSON_FILEWRITESTREAM_H_
 
-#include "rapidjson.h"
+#include "stream.h"
 #include <cstdio>
 
 #ifdef __clang__

=== added file 'shorts/xml2json/rapidjson/fwd.h'
--- shorts/xml2json/rapidjson/fwd.h	1970-01-01 00:00:00 +0000
+++ shorts/xml2json/rapidjson/fwd.h	2016-06-15 16:13:25 +0000
@@ -0,0 +1,151 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_FWD_H_
+#define RAPIDJSON_FWD_H_
+
+#include "rapidjson.h"
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+// encodings.h
+
+template<typename CharType> struct UTF8;
+template<typename CharType> struct UTF16;
+template<typename CharType> struct UTF16BE;
+template<typename CharType> struct UTF16LE;
+template<typename CharType> struct UTF32;
+template<typename CharType> struct UTF32BE;
+template<typename CharType> struct UTF32LE;
+template<typename CharType> struct ASCII;
+template<typename CharType> struct AutoUTF;
+
+template<typename SourceEncoding, typename TargetEncoding>
+struct Transcoder;
+
+// allocators.h
+
+class CrtAllocator;
+
+template <typename BaseAllocator>
+class MemoryPoolAllocator;
+
+// stream.h
+
+template <typename Encoding>
+struct GenericStringStream;
+
+typedef GenericStringStream<UTF8<char> > StringStream;
+
+template <typename Encoding>
+struct GenericInsituStringStream;
+
+typedef GenericInsituStringStream<UTF8<char> > InsituStringStream;
+
+// stringbuffer.h
+
+template <typename Encoding, typename Allocator>
+class GenericStringBuffer;
+
+typedef GenericStringBuffer<UTF8<char>, CrtAllocator> StringBuffer;
+
+// filereadstream.h
+
+class FileReadStream;
+
+// filewritestream.h
+
+class FileWriteStream;
+
+// memorybuffer.h
+
+template <typename Allocator>
+struct GenericMemoryBuffer;
+
+typedef GenericMemoryBuffer<CrtAllocator> MemoryBuffer;
+
+// memorystream.h
+
+struct MemoryStream;
+
+// reader.h
+
+template<typename Encoding, typename Derived>
+struct BaseReaderHandler;
+
+template <typename SourceEncoding, typename TargetEncoding, typename StackAllocator>
+class GenericReader;
+
+typedef GenericReader<UTF8<char>, UTF8<char>, CrtAllocator> Reader;
+
+// writer.h
+
+template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
+class Writer;
+
+// prettywriter.h
+
+template<typename OutputStream, typename SourceEncoding, typename TargetEncoding, typename StackAllocator, unsigned writeFlags>
+class PrettyWriter;
+
+// document.h
+
+template <typename Encoding, typename Allocator> 
+struct GenericMember;
+
+template <bool Const, typename Encoding, typename Allocator>
+class GenericMemberIterator;
+
+template<typename CharType>
+struct GenericStringRef;
+
+template <typename Encoding, typename Allocator> 
+class GenericValue;
+
+typedef GenericValue<UTF8<char>, MemoryPoolAllocator<CrtAllocator> > Value;
+
+template <typename Encoding, typename Allocator, typename StackAllocator>
+class GenericDocument;
+
+typedef GenericDocument<UTF8<char>, MemoryPoolAllocator<CrtAllocator>, CrtAllocator> Document;
+
+// pointer.h
+
+template <typename ValueType, typename Allocator>
+class GenericPointer;
+
+typedef GenericPointer<Value, CrtAllocator> Pointer;
+
+// schema.h
+
+template <typename SchemaDocumentType>
+class IGenericRemoteSchemaDocumentProvider;
+
+template <typename ValueT, typename Allocator>
+class GenericSchemaDocument;
+
+typedef GenericSchemaDocument<Value, CrtAllocator> SchemaDocument;
+typedef IGenericRemoteSchemaDocumentProvider<SchemaDocument> IRemoteSchemaDocumentProvider;
+
+template <
+    typename SchemaDocumentType,
+    typename OutputHandler,
+    typename StateAllocator>
+class GenericSchemaValidator;
+
+typedef GenericSchemaValidator<SchemaDocument, BaseReaderHandler<UTF8<char>, void>, CrtAllocator> SchemaValidator;
+
+RAPIDJSON_NAMESPACE_END
+
+#endif // RAPIDJSON_RAPIDJSONFWD_H_

=== modified file 'shorts/xml2json/rapidjson/internal/biginteger.h' (properties changed: -x to +x)
=== modified file 'shorts/xml2json/rapidjson/internal/diyfp.h'
--- shorts/xml2json/rapidjson/internal/diyfp.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/internal/diyfp.h	2016-06-15 16:13:25 +0000
@@ -41,7 +41,7 @@
 #endif
 
 struct DiyFp {
-    DiyFp() {}
+    DiyFp() : f(), e() {}
 
     DiyFp(uint64_t fp, int exp) : f(fp), e(exp) {}
 

=== modified file 'shorts/xml2json/rapidjson/internal/dtoa.h'
--- shorts/xml2json/rapidjson/internal/dtoa.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/internal/dtoa.h	2016-06-15 16:13:25 +0000
@@ -29,6 +29,7 @@
 #ifdef __GNUC__
 RAPIDJSON_DIAG_PUSH
 RAPIDJSON_DIAG_OFF(effc++)
+RAPIDJSON_DIAG_OFF(array-bounds) // some gcc versions generate wrong warnings https://gcc.gnu.org/bugzilla/show_bug.cgi?id=59124
 #endif
 
 inline void GrisuRound(char* buffer, int len, uint64_t delta, uint64_t rest, uint64_t ten_kappa, uint64_t wp_w) {
@@ -145,10 +146,10 @@
     return buffer;
 }
 
-inline char* Prettify(char* buffer, int length, int k) {
+inline char* Prettify(char* buffer, int length, int k, int maxDecimalPlaces) {
     const int kk = length + k;  // 10^(kk-1) <= v < 10^kk
 
-    if (length <= kk && kk <= 21) {
+    if (0 <= k && kk <= 21) {
         // 1234e7 -> 12340000000
         for (int i = length; i < kk; i++)
             buffer[i] = '0';
@@ -160,7 +161,16 @@
         // 1234e-2 -> 12.34
         std::memmove(&buffer[kk + 1], &buffer[kk], static_cast<size_t>(length - kk));
         buffer[kk] = '.';
-        return &buffer[length + 1];
+        if (0 > k + maxDecimalPlaces) {
+            // When maxDecimalPlaces = 2, 1.2345 -> 1.23, 1.102 -> 1.1
+            // Remove extra trailing zeros (at least one) after truncation.
+            for (int i = kk + maxDecimalPlaces; i > kk + 1; i--)
+                if (buffer[i] != '0')
+                    return &buffer[i + 1];
+            return &buffer[kk + 2]; // Reserve one zero
+        }
+        else
+            return &buffer[length + 1];
     }
     else if (-6 < kk && kk <= 0) {
         // 1234e-6 -> 0.001234
@@ -170,7 +180,23 @@
         buffer[1] = '.';
         for (int i = 2; i < offset; i++)
             buffer[i] = '0';
-        return &buffer[length + offset];
+        if (length - kk > maxDecimalPlaces) {
+            // When maxDecimalPlaces = 2, 0.123 -> 0.12, 0.102 -> 0.1
+            // Remove extra trailing zeros (at least one) after truncation.
+            for (int i = maxDecimalPlaces + 1; i > 2; i--)
+                if (buffer[i] != '0')
+                    return &buffer[i + 1];
+            return &buffer[3]; // Reserve one zero
+        }
+        else
+            return &buffer[length + offset];
+    }
+    else if (kk < -maxDecimalPlaces) {
+        // Truncate to zero
+        buffer[0] = '0';
+        buffer[1] = '.';
+        buffer[2] = '0';
+        return &buffer[3];
     }
     else if (length == 1) {
         // 1e30
@@ -186,7 +212,8 @@
     }
 }
 
-inline char* dtoa(double value, char* buffer) {
+inline char* dtoa(double value, char* buffer, int maxDecimalPlaces = 324) {
+    RAPIDJSON_ASSERT(maxDecimalPlaces >= 1);
     Double d(value);
     if (d.IsZero()) {
         if (d.Sign())
@@ -203,7 +230,7 @@
         }
         int length, K;
         Grisu2(value, buffer, &length, &K);
-        return Prettify(buffer, length, K);
+        return Prettify(buffer, length, K, maxDecimalPlaces);
     }
 }
 

=== modified file 'shorts/xml2json/rapidjson/internal/ieee754.h'
--- shorts/xml2json/rapidjson/internal/ieee754.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/internal/ieee754.h	2016-06-15 16:13:25 +0000
@@ -40,6 +40,7 @@
 
     bool IsNan() const { return (u_ & kExponentMask) == kExponentMask && Significand() != 0; }
     bool IsInf() const { return (u_ & kExponentMask) == kExponentMask && Significand() == 0; }
+    bool IsNanOrInf() const { return (u_ & kExponentMask) == kExponentMask; }
     bool IsNormal() const { return (u_ & kExponentMask) != 0 || Significand() == 0; }
     bool IsZero() const { return (u_ & (kExponentMask | kSignificandMask)) == 0; }
 

=== added file 'shorts/xml2json/rapidjson/internal/regex.h'
--- shorts/xml2json/rapidjson/internal/regex.h	1970-01-01 00:00:00 +0000
+++ shorts/xml2json/rapidjson/internal/regex.h	2016-06-15 16:13:25 +0000
@@ -0,0 +1,705 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#ifndef RAPIDJSON_INTERNAL_REGEX_H_
+#define RAPIDJSON_INTERNAL_REGEX_H_
+
+#include "../allocators.h"
+#include "../stream.h"
+#include "stack.h"
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+RAPIDJSON_DIAG_OFF(switch-enum)
+RAPIDJSON_DIAG_OFF(implicit-fallthrough)
+#endif
+
+#ifdef __GNUC__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(effc++)
+#endif
+
+#ifdef _MSC_VER
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
+#endif
+
+#ifndef RAPIDJSON_REGEX_VERBOSE
+#define RAPIDJSON_REGEX_VERBOSE 0
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+namespace internal {
+
+///////////////////////////////////////////////////////////////////////////////
+// GenericRegex
+
+static const SizeType kRegexInvalidState = ~SizeType(0);  //!< Represents an invalid index in GenericRegex::State::out, out1
+static const SizeType kRegexInvalidRange = ~SizeType(0);
+
+//! Regular expression engine with subset of ECMAscript grammar.
+/*!
+    Supported regular expression syntax:
+    - \c ab     Concatenation
+    - \c a|b    Alternation
+    - \c a?     Zero or one
+    - \c a*     Zero or more
+    - \c a+     One or more
+    - \c a{3}   Exactly 3 times
+    - \c a{3,}  At least 3 times
+    - \c a{3,5} 3 to 5 times
+    - \c (ab)   Grouping
+    - \c ^a     At the beginning
+    - \c a$     At the end
+    - \c .      Any character
+    - \c [abc]  Character classes
+    - \c [a-c]  Character class range
+    - \c [a-z0-9_] Character class combination
+    - \c [^abc] Negated character classes
+    - \c [^a-c] Negated character class range
+    - \c [\b]   Backspace (U+0008)
+    - \c \\| \\\\ ...  Escape characters
+    - \c \\f Form feed (U+000C)
+    - \c \\n Line feed (U+000A)
+    - \c \\r Carriage return (U+000D)
+    - \c \\t Tab (U+0009)
+    - \c \\v Vertical tab (U+000B)
+
+    \note This is a Thompson NFA engine, implemented with reference to 
+        Cox, Russ. "Regular Expression Matching Can Be Simple And Fast (but is slow in Java, Perl, PHP, Python, Ruby,...).", 
+        https://swtch.com/~rsc/regexp/regexp1.html 
+*/
+template <typename Encoding, typename Allocator = CrtAllocator>
+class GenericRegex {
+public:
+    typedef typename Encoding::Ch Ch;
+
+    GenericRegex(const Ch* source, Allocator* allocator = 0) : 
+        states_(allocator, 256), ranges_(allocator, 256), root_(kRegexInvalidState), stateCount_(), rangeCount_(), 
+        stateSet_(), state0_(allocator, 0), state1_(allocator, 0), anchorBegin_(), anchorEnd_()
+    {
+        GenericStringStream<Encoding> ss(source);
+        DecodedStream<GenericStringStream<Encoding> > ds(ss);
+        Parse(ds);
+    }
+
+    ~GenericRegex() {
+        Allocator::Free(stateSet_);
+    }
+
+    bool IsValid() const {
+        return root_ != kRegexInvalidState;
+    }
+
+    template <typename InputStream>
+    bool Match(InputStream& is) const {
+        return SearchWithAnchoring(is, true, true);
+    }
+
+    bool Match(const Ch* s) const {
+        GenericStringStream<Encoding> is(s);
+        return Match(is);
+    }
+
+    template <typename InputStream>
+    bool Search(InputStream& is) const {
+        return SearchWithAnchoring(is, anchorBegin_, anchorEnd_);
+    }
+
+    bool Search(const Ch* s) const {
+        GenericStringStream<Encoding> is(s);
+        return Search(is);
+    }
+
+private:
+    enum Operator {
+        kZeroOrOne,
+        kZeroOrMore,
+        kOneOrMore,
+        kConcatenation,
+        kAlternation,
+        kLeftParenthesis
+    };
+
+    static const unsigned kAnyCharacterClass = 0xFFFFFFFF;   //!< For '.'
+    static const unsigned kRangeCharacterClass = 0xFFFFFFFE;
+    static const unsigned kRangeNegationFlag = 0x80000000;
+
+    struct Range {
+        unsigned start; // 
+        unsigned end;
+        SizeType next;
+    };
+
+    struct State {
+        SizeType out;     //!< Equals to kInvalid for matching state
+        SizeType out1;    //!< Equals to non-kInvalid for split
+        SizeType rangeStart;
+        unsigned codepoint;
+    };
+
+    struct Frag {
+        Frag(SizeType s, SizeType o, SizeType m) : start(s), out(o), minIndex(m) {}
+        SizeType start;
+        SizeType out; //!< link-list of all output states
+        SizeType minIndex;
+    };
+
+    template <typename SourceStream>
+    class DecodedStream {
+    public:
+        DecodedStream(SourceStream& ss) : ss_(ss), codepoint_() { Decode(); }
+        unsigned Peek() { return codepoint_; }
+        unsigned Take() {
+            unsigned c = codepoint_;
+            if (c) // No further decoding when '\0'
+                Decode();
+            return c;
+        }
+
+    private:
+        void Decode() {
+            if (!Encoding::Decode(ss_, &codepoint_))
+                codepoint_ = 0;
+        }
+
+        SourceStream& ss_;
+        unsigned codepoint_;
+    };
+
+    State& GetState(SizeType index) {
+        RAPIDJSON_ASSERT(index < stateCount_);
+        return states_.template Bottom<State>()[index];
+    }
+
+    const State& GetState(SizeType index) const {
+        RAPIDJSON_ASSERT(index < stateCount_);
+        return states_.template Bottom<State>()[index];
+    }
+
+    Range& GetRange(SizeType index) {
+        RAPIDJSON_ASSERT(index < rangeCount_);
+        return ranges_.template Bottom<Range>()[index];
+    }
+
+    const Range& GetRange(SizeType index) const {
+        RAPIDJSON_ASSERT(index < rangeCount_);
+        return ranges_.template Bottom<Range>()[index];
+    }
+
+    template <typename InputStream>
+    void Parse(DecodedStream<InputStream>& ds) {
+        Allocator allocator;
+        Stack<Allocator> operandStack(&allocator, 256);     // Frag
+        Stack<Allocator> operatorStack(&allocator, 256);    // Operator
+        Stack<Allocator> atomCountStack(&allocator, 256);   // unsigned (Atom per parenthesis)
+
+        *atomCountStack.template Push<unsigned>() = 0;
+
+        unsigned codepoint;
+        while (ds.Peek() != 0) {
+            switch (codepoint = ds.Take()) {
+                case '^':
+                    anchorBegin_ = true;
+                    break;
+
+                case '$':
+                    anchorEnd_ = true;
+                    break;
+
+                case '|':
+                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() < kAlternation)
+                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
+                            return;
+                    *operatorStack.template Push<Operator>() = kAlternation;
+                    *atomCountStack.template Top<unsigned>() = 0;
+                    break;
+
+                case '(':
+                    *operatorStack.template Push<Operator>() = kLeftParenthesis;
+                    *atomCountStack.template Push<unsigned>() = 0;
+                    break;
+
+                case ')':
+                    while (!operatorStack.Empty() && *operatorStack.template Top<Operator>() != kLeftParenthesis)
+                        if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
+                            return;
+                    if (operatorStack.Empty())
+                        return;
+                    operatorStack.template Pop<Operator>(1);
+                    atomCountStack.template Pop<unsigned>(1);
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+                    break;
+
+                case '?':
+                    if (!Eval(operandStack, kZeroOrOne))
+                        return;
+                    break;
+
+                case '*':
+                    if (!Eval(operandStack, kZeroOrMore))
+                        return;
+                    break;
+
+                case '+':
+                    if (!Eval(operandStack, kOneOrMore))
+                        return;
+                    break;
+
+                case '{':
+                    {
+                        unsigned n, m;
+                        if (!ParseUnsigned(ds, &n))
+                            return;
+
+                        if (ds.Peek() == ',') {
+                            ds.Take();
+                            if (ds.Peek() == '}')
+                                m = kInfinityQuantifier;
+                            else if (!ParseUnsigned(ds, &m) || m < n)
+                                return;
+                        }
+                        else
+                            m = n;
+
+                        if (!EvalQuantifier(operandStack, n, m) || ds.Peek() != '}')
+                            return;
+                        ds.Take();
+                    }
+                    break;
+
+                case '.':
+                    PushOperand(operandStack, kAnyCharacterClass);
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+                    break;
+
+                case '[':
+                    {
+                        SizeType range;
+                        if (!ParseRange(ds, &range))
+                            return;
+                        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, kRangeCharacterClass);
+                        GetState(s).rangeStart = range;
+                        *operandStack.template Push<Frag>() = Frag(s, s, s);
+                    }
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+                    break;
+
+                case '\\': // Escape character
+                    if (!CharacterEscape(ds, &codepoint))
+                        return; // Unsupported escape character
+                    // fall through to default
+
+                default: // Pattern character
+                    PushOperand(operandStack, codepoint);
+                    ImplicitConcatenation(atomCountStack, operatorStack);
+            }
+        }
+
+        while (!operatorStack.Empty())
+            if (!Eval(operandStack, *operatorStack.template Pop<Operator>(1)))
+                return;
+
+        // Link the operand to matching state.
+        if (operandStack.GetSize() == sizeof(Frag)) {
+            Frag* e = operandStack.template Pop<Frag>(1);
+            Patch(e->out, NewState(kRegexInvalidState, kRegexInvalidState, 0));
+            root_ = e->start;
+
+#if RAPIDJSON_REGEX_VERBOSE
+            printf("root: %d\n", root_);
+            for (SizeType i = 0; i < stateCount_ ; i++) {
+                State& s = GetState(i);
+                printf("[%2d] out: %2d out1: %2d c: '%c'\n", i, s.out, s.out1, (char)s.codepoint);
+            }
+            printf("\n");
+#endif
+        }
+
+        // Preallocate buffer for SearchWithAnchoring()
+        RAPIDJSON_ASSERT(stateSet_ == 0);
+        if (stateCount_ > 0) {
+            stateSet_ = static_cast<unsigned*>(states_.GetAllocator().Malloc(GetStateSetSize()));
+            state0_.template Reserve<SizeType>(stateCount_);
+            state1_.template Reserve<SizeType>(stateCount_);
+        }
+    }
+
+    SizeType NewState(SizeType out, SizeType out1, unsigned codepoint) {
+        State* s = states_.template Push<State>();
+        s->out = out;
+        s->out1 = out1;
+        s->codepoint = codepoint;
+        s->rangeStart = kRegexInvalidRange;
+        return stateCount_++;
+    }
+
+    void PushOperand(Stack<Allocator>& operandStack, unsigned codepoint) {
+        SizeType s = NewState(kRegexInvalidState, kRegexInvalidState, codepoint);
+        *operandStack.template Push<Frag>() = Frag(s, s, s);
+    }
+
+    void ImplicitConcatenation(Stack<Allocator>& atomCountStack, Stack<Allocator>& operatorStack) {
+        if (*atomCountStack.template Top<unsigned>())
+            *operatorStack.template Push<Operator>() = kConcatenation;
+        (*atomCountStack.template Top<unsigned>())++;
+    }
+
+    SizeType Append(SizeType l1, SizeType l2) {
+        SizeType old = l1;
+        while (GetState(l1).out != kRegexInvalidState)
+            l1 = GetState(l1).out;
+        GetState(l1).out = l2;
+        return old;
+    }
+
+    void Patch(SizeType l, SizeType s) {
+        for (SizeType next; l != kRegexInvalidState; l = next) {
+            next = GetState(l).out;
+            GetState(l).out = s;
+        }
+    }
+
+    bool Eval(Stack<Allocator>& operandStack, Operator op) {
+        switch (op) {
+            case kConcatenation:
+                if (operandStack.GetSize() >= sizeof(Frag) * 2) {
+                    Frag e2 = *operandStack.template Pop<Frag>(1);
+                    Frag e1 = *operandStack.template Pop<Frag>(1);
+                    Patch(e1.out, e2.start);
+                    *operandStack.template Push<Frag>() = Frag(e1.start, e2.out, Min(e1.minIndex, e2.minIndex));
+                    return true;
+                }
+                return false;
+
+            case kAlternation:
+                if (operandStack.GetSize() >= sizeof(Frag) * 2) {
+                    Frag e2 = *operandStack.template Pop<Frag>(1);
+                    Frag e1 = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(e1.start, e2.start, 0);
+                    *operandStack.template Push<Frag>() = Frag(s, Append(e1.out, e2.out), Min(e1.minIndex, e2.minIndex));
+                    return true;
+                }
+                return false;
+
+            case kZeroOrOne:
+                if (operandStack.GetSize() >= sizeof(Frag)) {
+                    Frag e = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
+                    *operandStack.template Push<Frag>() = Frag(s, Append(e.out, s), e.minIndex);
+                    return true;
+                }
+                return false;
+
+            case kZeroOrMore:
+                if (operandStack.GetSize() >= sizeof(Frag)) {
+                    Frag e = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
+                    Patch(e.out, s);
+                    *operandStack.template Push<Frag>() = Frag(s, s, e.minIndex);
+                    return true;
+                }
+                return false;
+
+            case kOneOrMore:
+                if (operandStack.GetSize() >= sizeof(Frag)) {
+                    Frag e = *operandStack.template Pop<Frag>(1);
+                    SizeType s = NewState(kRegexInvalidState, e.start, 0);
+                    Patch(e.out, s);
+                    *operandStack.template Push<Frag>() = Frag(e.start, s, e.minIndex);
+                    return true;
+                }
+                return false;
+
+            default:
+                return false;
+        }
+    }
+
+    bool EvalQuantifier(Stack<Allocator>& operandStack, unsigned n, unsigned m) {
+        RAPIDJSON_ASSERT(n <= m);
+        if (operandStack.GetSize() < sizeof(Frag))
+            return false;
+
+        if (n == 0) {
+            if (m == 0)                             // a{0} not support
+                return false;
+            else if (m == kInfinityQuantifier)
+                Eval(operandStack, kZeroOrMore);    // a{0,} -> a*
+            else {
+                Eval(operandStack, kZeroOrOne);         // a{0,5} -> a?
+                for (unsigned i = 0; i < m - 1; i++)
+                    CloneTopOperand(operandStack);      // a{0,5} -> a? a? a? a? a?
+                for (unsigned i = 0; i < m - 1; i++)
+                    Eval(operandStack, kConcatenation); // a{0,5} -> a?a?a?a?a?
+            }
+            return true;
+        }
+
+        for (unsigned i = 0; i < n - 1; i++)        // a{3} -> a a a
+            CloneTopOperand(operandStack);
+
+        if (m == kInfinityQuantifier)
+            Eval(operandStack, kOneOrMore);         // a{3,} -> a a a+
+        else if (m > n) {
+            CloneTopOperand(operandStack);          // a{3,5} -> a a a a
+            Eval(operandStack, kZeroOrOne);         // a{3,5} -> a a a a?
+            for (unsigned i = n; i < m - 1; i++)
+                CloneTopOperand(operandStack);      // a{3,5} -> a a a a? a?
+            for (unsigned i = n; i < m; i++)
+                Eval(operandStack, kConcatenation); // a{3,5} -> a a aa?a?
+        }
+
+        for (unsigned i = 0; i < n - 1; i++)
+            Eval(operandStack, kConcatenation);     // a{3} -> aaa, a{3,} -> aaa+, a{3.5} -> aaaa?a?
+
+        return true;
+    }
+
+    static SizeType Min(SizeType a, SizeType b) { return a < b ? a : b; }
+
+    void CloneTopOperand(Stack<Allocator>& operandStack) {
+        const Frag *src = operandStack.template Top<Frag>();
+        SizeType count = stateCount_ - src->minIndex; // Assumes top operand contains states in [src->minIndex, stateCount_)
+        State* s = states_.template Push<State>(count);
+        memcpy(s, &GetState(src->minIndex), count * sizeof(State));
+        for (SizeType j = 0; j < count; j++) {
+            if (s[j].out != kRegexInvalidState)
+                s[j].out += count;
+            if (s[j].out1 != kRegexInvalidState)
+                s[j].out1 += count;
+        }
+        *operandStack.template Push<Frag>() = Frag(src->start + count, src->out + count, src->minIndex + count);
+        stateCount_ += count;
+    }
+
+    template <typename InputStream>
+    bool ParseUnsigned(DecodedStream<InputStream>& ds, unsigned* u) {
+        unsigned r = 0;
+        if (ds.Peek() < '0' || ds.Peek() > '9')
+            return false;
+        while (ds.Peek() >= '0' && ds.Peek() <= '9') {
+            if (r >= 429496729 && ds.Peek() > '5') // 2^32 - 1 = 4294967295
+                return false; // overflow
+            r = r * 10 + (ds.Take() - '0');
+        }
+        *u = r;
+        return true;
+    }
+
+    template <typename InputStream>
+    bool ParseRange(DecodedStream<InputStream>& ds, SizeType* range) {
+        bool isBegin = true;
+        bool negate = false;
+        int step = 0;
+        SizeType start = kRegexInvalidRange;
+        SizeType current = kRegexInvalidRange;
+        unsigned codepoint;
+        while ((codepoint = ds.Take()) != 0) {
+            if (isBegin) {
+                isBegin = false;
+                if (codepoint == '^') {
+                    negate = true;
+                    continue;
+                }
+            }
+
+            switch (codepoint) {
+            case ']':
+                if (start == kRegexInvalidRange)
+                    return false;   // Error: nothing inside []
+                if (step == 2) { // Add trailing '-'
+                    SizeType r = NewRange('-');
+                    RAPIDJSON_ASSERT(current != kRegexInvalidRange);
+                    GetRange(current).next = r;
+                }
+                if (negate)
+                    GetRange(start).start |= kRangeNegationFlag;
+                *range = start;
+                return true;
+
+            case '\\':
+                if (ds.Peek() == 'b') {
+                    ds.Take();
+                    codepoint = 0x0008; // Escape backspace character
+                }
+                else if (!CharacterEscape(ds, &codepoint))
+                    return false;
+                // fall through to default
+
+            default:
+                switch (step) {
+                case 1:
+                    if (codepoint == '-') {
+                        step++;
+                        break;
+                    }
+                    // fall through to step 0 for other characters
+
+                case 0:
+                    {
+                        SizeType r = NewRange(codepoint);
+                        if (current != kRegexInvalidRange)
+                            GetRange(current).next = r;
+                        if (start == kRegexInvalidRange)
+                            start = r;
+                        current = r;
+                    }
+                    step = 1;
+                    break;
+
+                default:
+                    RAPIDJSON_ASSERT(step == 2);
+                    GetRange(current).end = codepoint;
+                    step = 0;
+                }
+            }
+        }
+        return false;
+    }
+    
+    SizeType NewRange(unsigned codepoint) {
+        Range* r = ranges_.template Push<Range>();
+        r->start = r->end = codepoint;
+        r->next = kRegexInvalidRange;
+        return rangeCount_++;
+    }
+
+    template <typename InputStream>
+    bool CharacterEscape(DecodedStream<InputStream>& ds, unsigned* escapedCodepoint) {
+        unsigned codepoint;
+        switch (codepoint = ds.Take()) {
+            case '^':
+            case '$':
+            case '|':
+            case '(':
+            case ')':
+            case '?':
+            case '*':
+            case '+':
+            case '.':
+            case '[':
+            case ']':
+            case '{':
+            case '}':
+            case '\\':
+                *escapedCodepoint = codepoint; return true;
+            case 'f': *escapedCodepoint = 0x000C; return true;
+            case 'n': *escapedCodepoint = 0x000A; return true;
+            case 'r': *escapedCodepoint = 0x000D; return true;
+            case 't': *escapedCodepoint = 0x0009; return true;
+            case 'v': *escapedCodepoint = 0x000B; return true;
+            default:
+                return false; // Unsupported escape character
+        }
+    }
+
+    template <typename InputStream>
+    bool SearchWithAnchoring(InputStream& is, bool anchorBegin, bool anchorEnd) const {
+        RAPIDJSON_ASSERT(IsValid());
+        DecodedStream<InputStream> ds(is);
+
+        state0_.Clear();
+        Stack<Allocator> *current = &state0_, *next = &state1_;
+        const size_t stateSetSize = GetStateSetSize();
+        std::memset(stateSet_, 0, stateSetSize);
+
+        bool matched = AddState(*current, root_);
+        unsigned codepoint;
+        while (!current->Empty() && (codepoint = ds.Take()) != 0) {
+            std::memset(stateSet_, 0, stateSetSize);
+            next->Clear();
+            matched = false;
+            for (const SizeType* s = current->template Bottom<SizeType>(); s != current->template End<SizeType>(); ++s) {
+                const State& sr = GetState(*s);
+                if (sr.codepoint == codepoint ||
+                    sr.codepoint == kAnyCharacterClass || 
+                    (sr.codepoint == kRangeCharacterClass && MatchRange(sr.rangeStart, codepoint)))
+                {
+                    matched = AddState(*next, sr.out) || matched;
+                    if (!anchorEnd && matched)
+                        return true;
+                }
+                if (!anchorBegin)
+                    AddState(*next, root_);
+            }
+            internal::Swap(current, next);
+        }
+
+        return matched;
+    }
+
+    size_t GetStateSetSize() const {
+        return (stateCount_ + 31) / 32 * 4;
+    }
+
+    // Return whether the added states is a match state
+    bool AddState(Stack<Allocator>& l, SizeType index) const {
+        if (index == kRegexInvalidState)
+            return true;
+
+        const State& s = GetState(index);
+        if (s.out1 != kRegexInvalidState) { // Split
+            bool matched = AddState(l, s.out);
+            return AddState(l, s.out1) || matched;
+        }
+        else if (!(stateSet_[index >> 5] & (1 << (index & 31)))) {
+            stateSet_[index >> 5] |= (1 << (index & 31));
+            *l.template PushUnsafe<SizeType>() = index;
+        }
+        return s.out == kRegexInvalidState; // by using PushUnsafe() above, we can ensure s is not validated due to reallocation.
+    }
+
+    bool MatchRange(SizeType rangeIndex, unsigned codepoint) const {
+        bool yes = (GetRange(rangeIndex).start & kRangeNegationFlag) == 0;
+        while (rangeIndex != kRegexInvalidRange) {
+            const Range& r = GetRange(rangeIndex);
+            if (codepoint >= (r.start & ~kRangeNegationFlag) && codepoint <= r.end)
+                return yes;
+            rangeIndex = r.next;
+        }
+        return !yes;
+    }
+
+    Stack<Allocator> states_;
+    Stack<Allocator> ranges_;
+    SizeType root_;
+    SizeType stateCount_;
+    SizeType rangeCount_;
+
+    static const unsigned kInfinityQuantifier = ~0u;
+
+    // For SearchWithAnchoring()
+    uint32_t* stateSet_;        // allocated by states_.GetAllocator()
+    mutable Stack<Allocator> state0_;
+    mutable Stack<Allocator> state1_;
+    bool anchorBegin_;
+    bool anchorEnd_;
+};
+
+typedef GenericRegex<UTF8<> > Regex;
+
+} // namespace internal
+RAPIDJSON_NAMESPACE_END
+
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
+#ifdef _MSC_VER
+RAPIDJSON_DIAG_POP
+#endif
+
+#endif // RAPIDJSON_INTERNAL_REGEX_H_

=== modified file 'shorts/xml2json/rapidjson/internal/stack.h'
--- shorts/xml2json/rapidjson/internal/stack.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/internal/stack.h	2016-06-15 16:13:25 +0000
@@ -15,9 +15,14 @@
 #ifndef RAPIDJSON_INTERNAL_STACK_H_
 #define RAPIDJSON_INTERNAL_STACK_H_
 
-#include "../rapidjson.h"
+#include "../allocators.h"
 #include "swap.h"
 
+#if defined(__clang__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(c++98-compat)
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 namespace internal {
 
@@ -33,7 +38,6 @@
     // Optimization note: Do not allocate memory for stack_ in constructor.
     // Do it lazily when first Push() -> Expand() -> Resize().
     Stack(Allocator* allocator, size_t stackCapacity) : allocator_(allocator), ownAllocator_(0), stack_(0), stackTop_(0), stackEnd_(0), initialCapacity_(stackCapacity) {
-        RAPIDJSON_ASSERT(stackCapacity > 0);
     }
 
 #if RAPIDJSON_HAS_CXX11_RVALUE_REFS
@@ -108,11 +112,21 @@
     // Optimization note: try to minimize the size of this function for force inline.
     // Expansion is run very infrequently, so it is moved to another (probably non-inline) function.
     template<typename T>
-    RAPIDJSON_FORCEINLINE T* Push(size_t count = 1) {
+    RAPIDJSON_FORCEINLINE void Reserve(size_t count = 1) {
          // Expand the stack if needed
-        if (stackTop_ + sizeof(T) * count >= stackEnd_)
+        if (RAPIDJSON_UNLIKELY(stackTop_ + sizeof(T) * count > stackEnd_))
             Expand<T>(count);
-
+    }
+
+    template<typename T>
+    RAPIDJSON_FORCEINLINE T* Push(size_t count = 1) {
+        Reserve<T>(count);
+        return PushUnsafe<T>(count);
+    }
+
+    template<typename T>
+    RAPIDJSON_FORCEINLINE T* PushUnsafe(size_t count = 1) {
+        RAPIDJSON_ASSERT(stackTop_ + sizeof(T) * count <= stackEnd_);
         T* ret = reinterpret_cast<T*>(stackTop_);
         stackTop_ += sizeof(T) * count;
         return ret;
@@ -132,8 +146,23 @@
     }
 
     template<typename T>
+    const T* Top() const {
+        RAPIDJSON_ASSERT(GetSize() >= sizeof(T));
+        return reinterpret_cast<T*>(stackTop_ - sizeof(T));
+    }
+
+    template<typename T>
+    T* End() { return reinterpret_cast<T*>(stackTop_); }
+
+    template<typename T>
+    const T* End() const { return reinterpret_cast<T*>(stackTop_); }
+
+    template<typename T>
     T* Bottom() { return reinterpret_cast<T*>(stack_); }
 
+    template<typename T>
+    const T* Bottom() const { return reinterpret_cast<T*>(stack_); }
+
     bool HasAllocator() const {
         return allocator_ != 0;
     }
@@ -142,6 +171,7 @@
         RAPIDJSON_ASSERT(allocator_);
         return *allocator_;
     }
+
     bool Empty() const { return stackTop_ == stack_; }
     size_t GetSize() const { return static_cast<size_t>(stackTop_ - stack_); }
     size_t GetCapacity() const { return static_cast<size_t>(stackEnd_ - stack_); }
@@ -193,4 +223,8 @@
 } // namespace internal
 RAPIDJSON_NAMESPACE_END
 
+#if defined(__clang__)
+RAPIDJSON_DIAG_POP
+#endif
+
 #endif // RAPIDJSON_STACK_H_

=== modified file 'shorts/xml2json/rapidjson/internal/strfunc.h'
--- shorts/xml2json/rapidjson/internal/strfunc.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/internal/strfunc.h	2016-06-15 16:13:25 +0000
@@ -15,7 +15,7 @@
 #ifndef RAPIDJSON_INTERNAL_STRFUNC_H_
 #define RAPIDJSON_INTERNAL_STRFUNC_H_
 
-#include "../rapidjson.h"
+#include "../stream.h"
 
 RAPIDJSON_NAMESPACE_BEGIN
 namespace internal {
@@ -33,6 +33,22 @@
     return SizeType(p - s);
 }
 
+//! Returns number of code points in a encoded string.
+template<typename Encoding>
+bool CountStringCodePoint(const typename Encoding::Ch* s, SizeType length, SizeType* outCount) {
+    GenericStringStream<Encoding> is(s);
+    const typename Encoding::Ch* end = s + length;
+    SizeType count = 0;
+    while (is.src_ < end) {
+        unsigned codepoint;
+        if (!Encoding::Decode(is, &codepoint))
+            return false;
+        count++;
+    }
+    *outCount = count;
+    return true;
+}
+
 } // namespace internal
 RAPIDJSON_NAMESPACE_END
 

=== modified file 'shorts/xml2json/rapidjson/internal/strtod.h'
--- shorts/xml2json/rapidjson/internal/strtod.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/internal/strtod.h	2016-06-15 16:13:25 +0000
@@ -15,7 +15,6 @@
 #ifndef RAPIDJSON_STRTOD_
 #define RAPIDJSON_STRTOD_
 
-#include "../rapidjson.h"
 #include "ieee754.h"
 #include "biginteger.h"
 #include "diyfp.h"

=== modified file 'shorts/xml2json/rapidjson/internal/swap.h'
--- shorts/xml2json/rapidjson/internal/swap.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/internal/swap.h	2016-06-15 16:13:25 +0000
@@ -17,6 +17,11 @@
 
 #include "../rapidjson.h"
 
+#if defined(__clang__)
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(c++98-compat)
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 namespace internal {
 
@@ -34,4 +39,8 @@
 } // namespace internal
 RAPIDJSON_NAMESPACE_END
 
+#if defined(__clang__)
+RAPIDJSON_DIAG_POP
+#endif
+
 #endif // RAPIDJSON_INTERNAL_SWAP_H_

=== added file 'shorts/xml2json/rapidjson/istreamwrapper.h'
--- shorts/xml2json/rapidjson/istreamwrapper.h	1970-01-01 00:00:00 +0000
+++ shorts/xml2json/rapidjson/istreamwrapper.h	2016-06-15 16:13:25 +0000
@@ -0,0 +1,110 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#include "stream.h"
+#include <iosfwd>
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+#ifdef _MSC_VER
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(4351) // new behavior: elements of array 'array' will be default initialized
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Wrapper of \c std::basic_istream into RapidJSON's Stream concept.
+/*!
+    The classes can be wrapped including but not limited to:
+
+    - \c std::istringstream
+    - \c std::stringstream
+    - \c std::wistringstream
+    - \c std::wstringstream
+    - \c std::ifstream
+    - \c std::fstream
+    - \c std::wifstream
+    - \c std::wfstream
+
+    \tparam StreamType Class derived from \c std::basic_istream.
+*/
+   
+template <typename StreamType>
+class BasicIStreamWrapper {
+public:
+    typedef typename StreamType::char_type Ch;
+    BasicIStreamWrapper(StreamType& stream) : stream_(stream), count_(), peekBuffer_() {}
+
+    Ch Peek() const { 
+        typename StreamType::int_type c = stream_.peek();
+        return RAPIDJSON_LIKELY(c != StreamType::traits_type::eof()) ? static_cast<Ch>(c) : '\0';
+    }
+
+    Ch Take() { 
+        typename StreamType::int_type c = stream_.get();
+        if (RAPIDJSON_LIKELY(c != StreamType::traits_type::eof())) {
+            count_++;
+            return static_cast<Ch>(c);
+        }
+        else
+            return '\0';
+    }
+
+    // tellg() may return -1 when failed. So we count by ourself.
+    size_t Tell() const { return count_; }
+
+    Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    void Put(Ch) { RAPIDJSON_ASSERT(false); }
+    void Flush() { RAPIDJSON_ASSERT(false); }
+    size_t PutEnd(Ch*) { RAPIDJSON_ASSERT(false); return 0; }
+
+    // For encoding detection only.
+    const Ch* Peek4() const {
+        RAPIDJSON_ASSERT(sizeof(Ch) == 1); // Only usable for byte stream.
+        int i;
+        bool hasError = false;
+        for (i = 0; i < 4; ++i) {
+            typename StreamType::int_type c = stream_.get();
+            if (c == StreamType::traits_type::eof()) {
+                hasError = true;
+                stream_.clear();
+                break;
+            }
+            peekBuffer_[i] = static_cast<Ch>(c);
+        }
+        for (--i; i >= 0; --i)
+            stream_.putback(peekBuffer_[i]);
+        return !hasError ? peekBuffer_ : 0;
+    }
+
+private:
+    BasicIStreamWrapper(const BasicIStreamWrapper&);
+    BasicIStreamWrapper& operator=(const BasicIStreamWrapper&);
+
+    StreamType& stream_;
+    size_t count_;  //!< Number of characters read. Note:
+    mutable Ch peekBuffer_[4];
+};
+
+typedef BasicIStreamWrapper<std::istream> IStreamWrapper;
+typedef BasicIStreamWrapper<std::wistream> WIStreamWrapper;
+
+#if defined(__clang__) || defined(_MSC_VER)
+RAPIDJSON_DIAG_POP
+#endif
+
+RAPIDJSON_NAMESPACE_END

=== modified file 'shorts/xml2json/rapidjson/memorybuffer.h'
--- shorts/xml2json/rapidjson/memorybuffer.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/memorybuffer.h	2016-06-15 16:13:25 +0000
@@ -15,7 +15,7 @@
 #ifndef RAPIDJSON_MEMORYBUFFER_H_
 #define RAPIDJSON_MEMORYBUFFER_H_
 
-#include "rapidjson.h"
+#include "stream.h"
 #include "internal/stack.h"
 
 RAPIDJSON_NAMESPACE_BEGIN

=== modified file 'shorts/xml2json/rapidjson/memorystream.h'
--- shorts/xml2json/rapidjson/memorystream.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/memorystream.h	2016-06-15 16:13:25 +0000
@@ -15,7 +15,7 @@
 #ifndef RAPIDJSON_MEMORYSTREAM_H_
 #define RAPIDJSON_MEMORYSTREAM_H_
 
-#include "rapidjson.h"
+#include "stream.h"
 
 #ifdef __clang__
 RAPIDJSON_DIAG_PUSH
@@ -42,8 +42,8 @@
 
     MemoryStream(const Ch *src, size_t size) : src_(src), begin_(src), end_(src + size), size_(size) {}
 
-    Ch Peek() const { return (src_ == end_) ? '\0' : *src_; }
-    Ch Take() { return (src_ == end_) ? '\0' : *src_++; }
+    Ch Peek() const { return RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_; }
+    Ch Take() { return RAPIDJSON_UNLIKELY(src_ == end_) ? '\0' : *src_++; }
     size_t Tell() const { return static_cast<size_t>(src_ - begin_); }
 
     Ch* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }

=== added file 'shorts/xml2json/rapidjson/ostreamwrapper.h'
--- shorts/xml2json/rapidjson/ostreamwrapper.h	1970-01-01 00:00:00 +0000
+++ shorts/xml2json/rapidjson/ostreamwrapper.h	2016-06-15 16:13:25 +0000
@@ -0,0 +1,76 @@
+// Tencent is pleased to support the open source community by making RapidJSON available.
+// 
+// Copyright (C) 2015 THL A29 Limited, a Tencent company, and Milo Yip. All rights reserved.
+//
+// Licensed under the MIT License (the "License"); you may not use this file except
+// in compliance with the License. You may obtain a copy of the License at
+//
+// http://opensource.org/licenses/MIT
+//
+// Unless required by applicable law or agreed to in writing, software distributed 
+// under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR 
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the 
+// specific language governing permissions and limitations under the License.
+
+#include "stream.h"
+#include <iosfwd>
+
+#ifdef __clang__
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(padded)
+#endif
+
+RAPIDJSON_NAMESPACE_BEGIN
+
+//! Wrapper of \c std::basic_ostream into RapidJSON's Stream concept.
+/*!
+    The classes can be wrapped including but not limited to:
+
+    - \c std::ostringstream
+    - \c std::stringstream
+    - \c std::wpstringstream
+    - \c std::wstringstream
+    - \c std::ifstream
+    - \c std::fstream
+    - \c std::wofstream
+    - \c std::wfstream
+
+    \tparam StreamType Class derived from \c std::basic_ostream.
+*/
+   
+template <typename StreamType>
+class BasicOStreamWrapper {
+public:
+    typedef typename StreamType::char_type Ch;
+    BasicOStreamWrapper(StreamType& stream) : stream_(stream) {}
+
+    void Put(Ch c) {
+        stream_.put(c);
+    }
+
+    void Flush() {
+        stream_.flush();
+    }
+
+    // Not implemented
+    char Peek() const { RAPIDJSON_ASSERT(false); return 0; }
+    char Take() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t Tell() const { RAPIDJSON_ASSERT(false); return 0; }
+    char* PutBegin() { RAPIDJSON_ASSERT(false); return 0; }
+    size_t PutEnd(char*) { RAPIDJSON_ASSERT(false); return 0; }
+
+private:
+    BasicOStreamWrapper(const BasicOStreamWrapper&);
+    BasicOStreamWrapper& operator=(const BasicOStreamWrapper&);
+
+    StreamType& stream_;
+};
+
+typedef BasicOStreamWrapper<std::ostream> OStreamWrapper;
+typedef BasicOStreamWrapper<std::wostream> WOStreamWrapper;
+
+#ifdef __clang__
+RAPIDJSON_DIAG_POP
+#endif
+
+RAPIDJSON_NAMESPACE_END

=== modified file 'shorts/xml2json/rapidjson/pointer.h'
--- shorts/xml2json/rapidjson/pointer.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/pointer.h	2016-06-15 16:13:25 +0000
@@ -23,6 +23,11 @@
 RAPIDJSON_DIAG_OFF(switch-enum)
 #endif
 
+#ifdef _MSC_VER
+RAPIDJSON_DIAG_PUSH
+RAPIDJSON_DIAG_OFF(4512) // assignment operator could not be generated
+#endif
+
 RAPIDJSON_NAMESPACE_BEGIN
 
 static const SizeType kPointerInvalidIndex = ~SizeType(0);  //!< Represents an invalid index in GenericPointer::Token
@@ -101,7 +106,7 @@
     //@{
 
     //! Default constructor.
-    GenericPointer() : allocator_(), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
+    GenericPointer(Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
 
     //! Constructor that parses a string or URI fragment representation.
     /*!
@@ -160,7 +165,7 @@
     GenericPointer(const Token* tokens, size_t tokenCount) : allocator_(), ownAllocator_(), nameBuffer_(), tokens_(const_cast<Token*>(tokens)), tokenCount_(tokenCount), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {}
 
     //! Copy constructor.
-    GenericPointer(const GenericPointer& rhs) : allocator_(), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
+    GenericPointer(const GenericPointer& rhs, Allocator* allocator = 0) : allocator_(allocator), ownAllocator_(), nameBuffer_(), tokens_(), tokenCount_(), parseErrorOffset_(), parseErrorCode_(kPointerParseErrorNone) {
         *this = rhs;
     }
 
@@ -305,6 +310,9 @@
 
     //@}
 
+    //! Get the allocator of this pointer.
+    Allocator& GetAllocator() { return *allocator_; }
+
     //!@name Tokens
     //@{
 
@@ -457,9 +465,18 @@
     //! Query a value in a subtree.
     /*!
         \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
+        \param unresolvedTokenIndex If the pointer cannot resolve a token in the pointer, this parameter can obtain the index of unresolved token.
         \return Pointer to the value if it can be resolved. Otherwise null.
+
+        \note
+        There are only 3 situations when a value cannot be resolved:
+        1. A value in the path is not an array nor object.
+        2. An object value does not contain the token.
+        3. A token is out of range of an array value.
+
+        Use unresolvedTokenIndex to retrieve the token index.
     */
-    ValueType* Get(ValueType& root) const {
+    ValueType* Get(ValueType& root, size_t* unresolvedTokenIndex = 0) const {
         RAPIDJSON_ASSERT(IsValid());
         ValueType* v = &root;
         for (const Token *t = tokens_; t != tokens_ + tokenCount_; ++t) {
@@ -468,18 +485,23 @@
                 {
                     typename ValueType::MemberIterator m = v->FindMember(GenericStringRef<Ch>(t->name, t->length));
                     if (m == v->MemberEnd())
-                        return 0;
+                        break;
                     v = &m->value;
                 }
-                break;
+                continue;
             case kArrayType:
                 if (t->index == kPointerInvalidIndex || t->index >= v->Size())
-                    return 0;
+                    break;
                 v = &((*v)[t->index]);
-                break;
+                continue;
             default:
-                return 0;
+                break;
             }
+
+            // Error: unresolved token
+            if (unresolvedTokenIndex)
+                *unresolvedTokenIndex = static_cast<size_t>(t - tokens_);
+            return 0;
         }
         return v;
     }
@@ -489,7 +511,9 @@
         \param root Root value of a DOM sub-tree to be resolved. It can be any value other than document root.
         \return Pointer to the value if it can be resolved. Otherwise null.
     */
-    const ValueType* Get(const ValueType& root) const { return Get(const_cast<ValueType&>(root)); }
+    const ValueType* Get(const ValueType& root, size_t* unresolvedTokenIndex = 0) const { 
+        return Get(const_cast<ValueType&>(root), unresolvedTokenIndex);
+    }
 
     //@}
 
@@ -968,11 +992,11 @@
             src_++;
             Ch c = 0;
             for (int j = 0; j < 2; j++) {
-                c <<= 4;
+                c = static_cast<Ch>(c << 4);
                 Ch h = *src_;
-                if      (h >= '0' && h <= '9') c += h - '0';
-                else if (h >= 'A' && h <= 'F') c += h - 'A' + 10;
-                else if (h >= 'a' && h <= 'f') c += h - 'a' + 10;
+                if      (h >= '0' && h <= '9') c = static_cast<Ch>(c + h - '0');
+                else if (h >= 'A' && h <= 'F') c = static_cast<Ch>(c + h - 'A' + 10);
+                else if (h >= 'a' && h <= 'f') c = static_cast<Ch>(c + h - 'a' + 10);
                 else {
                     valid_ = false;
                     return 0;
@@ -1050,23 +1074,23 @@
 //////////////////////////////////////////////////////////////////////////////
 
 template <typename T>
-typename T::ValueType* GetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer) {
-    return pointer.Get(root);
+typename T::ValueType* GetValueByPointer(T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
+    return pointer.Get(root, unresolvedTokenIndex);
 }
 
 template <typename T>
-const typename T::ValueType* GetValueByPointer(const T& root, const GenericPointer<typename T::ValueType>& pointer) {
-    return pointer.Get(root);
-}
-
-template <typename T, typename CharType, size_t N>
-typename T::ValueType* GetValueByPointer(T& root, const CharType (&source)[N]) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root);
-}
-
-template <typename T, typename CharType, size_t N>
-const typename T::ValueType* GetValueByPointer(const T& root, const CharType(&source)[N]) {
-    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root);
+const typename T::ValueType* GetValueByPointer(const T& root, const GenericPointer<typename T::ValueType>& pointer, size_t* unresolvedTokenIndex = 0) {
+    return pointer.Get(root, unresolvedTokenIndex);
+}
+
+template <typename T, typename CharType, size_t N>
+typename T::ValueType* GetValueByPointer(T& root, const CharType (&source)[N], size_t* unresolvedTokenIndex = 0) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
+}
+
+template <typename T, typename CharType, size_t N>
+const typename T::ValueType* GetValueByPointer(const T& root, const CharType(&source)[N], size_t* unresolvedTokenIndex = 0) {
+    return GenericPointer<typename T::ValueType>(source, N - 1).Get(root, unresolvedTokenIndex);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -1323,4 +1347,8 @@
 RAPIDJSON_DIAG_POP
 #endif
 
+#ifdef _MSC_VER
+RAPIDJSON_DIAG_POP
+#endif
+
 #endif // RAPIDJSON_POINTER_H_

=== modified file 'shorts/xml2json/rapidjson/prettywriter.h'
--- shorts/xml2json/rapidjson/prettywriter.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/prettywriter.h	2016-06-15 16:13:25 +0000
@@ -24,6 +24,14 @@
 
 RAPIDJSON_NAMESPACE_BEGIN
 
+//! Combination of PrettyWriter format flags.
+/*! \see PrettyWriter::SetFormatOptions
+ */
+enum PrettyFormatOptions {
+    kFormatDefault = 0,         //!< Default pretty formatting.
+    kFormatSingleLineArray = 1  //!< Format arrays on a single line.
+};
+
 //! Writer with indentation and spacing.
 /*!
     \tparam OutputStream Type of ouptut os.
@@ -31,8 +39,8 @@
     \tparam TargetEncoding Encoding of output stream.
     \tparam StackAllocator Type of allocator for allocating memory of stack.
 */
-template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator>
-class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> {
+template<typename OutputStream, typename SourceEncoding = UTF8<>, typename TargetEncoding = UTF8<>, typename StackAllocator = CrtAllocator, unsigned writeFlags = kWriteDefaultFlags>
+class PrettyWriter : public Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator, writeFlags> {
 public:
     typedef Writer<OutputStream, SourceEncoding, TargetEncoding, StackAllocator> Base;
     typedef typename Base::Ch Ch;
@@ -42,8 +50,12 @@
         \param allocator User supplied allocator. If it is null, it will create a private one.
         \param levelDepth Initial capacity of stack.
     */
-    PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
-        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
+    explicit PrettyWriter(OutputStream& os, StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
+        Base(os, allocator, levelDepth), indentChar_(' '), indentCharCount_(4), formatOptions_(kFormatDefault) {}
+
+
+    explicit PrettyWriter(StackAllocator* allocator = 0, size_t levelDepth = Base::kDefaultLevelDepth) : 
+        Base(allocator, levelDepth), indentChar_(' '), indentCharCount_(4) {}
 
     //! Set custom indentation.
     /*! \param indentChar       Character for indentation. Must be whitespace character (' ', '\\t', '\\n', '\\r').
@@ -57,6 +69,14 @@
         return *this;
     }
 
+    //! Set pretty writer formatting options.
+    /*! \param options Formatting options.
+    */
+    PrettyWriter& SetFormatOptions(PrettyFormatOptions options) {
+        formatOptions_ = options;
+        return *this;
+    }
+
     /*! @name Implementation of Handler
         \see Handler
     */
@@ -70,6 +90,12 @@
     bool Uint64(uint64_t u64)   { PrettyPrefix(kNumberType); return Base::WriteUint64(u64);  }
     bool Double(double d)       { PrettyPrefix(kNumberType); return Base::WriteDouble(d); }
 
+    bool RawNumber(const Ch* str, SizeType length, bool copy = false) {
+        (void)copy;
+        PrettyPrefix(kNumberType);
+        return Base::WriteString(str, length);
+    }
+
     bool String(const Ch* str, SizeType length, bool copy = false) {
         (void)copy;
         PrettyPrefix(kStringType);
@@ -120,7 +146,7 @@
         RAPIDJSON_ASSERT(Base::level_stack_.template Top<typename Base::Level>()->inArray);
         bool empty = Base::level_stack_.template Pop<typename Base::Level>(1)->valueCount == 0;
 
-        if (!empty) {
+        if (!empty && !(formatOptions_ & kFormatSingleLineArray)) {
             Base::os_->Put('\n');
             WriteIndent();
         }
@@ -142,6 +168,18 @@
     bool Key(const Ch* str) { return Key(str, internal::StrLen(str)); }
 
     //@}
+
+    //! Write a raw JSON value.
+    /*!
+        For user to write a stringified JSON as a value.
+
+        \param json A well-formed JSON value. It should not contain null character within [0, length - 1] range.
+        \param length Length of the json.
+        \param type Type of the root of json.
+        \note When using PrettyWriter::RawValue(), the result json may not be indented correctly.
+    */
+    bool RawValue(const Ch* json, size_t length, Type type) { PrettyPrefix(type); return Base::WriteRawValue(json, length); }
+
 protected:
     void PrettyPrefix(Type type) {
         (void)type;
@@ -151,11 +189,14 @@
             if (level->inArray) {
                 if (level->valueCount > 0) {
                     Base::os_->Put(','); // add comma if it is not the first element in array
-                    Base::os_->Put('\n');
-                }
-                else
-                    Base::os_->Put('\n');
-                WriteIndent();
+                    if (formatOptions_ & kFormatSingleLineArray)
+                        Base::os_->Put(' ');
+                }
+
+                if (!(formatOptions_ & kFormatSingleLineArray)) {
+                    Base::os_->Put('\n');
+                    WriteIndent();
+                }
             }
             else {  // in object
                 if (level->valueCount > 0) {
@@ -191,6 +232,7 @@
 
     Ch indentChar_;
     unsigned indentCharCount_;
+    PrettyFormatOptions formatOptions_;
 
 private:
     // Prohibit copy constructor & assignment operator.

=== modified file 'shorts/xml2json/rapidjson/rapidjson.h'
--- shorts/xml2json/rapidjson/rapidjson.h	2016-03-04 13:27:57 +0000
+++ shorts/xml2json/rapidjson/rapidjson.h	2016-06-15 16:13:25 +0000
@@ -159,7 +159,7 @@
 */
 #ifndef RAPIDJSON_NO_INT64DEFINE
 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#ifdef _MSC_VER
+#if defined(_MSC_VER) && (_MSC_VER < 1800)	// Visual Studio 2013
 #include "msinttypes/stdint.h"
 #include "msinttypes/inttypes.h"
 #else
@@ -178,9 +178,9 @@
 
 #ifndef RAPIDJSON_FORCEINLINE
 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
-#if defined(_MSC_VER) && !defined(NDEBUG)
+#if defined(_MSC_VER) && defined(NDEBUG)
 #define RAPIDJSON_FORCEINLINE __forceinline
-#elif defined(__GNUC__) && __GNUC__ >= 4 && !defined(NDEBUG)
+#elif defined(__GNUC__) && __GNUC__ >= 4 && defined(NDEBUG)
 #define RAPIDJSON_FORCEINLINE __attribute__((always_inline))
 #else
 #define RAPIDJSON_FORCEINLINE
@@ -265,7 +265,8 @@
     \param x pointer to align
 
     Some machines require strict data alignment. Currently the default uses 4 bytes
-    alignment. User can customize by defining the RAPIDJSON_ALIGN function macro.
+    alignment on 32-bit platforms and 8 bytes alignment for 64-bit platforms.
+    User can customize by defining the RAPIDJSON_ALIGN function macro.
 */
 #ifndef RAPIDJSON_ALIGN
 #if RAPIDJSON_64BIT == 1
@@ -289,6 +290,36 @@
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_48BITPOINTER_OPTIMIZATION
+
+//! Use only lower 48-bit address for some pointers.
+/*!
+    \ingroup RAPIDJSON_CONFIG
+
+    This optimization uses the fact that current X86-64 architecture only implement lower 48-bit virtual address.
+    The higher 16-bit can be used for storing other data.
+    \c GenericValue uses this optimization to reduce its size form 24 bytes to 16 bytes in 64-bit architecture.
+*/
+#ifndef RAPIDJSON_48BITPOINTER_OPTIMIZATION
+#if defined(__amd64__) || defined(__amd64) || defined(__x86_64__) || defined(__x86_64) || defined(_M_X64) || defined(_M_AMD64)
+#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 1
+#else
+#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 0
+#endif
+#endif // RAPIDJSON_48BITPOINTER_OPTIMIZATION
+
+#if RAPIDJSON_48BITPOINTER_OPTIMIZATION == 1
+#if RAPIDJSON_64BIT != 1
+#error RAPIDJSON_48BITPOINTER_OPTIMIZATION can only be set to 1 when RAPIDJSON_64BIT=1
+#endif
+#define RAPIDJSON_SETPOINTER(type, p, x) (p = reinterpret_cast<type *>((reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(RAPIDJSON_UINT64_C2(0xFFFF0000, 0x00000000))) | reinterpret_cast<uintptr_t>(reinterpret_cast<const void*>(x))))
+#define RAPIDJSON_GETPOINTER(type, p) (reinterpret_cast<type *>(reinterpret_cast<uintptr_t>(p) & static_cast<uintptr_t>(RAPIDJSON_UINT64_C2(0x0000FFFF, 0xFFFFFFFF))))
+#else
+#define RAPIDJSON_SETPOINTER(type, p, x) (p = (x))
+#define RAPIDJSON_GETPOINTER(type, p) (p)
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
 // RAPIDJSON_SSE2/RAPIDJSON_SSE42/RAPIDJSON_SIMD
 
 /*! \def RAPIDJSON_SIMD
@@ -410,6 +441,35 @@
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
+// RAPIDJSON_LIKELY, RAPIDJSON_UNLIKELY
+
+//! Compiler branching hint for expression with high probability to be true.
+/*!
+    \ingroup RAPIDJSON_CONFIG
+    \param x Boolean expression likely to be true.
+*/
+#ifndef RAPIDJSON_LIKELY
+#if defined(__GNUC__) || defined(__clang__)
+#define RAPIDJSON_LIKELY(x) __builtin_expect(!!(x), 1)
+#else
+#define RAPIDJSON_LIKELY(x) (x)
+#endif
+#endif
+
+//! Compiler branching hint for expression with low probability to be true.
+/*!
+    \ingroup RAPIDJSON_CONFIG
+    \param x Boolean expression unlikely to be true.
+*/
+#ifndef RAPIDJSON_UNLIKELY
+#if defined(__GNUC__) || defined(__clang__)
+#define RAPIDJSON_UNLIKELY(x) __builtin_expect(!!(x), 0)
+#else
+#define RAPIDJSON_UNLIKELY(x) (x)
+#endif
+#endif
+
+///////////////////////////////////////////////////////////////////////////////
 // Helpers
 
 //!@cond RAPIDJSON_HIDDEN_FROM_DOXYGEN
@@ -501,6 +561,17 @@
 #define RAPIDJSON_HAS_CXX11_TYPETRAITS 0
 #endif
 
+#ifndef RAPIDJSON_HAS_CXX11_RANGE_FOR
+#if defined(__clang__)
+#define RAPIDJSON_HAS_CXX11_RANGE_FOR __has_feature(cxx_range_for)
+#elif (defined(RAPIDJSON_GNUC) && (RAPIDJSON_GNUC >= RAPIDJSON_VERSION_CODE(4,3,0)) && defined(__GXX_EXPERIMENTAL_CXX0X__)) || \
+      (defined(_MSC_VER) && _MSC_VER >= 1700)
+#define RAPIDJSON_HAS_CXX11_RANGE_FOR 1
+#else
+#define RAPIDJSON_HAS_CXX11_RANGE_FOR 0
+#endif
+#endif // RAPIDJSON_HAS_CXX11_RANGE_FOR
+
 //!@endcond
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -516,10 +587,7 @@
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
-// Allocators and Encodings
-
-#include "allocators.h"
-#include "encodings.h"
+// Type
 
 /*! \namespace rapidjson
     \brief main RapidJSON namespace
@@ -527,148 +595,6 @@
 */
 RAPIDJSON_NAMESPACE_BEGIN
 
-///////////////////////////////////////////////////////////////////////////////
-//  Stream
-
-/*! \class rapidjson::Stream
-    \brief Concept for reading and writing characters.
-
-    For read-only stream, no need to implement PutBegin(), Put(), Flush() and PutEnd().
-
-    For write-only stream, only need to implement Put() and Flush().
-
-\code
-concept Stream {
-    typename Ch;    //!< Character type of the stream.
-
-    //! Read the current character from stream without moving the read cursor.
-    Ch Peek() const;
-
-    //! Read the current character from stream and moving the read cursor to next character.
-    Ch Take();
-
-    //! Get the current read cursor.