Replace all CRLF to LF.

Author: xarray

.editorconfig

@@ -0,0 +1,13 @@
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 4
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+insert_final_newline = false
+trim_trailing_whitespace = false

3rdparty/imgui/node-editor/crude_json.h

@@ -1,4 +1,4 @@
-// Crude implementation of JSON value object and parser.
+// Crude implementation of JSON value object and parser.
 //
 // VERSION 0.1
 //

3rdparty/imgui/node-editor/imgui_canvas.h

@@ -1,4 +1,4 @@
-// Canvas widget - view over infinite virtual space.
+// Canvas widget - view over infinite virtual space.
 //
 // Canvas allows you to draw your widgets anywhere over infinite space and provide
 // view over it with support for panning and scaling.

3rdparty/ktx/gl_format.h

@@ -1,4 +1,4 @@
-/*
+/*
 ================================================================================================
 
 Description	:	OpenGL formats/types and properties.

3rdparty/pinyin/Cache.cpp

@@ -1,11 +1,10 @@
-#include "Cache.h"
+#include "Cache.h"
 #include <algorithm>
 #include "PinyinHanzi.h"
 #include "StringFunction.h"
 
 using namespace ime::pinyin;
 
-//为了兼容多个引擎，全局变量应该对象化
 std::map<std::string, std::shared_ptr<Query>>		g_queryLineCaches;
 std::map<std::string, std::shared_ptr<Query>>		g_combineAssociateLineCaches;
 std::map<std::string, std::vector<std::string>>		g_SingleCaches;
@@ -16,7 +15,6 @@ std::shared_ptr<Query> QueryLineCache::getQuery(const std::string & validPinyinS
 	if (iter == g_queryLineCaches.end())
 	{
 		std::shared_ptr<Query> p = std::make_shared<Query>();
-		//搜索size=，pinyin like的条目
 		p->search(Query::pinyin | Query::cizu | Query::weight, std::count(validPinyinStr.begin(), validPinyinStr.end(), '\'') + 1, Query::Condition::eq,
 			validPinyinStr, Query::Condition::like, false, false, "", Query::Condition::none, Query::weight);
 		g_queryLineCaches.insert({ validPinyinStr, p });
@@ -40,7 +38,6 @@ std::shared_ptr<Query> CombineLineCache::getQuery(const std::string & validPinyi
 	if (iter == g_combineAssociateLineCaches.end())
 	{
 		std::shared_ptr<Query> p = std::make_shared<Query>();
-		//搜索size=，pinyin like的条目
 		p->search(Query::pinyin | Query::cizu | Query::priority, std::count(validPinyinStr.begin(), validPinyinStr.end(), '\'') + 1, Query::Condition::eq,
 			validPinyinStr, Query::Condition::like, false, false, "", Query::Condition::none, Query::priority);
 		g_combineAssociateLineCaches.insert({ validPinyinStr, p });

3rdparty/pinyin/Cache.h

@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <vector>
 #include "Query.h"
 #include "Share.h"

3rdparty/pinyin/CandidateStubs.cpp

@@ -1,4 +1,4 @@
-#include "CandidateStubs.h"
+#include "CandidateStubs.h"
 #include "Query.h"
 #include "StringFunction.h"
 #include "PinyinBase.h"
@@ -11,12 +11,9 @@ void CombineAssociateCandidate::setInput(const std::string &divided, bool enable
 {
 	clear();
 	m_divided = divided;
-	//如果只有单个拼音，则没有组合词组
 	if (m_divided.find("'") == std::string::npos)
 		return;
 
-	//以下获取不可调换顺序
-	//按顺序搜索获取组合词（成功表示最长长度的pinyin不能搜索到词组；反之搜到了词组，不再获取组合词和联想词）
 	std::string sFirstPinyins;
 	std::wstring sFirstCizu;
 	std::string sSecondPinyin;
@@ -28,18 +25,13 @@ void CombineAssociateCandidate::setInput(const std::string &divided, bool enable
 			return;
 	}
 
-	//如果最长长度的pinyin不能搜索到词组，获取模糊词组
 	if (enableAssociateCandidate)
 		getAssociate(m_divided);
 
-	//如果最长长度的pinyin不能搜索到词组，才执行下面
-	//且第一个拼音是特殊独立的汉字拼音比如“我”，“你”，“他”，“这”等
-	//sFirstCizu.size()是1的话第二组合词肯定等于第一个组合词了，没必要再获取
 	bool bGetSecond = false;
 	if (enableCombineCandidate && bGetFirst && sFirstCizu.size() != 1)
 		bGetSecond = getSecondCombine(m_divided);
 
-	//sCombineCizu2未插入且第二个词为特殊独立的汉字拼音就添加一个组合词
 	if (enableCombineCandidate && !bGetSecond)
 		bool bGetThird = getThirdCombine(m_divided, sFirstPinyins, sFirstCizu, sSecondPinyin);
 }
@@ -92,7 +84,6 @@ bool CombineAssociateCandidate::getFirstCombine(const std::string &input, std::s
 				firstCizu = StringFunction::utf8ToUnicode(firstCan.cizu);
 			}
 
-			//如果最长长度的pinyin能搜索到词组，取消组合词
 			if (sSearch == m_divided && firstCan.size == std::count(input.begin(), input.end(), '\'') + 1)
 			{
 				return false;
@@ -131,7 +122,6 @@ bool CombineAssociateCandidate::getFirstCombine(const std::string &input, std::s
 
 void CombineAssociateCandidate::getAssociate(const std::string &input)
 {
-	//模糊搜索，与size无关
 	Query longestQuery;
 	longestQuery.search(Query::size | Query::pinyin | Query::cizu | Query::weight, -1, Query::Condition::none, input, Query::Condition::like, true, false, "", Query::Condition::none, Query::weight);
 	for (int i = 0; i != longestQuery.recordCount(); ++i)
@@ -268,13 +258,12 @@ void QueryCandidate::getCandidate(unsigned int index, unsigned int count, std::v
 		return;
 
 	unsigned int nGetCount = 0;
-	//计算起始query，并获取该query数据
 	int nStartQueryIndex = 0;
 	for (int n = 0; nStartQueryIndex != m_queryLine.queryCount(); ++nStartQueryIndex)
 	{
 		std::shared_ptr<Query> query = m_queryLine.at(nStartQueryIndex);
 		n += query->recordCount();
-		if ((int)index <= n - 1)	//强制转换为int，因为n - 1可能被隐性转为unsgned int，导致比较结果错误
+		if ((int)index <= n - 1)
 		{
 			int beg = index - (n - query->recordCount());
 			int size = m_queryLine.queryCount() + 1 - nStartQueryIndex;
@@ -290,7 +279,6 @@ void QueryCandidate::getCandidate(unsigned int index, unsigned int count, std::v
 		}
 	}
 
-	//从nStartQueryIndex的下一个query继续获取数据
 	for (int i = nStartQueryIndex + 1; i != m_queryLine.queryCount(); ++i)
 	{
 		int size = m_queryLine.queryCount() + 1 - i;

3rdparty/pinyin/CandidateStubs.h

@@ -1,4 +1,4 @@
-/**********************************************
+/**********************************************
 *	PRTCandidateCombineAssociate
 *
 *	组合词候选词和联想候选词管理器
@@ -47,8 +47,6 @@ class CombineAssociateCandidate
 	};
 
 	bool getFirstCombine(const std::string &input, std::string &firstPinyins, std::wstring &firstCizu, std::string &secondPinyin);
-	//获取最长模糊查询结果，比如"zai'suo'you'ren'shi'yi'fei'de'jing'se'li'wo'zui'xi'huan'ni",
-	//输入"zai'suo'you'ren'shi'"也会搜索"zai'suo'you'ren'shi%"
 	void getAssociate(const std::string &input);
 	bool getSecondCombine(const std::string &input);
 	bool getThirdCombine(const std::string &input, const std::string &firstPinyins, std::wstring &firstCizu, std::string &secondPinyin);
@@ -83,4 +81,4 @@ class SinglePinyinCandidate
 	std::vector<std::string>		m_hanzis;
 };
 
-}}
+}}

3rdparty/pinyin/Ciku.cpp

@@ -1,31 +1,27 @@
-#include "Ciku.h"
+#include "Ciku.h"
 #include "sqlite3.h"
 #include "CikuManager.h"
-#ifdef WIN32 
+#ifdef WIN32
 #include <io.h>
 #else
 #include <unistd.h>
 #endif
 
 using namespace ime::pinyin;
 #define ALIAS_PREFIX	"DB_"
-//全局只需一个句柄即可
 sqlite3	*Ciku::m_sqlHandle = nullptr;
 
 bool Ciku::load(const std::string & path)
 {
-	//需要判断db数据库是否存在，不存在它会自动创建的
 	if (access(path.data(), 0) != 0)
 		return false;
 
-	//打开数据库（第一次需要初始化全局sqlHandl）
 	if(sqlHandle() == nullptr)
 	{
 		if (sqlite3_open(path.data(), &m_sqlHandle) != SQLITE_OK)
 			return false;
 	}
 
-	//给数据库起别名
 	char *pErrorMsg = nullptr;
 	std::string aliasName = calcNextAliasName();
 	std::string sCmd = "attach database \"" + path + "\" as \"" + aliasName + "\"";
@@ -66,4 +62,4 @@ std::string Ciku::calcNextAliasName() const
 {
 	int count = CikuManager::getCikus().size();
 	return ALIAS_PREFIX + std::to_string(count);
-}
+}

3rdparty/pinyin/Ciku.h

@@ -1,4 +1,4 @@
-/**********************************************
+/**********************************************
 *	Ciku词库
 *
 *	1、使用sqlite3
@@ -22,26 +22,21 @@ class Ciku final
 	Ciku(const Ciku &other) = delete;
 	void operator = (const Ciku &other) = delete;
 
-	//加载
 	bool load(const std::string &path);
 
-	//获取路径
 	const std::string &path() const;
 
-	//别名
 	const std::string &alias() const;
 
-	//全局sql句柄
 	static sqlite3 *sqlHandle();
 	static void freeSqlHandle();
 
 private:
-	//计算数据库别名
 	std::string calcNextAliasName() const;
 
 	static sqlite3	*m_sqlHandle;
 	std::string		m_path;
 	std::string		m_alias;
 };
 
-}}
+}}

3rdparty/pinyin/CikuManager.cpp

@@ -1,4 +1,4 @@
-#include "CikuManager.h"
+#include "CikuManager.h"
 #include "Ciku.h"
 #include "StringFunction.h"
 #include "PinyinBase.h"

3rdparty/pinyin/CikuManager.h

@@ -1,4 +1,4 @@
-/*************************************************
+/*************************************************
 *	CikuManager词库管理
 *		类型分为系统词库,学习词库和用户词库,
 *		其中系统词库和学习词库在引擎初始化时加载
@@ -19,45 +19,31 @@ class CikuManager final
 	CikuManager() = delete;
 	~CikuManager() = delete;
 
-	//配置system-db和learn-db
 	static void configure(const std::string &systemCikuPath, const std::string &learnCikuPath);
 
-	//初始化，加载system-db和learn-db
 	static bool init();
 	static bool deinit();
 
-	//添加一个用户词库
 	static bool addUserCiku(const std::string &path);
 
-	//删除一个用户词库
 	static bool remoteUserCiku(const std::string &path);
 
-	//删除所有的用户词库
 	static void clearUserCiku();
 
-	//获取所有的用户词库路径
 	static void getAllUserCikuPaths(std::vector<std::string> &cikuPaths);
 
-	//获取所有词库
 	static std::vector<std::shared_ptr<Ciku>> getCikus();
 
-	//插入一个词条
-	//长度、pinyin、cizu、优先级、权重
 	static bool insertRecord(int size, const std::string &completedPinyinStr, const std::string &cizu, int priority, int weight);
 
-	//删除一个词条
-	//completedPinyinStr：形如 "wo'ai'ni"，必须是完整的
-	//cizu：形如："我爱你"
 	static bool deleteRecord(const std::string &completedPinyinStr, const std::string &cizu);
 
-	//更新
 	static bool updateRecord(const std::string &srcCompletedPinyin, const std::string &srcCizu, int newSize, const std::string &newCompletedPinyinStr, const std::string &newCizu, int newPriority, int newWeight);
 
 private:
-	//所有的词库，前两位为system词库和learn词库
 	static std::string								m_systemCikuPath;
 	static std::string								m_learnCikuPath;
 	static std::vector<std::shared_ptr<Ciku>>		m_cikus;
 };
 
-}}
+}}

3rdparty/pinyin/Pinyin.cpp

@@ -1,4 +1,4 @@
-#include "pinyin/Pinyin.h"
+#include "pinyin/Pinyin.h"
 #include "Pinyin_Internal.h"
 #include <exception>
 #include <cstdlib>