Hello community,
here is the log from the commit of package ibus-libpinyin for openSUSE:Factory checked in at 2018-03-05 13:44:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ibus-libpinyin (Old)
and /work/SRC/openSUSE:Factory/.ibus-libpinyin.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ibus-libpinyin"
Mon Mar 5 13:44:11 2018 rev:14 rq:582464 version:1.9.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/ibus-libpinyin/ibus-libpinyin.changes 2017-10-13 14:12:30.413675528 +0200
+++ /work/SRC/openSUSE:Factory/.ibus-libpinyin.new/ibus-libpinyin.changes 2018-03-05 13:44:52.504706855 +0100
@@ -1,0 +2,13 @@
+Mon Mar 5 03:10:34 UTC 2018 - hillwood@opensuse.org
+
+- Update version to 1.9.3
+ * Translate input method name in ibus menu
+ * Remove phrases.txt
+
+-------------------------------------------------------------------
+Thu Sep 28 13:13:38 UTC 2017 - hillwood@opensuse.org
+
+- Update to 1.9.2
+ * fixes pinyin and bopomofo config
+
+-------------------------------------------------------------------
@@ -4 +17 @@
-- Update 1.9.1
+- Update to 1.9.1
@@ -10 +23 @@
-- Update 1.9.0
+- Update to 1.9.0
Old:
----
ibus-libpinyin-1.9.1.tar.gz
New:
----
ibus-libpinyin-1.9.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ibus-libpinyin.spec ++++++
--- /var/tmp/diff_new_pack.QaSb38/_old 2018-03-05 13:44:53.420673709 +0100
+++ /var/tmp/diff_new_pack.QaSb38/_new 2018-03-05 13:44:53.420673709 +0100
@@ -1,8 +1,8 @@
#
# spec file for package ibus-libpinyin
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2017 Hillwood Yang (hillwood@opensuse.org)
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 Hillwood Yang
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
Name: ibus-libpinyin
-Version: 1.9.1
+Version: 1.9.3
Release: 0
Summary: Intelligent Pinyin engine based on libpinyin for IBus
License: GPL-2.0+
@@ -94,7 +94,6 @@
%{_datadir}/appdata/libpinyin.appdata.xml
%dir %{_datadir}/%{name}
%dir %{_datadir}/%{name}/db
-%{_datadir}/%{name}/phrases.txt
%{_datadir}/%{name}/icons
%{_datadir}/%{name}/setup
%{_datadir}/%{name}/db/strokes.db
++++++ ibus-libpinyin-1.9.1.tar.gz -> ibus-libpinyin-1.9.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/ChangeLog new/ibus-libpinyin-1.9.3/ChangeLog
--- old/ibus-libpinyin-1.9.1/ChangeLog 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/ChangeLog 2018-01-16 08:54:45.000000000 +0100
@@ -1,3 +1,12 @@
+version 1.9.3
+* translate input method name in ibus menu
+
+version 1.9.2
+* fixes pinyin and bopomofo config
+
+version 1.9.1
+* add sort candidate option to setup dialog
+
version 1.9.0
* bump version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/configure.ac new/ibus-libpinyin-1.9.3/configure.ac
--- old/ibus-libpinyin-1.9.1/configure.ac 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/configure.ac 2018-01-16 08:54:45.000000000 +0100
@@ -22,7 +22,7 @@
m4_define([ibus_released], [1])
m4_define([ibus_major_version], [1])
m4_define([ibus_minor_version], [9])
-m4_define([ibus_micro_version], [1])
+m4_define([ibus_micro_version], [3])
m4_define(ibus_maybe_datestamp,
m4_esyscmd([if test x]ibus_released[ != x1; then date +.%Y%m%d | tr -d '\n\r'; fi]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/lua/lua-ext-console.c new/ibus-libpinyin-1.9.3/lua/lua-ext-console.c
--- old/ibus-libpinyin-1.9.1/lua/lua-ext-console.c 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/lua/lua-ext-console.c 2018-01-16 08:54:45.000000000 +0100
@@ -101,8 +101,6 @@
exit(1);
}
- g_type_init();
-
IBusEnginePlugin * plugin = ibus_engine_plugin_new();
for ( i = 1; i < argc; ++i){
@@ -128,7 +126,7 @@
print_interactive_help();
if ( 0 == strcmp("i", strs[0]) )
list_all_commands(plugin);
- break;
+ break;
case 2:
if ( 0 == strcmp("i", strs[0]))
do_lua_call(plugin, strs[1], NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/lua/lua-plugin-init.c new/ibus-libpinyin-1.9.3/lua/lua-plugin-init.c
--- old/ibus-libpinyin-1.9.1/lua/lua-plugin-init.c 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/lua/lua-plugin-init.c 2018-01-16 08:54:45.000000000 +0100
@@ -26,10 +26,15 @@
#include "lua-plugin.h"
+#if LUA_VERSION_NUM >= 502
+/* ugly hack for lua 5.2 */
+
#ifndef lua_objlen
#define lua_objlen lua_rawlen
#endif
+#endif
+
static const luaL_Reg lualibs[] = {
{"", luaopen_base},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/lua/lua-plugin.c new/ibus-libpinyin-1.9.3/lua/lua-plugin.c
--- old/ibus-libpinyin-1.9.1/lua/lua-plugin.c 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/lua/lua-plugin.c 2018-01-16 08:54:45.000000000 +0100
@@ -25,15 +25,15 @@
#include "lua-plugin.h"
-#ifndef lua_objlen
-#define lua_objlen lua_rawlen
-#endif
-
#if LUA_VERSION_NUM >= 502
/* ugly hack for lua 5.2 */
#define lua_open luaL_newstate
+#ifndef lua_objlen
+#define lua_objlen lua_rawlen
+#endif
+
#endif
#define IBUS_ENGINE_PLUGIN_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), IBUS_TYPE_ENGINE_PLUGIN, IBusEnginePluginPrivate))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/lua/test-lua-plugin.c new/ibus-libpinyin-1.9.3/lua/test-lua-plugin.c
--- old/ibus-libpinyin-1.9.1/lua/test-lua-plugin.c 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/lua/test-lua-plugin.c 2018-01-16 08:54:45.000000000 +0100
@@ -28,8 +28,6 @@
int main(int argc, char * argv[]){
printf("starting test...\n");
- g_type_init();
-
IBusEnginePlugin * plugin;
plugin = ibus_engine_plugin_new();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/po/POTFILES.in new/ibus-libpinyin-1.9.3/po/POTFILES.in
--- old/ibus-libpinyin-1.9.1/po/POTFILES.in 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/po/POTFILES.in 2018-01-16 08:54:45.000000000 +0100
@@ -14,6 +14,7 @@
src/PYEnglishEditor.cc
src/PYStrokeEditor.cc
setup/main2.py
+setup/config.py
setup/dicttreeview.py
setup/keyboardshortcut.py
setup/shortcuteditor.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/po/ca.po new/ibus-libpinyin-1.9.3/po/ca.po
--- old/ibus-libpinyin-1.9.1/po/ca.po 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/po/ca.po 2018-01-16 08:54:45.000000000 +0100
@@ -3,7 +3,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-24 14:01+0800\n"
+"POT-Creation-Date: 2018-01-04 16:51+0800\n"
"PO-Revision-Date: 2015-09-24 09:36-0400\n"
"Last-Translator: Robert Antoni Buj Gelonch \n"
"Language-Team: Catalan\n"
@@ -134,6 +134,11 @@
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>Pinyin intel·ligent %s</b></big>"
+#: ../setup/config.py:30
+#, fuzzy
+msgid "Intelligent Pinyin"
+msgstr "Pinyin intel·ligent (depuració)"
+
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr "Art"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/po/fr.po new/ibus-libpinyin-1.9.3/po/fr.po
--- old/ibus-libpinyin-1.9.1/po/fr.po 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/po/fr.po 2018-01-16 08:54:45.000000000 +0100
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-24 14:01+0800\n"
+"POT-Creation-Date: 2018-01-04 16:51+0800\n"
"PO-Revision-Date: 2012-03-19 22:13+0100\n"
"Last-Translator: Ma Jiehong \n"
"Language-Team: French\n"
@@ -150,6 +150,11 @@
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>Ibus Pinyin %s</b></big>"
+#: ../setup/config.py:30
+#, fuzzy
+msgid "Intelligent Pinyin"
+msgstr "Pinyin (débug)"
+
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/po/ru.po new/ibus-libpinyin-1.9.3/po/ru.po
--- old/ibus-libpinyin-1.9.1/po/ru.po 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/po/ru.po 2018-01-16 08:54:45.000000000 +0100
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-24 14:01+0800\n"
+"POT-Creation-Date: 2018-01-04 16:51+0800\n"
"PO-Revision-Date: 2009-10-14 09:44+0300\n"
"Last-Translator: Alexey Kotlyarov \n"
"Language-Team: Russian\n"
@@ -151,6 +151,11 @@
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>IBus Пиньинь %s</b></big>"
+#: ../setup/config.py:30
+#, fuzzy
+msgid "Intelligent Pinyin"
+msgstr "Пиньинь"
+
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/po/zh_CN.po new/ibus-libpinyin-1.9.3/po/zh_CN.po
--- old/ibus-libpinyin-1.9.1/po/zh_CN.po 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/po/zh_CN.po 2018-01-16 08:54:45.000000000 +0100
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: ibus-libpinyin 1.2.99\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-24 14:01+0800\n"
-"PO-Revision-Date: 2017-08-24 14:03+0800\n"
+"POT-Creation-Date: 2018-01-04 16:51+0800\n"
+"PO-Revision-Date: 2018-01-04 16:53+0800\n"
"Last-Translator: Peng Huang \n"
"Language-Team: Peng Huang \n"
"Language: \n"
@@ -136,6 +136,10 @@
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>IBus 智能拼音 %s</b></big>"
+#: ../setup/config.py:30
+msgid "Intelligent Pinyin"
+msgstr "智能拼音"
+
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr "艺术"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/po/zh_HK.po new/ibus-libpinyin-1.9.3/po/zh_HK.po
--- old/ibus-libpinyin-1.9.1/po/zh_HK.po 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/po/zh_HK.po 2018-01-16 08:54:45.000000000 +0100
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: ibus-libpinyin 1.3.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-24 14:01+0800\n"
+"POT-Creation-Date: 2018-01-04 16:51+0800\n"
"PO-Revision-Date: 2009-09-20 16:05+8\n"
"Last-Translator: BYVoid \n"
"Language-Team: BYVoid \n"
@@ -143,6 +143,11 @@
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>IBus 拼音 %s</b></big>"
+#: ../setup/config.py:30
+#, fuzzy
+msgid "Intelligent Pinyin"
+msgstr "拼音(調試)"
+
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/po/zh_TW.po new/ibus-libpinyin-1.9.3/po/zh_TW.po
--- old/ibus-libpinyin-1.9.1/po/zh_TW.po 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/po/zh_TW.po 2018-01-16 08:54:45.000000000 +0100
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: ibus-libpinyin 1.3.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-08-24 14:01+0800\n"
+"POT-Creation-Date: 2018-01-04 16:51+0800\n"
"PO-Revision-Date: 2009-09-20 16:05+8\n"
"Last-Translator: BYVoid \n"
"Language-Team: BYVoid \n"
@@ -143,6 +143,11 @@
msgid "<big><b>Intelligent Pinyin %s</b></big>"
msgstr "<big><b>IBus 拼音 %s</b></big>"
+#: ../setup/config.py:30
+#, fuzzy
+msgid "Intelligent Pinyin"
+msgstr "拼音(調試)"
+
#: ../setup/dicttreeview.py:52
msgid "Art"
msgstr ""
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/setup/config.py.in new/ibus-libpinyin-1.9.3/setup/config.py.in
--- old/ibus-libpinyin-1.9.1/setup/config.py.in 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/setup/config.py.in 2018-01-16 08:54:45.000000000 +0100
@@ -19,6 +19,12 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+import gettext
+
+gettext.install("ibus-libpinyin")
def get_version():
return "@VERSION@"
+
+def get_longname():
+ return _("Intelligent Pinyin")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/src/Makefile.am new/ibus-libpinyin-1.9.3/src/Makefile.am
--- old/ibus-libpinyin-1.9.1/src/Makefile.am 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/src/Makefile.am 2018-01-16 08:54:45.000000000 +0100
@@ -169,10 +169,6 @@
$(ibus_engine_built_h_sources) \
$(NULL)
-pkgdata_DATA = \
- phrases.txt \
- $(NULL)
-
component_DATA = \
libpinyin.xml \
$(NULL)
@@ -180,7 +176,6 @@
EXTRA_DIST = \
libpinyin.xml.in \
- phrases.txt \
$(NULL)
CLEANFILES = \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/src/PYPConfig.cc new/ibus-libpinyin-1.9.3/src/PYPConfig.cc
--- old/ibus-libpinyin-1.9.1/src/PYPConfig.cc 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/src/PYPConfig.cc 2018-01-16 08:54:45.000000000 +0100
@@ -311,9 +311,9 @@
self->valueChanged (section, name, value);
- if (self->m_section == "engine/pinyin")
+ if (self->m_section == "engine/libpinyin")
LibPinyinBackEnd::instance ().setPinyinOptions (self);
- if (self->m_section == "engine/bopomofo")
+ if (self->m_section == "engine/libbopomofo")
LibPinyinBackEnd::instance ().setChewingOptions (self);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/src/libpinyin.xml.in.in new/ibus-libpinyin-1.9.3/src/libpinyin.xml.in.in
--- old/ibus-libpinyin-1.9.1/src/libpinyin.xml.in.in 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/src/libpinyin.xml.in.in 2018-01-16 08:54:45.000000000 +0100
@@ -28,6 +28,7 @@
<symbol>拼</symbol>
@ICON_PROP_KEY_XML@
<setup>${libexecdir}/ibus-setup-libpinyin libpinyin</setup>
+ <textdomain>ibus-libpinyin</textdomain>
</engine>
<engine>
<name>libbopomofo</name>
@@ -46,6 +47,7 @@
<symbol>ㄉ</symbol>
@ICON_PROP_KEY_XML@
<setup>${libexecdir}/ibus-setup-libpinyin libbopomofo</setup>
+ <textdomain>ibus-libpinyin</textdomain>
</engine>
</engines>
</component>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ibus-libpinyin-1.9.1/src/phrases.txt new/ibus-libpinyin-1.9.3/src/phrases.txt
--- old/ibus-libpinyin-1.9.1/src/phrases.txt 2017-08-24 08:04:38.000000000 +0200
+++ new/ibus-libpinyin-1.9.3/src/phrases.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,78 +0,0 @@
-; ibus 拼音输入法--自定义短语配置文件
-;
-; 说明:
-; **注意**
-; 修改后请重新启动输入法
-; 或者运行下面命令:pkill -x -u $USERNAME ibus-engine-pinyin
-; 格式:
-; 英文字符串=短语
-; 英文字符串=#动态短语
-; 动态短语:
-; 函数 含义 举例
-; ${year} 年(4位) 2006、2008
-; ${year_yy} 年(2位) 06、08
-; ${month} 月 12、8、3
-; ${month_mm} 月 12、08、03
-; ${day} 日 3、13、22
-; ${day_dd} 日 03、13、22
-; ${weekday} 星期 0、1、2、5、6
-; ${fullhour} 时(24小时制) 02、08、13、23
-; ${halfhour} 时(12小时制) 02、08、01、11
-; ${ampm} AM、PM(英) AM、PM(大写)
-; ${minute} 分 02、08、15、28
-; ${second} 秒 02、08、15、28
-; ${year_cn} 年(中文4位) 二〇〇六
-; ${year_yy_cn} 年(中文2位) 〇六
-; ${month_cn} 月(中文) 十二、八、三
-; ${day_cn} 日(中文) 三、十三、二十二
-; ${weekday_cn} 星期(中文) 日、一、二、五、六
-; ${fullhour_cn} 月(中文24时制) 二、八、十三、二十三
-; ${halfhour_cn} 时(中文12时制) 二、八、一、十一
-; ${ampm_cn} 上午下午(中文) 上午、下午
-; ${minute_cn} 分(中文) 零二、零八、十五、二十八
-; ${second_cn} 秒(中文) 零二、零八、十五、二十八
-
-aazhi=AA制
-agu=A股
-bchao=B超
-bgu=B股
-bichao=B超
-bsn=╭∩╮(︶︿︶)╭∩╮鄙视你!
-ceo=首席执行官
-cpan=C盘
-cyuyan=C语言
-dna=脱氧核糖核酸
-dpan=D盘
-gps=全球定位系统
-haha=^_^
-haha=o(∩∩)o...哈哈
-hehe=:-)
-hgu=H股
-icka=IC卡
-ipdianhua=IP电话
-ipdizhi=IP地址
-ipka=IP卡
-kalaok=卡拉OK
-pcji=PC机
-qiruiqq=奇瑞QQ
-qqhao=QQ号
-simka=SIM卡
-tixu=T恤
-tixushan=T恤衫
-txingtai=T型台
-txu=T恤
-upan=U盘
-xixi=(*^__^*) 嘻嘻……
-xshexian=X射线
-
-; 动态短语
-rq=#${year}年${month}月${day}日
-rq=#${year_cn}年${month_cn}月${day_cn}日
-rq=#${year}-${month}-${day}
-sj=#${fullhour}时${minute}分${second}秒
-sj=#${fullhour}:${minute}:${second}
-xq=#星期${weekday_cn}
-lb=#礼拜${weekday_cn}
-
-; 暂时不支持
-; nl=#农历${lunardate}