rpms/anthy-unicode
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Delete upstreamed anthy-unicode-xx-HEAD.patch

Browse Source
This commit is contained in:
Takao Fujiwara 2019-10-16 12:42:26 +09:00
parent 52e9c3a615
commit 9098bcb455
1 changed files with 0 additions and 768 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

768
anthy-unicode-xx-HEAD.patch
View File

@ -1,768 +0,0 @@
From 0b21c7d45fce7ce98fcb85e1454a9d7c2d50fb84 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Mon, 3 Jun 2019 12:30:25 +0900
Subject: [PATCH] Update COPYING with the latest LGPL 2.1
---
COPYING | 83 ++++++++++++++++++++++++++-------------------------------
1 file changed, 38 insertions(+), 45 deletions(-)
diff --git a/COPYING b/COPYING
index d24f13a..0bf2e5b 100644
--- a/COPYING
+++ b/COPYING
@@ -16,7 +16,7 @@ anyway http://www.gnu.org/licenses/gpl-faq.html#MereAggregation says
Version 2.1, February 1999
Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
@@ -36,8 +36,7 @@ specially designated software packages--typically libraries--of the
Free Software Foundation and other authors who decide to use it. You
can use it too, but we suggest you first think carefully about whether
this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
+strategy to use in any particular case, based on the explanations below.
When we speak of free software, we are referring to freedom of use,
not price. Our General Public Licenses are designed to make sure that
@@ -70,7 +69,7 @@ modified by someone else and passed on, the recipients should know
that what they have is not the original version, so that the original
author's reputation will not be affected by problems that might be
introduced by others.
-^L
+
Finally, software patents pose a constant threat to the existence of
any free program. We wish to make sure that a company cannot
effectively restrict the users of a free program by obtaining a
@@ -102,9 +101,9 @@ libraries. However, the Lesser license provides advantages in certain
special circumstances.
For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard. To achieve this, non-free programs must
-be allowed to use the library. A more frequent case is that a free
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard. To achieve this, non-free programs must be
+allowed to use the library. A more frequent case is that a free
library does the same job as widely used non-free libraries. In this
case, there is little to gain by limiting the free library to free
software only, so we use the Lesser General Public License.
@@ -126,7 +125,7 @@ modification follow. Pay close attention to the difference between a
"work based on the library" and a "work that uses the library". The
former contains code derived from the library, whereas the latter must
be combined with the library in order to run.
-^L
+
GNU LESSER GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
@@ -151,8 +150,8 @@ included without limitation in the term "modification".)
"Source code" for a work means the preferred form of the work for
making modifications to it. For a library, complete source code means
all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
Activities other than copying, distribution and modification are not
covered by this License; they are outside its scope. The act of
@@ -231,7 +230,7 @@ instead of to this License. (If a newer version than version 2 of the
ordinary GNU General Public License has appeared, then you can specify
that version instead if you wish.) Do not make any other change in
these notices.
-^L
+
Once this change is made in a given copy, it is irreversible for
that copy, so the ordinary GNU General Public License applies to all
subsequent copies and derivative works made from that copy.
@@ -282,7 +281,7 @@ Library will still fall under Section 6.)
distribute the object code for the work under the terms of Section 6.
Any executables containing that work also fall under Section 6,
whether or not they are linked directly with the Library itself.
-^L
+
6. As an exception to the Sections above, you may also combine or
link a "work that uses the Library" with the Library to produce a
work containing portions of the Library, and distribute that work
@@ -318,10 +317,10 @@ of these things:
the user installs one, as long as the modified version is
interface-compatible with the version that the work was made with.
- c) Accompany the work with a written offer, valid for at least
- three years, to give the same user the materials specified in
- Subsection 6a, above, for a charge no more than the cost of
- performing this distribution.
+ c) Accompany the work with a written offer, valid for at
+ least three years, to give the same user the materials
+ specified in Subsection 6a, above, for a charge no more
+ than the cost of performing this distribution.
d) If distribution of the work is made by offering access to copy
from a designated place, offer equivalent access to copy the above
@@ -344,7 +343,7 @@ restrictions of other proprietary libraries that do not normally
accompany the operating system. Such a contradiction means you cannot
use both them and the Library together in an executable that you
distribute.
-^L
+
7. You may place library facilities that are a work based on the
Library side-by-side in a single library together with other library
facilities not covered by this License, and distribute such a combined
@@ -385,7 +384,7 @@ subject to these terms and conditions. You may not impose any further
restrictions on the recipients' exercise of the rights granted herein.
You are not responsible for enforcing compliance by third parties with
this License.
-^L
+
11. If, as a consequence of a court judgment or allegation of patent
infringement or for any other reason (not limited to patent issues),
conditions are imposed on you (whether by court order, agreement or
@@ -399,10 +398,9 @@ all those who receive copies directly or indirectly through you, then
the only way you could satisfy both it and this License would be to
refrain entirely from distribution of the Library.
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
It is not the purpose of this section to induce you to infringe any
patents or other property right claims or to contest validity of any
@@ -420,11 +418,11 @@ be a consequence of the rest of this License.
12. If the distribution and/or use of the Library is restricted in
certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded. In such case, this License incorporates the limitation as if
+written in the body of this License.
13. The Free Software Foundation may publish revised and/or new
versions of the Lesser General Public License from time to time.
@@ -438,7 +436,7 @@ conditions either of that version or of any later version published by
the Free Software Foundation. If the Library does not specify a
license version number, you may choose any version ever published by
the Free Software Foundation.
-^L
+
14. If you wish to incorporate parts of the Library into other free
programs whose distribution conditions are incompatible with these,
write to the author to ask for permission. For software which is
@@ -472,21 +470,19 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
DAMAGES.
END OF TERMS AND CONDITIONS
-^L
+
How to Apply These Terms to Your New Libraries
If you develop a new library, and you want it to be of the greatest
possible use to the public, we recommend making it free software that
everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
- To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+ To apply these terms, attach the following notices to the library. It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
<one line to give the library's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
@@ -503,21 +499,18 @@ notice is found.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Also add information on how to contact you by electronic and paper mail.
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary. Here is a sample; alter the names:
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary. Here is a sample; alter the names:
Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James
- Random Hacker.
+ library `Frob' (a library for tweaking knobs) written by James Random Hacker.
<signature of Ty Coon>, 1 April 1990
Ty Coon, President of Vice
That's all there is to it!
-
-
--
2.21.0
From 85465940ffc23f70a8202aa13fb0e2a5ee9a1fc9 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 4 Jun 2019 12:34:05 +0900
Subject: [PATCH] mkworddic: Make parse_modify_freq_command() for UTF-8
Now mkworddic/adjust.t is UTF-8 file and need to update
parse_modify_freq_command() to handle UTF-8 strings.
---
mkworddic/mkdic.c | 40 +++++++++++++++++++++++-----------------
1 file changed, 23 insertions(+), 17 deletions(-)
diff --git a/mkworddic/mkdic.c b/mkworddic/mkdic.c
index 36c19a7..eb042e4 100644
--- a/mkworddic/mkdic.c
+++ b/mkworddic/mkdic.c
@@ -578,48 +578,54 @@ mk_yomi_hash(FILE *yomi_hash_out, struct yomi_entry_list *yl)
}
static struct adjust_command *
-parse_modify_freq_command(const char *buf)
+parse_modify_freq_command (const char *buf,
+ struct mkdic_stat *mds)
{
- char *line = alloca(strlen(buf) + 1);
+ char *line = alloca (strlen (buf) + 1);
char *yomi, *wt, *word, *type_str;
struct adjust_command *cmd;
int type = 0;
- strcpy(line, buf);
- yomi = strtok(line, " ");
- wt = strtok(NULL, " ");
- word = strtok(NULL, " ");
- type_str = strtok(NULL, " ");
+ strcpy (line, buf);
+ yomi = strtok (line, " ");
+ wt = strtok (NULL, " ");
+ word = strtok (NULL, " ");
+ type_str = strtok (NULL, " ");
if (!yomi || !wt || !word || !type_str) {
return NULL;
}
- if (!strcmp(type_str, "up")) {
+ if (!strcmp (type_str, "up")) {
type = ADJUST_FREQ_UP;
}
- if (!strcmp(type_str, "down")) {
+ if (!strcmp (type_str, "down")) {
type = ADJUST_FREQ_DOWN;
}
- if (!strcmp(type_str, "kill")) {
+ if (!strcmp (type_str, "kill")) {
type = ADJUST_FREQ_KILL;
}
if (!type) {
return NULL;
}
- cmd = malloc(sizeof(struct adjust_command));
+ cmd = malloc (sizeof (struct adjust_command));
cmd->type = type;
- cmd->yomi = anthy_cstr_to_xstr(yomi, ANTHY_EUC_JP_ENCODING);
+ cmd->yomi = anthy_cstr_to_xstr (yomi, mds->input_encoding);
cmd->wt = get_wt_name(wt);
- cmd->word = anthy_conv_euc_to_utf8(word);
+ if (mds->input_encoding == ANTHY_EUC_JP_ENCODING)
+ cmd->word = anthy_conv_euc_to_utf8 (word);
+ else
+ cmd->word = strdup (word);
return cmd;
}
static void
-parse_adjust_command(const char *buf, struct adjust_command *ac_list)
+parse_adjust_command (const char *buf,
+ struct mkdic_stat *mds)
{
struct adjust_command *cmd = NULL;
- if (!strncmp("\\modify_freq ", buf, 13)) {
- cmd = parse_modify_freq_command(&buf[13]);
+ if (!strncmp ("\\modify_freq ", buf, 13)) {
+ cmd = parse_modify_freq_command (&buf[13], mds);
}
if (cmd) {
+ struct adjust_command *ac_list = &mds->ac_list;
cmd->next = ac_list->next;
ac_list->next = cmd;
}
@@ -638,7 +644,7 @@ parse_dict_file(FILE *fin, struct mkdic_stat *mds)
/* １行ã<C592>šã<C5A1>¤å‡¦ç<C2A6>† */
while (read_line(fin, buf)) {
if (buf[0] == '\\' && buf[1] != ' ') {
- parse_adjust_command(buf, &mds->ac_list);
+ parse_adjust_command(buf, mds);
continue ;
}
index_xs = get_index_from_line(mds, buf);
--
2.21.0
From 73357bab97442330557683e9de01741257d2b047 Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 4 Jun 2019 12:55:00 +0900
Subject: [PATCH] src-worddic: Revert ptab.h to EUC-JP
Changing depgraph/indepword.txt to UTF-8 has problems in the
conversion and now ptab.h is reverted to EUC-JP at the moment.
BUG=https://github.com/fujiwarat/anthy-unicode/issues/1
---
src-worddic/ptab.h | 276 ++++++++++++++++++++++-----------------------
1 file changed, 138 insertions(+), 138 deletions(-)
diff --git a/src-worddic/ptab.h b/src-worddic/ptab.h
index 30a2078..552e653 100644
--- a/src-worddic/ptab.h
+++ b/src-worddic/ptab.h
@@ -1,153 +1,153 @@
/* POS(Part of Speech) table */
-{"å<><C3A5>è©ž",POS_NOUN,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž0",POS_NOUN,COS_NONE,SCOS_T0,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž2",POS_NOUN,COS_NONE,SCOS_T2,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž3",POS_NOUN,COS_NONE,SCOS_T3,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž4",POS_NOUN,COS_NONE,SCOS_T4,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž5",POS_NOUN,COS_NONE,SCOS_T5,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž7",POS_NOUN,COS_NONE,SCOS_T7,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž8",POS_NOUN,COS_NONE,SCOS_T8,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž9",POS_NOUN,COS_NONE,SCOS_T9,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž10",POS_NOUN,COS_NONE,SCOS_T10,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž12",POS_NOUN,COS_NONE,SCOS_T12,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž13",POS_NOUN,COS_NONE,SCOS_T13,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž14",POS_NOUN,COS_NONE,SCOS_T14,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž15",POS_NOUN,COS_NONE,SCOS_T15,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž17",POS_NOUN,COS_NONE,SCOS_T17,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž18",POS_NOUN,COS_NONE,SCOS_T18,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž19",POS_NOUN,COS_NONE,SCOS_T19,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž20",POS_NOUN,COS_NONE,SCOS_T20,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž22",POS_NOUN,COS_NONE,SCOS_T22,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž23",POS_NOUN,COS_NONE,SCOS_T23,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž24",POS_NOUN,COS_NONE,SCOS_T24,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž25",POS_NOUN,COS_NONE,SCOS_T25,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž27",POS_NOUN,COS_NONE,SCOS_T27,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž28",POS_NOUN,COS_NONE,SCOS_T28,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž29",POS_NOUN,COS_NONE,SCOS_T29,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž30",POS_NOUN,COS_NONE,SCOS_T30,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž32",POS_NOUN,COS_NONE,SCOS_T32,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž33",POS_NOUN,COS_NONE,SCOS_T33,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž34",POS_NOUN,COS_NONE,SCOS_T34,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
-{"å<><C3A5>è©ž35",POS_NOUN,COS_NONE,SCOS_T35,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž37",POS_NOUN,COS_NONE,SCOS_T37,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž38",POS_NOUN,COS_NONE,SCOS_T38,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>è©ž39",POS_NOUN,COS_NONE,SCOS_T39,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>詞化接尾語",POS_NOUN,COS_NONE,SCOS_T40,CC_NONE,CT_NONE,WF_INDEP},
-{"æ•°è©ž",POS_NUMBER,COS_NN,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
-{"æ•°è©ž1",POS_NUMBER,COS_NN,SCOS_N1,CC_NONE,CT_NONE,WF_INDEP},
-{"æ•°è©ž10",POS_NUMBER,COS_NN,SCOS_N10,CC_NONE,CT_NONE,WF_INDEP},
-{"æ•°è©ž100",POS_NUMBER,COS_NN,SCOS_N100,CC_NONE,CT_NONE,WF_INDEP},
-{"æ•°è©ž1000",POS_NUMBER,COS_NN,SCOS_N1000,CC_NONE,CT_NONE,WF_INDEP},
-{"æ•°è©ž10000",POS_NUMBER,COS_NN,SCOS_N10000,CC_NONE,CT_NONE,WF_INDEP},
-{"人å<C2BA><C3A5>",POS_NOUN,COS_JN,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
-{"地å<C2B0><C3A5>",POS_NOUN,COS_CN,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
-{"団体å<E2809C><C3A5>",POS_NOUN,COS_KK,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
-{"é–‹ã<E280B9><C3A3>括弧",POS_OPEN,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
-{"é–‰ã<E280B0>˜æ‹¬å¼§",POS_CLOSE,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
-{"å<><C3A5>詞接頭辞",POS_PRE,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
-{"人å<C2BA><C3A5>接尾辞",POS_SUC,COS_JN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
-{"å<><C3A5>詞接尾辞",POS_NOUN,COS_SUFFIX,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
-{"数接頭辞",POS_PRE,COS_NN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
-{"数接尾辞",POS_SUC,COS_NN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
-{"地å<C2B0><C3A5>接頭辞",POS_PRE,COS_CN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
-{"地å<C2B0><C3A5>接尾辞",POS_SUC,COS_CN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
-{"サ変接尾辞",POS_SUC,COS_SVSUFFIX,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
-{"助詞",POS_PRT,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
-{"副詞",POS_AV,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞0",POS_AV,COS_NONE,SCOS_F0,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞1",POS_AV,COS_NONE,SCOS_F1,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞2",POS_AV,COS_NONE,SCOS_F2,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞3",POS_AV,COS_NONE,SCOS_F3,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞4",POS_AV,COS_NONE,SCOS_F4,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞5",POS_AV,COS_NONE,SCOS_F5,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞6",POS_AV,COS_NONE,SCOS_F6,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞7",POS_AV,COS_NONE,SCOS_F7,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞8",POS_AV,COS_NONE,SCOS_F8,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞9",POS_AV,COS_NONE,SCOS_F9,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞10",POS_AV,COS_NONE,SCOS_F10,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞11",POS_AV,COS_NONE,SCOS_F11,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞12",POS_AV,COS_NONE,SCOS_F12,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞13",POS_AV,COS_NONE,SCOS_F13,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞14",POS_AV,COS_NONE,SCOS_F14,CC_NONE,CT_NONE,WF_INDEP},
-{"副詞語幹",POS_AV,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_NONE},
-{"å‹•è©ž",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
-{"動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_INDEP},
-{"接続詞",POS_CONJ,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"̾»ì",POS_NOUN,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì0",POS_NOUN,COS_NONE,SCOS_T0,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì2",POS_NOUN,COS_NONE,SCOS_T2,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì3",POS_NOUN,COS_NONE,SCOS_T3,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì4",POS_NOUN,COS_NONE,SCOS_T4,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì5",POS_NOUN,COS_NONE,SCOS_T5,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì7",POS_NOUN,COS_NONE,SCOS_T7,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì8",POS_NOUN,COS_NONE,SCOS_T8,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì9",POS_NOUN,COS_NONE,SCOS_T9,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì10",POS_NOUN,COS_NONE,SCOS_T10,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì12",POS_NOUN,COS_NONE,SCOS_T12,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì13",POS_NOUN,COS_NONE,SCOS_T13,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì14",POS_NOUN,COS_NONE,SCOS_T14,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì15",POS_NOUN,COS_NONE,SCOS_T15,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì17",POS_NOUN,COS_NONE,SCOS_T17,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì18",POS_NOUN,COS_NONE,SCOS_T18,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì19",POS_NOUN,COS_NONE,SCOS_T19,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì20",POS_NOUN,COS_NONE,SCOS_T20,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì22",POS_NOUN,COS_NONE,SCOS_T22,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì23",POS_NOUN,COS_NONE,SCOS_T23,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì24",POS_NOUN,COS_NONE,SCOS_T24,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì25",POS_NOUN,COS_NONE,SCOS_T25,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì27",POS_NOUN,COS_NONE,SCOS_T27,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì28",POS_NOUN,COS_NONE,SCOS_T28,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì29",POS_NOUN,COS_NONE,SCOS_T29,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì30",POS_NOUN,COS_NONE,SCOS_T30,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì32",POS_NOUN,COS_NONE,SCOS_T32,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì33",POS_NOUN,COS_NONE,SCOS_T33,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì34",POS_NOUN,COS_NONE,SCOS_T34,CC_NONE,CT_NONE,WF_INDEP|WF_SV},
+{"̾»ì35",POS_NOUN,COS_NONE,SCOS_T35,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì37",POS_NOUN,COS_NONE,SCOS_T37,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì38",POS_NOUN,COS_NONE,SCOS_T38,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì39",POS_NOUN,COS_NONE,SCOS_T39,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ì²½ÀÜÈø¸ì",POS_NOUN,COS_NONE,SCOS_T40,CC_NONE,CT_NONE,WF_INDEP},
+{"¿ô»ì",POS_NUMBER,COS_NN,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"¿ô»ì1",POS_NUMBER,COS_NN,SCOS_N1,CC_NONE,CT_NONE,WF_INDEP},
+{"¿ô»ì10",POS_NUMBER,COS_NN,SCOS_N10,CC_NONE,CT_NONE,WF_INDEP},
+{"¿ô»ì100",POS_NUMBER,COS_NN,SCOS_N100,CC_NONE,CT_NONE,WF_INDEP},
+{"¿ô»ì1000",POS_NUMBER,COS_NN,SCOS_N1000,CC_NONE,CT_NONE,WF_INDEP},
+{"¿ô»ì10000",POS_NUMBER,COS_NN,SCOS_N10000,CC_NONE,CT_NONE,WF_INDEP},
+{"¿Í̾",POS_NOUN,COS_JN,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"ÃÏ̾",POS_NOUN,COS_CN,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"ÃÄÂÎ̾",POS_NOUN,COS_KK,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"³«¤­³ç¸Ì",POS_OPEN,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"ÊĤ¸³ç¸Ì",POS_CLOSE,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"̾»ìÀÜƬ¼­",POS_PRE,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"¿Í̾ÀÜÈø¼­",POS_SUC,COS_JN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"̾»ìÀÜÈø¼­",POS_NOUN,COS_SUFFIX,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"¿ôÀÜƬ¼­",POS_PRE,COS_NN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"¿ôÀÜÈø¼­",POS_SUC,COS_NN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"ÃÏ̾ÀÜƬ¼­",POS_PRE,COS_CN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"ÃÏ̾ÀÜÈø¼­",POS_SUC,COS_CN,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"¥µÊÑÀÜÈø¼­",POS_SUC,COS_SVSUFFIX,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"½õ»ì",POS_PRT,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"Éû»ì",POS_AV,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì0",POS_AV,COS_NONE,SCOS_F0,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì1",POS_AV,COS_NONE,SCOS_F1,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì2",POS_AV,COS_NONE,SCOS_F2,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì3",POS_AV,COS_NONE,SCOS_F3,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì4",POS_AV,COS_NONE,SCOS_F4,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì5",POS_AV,COS_NONE,SCOS_F5,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì6",POS_AV,COS_NONE,SCOS_F6,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì7",POS_AV,COS_NONE,SCOS_F7,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì8",POS_AV,COS_NONE,SCOS_F8,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì9",POS_AV,COS_NONE,SCOS_F9,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì10",POS_AV,COS_NONE,SCOS_F10,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì11",POS_AV,COS_NONE,SCOS_F11,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì12",POS_AV,COS_NONE,SCOS_F12,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì13",POS_AV,COS_NONE,SCOS_F13,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì14",POS_AV,COS_NONE,SCOS_F14,CC_NONE,CT_NONE,WF_INDEP},
+{"Éû»ì¸ì´´",POS_AV,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_NONE},
+{"Æ°»ì",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_INDEP},
+{"Æ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_INDEP},
+{"Àܳ»ì",POS_CONJ,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
/**/
-{"動詞未然形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_MIZEN,WF_INDEP},
+{"Æ°»ì̤Á³·Á",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_MIZEN,WF_INDEP},
/**/
-{"動詞連用形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_RENYOU,WF_INDEP},
+{"Æ°»ìÏ¢ÍÑ·Á",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_RENYOU,WF_INDEP},
/**/
-{"動詞終止形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_SYUSI,WF_INDEP},
+{"Æ°»ì½ª»ß·Á",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_SYUSI,WF_INDEP},
/**/
-{"動詞連体形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_RENTAI,WF_INDEP},
+{"Æ°»ìÏ¢ÂηÁ",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_RENTAI,WF_INDEP},
/**/
-{"動詞仮定形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_KATEI,WF_INDEP},
+{"Æ°»ì²¾Äê·Á",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_KATEI,WF_INDEP},
/**/
-{"動詞命令形",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_MEIREI,WF_INDEP},
+{"Æ°»ìÌ¿Îá·Á",POS_V,COS_NONE,SCOS_NONE,CC_NONE,CT_MEIREI,WF_INDEP},
/**/
-{"カ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_K5,CT_HEAD,WF_INDEP},
-{"カ行C5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_C5,CT_HEAD,WF_INDEP},
-{"ガ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_G5,CT_HEAD,WF_INDEP},
-{"サ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_S5,CT_HEAD,WF_INDEP},
-{"タ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_T5,CT_HEAD,WF_INDEP},
-{"ナ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_N5,CT_HEAD,WF_INDEP},
-{"マ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_M5,CT_HEAD,WF_INDEP},
-{"ãƒ<C3A3>è¡Œ5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_B5,CT_HEAD,WF_INDEP},
-{"ラ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_R5,CT_HEAD,WF_INDEP},
-{"ラ行L5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_L5,CT_HEAD,WF_INDEP},
-{"ワ行5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_W5,CT_HEAD,WF_INDEP},
-{"ワ行U5段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_U5,CT_HEAD,WF_INDEP},
-{"上下一段活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_KS1,CT_HEAD,WF_INDEP},
-{"ã‚«è¡Œ5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_K5,CT_MEISIKA,WF_INDEP},
-{"ã‚«è¡ŒC5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_C5,CT_MEISIKA,WF_INDEP},
-{"ガ行5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_G5,CT_MEISIKA,WF_INDEP},
-{"サ行5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_S5,CT_MEISIKA,WF_INDEP},
-{"ã‚¿è¡Œ5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_T5,CT_MEISIKA,WF_INDEP},
-{"ナ行5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_N5,CT_MEISIKA,WF_INDEP},
-{"マ行5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_M5,CT_MEISIKA,WF_INDEP},
-{"ãƒ<C3A3>è¡Œ5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_B5,CT_MEISIKA,WF_INDEP},
-{"ラ行5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_R5,CT_MEISIKA,WF_INDEP},
-{"ラ行L5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_L5,CT_MEISIKA,WF_INDEP},
-{"ワ行5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_W5,CT_MEISIKA,WF_INDEP},
-{"ワ行U5段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_U5,CT_MEISIKA,WF_INDEP},
-{"上下一段活用動詞å<C5BE><C3A5>詞化語幹",POS_V,COS_NONE,SCOS_NONE,CC_KS1,CT_MEISIKA,WF_INDEP},
+{"¥«¹Ô5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_K5,CT_HEAD,WF_INDEP},
+{"¥«¹ÔC5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_C5,CT_HEAD,WF_INDEP},
+{"¥¬¹Ô5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_G5,CT_HEAD,WF_INDEP},
+{"¥µ¹Ô5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_S5,CT_HEAD,WF_INDEP},
+{"¥¿¹Ô5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_T5,CT_HEAD,WF_INDEP},
+{"¥Ê¹Ô5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_N5,CT_HEAD,WF_INDEP},
+{"¥Þ¹Ô5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_M5,CT_HEAD,WF_INDEP},
+{"¥Ð¹Ô5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_B5,CT_HEAD,WF_INDEP},
+{"¥é¹Ô5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_R5,CT_HEAD,WF_INDEP},
+{"¥é¹ÔL5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_L5,CT_HEAD,WF_INDEP},
+{"¥ï¹Ô5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_W5,CT_HEAD,WF_INDEP},
+{"¥ï¹ÔU5ÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_U5,CT_HEAD,WF_INDEP},
+{"¾å²¼°ìÃʳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_KS1,CT_HEAD,WF_INDEP},
+{"¥«¹Ô5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_K5,CT_MEISIKA,WF_INDEP},
+{"¥«¹ÔC5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_C5,CT_MEISIKA,WF_INDEP},
+{"¥¬¹Ô5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_G5,CT_MEISIKA,WF_INDEP},
+{"¥µ¹Ô5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_S5,CT_MEISIKA,WF_INDEP},
+{"¥¿¹Ô5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_T5,CT_MEISIKA,WF_INDEP},
+{"¥Ê¹Ô5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_N5,CT_MEISIKA,WF_INDEP},
+{"¥Þ¹Ô5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_M5,CT_MEISIKA,WF_INDEP},
+{"¥Ð¹Ô5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_B5,CT_MEISIKA,WF_INDEP},
+{"¥é¹Ô5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_R5,CT_MEISIKA,WF_INDEP},
+{"¥é¹ÔL5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_L5,CT_MEISIKA,WF_INDEP},
+{"¥ï¹Ô5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_W5,CT_MEISIKA,WF_INDEP},
+{"¥ï¹ÔU5ÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_U5,CT_MEISIKA,WF_INDEP},
+{"¾å²¼°ìÃʳèÍÑÆ°»ì̾»ì²½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_KS1,CT_MEISIKA,WF_INDEP},
/**/
-{"ラ変活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_RV,CT_HEAD,WF_INDEP},
-{"カ変活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_HEAD,WF_INDEP},
-{"サ変活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_SV,CT_HEAD,WF_INDEP},
-{"ザ変活用動詞語幹",POS_V,COS_NONE,SCOS_NONE,CC_ZV,CT_HEAD,WF_INDEP},
+{"¥éÊѳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_RV,CT_HEAD,WF_INDEP},
+{"¥«ÊѳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_HEAD,WF_INDEP},
+{"¥µÊѳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_SV,CT_HEAD,WF_INDEP},
+{"¥¶ÊѳèÍÑÆ°»ì¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_ZV,CT_HEAD,WF_INDEP},
/**/
-{"カ変活用動詞未然形",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_MIZEN,WF_INDEP},
-{"カ変活用動詞連用形",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_RENYOU,WF_INDEP},
-{"カ変活用動詞終止形",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_SYUSI,WF_INDEP},
-{"カ変活用動詞仮定形",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_KATEI,WF_INDEP},
-{"カ変活用動詞命令形",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_MEIREI,WF_INDEP},
+{"¥«ÊѳèÍÑÆ°»ì̤Á³·Á",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_MIZEN,WF_INDEP},
+{"¥«ÊѳèÍÑÆ°»ìÏ¢ÍÑ·Á",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_RENYOU,WF_INDEP},
+{"¥«ÊѳèÍÑÆ°»ì½ª»ß·Á",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_SYUSI,WF_INDEP},
+{"¥«ÊѳèÍÑÆ°»ì²¾Äê·Á",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_KATEI,WF_INDEP},
+{"¥«ÊѳèÍÑÆ°»ìÌ¿Îá·Á",POS_V,COS_NONE,SCOS_NONE,CC_KV,CT_MEIREI,WF_INDEP},
/**/
-{"ã<>™ã‚‹æœªç„¶å½¢ã€Œã<C592>—ã€<C3A3>",POS_V,COS_NONE,SCOS_NONE,CC_SRV,CT_MIZEN,WF_INDEP},
-{"ã<>™ã‚‹æœªç„¶å½¢ã€Œã<C592>›ã€<C3A3>",POS_V,COS_NONE,SCOS_NONE,CC_SRV,CT_MIZEN,WF_INDEP},
-{"ã<>™ã‚‹é€£ç”¨å½¢ã€Œã<C592>—ã€<C3A3>",POS_V,COS_NONE,SCOS_NONE,CC_SRV,CT_RENYOU,WF_INDEP},
-{"ã<>™ã‚‹å‘½ä»¤å½¢ã€Œã<C592>—ã‚<C3A3>ã€<C3A3>",POS_V,COS_NONE,SCOS_NONE,CC_SRV,CT_MEIREI,WF_INDEP},
-{"ã<>™ã‚‹å‘½ä»¤å½¢ã€Œã<C592>›ã‚ˆã€<C3A3>",POS_V,COS_NONE,SCOS_NONE,CC_SRV,CT_MEIREI,WF_INDEP},
+{"¤¹¤ë̤Á³·Á¡Ö¤·¡×",POS_V,COS_NONE,SCOS_NONE,CC_SRV,CT_MIZEN,WF_INDEP},
+{"¤¹¤ë̤Á³·Á¡Ö¤»¡×",POS_V,COS_NONE,SCOS_NONE,CC_SRV,CT_MIZEN,WF_INDEP},
+{"¤¹¤ëÏ¢ÍÑ·Á¡Ö¤·¡×",POS_V,COS_NONE,SCOS_NONE,CC_SRV,CT_RENYOU,WF_INDEP},
+{"¤¹¤ëÌ¿Îá·Á¡Ö¤·¤í¡×",POS_V,COS_NONE,SCOS_NONE,CC_SRV,CT_MEIREI,WF_INDEP},
+{"¤¹¤ëÌ¿Îá·Á¡Ö¤»¤è¡×",POS_V,COS_NONE,SCOS_NONE,CC_SRV,CT_MEIREI,WF_INDEP},
/**/
-{"形容詞",POS_A,COS_NONE,SCOS_A0,CC_NONE,CT_NONE,WF_NONE},
-{"形容詞化接尾語",POS_D2KY,COS_NONE,SCOS_A1,CC_NONE,CT_NONE,WF_NONE},
-{"形容詞未然形",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_MIZEN,WF_NONE},
-{"形容詞連用形",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_RENYOU,WF_NONE},
-{"形容詞終止形",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_SYUSI,WF_NONE},
-{"形容詞連体形",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_RENTAI,WF_NONE},
-{"形容詞仮定形",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_KATEI,WF_NONE},
-{"形容詞語幹",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_NONE},
+{"·ÁÍÆ»ì",POS_A,COS_NONE,SCOS_A0,CC_NONE,CT_NONE,WF_NONE},
+{"·ÁÍƻ첽ÀÜÈø¸ì",POS_D2KY,COS_NONE,SCOS_A1,CC_NONE,CT_NONE,WF_NONE},
+{"·ÁÍÆ»ì̤Á³·Á",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_MIZEN,WF_NONE},
+{"·ÁÍÆ»ìÏ¢ÍÑ·Á",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_RENYOU,WF_NONE},
+{"·ÁÍƻ콪»ß·Á",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_SYUSI,WF_NONE},
+{"·ÁÍÆ»ìÏ¢ÂηÁ",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_RENTAI,WF_NONE},
+{"·ÁÍƻ첾Äê·Á",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_KATEI,WF_NONE},
+{"·ÁÍÆ»ì¸ì´´",POS_A,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_NONE},
/**/
-{"形容動詞未然形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_MIZEN,WF_NONE},
-{"形容動詞連用形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_RENYOU,WF_NONE},
-{"形容動詞終止形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_SYUSI,WF_NONE},
-{"形容動詞連体形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_RENTAI,WF_NONE},
-{"形容動詞仮定形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_KATEI,WF_NONE},
-{"形容動詞原形",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},/*形容動詞ã<C5BE>®åŽŸå½¢*/
-{"形容動詞語幹",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_NONE},
+{"·ÁÍÆÆ°»ì̤Á³·Á",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_MIZEN,WF_NONE},
+{"·ÁÍÆÆ°»ìÏ¢ÍÑ·Á",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_RENYOU,WF_NONE},
+{"·ÁÍÆÆ°»ì½ª»ß·Á",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_SYUSI,WF_NONE},
+{"·ÁÍÆÆ°»ìÏ¢ÂηÁ",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_RENTAI,WF_NONE},
+{"·ÁÍÆÆ°»ì²¾Äê·Á",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_KATEI,WF_NONE},
+{"·ÁÍÆÆ°»ì¸¶·Á",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},/*·ÁÍÆÆ°»ì¤Î¸¶·Á*/
+{"·ÁÍÆÆ°»ì¸ì´´",POS_AJV,COS_NONE,SCOS_NONE,CC_NONE,CT_HEAD,WF_NONE},
/**/
-{"å<>˜æ¼¢å­—",POS_TANKANJI,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
-{"連体詞",POS_ME,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
-{"å‹•è©žä¸<C3A4>寧表ç<C2A8>¾èªžå¹¹",POS_V,COS_NONE,SCOS_NONE,CC_SV,CT_NONE,WF_INDEP},
+{"ñ´Á»ú",POS_TANKANJI,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"Ï¢Âλì",POS_ME,COS_NONE,SCOS_NONE,CC_NONE,CT_NONE,WF_NONE},
+{"Æ°»ìÃúǫɽ¸½¸ì´´",POS_V,COS_NONE,SCOS_NONE,CC_SV,CT_NONE,WF_INDEP},
{0,0,0,0,0,0,0},
--
2.21.0
From 4f737e08a1366c4a19911d48f9b41cc76c64133b Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 4 Jun 2019 13:33:21 +0900
Subject: [PATCH] src-util: Fix some obsolete warnings in emacs
batch-byte-compile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
When emacs batch-byte-compile runs, some obsolete warnings are output.
anthy.el:74:2:Warning: ‘set-face-underline-p’ is an obsolete function
(as of 24.3); use ‘set-face-underline’ instead.
anthy.el:163:1:Warning: !! The file uses old-style backquotes !!
This functionality has been obsolete for more than 10 years already
and will be removed soon. See (elisp)Backquote in the manual.
anthy.el:246:4:Warning: ‘mapcar’ called for effect; use ‘mapc’ or ‘dolist’
instead
https://stackoverflow.com/questions/8109665/how-fix-emacs-error-old-style-backquotes-detected
---
src-util/anthy.el | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/src-util/anthy.el b/src-util/anthy.el
index 1a0adc3..8980957 100644
--- a/src-util/anthy.el
+++ b/src-util/anthy.el
@@ -71,7 +71,7 @@
(defvar anthy-highlight-face nil)
(defvar anthy-underline-face nil)
(copy-face 'highlight 'anthy-highlight-face)
-(set-face-underline-p 'anthy-highlight-face t)
+(set-face-underline 'anthy-highlight-face t)
(copy-face 'underline 'anthy-underline-face)
;;
@@ -160,12 +160,15 @@
(defvar anthy-last-context-id 1)
;; From skk-macs.el From viper-util.el. Welcome!
+;; Fixed emacs batch-byte-compile of anthy.el about the below warning:
+;; "anthy.el:163:1:Warning: !! The file uses old-style backquotes !!"
+;; https://stackoverflow.com/questions/8109665/how-fix-emacs-error-old-style-backquotes-detected
(defmacro anthy-deflocalvar (var default-value &optional documentation)
- (` (progn
- (defvar (, var) (, default-value)
- (, (format "%s\n\(buffer local\)" documentation)))
- (make-variable-buffer-local '(, var))
- )))
+ `(progn
+ (defvar ,var ,default-value
+ ,(format "%s\n\(buffer local\)" documentation))
+ (make-variable-buffer-local ',var)
+ ))
;; buffer local variables
(anthy-deflocalvar anthy-context-id nil "$B%3%s%F%-%9%H$N(Bid")
@@ -243,7 +246,7 @@
(delete-region start (+ start len))
(goto-char start)))
(setq anthy-preedit "")
- (mapcar 'delete-overlay anthy-preedit-overlays)
+ (mapc 'delete-overlay anthy-preedit-overlays)
(setq anthy-preedit-overlays nil))
(defun anthy-select-face-by-attr (attr)
@@ -745,7 +748,7 @@
(if anthy-agent-process
(kill-process anthy-agent-process))
(setq anthy-agent-process proc)
- (process-kill-without-query proc)
+ (process-query-on-exist-flag proc)
(if anthy-xemacs
(if (coding-system-p (find-coding-system 'euc-japan))
(set-process-coding-system proc 'euc-japan 'euc-japan))
@@ -864,7 +867,7 @@
;; leim $B$N(B activate
;;
(defun anthy-leim-activate (&optional name)
- (setq inactivate-current-input-method-function 'anthy-leim-inactivate)
+ (setq deactivate-current-input-method-function 'anthy-leim-inactivate)
(setq anthy-leim-active-p t)
(anthy-update-mode)
(when (eq (selected-window) (minibuffer-window))
@@ -874,7 +877,7 @@
;; emacs$B$N%P%0Hr$1$i$7$$$G$9(B
;;
(defun anthy-leim-exit-from-minibuffer ()
- (inactivate-input-method)
+ (deactivate-input-method)
(when (<= (minibuffer-depth) 1)
(remove-hook 'minibuffer-exit-hook 'anthy-leim-exit-from-minibuffer)))
--
2.21.0
From 4c618b8d3c41d7c43d30050bec96cdea2dbae6be Mon Sep 17 00:00:00 2001
From: fujiwarat <takao.fujiwara1@gmail.com>
Date: Tue, 30 Jul 2019 20:09:17 +0900
Subject: [PATCH] src-diclib: Fix rpmlint shared-lib-calls-exit
The memory errors should be abort instead of exit.
---
src-diclib/alloc.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src-diclib/alloc.c b/src-diclib/alloc.c
index 460c9c7..0c8f4cc 100644
--- a/src-diclib/alloc.c
+++ b/src-diclib/alloc.c
@@ -179,13 +179,13 @@ anthy_create_allocator(int size, void (*dtor)(void *))
allocator a;
size=roundup_align(size);
if (size > (int)(PAGE_SIZE - PAGE_HEADER_SIZE - CHUNK_HEADER_SIZE)) {
- anthy_log(0, "Fatal error: too big allocator is requested.\n");
- exit(1);
+ anthy_log (0, "Fatal error: too big allocator is requested.\n");
+ abort ();
}
a = malloc(sizeof(*a));
if (!a) {
- anthy_log(0, "Fatal error: Failed to allocate memory.\n");
- exit(1);
+ anthy_log (0, "Fatal error: Failed to allocate memory.\n");
+ abort ();
}
a->size = size;
a->max_num = calc_max_num(size);
--
2.21.0