Re: pkg/60727: inputmethod/anthy: crashes and hangs on its own learning record, and has wrong dictionary entries

["zakinko%snowrabbit.org@localhost via gnats" <gnats-admin%NetBSD.org@localhost>]

The following reply was made to PR pkg/60727; it has been noted by GNATS.

From: zakinko%snowrabbit.org@localhost
To: gnats-bugs%NetBSD.org@localhost
Cc: zakinko%snowrabbit.org@localhost
Subject: Re: pkg/60727: inputmethod/anthy: crashes and hangs on its own learning record, and has wrong dictionary entries
Date: Tue, 15 Sep 2026 20:26:13 +0900 (JST)

 Sorry about the breakage, and thank you both for looking.  Jonathan's
 guess is right, and I think I can point at the spot.
 
 check-portability reads $PATCHDIR/patch-* to work out which files are
 patched.  In mktool's src/check_portability.rs that loop is
 
     let pfile = fs::File::open(patch.path())?;
     let reader = BufReader::new(pfile);
     for line in reader.lines() {
         let line = line?;
         if line.starts_with("+++") {
 
 BufRead::lines() yields String, so a non-UTF-8 byte makes it return
 InvalidData and the ? ends the whole run.  That is the message Thomas
 saw.  The loop over the extracted files, further down the same file,
 does have the lossy handling:
 
     let Ok(line) = line else {
         continue;
     };
 
 so it looks like the patch loop is the one place it was not applied.
 
 Two of my patches are EUC-JP, because the files they patch are, and
 their comments are in Japanese, so they are not valid UTF-8 and the
 read stops there.
 
 This has not bitten anyone before because that loop breaks at the
 first "+++" line, and until now every non-UTF-8 patch in the tree has
 had its non-UTF-8 only in the hunks, which come after that line.  I
 scanned the 33140 patch files in pkgsrc: 83 are not valid UTF-8, and
 none of those has a non-UTF-8 byte before its first "+++".
 
 That also gives a fix that does not need mktool to change: the comment
 and the hunks do not have to be in the same encoding.  patch(1) only
 cares about the hunks.  So the two patches below have the same hunks,
 byte for byte, with the comment re-encoded as UTF-8.  mktool then
 reads the comment, reaches "+++", and stops before the EUC-JP starts.
 As a side effect the comment is now readable in a UTF-8 terminal,
 which it was not before.
 
 Checked on NetBSD 11.0/amd64: all five still apply to a pristine
 anthy-9100h with no offset and no fuzz (24 hunks), and make package
 builds anthy-9100hnb2.  Only two distinfo lines change:
 
  SHA1 (patch-mkworddic_compound.t) = abef661d5f6bb8858946e434f153b03e6b093a2c
  SHA1 (patch-mkworddic_name.t) = 0f09fb25bda679db79c5231b11c29955500333da
 
 The other three patches and the rest of the report are unchanged.
 Whether mktool should also be lossy there is of course Jonathan's
 call; the two files below are enough to get the package building
 either way.
 
 Please replace these two files from the original report.
 
 
 === inputmethod/anthy/patches/patch-mkworddic_name.t ===
 
 $NetBSD$
 
 Fix the kanji for the novelist Abe Kobo (1924-1993).  The entry reads
 "abekoubou" and gives ����; he wrote his family name ����.
 
 The neighbouring entries in this file already spell å®?å??æ??ä¸?, å®?å??æ?´æ??
 and å®?å??ã?ªã?¤ã?¿ correctly, so this is an isolated slip rather than a
 convention the dictionary follows.  Writing a person's name with the
 wrong character is a discourtesy in Japanese, and an input method that
 offers only the wrong form makes the right one awkward to type.
 
 Taken from Fedora, which has carried this since 2010 as
 anthy-fix-typo-in-dict-name.patch.
 
 --- mkworddic/name.t.orig
 +++ mkworddic/name.t
 @@ -43,7 +43,7 @@
  ¤¢¤È¤¦¤À¤¿¤«¤· #JN #_4°¤ÅáÅÄ_3¹â
  ¤¢¤Ê¤ó #JN ¥¢¥Ê¥ó
  ¤¢¤Ó¤ë¤æ¤¦ #JN #_3¤¢¤Ó¤ë_2Í¥
 -¤¢¤Ù¤³¤¦¤Ü¤¦ #JN #_2°¤Éô_4¸ø˼
 +¤¢¤Ù¤³¤¦¤Ü¤¦ #JN #_2°ÂÉô_4¸ø˼
  ¤¢¤Ù¤·¤å¤·¤ç¤¦ #JN #_2°ÂÇÜ_5¼óÁê
  ¤¢¤Ù¤·¤ó¤¾¤¦ #JN #_2°ÂÇÜ_4¿¸»°
  ¤¢¤Ù¤½¤¦¤ê #JN #_2°ÂÇÜ_3ÁíÍý
 
 
 === inputmethod/anthy/patches/patch-mkworddic_compound.t ===
 
 $NetBSD$
 
 Fix wrong kanji, wrong readings and malformed part-of-speech tags.
 
 The conversions corrected here give a different word from the one the reading
 asks for:
 
 	ã??ã??ã??ã??ã??ã??ã??ã??ã??	ç??é?¢è¨¼æ??	-> ç??é?¢ç?§æ??
 	ã??ã??ã??ã??ã?¯ã??ã?¦ã??	é«?é??å?¤å®?	-> å?¬é??å?¤å®?
 	ã??ã??ã??ã??ã??ã??ã??ã??	æ¶?å??ç?¨æ°´	-> æ¶?ç?«ç?¨æ°´
 	ã?²ã?ªã??ã??ã??ã??ã??ã??	é??é?£å¼±è??	-> é?¿é?£å¼±è??
 	ã?²ã?ªã??ã??ã??ã??		é??é?£é??è·¯	-> é?¿é?£é??è·¯
 	ã??ã?¾ã??ã??ã??ã??ã??		æ²¹è??以ä¸?	-> æ²¹è??ç?°å¸¸
 	ã??ã??ã??ã??ã??ã??ã??ã??ã??	æ­©é??æ?´å??	-> å?¨æ?²é?²é?³
 
 The last one had been given the entry for a different word entirely; æ­©é??æ?´å??
 is added back under its own reading, ã?»ã?©ã??ã??ã??ã?³.
 
 Two readings were wrong: ã??ã??ã??ã??ã?£ã?? for ä¼?æ´¥æ¼?å?¨, which is ã??ã??ã?¥, and
 ã??ã??ã??ã??ã??ã??ã??ã?? for é?¢æ°´é??å±?, which is ã??ã??ã??ã??.  Seven entries carried a
 malformed part-of-speech tag (no leading #, or #35, #T5, #T#5 where #T30 or
 #T35 was meant); mkworddic takes the tag only from a token that starts with #
 and names a known type, so those compounds were never registered.
 
 Fedora has carried these since 2010, and anthy-unicode -- the fork that is
 still maintained -- has every one of them.
 
 --- mkworddic/compound.t.orig
 +++ mkworddic/compound.t
 @@ -8,7 +8,6 @@
  ¤¢¤¤¤·¤ã¤»¤¤¤·¤ó #T35 #_4°¦¼Ò_4Àº¿À
  ¤¢¤¤¤·¤ç¤¦¤·¤ó¤À¤ó #T35 #_5ÁêÀ­_4¿ÇÃÇ
  ¤¢¤¤¤·¤ç¤¦¤á¤¤ #T35 #_5°¦¾Î_2̾
 -¤¢¤¤¤º¤·¤Ã¤­ #T35 #_3²ñÄÅ_3¼¿´ï
  ¤¢¤¤¤¼¤ó¤·¤å¤¿¤Ã¤È #CN ¥¢¥¤¥¼¥ó¥·¥å¥¿¥Ã¥È
  ¤¢¤¤¤¾¤¦¤²¤­ #T35 #_4°¦Áþ_2·à
  ¤¢¤¤¤Á¤¤¤À¤¤ #T35 #_3°¦ÃÎ_3°åÂç
 @@ -20,6 +19,7 @@
  ¤¢¤¤¤Á¤³¤¦¤¸¤ç¤¦ #T35 #_3°¦ÃÎ_5¹©¾ì
  ¤¢¤¤¤Á¤³¤¦¤À¤¤ #T35 #_3°¦ÃÎ_4¹©Âç
  ¤¢¤¤¤Á¤·¤å¤Ã¤·¤ó #T35 #_3°¦ÃÎ_5½Ð¿È
 +¤¢¤¤¤Å¤·¤Ã¤­ #T35 #_3²ñÄÅ_3¼¿´ï
  ¤¢¤¤¤Å¤À¤¤¤¬¤¯ #T35 #_3²ñÄÅ_4Âç³Ø
  ¤¢¤¤¤Å¤Æ¤Ä¤É¤¦ #T35 #_3²ñÄÅ_4Å´Æ»
  ¤¢¤¤¤Å¤Æ¤Ä¤É¤¦¤»¤ó #T35 #_3²ñÄÅ_6Å´Æ»Àþ
 @@ -1987,7 +1987,7 @@
  ¤¤¤Ã¤Ñ¤ó¤è¤ä¤¯¤«¤¤¤· #T35 #_4°ìÈÌ_3ͽÌó_3³«»Ï
  ¤¤¤Ã¤Ñ¤ó¤ê¤ç¤¯ #T35 #_4°ìÈÌ_3ÎÏ
  ¤¤¤Ã¤Ñ¤ó¤ê¤ç¤³¤¦ #T35 #_4°ìÈÌ_4ι¹Ô
 -¤¤¤Ã¤Ñ¤ó¤ê¤è¤¦ #35 #_4°ìÈÌ_3ÍøÍÑ
 +¤¤¤Ã¤Ñ¤ó¤ê¤è¤¦ #T30 #_4°ìÈÌ_3ÍøÍÑ
  ¤¤¤Ã¤Ñ¤ó¤ê¤è¤¦¤·¤ã #T35 #_4°ìÈÌ_3ÍøÍÑ_2¼Ô
  ¤¤¤Ã¤Ñ¤ó¤ê¤è¤¦¤·¤ã¤à¤­ #T35 #_4°ìÈÌ_3ÍøÍÑ_2¼Ô_2¸þ
  ¤¤¤Ã¤Ñ¤ó¤ê¤í¤ó #T35 #_4°ìÈÌ_3ÍýÏÀ
 @@ -9714,7 +9714,6 @@
  ¤«¤ó¤¸¤ó¤º¤â¤¦ #T35 #_4´«¿Ê_3ÁêËÐ
  ¤«¤ó¤¸¤ó¤Á¤ç¤¦ #T35 #_4´«¿Ê_3Ä¢
  ¤«¤ó¤¹¤¤¤«¤·¤ç #T35 #_4´§¿å_3²Õ½ê
 -¤«¤ó¤¹¤¤¤­¤ó¤¾¤¯ #T35 #_4´Ø¿å_4¶â°
  ¤«¤ó¤¹¤¤¤®¤ç #T35 #_4´¨¿å_2µû
  ¤«¤ó¤¹¤¤¤Ð¤·¤ç #T35 #_4´§¿å_3¾ì½ê
  ¤«¤ó¤¹¤¦¤«¤¤¤»¤­ #T35 #_4´Ø¿ô_4²òÀÏ
 @@ -10235,7 +10234,7 @@
  ¤«¤ó¤Ö¤¸¤ó¤¸ #T35 #_3´´Éô_3¿Í»ö
  ¤«¤ó¤Ö¤Ä¤ä #T35 #_4´¥Êª_1²°
  ¤«¤ó¤Ö¤ê #T35 #_2´¨_2¥Ö¥ê
 -¤«¤ó¤Ö¤ê¤å¤¦¤·¤å¤Ä #T#5 #_3´´Éô_6ή½Ð
 +¤«¤ó¤Ö¤ê¤å¤¦¤·¤å¤Ä #T30 #_3´´Éô_6ή½Ð
  ¤«¤ó¤Ö¤ó¤¯¤ó¤É¤¯¤¿¤¤ #T35 #_4´Áʸ_4·±ÆÉ_2ÂÎ
  ¤«¤ó¤Ö¤ó¤Æ¤­ #T35 #_4´Áʸ_2Ū
  ¤«¤ó¤×¤¦¤²¤­ #T35 #_4´°Éõ_2·à
 @@ -14320,7 +14319,7 @@
  ¤­¤ç¤¦¤È¤·¤ó¤Ö¤ó #KK #_4µþÅÔ_4¿·Ê¹
  ¤­¤ç¤¦¤È¤·¤ó¤Ö¤ó¤Ï¤¤ #T35 #_4µþÅÔ_4¿·Ê¹_2ÇÕ
  ¤­¤ç¤¦¤È¤¸¤å¤¦ #T35 #_4µþÅÔ_3Ãæ
 -¤­¤ç¤¦¤È¤¸¤å¤¦¤«¤ó¤¸¤É¤¦¤·¤ã¤É¤¦ T35 #_4µþÅÔ_5½Ä´Ó_5¼«Æ°¼Ö_2Æ»
 +¤­¤ç¤¦¤È¤¸¤å¤¦¤«¤ó¤¸¤É¤¦¤·¤ã¤É¤¦ #T35 #_4µþÅÔ_5½Ä´Ó_5¼«Æ°¼Ö_2Æ»
  ¤­¤ç¤¦¤È¤¸¤ó #T35 #_4µþÅÔ_2¿Í
  ¤­¤ç¤¦¤È¤»¤é¤ß¤Ã¤¯ #KK #_4µþÅÔ_5¥»¥é¥ß¥Ã¥¯
  ¤­¤ç¤¦¤È¤¿¤¤¤·¤ç¤¦¤Æ¤ó #T35 #_4µþÅÔ_5Âç¾Þ_2ŵ
 @@ -19234,7 +19233,7 @@
  ¤²¤ó¤«¤ó¤°¤Á #T35 #_4¸¼´Ø_2¸ý
  ¤²¤ó¤«¤ó¤²¤ó¤¾¤¦ #T35 #_2¸º_2´¶_4¸½Áü
  ¤²¤ó¤«¤ó¤µ¤­ #T35 #_4¸¼´Ø_2Àè
 -¤²¤ó¤«¤ó¤·¤ç¤¦¤á¤¤ #T35 #_4¸¼´Ø_5¾ÚÌÀ
 +¤²¤ó¤«¤ó¤·¤ç¤¦¤á¤¤ #T35 #_4¸¼´Ø_5¾ÈÌÀ
  ¤²¤ó¤«¤ó¤¹¤¦ #T35 #_2¸¶_4´Ø¿ô
  ¤²¤ó¤«¤ó¤Þ¤¨ #T35 #_4¸¼´Ø_2Á°
  ¤²¤ó¤«¤ó¤ê¤Ë¤ó #T35 #_2¸½_3´ÉÍý_2¿Í
 @@ -19964,7 +19963,7 @@
  ¤²¤ó¤ê¤ç¤¦¤Á¤ç¤¦¤¿¤Ä #T35 #_5¸¶ÎÁ_5Ĵã
  ¤²¤ó¤í¤¦¤¤¤ó #T35 #_4¸µÏ·_2±¡
  ¤²¤ó¤í¤¯¤º¤· #T35 #_4¸µÏ½_2¼÷»Ê
 -¤²¤ó¤í¤»¤ó #T5 #_2¸½_3Ï©Àþ
 +¤²¤ó¤í¤»¤ó #T35 #_2¸½_3Ï©Àþ
  ¤²¤ó¤í¤ó¤¯¤¦¤«¤ó #T35 #_4¸ÀÏÀ_4¶õ´Ö
  ¤²¤ó¤í¤ó¤¸¤æ¤¦ #T35 #_4¸ÀÏÀ_3¼«Í³
  ¤²¤ó¤í¤ó¤»¤¤¤²¤ó #T35 #_4¸ÀÏÀ_4À©¸Â
 @@ -20163,7 +20162,7 @@
  ¤³¤¦¤«¤¤¤È¤¦¤í¤ó #T35 #_4¸ø³«_4ƤÏÀ
  ¤³¤¦¤«¤¤¤Ê¤Þ¤Û¤¦¤½¤¦ #T35 #_4¸ø³«_2À¸_4ÊüÁ÷
  ¤³¤¦¤«¤¤¤Ï¤ó #T35 #_4¹Ò³¤_2ÈÉ
 -¤³¤¦¤«¤¤¤Ï¤ó¤Æ¤¤ #T35 #_4¹â³¬_4ȽÄê
 +¤³¤¦¤«¤¤¤Ï¤ó¤Æ¤¤ #T35 #_4¸ø³«_4ȽÄê
  ¤³¤¦¤«¤¤¤Ð¤ó #T35 #_4¸ø³«_2ÈÇ
  ¤³¤¦¤«¤¤¤Ó #T35 #_4¸ø³«_1Æü
  ¤³¤¦¤«¤¤¤Û¤¦¤½¤¦ #T35 #_4¸ø³«_4ÊüÁ÷
 @@ -21650,7 +21649,7 @@
  ¤³¤¦¤Æ¤¤¤Ï #T35 #_4¹ÎÄê_1ÇÉ
  ¤³¤¦¤Æ¤­¤«¤¤¤´¤Û¤±¤ó #T35 #_4¸øŪ_3²ð¸î_3Êݸ±
  ¤³¤¦¤Æ¤­¤«¤ó¤­¤ó #T35 #_4¸øŪ_4´¹¶â
 -¤³¤¦¤Æ¤­¤«¤ó¤è T35 #_4¸øŪ_3´ØÍ¿
 +¤³¤¦¤Æ¤­¤«¤ó¤è #T30 #_4¸øŪ_3´ØÍ¿
  ¤³¤¦¤Æ¤­¤­¤«¤ó #T35 #_4¸øŪ_3µ¡´Ø
  ¤³¤¦¤Æ¤­¤­¤»¤¤ #T35 #_4¸øŪ_3µ¬À©
  ¤³¤¦¤Æ¤­¤­¤ó¤æ¤¦ #T35 #_4¸øŪ_4¶âÍ»
 @@ -30752,7 +30751,6 @@
  ¤·¤å¤ó¤¸¤å¤¦¤»¤ó¤´¤¯¤¸¤À¤¤ #T35 #_6½Õ½©_4Àï¹ñ_3»þÂå
  ¤·¤å¤ó¤¸¤å¤¦¤Î¤Þ #T35 #_7½Õ½©¤Î_1´Ö
  ¤·¤å¤ó¤Æ¤¤¤¿¤¤¤µ¤¯ #T35 #_5½ÖÄä_4Âкö
 -¤·¤å¤ó¤È¤¦¤°¤ó #T35 #_5½ÙÅì_2·´
  ¤·¤å¤ó¤Ñ¤Ä¤ê¤ç¤¯ #T35 #_5½Öȯ_3ÎÏ
  ¤·¤å¤ó¤Ñ¤Ä¤ê¤ç¤¯¤·¤ç¤¦¤Ö #T35 #_5½Öȯ_3ÎÏ_4¾¡Éé
  ¤·¤å¤ó¤Ó¤ó¤»¤¤ #T35 #_5½ÓÉÒ_2À­
 @@ -30839,7 +30837,7 @@
  ¤·¤ç¤¦¤«¤Ø¤¤ #T35 #_3¾®_3²ÖÊÁ
  ¤·¤ç¤¦¤«¤Ü¤¦ #T35 #_4¾Ø²Ú_2˼
  ¤·¤ç¤¦¤«¤è¤¦¤¤¤ó #T35 #_4¾Ã²½_4Í×°÷
 -¤·¤ç¤¦¤«¤è¤¦¤¹¤¤ #T35 #_4¾Ã²½_4ÍÑ¿å
 +¤·¤ç¤¦¤«¤è¤¦¤¹¤¤ #T35 #_4¾Ã²Ð_4ÍÑ¿å
  ¤·¤ç¤¦¤«¤ê¤ç¤¯ #T35 #_4¾Ã²½_3ÎÏ
  ¤·¤ç¤¦¤«¤ó¤­¤«¤ó #T35 #_5½þ´Ô_3´ü´Ö
  ¤·¤ç¤¦¤«¤ó¤­¤²¤ó #T35 #_5½þ´Ô_3´ü¸Â
 @@ -40405,6 +40403,7 @@
  ¤»¤­¤·¤ç¤¯¤È¤¦ #T35 #_5ÀÖ¿§_2Åô
  ¤»¤­¤¸¤Ò¤ç¤¦ #T35 #_3Àʼ¡_3ɽ
  ¤»¤­¤¸¤å¤¦¤¸¤­ #T35 #_6ÀÖ½½»ú_1´ú
 +¤»¤­¤¹¤¤¤­¤ó¤¾¤¯ #KK #_4´Ø¿å_4¶â°
  ¤»¤­¤º¤¤¤·¤ç¤¦ #T35 #_4ÀÔ¿ñ_3¾É
  ¤»¤­¤º¤¤¤½¤ó¤·¤ç¤¦ #T35 #_4ÀÔ¿ñ_5»½ý
  ¤»¤­¤º¤¤¤Ï¤ó¤·¤ã #T35 #_4ÀÔ¿ñ_4È¿¼Í
 @@ -40670,7 +40669,7 @@
  ¤»¤Ã¤Á¤ã¤¯¤¶¤¤ #T35 #_5ÀÜÃå_2ºÞ
  ¤»¤Ã¤Á¤ã¤¯¤¶¤¤ #T35 #_5ÀÜÃå_2ºà
  ¤»¤Ã¤Á¤ã¤¯¤Ö #T35 #_5ÀÜÃå_1Éô
 -¤»¤Ã¤Á¤ã¤¯¤Ö¤Ö¤ó T35 #_5ÀÜÃå_3Éôʬ
 +¤»¤Ã¤Á¤ã¤¯¤Ö¤Ö¤ó #T35 #_5ÀÜÃå_3Éôʬ
  ¤»¤Ã¤Á¤ã¤¯¤á¤ó #T35 #_5ÀÜÃå_2ÌÌ
  ¤»¤Ã¤Á¤ã¤¯¤á¤ó¤»¤­ #T35 #_5ÀÜÃå_4ÌÌÀÑ
  ¤»¤Ã¤Á¤å¤¦¤¢¤ó #T35 #_5ÀÞÃï_2°Æ
 @@ -41942,7 +41941,7 @@
  ¤¼¤ó¤­¤ç¤¯¤¹¤¦ #T35 #_5Á´¶Ê_2¿ô
  ¤¼¤ó¤­¤ç¤¯¤Á¤å¤¦ #T35 #_5Á´¶Ê_3Ãæ
  ¤¼¤ó¤­¤ç¤¯¤Ð¤ó #T35 #_5Á´¶Ê_2ÈÇ
 -¤¼¤ó¤­¤ç¤¯¤í¤¯¤ª¤ó #T35 #_5ÊâÆ»_4À°È÷
 +¤¼¤ó¤­¤ç¤¯¤í¤¯¤ª¤ó #T30 #_5Á´¶Ê_4Ï¿²»
  ¤¼¤ó¤­¤ó¤¢¤ó¤Æ¤¤¤»¤¤ #T35 #_4Á²¶á_6°ÂÄêÀ­
  ¤¼¤ó¤­¤ó¤»¤ó #T35 #_4Á²¶á_2Àþ
  ¤¼¤ó¤­¤ó¤»¤ó¤¸¤ç¤¦ #T35 #_6Á²¶áÀþ_3¾å
 @@ -46498,7 +46497,7 @@
  ¤Á¤å¤¦¤Ð¤Á¤±¤ó #KK #_5ÃæÈ­_2¸¦
  ¤Á¤å¤¦¤Ð¤ó¤¤¤³¤¦ #T35 #_5ÃæÈ×_3°Ê¹ß
  ¤Á¤å¤¦¤Ð¤ó¤¤¤¸¤ç¤¦ #T35 #_5ÃæȽ_4°Ê¾å
 -¤Á¤å¤¦¤Ö¤¸¤å¤¦¤«¤ó¤¸¤É¤¦¤·¤ã¤É¤¦ T35 #_4ÃæÉô_5½Ä´Ó_5¼«Æ°¼Ö_2Æ»
 +¤Á¤å¤¦¤Ö¤¸¤å¤¦¤«¤ó¤¸¤É¤¦¤·¤ã¤É¤¦ #T35 #_4ÃæÉô_5½Ä´Ó_5¼«Æ°¼Ö_2Æ»
  ¤Á¤å¤¦¤Ö¤¼¤¤ #T35 #_4ÃæÉô_2Àª
  ¤Á¤å¤¦¤Ö¤Á¤¯ #T35 #_4ÃæÉô_2Ã϶è
  ¤Á¤å¤¦¤Ö¤Á¤Û¤¦ #T35 #_4ÃæÉô_3ÃÏÊý
 @@ -57562,11 +57561,11 @@
  ¤Ò¤Ê¤ó¤´¤ä #T35 #_3ÈòÆñ_2¾®²°
  ¤Ò¤Ê¤ó¤µ¤­ #T35 #_3ÈòÆñ_2Àè
  ¤Ò¤Ê¤ó¤·¤¨¤ó #T35 #_3ÈòÆñ_3»Ù±ç
 -¤Ò¤Ê¤ó¤¸¤ã¤¯¤·¤ã #T35 #_3ÈóÆñ_5¼å¼Ô
 +¤Ò¤Ê¤ó¤¸¤ã¤¯¤·¤ã #T35 #_3ÈòÆñ_5¼å¼Ô
  ¤Ò¤Ê¤ó¤¸¤å¤¦¤ß¤ó #T35 #_3ÈòÆñ_5½»Ì±
  ¤Ò¤Ê¤ó¤¸¤ç #T35 #_3ÈòÆñ_2½ê
  ¤Ò¤Ê¤ó¤»¤¤¤«¤Ä #T35 #_3ÈòÆñ_4À¸³è
 -¤Ò¤Ê¤ó¤¿¤¤¤í #T35 #_3ÈóÆñ_3ÂàÏ©
 +¤Ò¤Ê¤ó¤¿¤¤¤í #T35 #_3ÈòÆñ_3ÂàÏ©
  ¤Ò¤Ê¤ó¤Ä¤¦¤í #T35 #_3ÈòÆñ_3ÄÌÏ©
  ¤Ò¤Ê¤ó¤Ð¤·¤ç #T35 #_3ÈòÆñ_3¾ì½ê
  ¤Ò¤Ê¤ó¤æ¤¦¤É¤¦ #T35 #_3ÈòÆñ_4ͶƳ
 @@ -62585,6 +62584,7 @@
  ¤Û¤È¤±¤µ¤Þ #T35 #_3Ê©_2ÍÍ
  ¤Û¤É¤¦¤¬¤ï #T35 #_3ÊâÆ»_2¦
  ¤Û¤É¤¦¤¸¤ç¤¦ #T35 #_3ÊâÆ»_3¾å
 +¤Û¤É¤¦¤»¤¤¤Ó #T30 #_3ÊâÆ»_3À°È÷
  ¤Û¤É¤¦¤ì¤­ #T35 #_3ÊäƳ_2Îò
  ¤Û¤Ë¤å¤¦¤É¤¦¤Ö¤Ä #T35 #_4Ó®Æý_4ưʪ
  ¤Û¤Ë¤å¤¦¤Ó¤ó #T35 #_4Ó®Æý_2ÉÓ
 @@ -66264,7 +66264,6 @@
  ¤æ¤½¤¦¤­ #T35 #_3Í¢Á÷_1µ¡
  ¤æ¤½¤¦¤­¤«¤ó #T35 #_3Í¢Á÷_3µ¡´Ø
  ¤æ¤½¤¦¤­¤Á #T35 #_3Í¢Á÷_2´ðÃÏ
 -¤æ¤½¤¦¤­¤É #T35 #_3Í¢Á÷_2µ±ÅÙ
  ¤æ¤½¤¦¤­¤ç¤ê #T35 #_3Í¢Á÷_3µ÷Î¥
  ¤æ¤½¤¦¤®¤ç¤¦¤·¤ã #T35 #_3Í¢Á÷_5¶È¼Ô
  ¤æ¤½¤¦¤±¤¤¤«¤¯ #T35 #_3Í¢Á÷_4·×²è
 @@ -66351,7 +66350,7 @@
  ¤æ¤Ó¤µ¤·¤«¤¯¤Ë¤ó #T35 #_4»Øº¹¤·_4³Îǧ
  ¤æ¤Ó¤â¤¸ #T35 #_2»Ø_2ʸ»ú
  ¤æ¤Ó¤ï¤â¤Î¤¬¤¿¤ê #T35 #_3»ØÎØ_5ʪ¸ì
 -¤æ¤Þ¤¯¤¤¤¸¤ç¤¦ #T35 #_3ÌýËì_4°Ê¾å
 +¤æ¤Þ¤¯¤¤¤¸¤ç¤¦ #T35 #_3ÌýËì_4°Û¾ï
  ¤æ¤Þ¤¯¤±¤¤¤»¤¤¤ê¤ç¤¯ #T35 #_3ÌýËì_4·ÁÀ®_3ÎÏ
  ¤æ¤à¤é¤ª¤ó¤»¤ó #T35 #_3Åò¼_4²¹Àô
  ¤æ¤á¤«¤«¤¯ #T35 #_2Ì´_3²Á³Ê