Merge branch 'master' into sunpalevo

+Apache License
+
+Version 2.0, January 2004
+
+http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+"License" shall mean the terms and conditions for use, reproduction,
+and distribution as defined by Sections 1 through 9 of this document.
+
+"Licensor" shall mean the copyright owner or entity authorized by the
+copyright owner that is granting the License.
+
+"Legal Entity" shall mean the union of the acting entity and all other
+entities that control, are controlled by, or are under common control
+with that entity. For the purposes of this definition, "control" means
+(i) the power, direct or indirect, to cause the direction or
+management of such entity, whether by contract or otherwise, or (ii)
+ownership of fifty percent (50%) or more of the outstanding shares, or
+(iii) beneficial ownership of such entity.
+
+"You" (or "Your") shall mean an individual or Legal Entity exercising
+permissions granted by this License.
+
+"Source" form shall mean the preferred form for making modifications,
+including but not limited to software source code, documentation
+source, and configuration files.
+
+"Object" form shall mean any form resulting from mechanical
+transformation or translation of a Source form, including but not
+limited to compiled object code, generated documentation, and
+conversions to other media types.
+
+"Work" shall mean the work of authorship, whether in Source or Object
+form, made available under the License, as indicated by a copyright
+notice that is included in or attached to the work (an example is
+provided in the Appendix below).
+
+"Derivative Works" shall mean any work, whether in Source or Object
+form, that is based on (or derived from) the Work and for which the
+editorial revisions, annotations, elaborations, or other modifications
+represent, as a whole, an original work of authorship. For the
+purposes of this License, Derivative Works shall not include works
+that remain separable from, or merely link (or bind by name) to the
+interfaces of, the Work and Derivative Works thereof.
+
+"Contribution" shall mean any work of authorship, including the
+original version of the Work and any modifications or additions to
+that Work or Derivative Works thereof, that is intentionally submitted
+to Licensor for inclusion in the Work by the copyright owner or by an
+individual or Legal Entity authorized to submit on behalf of the
+copyright owner. For the purposes of this definition, "submitted"
+means any form of electronic, verbal, or written communication sent to
+the Licensor or its representatives, including but not limited to
+communication on electronic mailing lists, source code control
+systems, and issue tracking systems that are managed by, or on behalf
+of, the Licensor for the purpose of discussing and improving the Work,
+but excluding communication that is conspicuously marked or otherwise
+designated in writing by the copyright owner as "Not a Contribution."
+
+"Contributor" shall mean Licensor and any individual or Legal Entity
+on behalf of whom a Contribution has been received by Licensor and
+subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+copyright license to reproduce, prepare Derivative Works of, publicly
+display, publicly perform, sublicense, and distribute the Work and
+such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+this License, each Contributor hereby grants to You a perpetual,
+worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except
+as stated in this section) patent license to make, have made, use,
+offer to sell, sell, import, and otherwise transfer the Work, where
+such license applies only to those patent claims licensable by such
+Contributor that are necessarily infringed by their Contribution(s)
+alone or by combination of their Contribution(s) with the Work to
+which such Contribution(s) was submitted. If You institute patent
+litigation against any entity (including a cross-claim or counterclaim
+in a lawsuit) alleging that the Work or a Contribution incorporated
+within the Work constitutes direct or contributory patent
+infringement, then any patent licenses granted to You under this
+License for that Work shall terminate as of the date such litigation
+is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the Work
+or Derivative Works thereof in any medium, with or without
+modifications, and in Source or Object form, provided that You meet
+the following conditions:
+
+You must give any other recipients of the Work or Derivative Works a
+copy of this License; and
+
+You must cause any modified files to carry prominent notices stating
+that You changed the files; and
+
+You must retain, in the Source form of any Derivative Works that You
+distribute, all copyright, patent, trademark, and attribution notices
+from the Source form of the Work, excluding those notices that do not
+pertain to any part of the Derivative Works; and
+
+If the Work includes a "NOTICE" text file as part of its distribution,
+then any Derivative Works that You distribute must include a readable
+copy of the attribution notices contained within such NOTICE file,
+excluding those notices that do not pertain to any part of the
+Derivative Works, in at least one of the following places: within a
+NOTICE text file distributed as part of the Derivative Works; within
+the Source form or documentation, if provided along with the
+Derivative Works; or, within a display generated by the Derivative
+Works, if and wherever such third-party notices normally appear. The
+contents of the NOTICE file are for informational purposes only and do
+not modify the License. You may add Your own attribution notices
+within Derivative Works that You distribute, alongside or as an
+addendum to the NOTICE text from the Work, provided that such
+additional attribution notices cannot be construed as modifying the
+License.
+
+You may add Your own copyright statement to Your modifications and may
+provide additional or different license terms and conditions for use,
+reproduction, or distribution of Your modifications, or for any such
+Derivative Works as a whole, provided Your use, reproduction, and
+distribution of the Work otherwise complies with the conditions stated
+in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+any Contribution intentionally submitted for inclusion in the Work by
+You to the Licensor shall be under the terms and conditions of this
+License, without any additional terms or conditions. Notwithstanding
+the above, nothing herein shall supersede or modify the terms of any
+separate license agreement you may have executed with Licensor
+regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+names, trademarks, service marks, or product names of the Licensor,
+except as required for reasonable and customary use in describing the
+origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or agreed
+to in writing, Licensor provides the Work (and each Contributor
+provides its Contributions) on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+CONDITIONS OF ANY KIND, either express or implied, including, without
+limitation, any warranties or conditions of TITLE, NON-INFRINGEMENT,
+MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are solely
+responsible for determining the appropriateness of using or
+redistributing the Work and assume any risks associated with Your
+exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+whether in tort (including negligence), contract, or otherwise, unless
+required by applicable law (such as deliberate and grossly negligent
+acts) or agreed to in writing, shall any Contributor be liable to You
+for damages, including any direct, indirect, special, incidental, or
+consequential damages of any character arising as a result of this
+License or out of the use or inability to use the Work (including but
+not limited to damages for loss of goodwill, work stoppage, computer
+failure or malfunction, or any and all other commercial damages or
+losses), even if such Contributor has been advised of the possibility
+of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+the Work or Derivative Works thereof, You may choose to offer, and
+charge a fee for, acceptance of support, warranty, indemnity, or other
+liability obligations and/or rights consistent with this
+License. However, in accepting such obligations, You may act only on
+Your own behalf and on Your sole responsibility, not on behalf of any
+other Contributor, and only if You agree to indemnify, defend, and
+hold each Contributor harmless for any liability incurred by, or
+claims asserted against, such Contributor by reason of your accepting
+any such warranty or additional liability.

+M+ FONTS                                Copyright (C) 2002-2014 M+ FONTS PROJECT
+
+-
+
+LICENSE_E
+
+
+
+
+These fonts are free software.
+Unlimited permission is granted to use, copy, and distribute them, with
+or without modification, either commercially or noncommercially.
+THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
+
+
+http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/

+M+ FONTS                                Copyright (C) 2002-2014 M+ FONTS PROJECT
+
+-
+
+LICENSE_J
+
+
+
+
+これらのフォントはフリー（自由な）ソフトウエアです。
+あらゆる改変の有無に関わらず、また商業的な利用であっても、自由にご利用、
+複製、再配布することができますが、全て無保証とさせていただきます。
+
+
+http://mplus-fonts.sourceforge.jp/

+NatuMono（ナツ　モノ）フォント
+version 2014.0812
+
+源真ゴシック (げんしんゴシック)等幅 Regular
+Version 1.000.20140807
+に以下の改変を加えました。
+
+・濁点文字・半濁点文字を区別できるよう、半濁点を大きくする
+・0O（数字ゼロ・大文字オー）を区別できるよう、数字ゼロにスラッシュを入れる
+・大文字アイIの横棒が長すぎて半角カタカナのｴに見えるので短くする。
+・カ力 エ工 ロ口 ー一 ニ二 タ夕 ト卜（カタカナ・漢字）を区別できるよう、漢字の字形を加工する
+・へヘ（ひらがな・カタカナ）を区別できるよう、カタカナの字形を加工する
+・～〜（FULLWIDTH TILDE U+FF5E・WAVE DASH U+301C）を区別できるよう、U+301CをUnicode字形にする
+
+現時点ではウェイトはRegularのみです。Boldはありません。
+
+
+作成環境
+・Windows 7 64bit
+・unofficial fontforge-cygwin 2014_01_04 (FontForge 2.0.20140101＋縦書きパッチ）
+・源真ゴシック等幅 Regular Version 1.000.20140807 http://mm.xvs.jp/
+
+
+ライセンス
+・NatuMonoフォントのフォントファイルは、源ノ角ゴシックと同じ Apache 2.0 License のもとで使用することができます。
+・フォントデータに含まれる、源ノ角ゴシック由来の文字グリフの著作権は Adobe が所有しています。
+　　源真ゴシック等幅の半角等幅字形は、源ノ角ゴシックに含まれていたものだそうです。
+・フォントデータに含まれる、M+ OUTLINE FONTS 由来の文字グリフの著作権は M+ FONTS PROJECT が所有しています。
+
+  Apache 2.0 License の日本語訳は、以下から参照することができます。
+  http://sourceforge.jp/projects/opensource/wiki/licenses%2FApache_License_2.0
+
+-- 
+Itou Hiroki <itouhiro at users sourceforge dot jp>
\ No newline at end of file

+M+ FONTS                                Copyright (C) 2002-2014 M+ FONTS PROJECT
+
+-
+
+LICENSE_E
+
+
+
+
+These fonts are free software.
+Unlimited permission is granted to use, copy, and distribute them, with
+or without modification, either commercially or noncommercially.
+THESE FONTS ARE PROVIDED "AS IS" WITHOUT WARRANTY.
+
+
+http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/

+M+ FONTS                                Copyright (C) 2002-2014 M+ FONTS PROJECT
+
+-
+
+LICENSE_J
+
+
+
+
+これらのフォントはフリー（自由な）ソフトウエアです。
+あらゆる改変の有無に関わらず、また商業的な利用であっても、自由にご利用、
+複製、再配布することができますが、全て無保証とさせていただきます。
+
+
+http://mplus-fonts.sourceforge.jp/

+M+ FONTS                                Copyright (C) 2002-2014 M+ FONTS PROJECT
+
+-
+
+README_E
+
+
+
+
+M+ TESTFLIGHT
+
+The M+ OUTLINE FONTS are distributed with proportional Latin (4 variations), fixed-halfwidth Latin (3 variations) and fixed-fullwidth Japanese (2 Kana variations) character set. 7 weights from Thin to Black are included, but fixed-halfwidth Latin with 5 weights from Thin to Bold.
+
+
+PROPORTIONAL FONTS (proportional Latin and fixed-fullwidth Japanese)
+
+M+ 1P     mplus-1p-thin.ttf
+          mplus-1p-light.ttf
+          mplus-1p-regular.ttf
+          mplus-1p-medium.ttf
+          mplus-1p-bold.ttf
+          mplus-1p-heavy.ttf
+          mplus-1p-black.ttf
+          
+M+ 2P     mplus-2p-thin.ttf
+          mplus-2p-light.ttf
+          mplus-2p-regular.ttf
+          mplus-2p-medium.ttf
+          mplus-2p-bold.ttf
+          mplus-2p-heavy.ttf
+          mplus-2p-black.ttf
+          
+M+ 1C     mplus-1c-thin.ttf
+          mplus-1c-light.ttf
+          mplus-1c-regular.ttf
+          mplus-1c-medium.ttf
+          mplus-1c-bold.ttf
+          mplus-1c-heavy.ttf
+          mplus-1c-black.ttf
+          
+M+ 2C     mplus-2c-thin.ttf
+          mplus-2c-light.ttf
+          mplus-2c-regular.ttf
+          mplus-2c-medium.ttf
+          mplus-2c-bold.ttf
+          mplus-2c-heavy.ttf
+          mplus-2c-black.ttf
+
+
+FIXED-WIDTH FONTS (fixed-halfwidth Latin and fixed-fullwidth Japanese)
+
+M+ 1M     mplus-1m-thin.ttf
+          mplus-1m-light.ttf
+          mplus-1m-regular.ttf
+          mplus-1m-medium.ttf
+          mplus-1m-bold.ttf
+          
+M+ 2M     mplus-2m-thin.ttf
+          mplus-2m-light.ttf
+          mplus-2m-regular.ttf
+          mplus-2m-medium.ttf
+          mplus-2m-bold.ttf
+
+M+ 1MN    mplus-1mn-thin.ttf
+          mplus-1mn-light.ttf
+          mplus-1mn-regular.ttf
+          mplus-1mn-medium.ttf
+          mplus-1mn-bold.ttf
+
+          
+
+
+-
+
+M+ OUTLINE FONTS
+http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/
+
+mplus-fonts-dev ML
+http://lists.sourceforge.jp/mailman/listinfo/mplus-fonts-dev
+
+M+ FONTS open forum
+http://sourceforge.jp/forum/forum.php?forum_id=3403

+M+ FONTS                                Copyright (C) 2002-2014 M+ FONTS PROJECT
+
+-
+
+README_J
+
+
+
+
+M+ TESTFLIGHT
+
+M+ OUTLINE FONTS は 2 種類のかな文字を持つ固定幅和文フォントと 4 種類の
+プロポーショナル欧文フォント、3 種類の半角固定幅欧文フォントの組み合わせから
+構成され、それぞれ Thin から Black まで 7 種類（半角固定幅フォントは Bold
+まで 5 種類）のウエイトバリエーションがあります。
+
+
+プロポーショナルフォント（和文は全角固定幅、欧文・数字はプロポーショナル）
+
+M+ 1P     mplus-1p-thin.ttf
+          mplus-1p-light.ttf
+          mplus-1p-regular.ttf
+          mplus-1p-medium.ttf
+          mplus-1p-bold.ttf
+          mplus-1p-heavy.ttf
+          mplus-1p-black.ttf
+          
+M+ 2P     mplus-2p-thin.ttf
+          mplus-2p-light.ttf
+          mplus-2p-regular.ttf
+          mplus-2p-medium.ttf
+          mplus-2p-bold.ttf
+          mplus-2p-heavy.ttf
+          mplus-2p-black.ttf
+          
+M+ 1C     mplus-1c-thin.ttf
+          mplus-1c-light.ttf
+          mplus-1c-regular.ttf
+          mplus-1c-medium.ttf
+          mplus-1c-bold.ttf
+          mplus-1c-heavy.ttf
+          mplus-1c-black.ttf
+          
+M+ 2C     mplus-2c-thin.ttf
+          mplus-2c-light.ttf
+          mplus-2c-regular.ttf
+          mplus-2c-medium.ttf
+          mplus-2c-bold.ttf
+          mplus-2c-heavy.ttf
+          mplus-2c-black.ttf
+
+
+固定幅フォント（和文は全角、欧文・数字は半角の固定幅）
+
+M+ 1M     mplus-1m-thin.ttf
+          mplus-1m-light.ttf
+          mplus-1m-regular.ttf
+          mplus-1m-medium.ttf
+          mplus-1m-bold.ttf
+          
+M+ 2M     mplus-2m-thin.ttf
+          mplus-2m-light.ttf
+          mplus-2m-regular.ttf
+          mplus-2m-medium.ttf
+          mplus-2m-bold.ttf
+
+M+ 1MN    mplus-1mn-thin.ttf
+          mplus-1mn-light.ttf
+          mplus-1mn-regular.ttf
+          mplus-1mn-medium.ttf
+          mplus-1mn-bold.ttf
+
+          
+
+
+かな文字と常用漢字、基本的な欧文グリフが揃い、一般的な文章の大半の文字を表示
+できるようになりました。不足している文字は他のフォントからの自動補完、
+IPAG フォントとの合成などで補うことができます。
+M+ OUTLINE FONTS の詳細、お問い合わせなどは以下の URL からお願いします。
+
+-
+
+M+ OUTLINE FONTS
+http://mplus-fonts.sourceforge.jp/mplus-outline-fonts/
+
+mplus-fonts-dev ML
+http://lists.sourceforge.jp/mailman/listinfo/mplus-fonts-dev
+
+M+ FONTS open forum
+http://sourceforge.jp/forum/forum.php?forum_id=3403

+XANO明朝フォント Ver. 0.2004.0229 について
+
+2004年2月29日
+内田明
+<uchida@happy.email.ne.jp>
+
+
+■XANO明朝フォントとは何か
+
+株式会社日立製作所と株式会社タイプバンクが共同開発した「日立明朝
+体 32x32ドット ウエイト3 フォント」(以下「日立明朝Mフォント」) に
+関する「フォント権利使用許諾契約」(以下「HPS内田契約」)に基づき、
+内田明が開発・製作、配布を行うフォントの1つを、XANO明朝フォントと
+呼びます。
+
+内田は、HPS内田契約に基づいて、株式会社日立製作所と株式会社タイプ
+バンクが保有する日立明朝Mフォントの利用権——すなわち、日立明朝M
+フォントに表現されている文字の骨格、文字間のデザイン統一に関わる
+仕様、文字を構成する要素のデザイン・組み合わせ方・バランス等を派
+生フォントにおいて再現し利用する権利——を使用し、XANO明朝フォン
+トの開発・製作、配布を行っています。
+
+まず、ビットマップフォントである日立明朝Mフォントのうち、JIS C 
+6226-1983 (通称「83JIS」) にある漢字グリフを機械的に平滑化・アウ
+トライン化して得たTrueTypeフォントを、「ANO明朝フォント」と呼ん
+でおきます。
+また、HPS内田契約によりANO明朝フォントを改造・拡張して得た漢字グ
+リフ集合を、「拡張ANOグリフ集合」と呼んでおきます。拡張ANOグリフ
+集合には、2004年2月29日現在、JIS X 0213:2004(以下「2004JIS」)の
+1面漢字の全てと、2面漢字の一部が含まれています。
+
+XANO明朝フォントとは、内田が独自に製作した2004JISの非漢字等を実装
+するフォント「ORADANO明朝フォント」と、拡張ANOグリフ集合、そして、
+和田研漢字分科会により製作・配布されている「和田研明朝フォント」
+の補助漢字版から得た漢字グリフ集合とを結合して製作された、2004JIS
+実装水準4のTrueTypeフォントです。
+
+
+■XANO明朝フォントの利用
+
+このフォントは、印刷・表示、電子文書への埋め込み等の目的で、誰も
+が自由に無償で用いることができます。
+このフォントの配布・再配布は、自由に無償で行うことができます。
+このフォントを、より大きな規模のソフトウエアパッケージの一部とし
+て販売するなどしても構いません。
+このフォントを、フォント単独商品として販売してはなりません。
+このフォントは自由に拡張・改造等を行うことができますが、このフォ
+ントのうち前述の「拡張ANOグリフ集合」を用いて新たなフォントの開
+発・製作およびその配布を行おうとする場合、そのフォントをフォント
+単独商品として販売してはならず、またその説明書等の文書に《株式会
+社日立製作所と株式会社タイプバンクが保有する、「日立明朝体 32x32
+ドット ウエイト3 フォント」の派生フォント利用権を使用している》
+旨の明記を要します。
+
+
+■XANO明朝フォントの免責事項
+
+XANO明朝フォントは、「あるがまま」で提供される物であり、製作者お
+よび再配布者は、公的・私的な規格や言語慣習への適合性、何らかの用
+途への有用性などの、品質に関する保証を一切行いません。
+このフォントの利用に起因する損害に対し、その責任はすべて利用者が
+負うものとします。損害の起こる可能性が知られていた場合でも、製作
+者および再配布者は、法的・道義的な責任を負うことはありません。
+製作者および再配布者は、このフォントに不具合が発見されたときに、
+それを修正・告知する義務を負いません。
+

+Copyright (c) 2003 Hitachi, Ltd. and TypeBank Co., Ltd.
+Copyright (c) 2003 UCHIDA Akira
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+The end-user documentation included with the derived work, if any, must
+include the following acknowledgment:
+  This product is derived by using the right to use "Hitachi-Mincho
+  32x32-dot weight 3 Font" possessed by Hitachi, Ltd. and TypeBank 
+  Co., Ltd.
+Alternately, this acknowledgment may appear in the Font Software itself,
+if and wherever such third-party acknowledgments normally appear.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR
+CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+

+XANO明朝フォント Ver. 0.2004.0229 について
+
+2004年2月29日
+内田明
+<uchida@happy.email.ne.jp>
+
+
+■XANO明朝フォントとは何か
+
+株式会社日立製作所と株式会社タイプバンクが共同開発した「日立明朝
+体 32x32ドット ウエイト3 フォント」(以下「日立明朝Mフォント」) に
+関する「フォント権利使用許諾契約」(以下「HPS内田契約」)に基づき、
+内田明が開発・製作、配布を行うフォントの1つを、XANO明朝フォントと
+呼びます。
+
+内田は、HPS内田契約に基づいて、株式会社日立製作所と株式会社タイプ
+バンクが保有する日立明朝Mフォントの利用権——すなわち、日立明朝M
+フォントに表現されている文字の骨格、文字間のデザイン統一に関わる
+仕様、文字を構成する要素のデザイン・組み合わせ方・バランス等を派
+生フォントにおいて再現し利用する権利——を使用し、XANO明朝フォン
+トの開発・製作、配布を行っています。
+
+まず、ビットマップフォントである日立明朝Mフォントのうち、JIS C 
+6226-1983 (通称「83JIS」) にある漢字グリフを機械的に平滑化・アウ
+トライン化して得たTrueTypeフォントを、「ANO明朝フォント」と呼ん
+でおきます。
+また、HPS内田契約によりANO明朝フォントを改造・拡張して得た漢字グ
+リフ集合を、「拡張ANOグリフ集合」と呼んでおきます。拡張ANOグリフ
+集合には、2004年2月29日現在、JIS X 0213:2004(以下「2004JIS」)の
+1面漢字の全てと、2面漢字の一部が含まれています。
+
+XANO明朝フォントとは、内田が独自に製作した2004JISの非漢字等を実装
+するフォント「ORADANO明朝フォント」と、拡張ANOグリフ集合、そして、
+和田研漢字分科会により製作・配布されている「和田研明朝フォント」
+の補助漢字版から得た漢字グリフ集合とを結合して製作された、2004JIS
+実装水準4のTrueTypeフォントです。
+
+
+■XANO明朝フォントの利用
+
+このフォントは、印刷・表示、電子文書への埋め込み等の目的で、誰も
+が自由に無償で用いることができます。
+このフォントの配布・再配布は、自由に無償で行うことができます。
+このフォントを、より大きな規模のソフトウエアパッケージの一部とし
+て販売するなどしても構いません。
+このフォントを、フォント単独商品として販売してはなりません。
+このフォントは自由に拡張・改造等を行うことができますが、このフォ
+ントのうち前述の「拡張ANOグリフ集合」を用いて新たなフォントの開
+発・製作およびその配布を行おうとする場合、そのフォントをフォント
+単独商品として販売してはならず、またその説明書等の文書に《株式会
+社日立製作所と株式会社タイプバンクが保有する、「日立明朝体 32x32
+ドット ウエイト3 フォント」の派生フォント利用権を使用している》
+旨の明記を要します。
+
+
+■XANO明朝フォントの免責事項
+
+XANO明朝フォントは、「あるがまま」で提供される物であり、製作者お
+よび再配布者は、公的・私的な規格や言語慣習への適合性、何らかの用
+途への有用性などの、品質に関する保証を一切行いません。
+このフォントの利用に起因する損害に対し、その責任はすべて利用者が
+負うものとします。損害の起こる可能性が知られていた場合でも、製作
+者および再配布者は、法的・道義的な責任を負うことはありません。
+製作者および再配布者は、このフォントに不具合が発見されたときに、
+それを修正・告知する義務を負いません。
+

+Copyright (c) 2003 Hitachi, Ltd. and TypeBank Co., Ltd.
+Copyright (c) 2003 UCHIDA Akira
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of the fonts accompanying this license ("Fonts") and associated
+documentation files (the "Font Software"), to reproduce and distribute
+the Font Software, including without limitation the rights to use, copy,
+modify, merge, publish, distribute, and/or sell copies of the Font
+Software, and to permit persons to whom the Font Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies of one or more of the Font Software typefaces.
+
+The Font Software may be sold as part of a larger software package but
+no copy of one or more of the Font Software typefaces may be sold by
+itself.
+
+The end-user documentation included with the derived work, if any, must
+include the following acknowledgment:
+  This product is derived by using the right to use "Hitachi-Mincho
+  32x32-dot weight 3 Font" possessed by Hitachi, Ltd. and TypeBank 
+  Co., Ltd.
+Alternately, this acknowledgment may appear in the Font Software itself,
+if and wherever such third-party acknowledgments normally appear.
+
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF
+COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR
+CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT
+SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
+

+Copyright (c) 2015, NAVER Corporation (http://www.navercorp.com), with Reserved Font Name D2Coding.
+
+Copyright (c) 2015, NAVER Corporation (http://www.navercorp.com), with Reserved Font Name D2Coding-Bold.
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+
+This license is copied below, and is also available with a FAQ at: http://scripts.sil.org/OFL
+
+SIL OPEN FONT LICENSE
+Version 1.1 - 26 February 2007
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide development of collaborative font projects, to support the font creation efforts of academic and linguistic communities, and to provide a free and open framework in which fonts may be shared and improved in partnership with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and redistributed freely as long as they are not sold by themselves. The fonts, including any derivative works, can be bundled, embedded, redistributed and/or sold with any software provided that any reserved names are not used by derivative works. The fonts and derivatives, however, cannot be released under any other type of license. The requirement for fonts to remain under this license does not apply to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright Holder(s) under this license and clearly marked as such. This may include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting, or substituting -- in part or in whole -- any of the components of the Original Version, by changing formats or by porting the Font Software to a new environment.
+
+"Author" refers to any designer, engineer, programmer, technical writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining a copy of the Font Software, to use, study, copy, merge, embed, modify, redistribute, and sell modified and unmodified copies of the Font Software, subject to the following conditions:
+
+Neither the Font Software nor any of its individual components, in Original or Modified Versions, may be sold by itself.
+
+Original or Modified Versions of the Font Software may be bundled, redistributed and/or sold with any software, provided that each copy contains the above copyright notice and this license. These can be included either as stand-alone text files, human-readable headers or in the appropriate machine-readable metadata fields within text or binary files as long as those fields can be easily viewed by the user.
+
+No Modified Version of the Font Software may use the Reserved Font Name(s) unless explicit written permission is granted by the corresponding Copyright Holder. This restriction only applies to the primary font name as presented to the users.
+
+The name(s) of the Copyright Holder(s) or the Author(s) of the Font Software shall not be used to promote, endorse or advertise any Modified Version, except to acknowledge the contribution(s) of the Copyright Holder(s) and the Author(s) or with their explicit written permission.
+
+The Font Software, modified or unmodified, in part or in whole, must be distributed entirely under this license, and must not be distributed under any other license. The requirement for fonts to remain under this license does not apply to any document created using the Font Software.
+
+##TERMINATION This license becomes null and void if any of the above conditions are not met.
+
+##DISCLAIMER THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
\ No newline at end of file

+KR : INSULA__ -> songgang-gasa-regular
+https://www.oning.co.kr/license
+
+KR : Unquiet Spirits -> yoonbongil_GS
+https://gscaltexmediahub.com/campaign/the-energy-of-independence-fighters/
+
+KR : mainframe-opto -> NEXONFootballGothicL
+http://levelup.nexon.com/font/index.aspx?page=4
\ No newline at end of file

@@ -67,16 +67,49 @@ newPackage{ id = "fantasy", name = "Fantasy", weight = 100,
 
 
 newPackage{ id = "chinese", name = "Chinese", weight = 100,
-	small = {font="/data/font/WenQuanYiMicroHei.ttf", normal=12, small=10, big=14},
-	default = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16, small=12, big=18},
-	bold = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16, small=12, big=18},
-	mono = {font="/data/font/WenQuanYiMicroHeiMono.ttf", normal=16, small=12, big=18},
-	mono_small = {font="/data/font/WenQuanYiMicroHeiMono.ttf", normal=14, small=10, big=16},
-	flyer = {font="/data/font/WenQuanYiMicroHei.ttf", normal=14, small=12, big=16},
-	bignews = {font="/data/font/WenQuanYiMicroHei.ttf", normal=30},
-	resources_normal = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16},
-	resources_small = {font="/data/font/WenQuanYiMicroHei.ttf", normal=14},
-	classic = {font="/data/font/WenQuanYiMicroHei.ttf", normal=16, small=14, big=18},
-	classic_mono = {font="/data/font/WenQuanYiMicroHeiMono.ttf", normal=14, small=10, big=16},
-	terminal = {font="/data/font/WenQuanYiMicroHeiMono.ttf", normal=12, small=10, big=14},
+	small = {font="/data/font/zh_hans/WenQuanYiMicroHei.ttf", normal=12, small=10, big=14},
+	default = {font="/data/font/zh_hans/WenQuanYiMicroHei.ttf", normal=16, small=12, big=18},
+	bold = {font="/data/font/zh_hans/WenQuanYiMicroHei.ttf", normal=16, small=12, big=18},
+	mono = {font="/data/font/zh_hans/WenQuanYiMicroHeiMono.ttf", normal=16, small=12, big=18},
+	mono_small = {font="/data/font/zh_hans/WenQuanYiMicroHeiMono.ttf", normal=14, small=10, big=16},
+	flyer = {font="/data/font/zh_hans/WenQuanYiMicroHei.ttf", normal=14, small=12, big=16},
+	bignews = {font="/data/font/zh_hans/WenQuanYiMicroHei.ttf", normal=30},
+	resources_normal = {font="/data/font/zh_hans/WenQuanYiMicroHei.ttf", normal=16},
+	resources_small = {font="/data/font/zh_hans/WenQuanYiMicroHei.ttf", normal=14},
+	classic = {font="/data/font/zh_hans/WenQuanYiMicroHei.ttf", normal=16, small=14, big=18},
+	classic_mono = {font="/data/font/zh_hans/WenQuanYiMicroHeiMono.ttf", normal=14, small=10, big=16},
+	insular = {font="/data/font/zh_hans/MaShanZheng-Regular.ttf", normal=14, small=12, big=16},
+	terminal = {font="/data/font/zh_hans/WenQuanYiMicroHeiMono.ttf", normal=12, small=10, big=14},
 }
+
+newPackage{ id = "japanese", name = "Japanese", weight = 100,
+	small = {font="/data/font/ja_JP/HigashiOme/HigashiOme-Gothic-1.3i.ttf", normal=11, small=9, big=13},
+	default = {font="/data/font/ja_JP/HigashiOme/HigashiOme-Gothic-1.3i.ttf", normal=15, small=13, big=17},
+	bold = {font="/data/font/ja_JP/HigashiOme/HigashiOme-Gothic-1.3i.ttf", normal=15, small=13, big=17},
+	mono = {font="/data/font/ja_JP/NatuMono/NatuMono-Regular-20140812.ttf", normal=14, small=12, big=16},
+	mono_small = {font="/data/font/ja_JP/NatuMono/NatuMono-Regular-20140812.ttf", normal=14, small=10, big=16},
+	flyer = {font="/data/font/ja_JP/HigashiOme/HigashiOme-Gothic-1.3i.ttf", normal=14, small=12, big=16},
+	bignews = {font="/data/font/ja_JP/HigashiOme/HigashiOme-Gothic-1.3i.ttf", normal=30},
+	resources_normal = {font="/data/font/ja_JP/HigashiOme/HigashiOme-Gothic-1.3i.ttf", normal=15},
+	resources_small = {font="/data/font/ja_JP/HigashiOme/HigashiOme-Gothic-1.3i.ttf", normal=13},
+	classic = {font="/data/font/ja_JP/HigashiOme/HigashiOme-Gothic-1.3i.ttf", normal=14, small=12, big=16},
+	classic_mono = {font="/data/font/ja_JP/NatuMono/NatuMono-Regular-20140812.ttf", normal=14, small=10, big=16},
+	insular = {font="/data/font/ja_JP/XANO-U32-2004-0509/XANO-mincho-U32.ttf", normal=14, small=12, big=16},
+	terminal = {font="/data/font/ja_JP/NatuMono/NatuMono-Regular-20140812.ttf", normal=12, small=10, big=14},
+}
+
+newPackage{ id = "korean", name = "Korean", weight = 100,
+	small = {font="/data/font/ko_KR/JejuGothic.ttf", normal=11, small=9, big=13},
+	default = {font="/data/font/ko_KR/JejuGothic.ttf", normal=15, small=13, big=17},
+	bold = {font="/data/font/ko_KR/JejuGothic.ttf", normal=15, small=13, big=17},
+	mono = {font="/data/font/ko_KR/D2Coding.ttf", normal=16, small=12, big=16},
+	mono_small = {font="/data/font/ko_KR/D2Coding.ttf", normal=14, small=10, big=16},
+	flyer = {font="/data/font/ko_KR/JejuGothic.ttf", normal=14, small=12, big=16},
+	bignews = {font="/data/font/ko_KR/JejuGothic.ttf", normal=30},
+	resources_normal = {font="/data/font/ko_KR/JejuGothic.ttf", normal=15},
+	resources_small = {font="/data/font/ko_KR/JejuGothic.ttf", normal=13},
+	classic = {font="/data/font/ko_KR/D2Coding.ttf", normal=14, small=12, big=16},
+	classic_mono = {font="/data/font/ko_KR/D2Coding.ttf", normal=14, small=10, big=16},
+	insular = {font="/data/font/ko_KR/songgang-gasa-regular.ttf", normal=14, small=12, big=16},
+	terminal = {font="/data/font/ko_KR/D2Coding.ttf", normal=12, small=10, big=14},
+}
\ No newline at end of file

+Copyright 2018 The Ma Shan Zheng Project Authors (https://github.com/googlefonts/mashanzheng)
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.

+Copyright (c) 2007, Google Corp.; Copyright (c) 2008,2009 WenQuanYi Board of Trustees and Qianqian Fang. This font is dual-licensed under Apache License 2.0 or GNU General Public License v3] with font embedding exceptions.

@@ -519,18 +519,18 @@ function _M:lineFOV(tx, ty, extra_block, block, sx, sy)
 		(game.level.map.lites(tx, ty) or act and self:canSee(act))
 
 	extra_block = type(extra_block) == "function" and extra_block
-		or type(extra_block) == "string" and function(_, x, y) return game.level.map:checkAllEntities(x, y, extra_block) end
+		or type(extra_block) == "string" and function(self, x, y) return game.level.map:checkAllEntities(x, y, extra_block, self) end
 
 	block = block
 		or sees_target and function(_, x, y)
-			return game.level.map:checkAllEntities(x, y, "block_sight") or
-				game.level.map:checkEntity(x, y, engine.Map.TERRAIN, "block_move") and not game.level.map:checkEntity(x, y, engine.Map.TERRAIN, "pass_projectile") or
+			return game.level.map:checkAllEntities(x, y, "block_sight", self) or
+				game.level.map:checkEntity(x, y, engine.Map.TERRAIN, "block_move", self) and not game.level.map:checkEntity(x, y, engine.Map.TERRAIN, "pass_projectile") or
 				extra_block and extra_block(self, x, y)
 			end
 		or function(_, x, y)
 			if (self.sight and core.fov.distance(sx, sy, x, y) <= self.sight or not self.sight) and game.level.map.lites(x, y) then
-				return game.level.map:checkEntity(x, y, Map.TERRAIN, "block_sight") or
-					game.level.map:checkEntity(x, y, engine.Map.TERRAIN, "block_move") and not game.level.map:checkEntity(x, y, engine.Map.TERRAIN, "pass_projectile") or
+				return game.level.map:checkEntity(x, y, Map.TERRAIN, "block_sight", self) or
+					game.level.map:checkEntity(x, y, engine.Map.TERRAIN, "block_move", self) and not game.level.map:checkEntity(x, y, engine.Map.TERRAIN, "pass_projectile") or
 					extra_block and extra_block(self, x, y)
 			else
 				return true
@@ -613,5 +613,5 @@ function _M:him_her() return string.him_her(self) end
 function _M:his_her_self() return string.his_her_self(self) end
 
 function _M:getName()
-	return _t(self.name)
+	return _t(self.name, "entity name")
 end
\ No newline at end of file

@@ -44,7 +44,7 @@ DAY_START = HOUR * 6
 -- @param start_day defaults to 1
 -- @param start_hour defaults to 8
 function _M:init(definition, datestring, start_year, start_day, start_hour)
-	local data = dofile(definition)
+	local data, c_dts = dofile(definition)
 	self.calendar = {}
 	local days = 0
 	for _, e in ipairs(data) do
@@ -54,7 +54,7 @@ function _M:init(definition, datestring, start_year, start_day, start_hour)
 	end
 	assert(days == 365, "Calendar incomplete, days ends at "..days.." instead of 365")
 
-	self.datestring = datestring
+	self.datestring = c_dts or datestring
 	self.start_year = start_year
 	self.start_day = start_day or 1
 	self.start_hour = start_hour or 8

@@ -18,13 +18,14 @@
 -- darkgod@te4.org
 
 require "engine.class"
-require "engine.dialogs.Chat"
+require "Json2"
 local slt2 = require "slt2"
 
 --- Handle chats between the player and NPCs
 -- @classmod engine.Chat
 module(..., package.seeall, class.make)
 
+_M.chat_dialog = "engine.dialogs.Chat"
 _M.chat_context_strings = {"#{italic}##LIGHT_GREEN#", "#LAST##{normal}#"}
 _M.chat_bold_strings = {"#{bold}#", "#{normal}#"}
 
@@ -34,6 +35,7 @@ _M.chat_bold_strings = {"#{bold}#", "#{normal}#"}
 -- @param[type=Actor] player the player
 -- @param[type=table] data
 function _M:init(name, npc, player, data)
+	self.chat_env = {}
 	self.quick_replies = 0
 	self.chats = {}
 	self.npc = npc
@@ -44,17 +46,22 @@ function _M:init(name, npc, player, data)
 	if not data.player then data.player = player end
 	if not data.npc then data.npc = npc end
 
-	local f, err = loadfile(self:getChatFile(name))
-	if not f and err then error(err) end
-	local env = setmetatable({
-		cur_chat = self,
-		setDialogWidth = function(w) self.force_dialog_width = w end,
-		newChat = function(c) self:addChat(c) end,
-		setTextFont = function(font, size) self.dialog_text_font = {font, size} end,
-		setAnswerFont = function(font, size) self.dialog_answer_font = {font, size} end,
-	}, {__index=data})
-	setfenv(f, env)
-	self.default_id = f()
+	local filepath, is_chat_format = self:getChatFile(name)
+	if not is_chat_format then
+		local f, err = loadfile(filepath)
+		if not f and err then error(err) end
+		local env = setmetatable({
+			cur_chat = self,
+			setDialogWidth = function(w) self.force_dialog_width = w end,
+			newChat = function(c) self:addChat(c) end,
+			setTextFont = function(font, size) self.dialog_text_font = {font, size} end,
+			setAnswerFont = function(font, size) self.dialog_answer_font = {font, size} end,
+		}, {__index=data})
+		setfenv(f, env)
+		self.default_id = f()
+	else
+		self:loadChatFormat(filepath)
+	end
 
 	self:triggerHook{"Chat:load", data=data, env=env}
 end
@@ -65,17 +72,308 @@ end
 function _M:getChatFile(file)
 	local _, _, addon, rfile = file:find("^([^+]+)%+(.+)$")
 	if addon and rfile then
+		if fs.exists("/data-"..addon.."/chats/"..rfile..".chat") then return "/data-"..addon.."/chats/"..rfile..".chat", true end
 		return "/data-"..addon.."/chats/"..rfile..".lua"
 	end
+	if fs.exists("/data/chats/"..file..".chat") then return "/data/chats/"..file..".chat", true end
 	return "/data/chats/"..file..".lua"
 end
 
+function _M:setFunctionEnv(fct)
+	local env = setmetatable({
+		self = self,
+		chat_env = self.chat_env,
+		newChat = function(c) self:addChat(c) end,
+	}, {__index=_G})
+	setfenv(fct, env)
+end
+
+--- Build up an answer from various nodes
+-- Note to future code divers, this is a recursive method and on long chats can recurse a log, but it only use tailcalls so it's fine. Lua rocks
+function _M:chatFormatActions(nodes, answer, node, stop_at)
+	if not node or node == stop_at then return end
+	local function getnext()
+		-- Find out if we have actions to take, conditions to apply and where to jump to
+		if table.sget(node, 'outputs', 'output_1', "connections", 1, "node") then
+			return nodes[table.sget(node, 'outputs', 'output_1', "connections", 1, "node")]
+		end
+	end
+
+	local function add_action(node, action)
+		self:setFunctionEnv(action)
+		if answer.action then
+			local old = answer.action
+			answer.action = function(npc, player)
+				local r1 = old(npc, player)
+				local r2 = action(npc, player)
+				return r2 or r1
+			end
+		else
+			answer.action = action
+		end
+	end
+	local function add_cond(node, cond)
+		if node.data['not'] then local oc = cond cond = function(npc, player) return not oc(npc, player) end end
+		self:setFunctionEnv(cond)
+		if answer.cond then
+			local old = answer.cond
+			answer.cond = function(npc, player)
+				return old(npc, player) and cond(npc, player)
+			end
+		else
+			answer.cond = cond
+		end
+	end
+
+	---------------------------------------------------------------------------
+	if node.name == "chat" or node.name == "entry-selector" then
+		answer.jump = node.data.chatid
+	---------------------------------------------------------------------------
+	elseif node.name == "lua-code" then
+		local action, err = loadstring("return function(npc, player) "..node.data.code.." end")
+		if not action and err then error("[Chat] chatFormatActions ERROR: "..err) end
+		action = action()
+		add_action(node, action)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "lua-cond" then
+		if not node.data.code:find("return ") then node.data.code = "return "..node.data.code end
+		local cond, err = loadstring("return function(npc, player) "..node.data.code.." end")
+		if not cond and err then error("[Chat] chatFormatActions ERROR: "..err) end
+		cond = cond()
+		add_cond(node, cond)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "quest-set" then
+		local Quest = require "engine.Quest"
+		local sub = nil
+		if node.data.sub ~= "" then sub = node.data.sub end
+		add_action(node, function(npc, player) if player:hasQuest(node.data.quest) then player:setQuestStatus(node.data.quest, Quest[node.data.status], sub) end end)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "quest-give" then
+		local Quest = require "engine.Quest"
+		add_action(node, function(npc, player) player:grantQuest(node.data.quest) end)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "quest-cond" then
+		local Quest = require "engine.Quest"
+		local sub = nil
+		if node.data.sub ~= "" then sub = node.data.sub end
+		add_cond(node, function(npc, player) return player:hasQuest(node.data.quest) and player:isQuestStatus(node.data.quest, Quest[node.data.status], sub) end)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "quest-has" then
+		if node.data.state == "has" then
+			add_cond(node, function(npc, player) return player:hasQuest(node.data.quest) end)
+		else
+			add_cond(node, function(npc, player) return not player:hasQuest(node.data.quest) end)
+		end
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "birth-descriptor" then
+		add_cond(node, function(npc, player) return player.descriptor and player.descriptor[node.data.what] == node.data.value end)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "object-has" then
+		add_cond(node, function(npc, player)
+			local actor = node.data.who == "player" and player or npc
+			if node.data['in'] == "all-inventories" then
+				return actor:findInAllInventoriesBy(node.data.search_by, node.data.search)
+			elseif node.data['in'] == "worn-inventories" then
+				return actor:findInAllWornInventoriesBy(true, node.data.search_by, node.data.search)
+			elseif node.data['in'] == "nonworn-inventories" then
+				return actor:findInAllWornInventoriesBy(false, node.data.search_by, node.data.search)
+			else
+				return actor:findInInventoryBy(actor:getInven(node.data['in']), node.data.search_by, node.data.search)
+			end
+			return 
+		end)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "attr-inc" then
+		if not node.data.value:find("return ") then node.data.value = "return "..node.data.value end
+		local a, err = loadstring(node.data.value)
+		if not a and err then error("[Chat] chatFormatActions ERROR: "..err) end
+		a = a()
+		local is_player = node.data.who == "player"
+		add_action(node, function(npc, player) return (is_player and player or npc):attr(node.data.attr, a) end)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "attr-get" then
+		if node.data.value == "" and node.data.test ~= "?" and node.data.test ~= "!" then error("[Chat] chatFormatActions ERROR: no value for a non existance test") end
+		if not node.data.value:find("return ") then node.data.value = "return "..node.data.value end
+		local a, err = loadstring(node.data.value)
+		if not a and err then error("[Chat] chatFormatActions ERROR: "..err) end
+		a = a()
+		local is_player = node.data.who == "player"
+		add_cond(node, function(npc, player)
+			local actor = (is_player and player or npc)
+			local v = actor:attr(node.data.attr)
+			if node.data.test == "?" then return v and true or false
+			elseif node.data.test == "!" then return not v and true or false
+			elseif node.data.test == "=" then return v == a
+			elseif node.data.test == ">" then return v > a
+			elseif node.data.test == "<" then return v < a
+			elseif node.data.test == ">=" then return v >= a
+			elseif node.data.test == "<=" then return v <= a
+			end
+		end)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "swap-actor" then
+		if node.data.custom == "id" then
+			local e
+			if node.data.id == "player" then e = self.player
+			else e = game.level:findEntity{define_as = node.data.id}
+			end
+			if e then
+				answer.switch_npc = e
+				if node.data.move_camera == true then answer.switch_npc_move_camera = true end
+			end
+		elseif node.data.custom == "true" then
+			if not node.data.def:find("return ") then node.data.def = "return "..node.data.def end
+			local a, err = loadstring(node.data.def)
+			if not a and err then error("[Chat] chatFormatActions ERROR: "..err) end
+			answer.switch_npc = engine.Entity.new(a())
+		else
+			local Map = require "engine.Map"
+			local is_tall = false
+			if Map.tiles then
+				local _, _, _, w, h = Map.tiles:get('', 0, 0, 0, 0, 0, 0, node.data.image)
+				is_tall = h > w
+			end
+			answer.switch_npc = engine.Entity.new{name=node.data.name, image=node.data.image, dislpay_y=is_tall and -1 or 0, display_h=is_tall and 2 or 1}
+		end
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "change-zone" then
+		local zone = nil
+		if node.data.zone ~= "--" then zone = node.data.zone end
+		add_action(node, function() game:changeLevel(tonumber(node.data.level), zone) end)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "set-faction-reaction" then
+		add_action(node, function(npc, player)
+			local f1 = node.data.f1
+			if f1 == "--player--" then f1 = player.faction end
+			local f2 = node.data.f2
+			if f2 == "--npc--" then f2 = npc.faction end
+			engine.Faction:setFactionReaction(f1, f2, tonumber(node.data.reaction), true)
+		end)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "unique" then
+		local getstore = function(npc, player)
+			local store = {}
+			if node.data.store == "player" then player.__chat_uniqueness = player.__chat_uniqueness or {} store = player.__chat_uniqueness end
+			if node.data.store == "npc" then npc.__chat_uniqueness = npc.__chat_uniqueness or {} store = npc.__chat_uniqueness end
+			if node.data.store == "game" then game.state.__chat_uniqueness = game.state.__chat_uniqueness or {} store = game.state.__chat_uniqueness end
+			return store
+		end
+		add_cond(node, function(npc, player) local store = getstore(npc, player) return not store[node.data.id] end)
+		add_action(node, function(npc, player) local store = getstore(npc, player) store[node.data.id] = true end)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "not" then
+		if answer.cond then local old = answer.cond answer.cond = function(npc, player) return not old(npc, player) end
+		else answer.cond = function() return false end end
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	---------------------------------------------------------------------------
+	elseif node.name == "or" then
+		-- Recurse back to the star of the condition chains of both input2 and input3, then walk them the usual way until we reach us again
+		local conds = {}
+		local function walk_chain(chainnode)
+			local fakeanswer = {}
+			local function walk(n)
+				local tid = table.sget(n, 'inputs', 'input_1', "connections", 1, "node")
+				-- If we have a parent, follow it
+				if tid then
+					return walk(nodes[tid])
+				-- No parent, we are the start of the chain, that building the cond
+				else
+					self:chatFormatActions(nodes, fakeanswer, getnext(), node)
+				end
+			end
+			walk(chainnode)
+			conds[#conds+1] = fakeanswer.cond
+		end
+
+		for i, d in ipairs(table.sget(node, 'inputs', 'input_2', "connections") or {}) do walk_chain(nodes[d.node]) end
+		for i, d in ipairs(table.sget(node, 'inputs', 'input_3', "connections") or {}) do walk_chain(nodes[d.node]) end
+
+		add_cond(node, function(npc, player) for i, cond in ipairs(conds) do if cond(npc, player) then return true end end end)
+		return self:chatFormatActions(nodes, answer, getnext(), stop_at)
+	else
+		return self:triggerHook{"Chat:chatFormatActions", nodes=node, answer=answer, node=node, add_action=add_action, add_cond=add_cond, getnext=getnext, stop_at=stop_at}
+	end
+end
+
+function _M:loadChatFormat(filepath)
+	local fdata = fs.readAll(filepath)
+	if not fdata then print("[Chat] loadChatFormat: error reading file") return end
+	local data = json.decode(fdata)
+
+	-- Fix chatids to ensure uniqueness
+	local chatids = {}
+	for nodeid, node in pairs(data) do
+		if node.name == "chat" then
+			local chatid = node.data.chatid
+			while chatids[node.data.chatid] do node.data.chatid = chatid..rng.range(1, 99999) end
+			chatids[node.data.chatid] = node
+		end
+	end
+
+	for nodeid, node in pairs(data) do
+		if node.name == "chat" then
+			local answers = {}
+			local i = 1
+			while node.data["answer"..i] do
+				answers[i] = {_t(node.data["answer"..i])}
+				-- Find out if we have actions to take, conditions to apply and where to jump to
+				if table.sget(node, 'outputs', 'output_'..i, "connections", 1, "node") then
+					local tn = data[table.sget(node, 'outputs', 'output_'..i, "connections", 1, "node")]
+					self:chatFormatActions(data, answers[i], tn)
+				end
+				i = i + 1
+			end
+			self:addChat{ id = node.data.chatid,
+				text = _t(node.data.chat),
+				answers = answers,
+			}	
+		elseif node.name == "entry-selector" then
+			local answers = {}
+			local i = 1
+			while table.sget(node, 'outputs', 'output_'..i, "connections", 1, "node") do
+				answers[i] = {""}
+				-- Find out if we have actions to take, conditions to apply and where to jump to
+				local tn = data[table.sget(node, 'outputs', 'output_'..i, "connections", 1, "node")]
+				self:chatFormatActions(data, answers[i], tn)
+				i = i + 1
+			end
+			local auto, err = loadstring("return function(npc, player) "..node.data.code.." end")
+			if not auto and err then error("[Chat] chatFormatActions ERROR: "..err) end
+			auto = auto()
+			self:setFunctionEnv(auto)
+			self:addChat{ id = node.data.chatid,
+				text = "",
+				auto = auto,
+				answers = answers,
+			}	
+		end
+	end
+	self.default_id = "welcome"
+end
+
 --- Switch the NPC talking
 -- @param[type=Actor] npc
 -- @return NPC we switched from
-function _M:switchNPC(npc)
+function _M:switchNPC(npc, pan_camera)
 	local old = self.npc
 	self.npc = npc
+	if pan_camera and game.level and game.level.map and npc.x and npc.y then
+		game.level.map:centerViewAround(npc.x, npc.y)
+	end
 	return old
 end
 
@@ -115,7 +413,7 @@ function _M:invoke(id)
 	local hd = {"Chat:invoke", id = id or self.default_id }
 	self:triggerHook(hd)
 
-	local d = engine.dialogs.Chat.new(self, hd.id, self.force_dialog_width or 500)
+	local d = require(self.chat_dialog).new(self, hd.id, self.force_dialog_width or 500)
 	game:registerDialog(d)
 	return d
 end
@@ -135,7 +433,16 @@ end
 --- Replace some keywords in the given text
 -- @string text @playername@, @npcname@, @playerdescriptor.(.-)@
 function _M:replace(text)
-	text = text:noun_sub("@playername@", self.player:getName()):noun_sub("@npcname@", self.npc.