Merge lp:~logan/ubuntu/quantal/julius/new-upstream into lp:ubuntu/quantal/julius

[Logan Rosen]

[Luke Yelavich (themuso)]

Thanks for your work.

review: Approve

=== modified file '00readme-ja.txt'
--- 00readme-ja.txt	2010-07-04 15:18:40 +0000
+++ 00readme-ja.txt	2012-08-03 04:20:23 +0000
@@ -4,11 +4,10 @@
 
                                 Julius
 
+                                                (Rev 4.2.2 2012/08/01)
+                                                (Rev 4.2.1 2011/12/25)
+                                                (Rev 4.2   2011/05/01)
                                                 (Rev 4.1.5 2010/06/04)
-                                                (Rev 4.1.4 2009/12/25)
-                                                (Rev 4.1.3 2009/11/02)
-                                                (Rev 4.1.2 2009/02/12)
-                                                (Rev 4.1.1 2008/12/13)
                                                 (Rev 4.1   2008/10/03)
                                                 (Rev 4.0.2 2008/05/27)
                                                 (Rev 4.0   2007/12/19)
@@ -17,10 +16,10 @@
                                                 (Rev 2.0   1999/02/20)
                                                 (Rev 1.0   1998/02/20)
 
- Copyright (c) 1991-2010 ‹ž“s‘åŠw ‰ÍŒ´Œ¤‹†Žº
+ Copyright (c) 1991-2012 ‹ž“s‘åŠw ‰ÍŒ´Œ¤‹†Žº
  Copyright (c) 1997-2000 �î•ñ�ˆ—��U‹»Ž–‹Æ‹¦‰ï(IPA)
  Copyright (c) 2000-2005 “Þ—Ç�æ’[‰ÈŠw‹Z�p‘åŠw‰@‘åŠw Ž­–쌤‹†Žº
- Copyright (c) 2005-2010 –¼ŒÃ‰®�H‹Æ‘åŠw JuliusŠJ”­ƒ`�[ƒ€
+ Copyright (c) 2005-2012 –¼ŒÃ‰®�H‹Æ‘åŠw JuliusŠJ”­ƒ`�[ƒ€
  All rights reserved
 ======================================================================
 
@@ -37,14 +36,14 @@
     http://julius.sourceforge.jp/
 
 
-Julius-4.1.5
+Julius-4.2.2
 =============
 
-ƒo�[ƒWƒ‡ƒ“ 4.1.5 ‚̓oƒO�C�³‚̃ŠƒŠ�[ƒX‚Å‚·�DƒAƒ‹ƒSƒŠƒYƒ€�ã‚̃oƒO�C�³‚Æ
-‚µ‚Ä�A1) •¶–@”FŽ¯Žž‚ÉŽå‚É‘æ2ƒpƒX‚Å’PŒê‘}“üƒyƒiƒ‹ƒeƒB‚ª�³‚µ‚­ˆµ‚í‚ê‚Ä‚¢
-‚È‚¢�A2) ‘æ2ƒpƒX‚Å�Å�‰‚Ì’PŒê("</s>"‚ɌŒè)‚Ì1-gramŠm—¦‚ªLMƒXƒRƒA‚ɃJƒE
-ƒ“ƒg‚³‚ê‚Ä‚¢‚È‚¢�A‚Ì2“_‚ª�C�³‚³‚ê‚Ü‚µ‚½�B‘æ2ƒpƒX‚Å—�—R•s–¾‚Ì’T�õŽ¸”s‚ª
-‘½‚­Œ©‚ç‚ê‚Ä‚¢‚½�ê�‡�A‚±‚Ì�Å�V”Å‚ðŽg‚¤‚±‚Æ‚ÅŒyŒ¸‚³‚ê‚é‰Â”\�«‚ª‚ ‚è‚Ü‚·�B
+ƒo�[ƒWƒ‡ƒ“ 4.2.2 ‚̓oƒO�C�³‚݂̂̃ŠƒŠ�[ƒX‚Å‚·�B
+‚¢‚­‚‚©‚Ì•s‹ï�‡‚ª�C�³‚³‚ê‚Ü‚µ‚½�B
+‚Ü‚½�A•¶–@ƒRƒ“ƒpƒCƒ‰ (mkfa) ‚ª flex ‚̃‰ƒCƒuƒ‰ƒŠ‚ðƒŠƒ“ƒN‚µ‚È‚¢‚悤
+•Ï�X‚³‚ê‚Ü‚µ‚½�B‚±‚ê‚É‚æ‚è�Aflex ‚ªƒCƒ“ƒXƒg�[ƒ‹‚³‚ê‚Ä‚¢‚È‚¢ŠÂ‹«‚Å‚à
+ƒRƒ“ƒpƒCƒ‹‚Å‚«‚é‚悤‚É‚È‚è‚Ü‚µ‚½�B
 
 •Ï�X“_‚Ì�Ú�ׂȈꗗ‚Í Release-ja.txt ‚ð‚²——‚­‚¾‚³‚¢�D
 
@@ -103,7 +102,7 @@
 
 Julius ‚̓I�[ƒvƒ“ƒ\�[ƒXƒ\ƒtƒgƒEƒFƒA‚Å‚·�D
 Šw�p—p“r�E�¤—p‚ðŠÜ‚ß�C—˜—p‚ÉŠÖ‚µ‚Ä“Á‚É�§ŒÀ‚Í‚ ‚è‚Ü‚¹‚ñ�D
-—˜—p‹–‘ø‚ɂ‚¢‚Ä‚Í�C“¯�«‚Ì•¶�‘ "LICENSE.txt" ‚É‚ ‚è‚Ü‚·‚Ì‚Å‚¨“ǂ݉º‚³‚¢�D
+—˜—p‹–‘ø‚ɂ‚¢‚Ä‚Í�C“¯�«‚Ì•¶�‘ "LICENSE.txt" ‚ð‚¨“Ç‚Ý‰º‚³‚¢�D
 
 
 ˜A—��æ

=== modified file '00readme.txt'
--- 00readme.txt	2010-07-04 15:18:40 +0000
+++ 00readme.txt	2012-08-03 04:20:23 +0000
@@ -4,11 +4,10 @@
 
                                 Julius
 
+                                                (Rev 4.2.2 2012/08/01)
+                                                (Rev 4.2.1 2011/12/25)
+                                                (Rev 4.2   2011/05/01)
                                                 (Rev 4.1.5 2010/06/04)
-                                                (Rev 4.1.4 2009/12/25)
-                                                (Rev 4.1.3 2009/11/02)
-                                                (Rev 4.1.2 2009/02/12)
-                                                (Rev 4.1.1 2008/12/13)
                                                 (Rev 4.1   2008/10/03)
                                                 (Rev 4.0.2 2008/05/27)
                                                 (Rev 4.0   2007/12/19)
@@ -17,10 +16,10 @@
                                                 (Rev 2.0   1999/02/20)
                                                 (Rev 1.0   1998/02/20)
 
- Copyright (c) 1991-2010 Kawahara Lab., Kyoto University
+ Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan
  Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- Copyright (c) 2005-2010 Julius project team, Nagoya Institute of Technology
+ Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  All rights reserved
 ======================================================================
 
@@ -49,21 +48,17 @@
 together with source codes.
 
 
-What's new in Julius-4.1.5
+What's new in Julius-4.2.2
 ===========================
 
-The version 4.1.5 is a bug-fix release.  Two bugs are found relating
-search algorithm, word insertion penalty handling on grammar
-recognition and LM score handling of the first word on the second
-pass.  They have been fixed on this release.  If you have been
-encountering unreasonable search failures on the second pass, they 
-may be eased by using the newest version.
-
-Other bugs are also fixed.  See "Release.txt" for the full list of the
-fixed bugs.
-
-
-Contents of Julius-4.1.5
+Version 4.2.2 is a bug fix release.  Several bugs has been fixed.  The
+grammar compiler (mkfa) now does not link flex library, so you can
+compile without flex.
+
+See the "Release.txt" file for the full list of updates.
+
+
+Contents of Julius-4.2.2
 =========================
 
 	(Documents with suffix "ja" are written in Japanese)

=== modified file 'LICENSE.txt'
--- LICENSE.txt	2010-07-04 15:18:40 +0000
+++ LICENSE.txt	2012-08-03 04:20:23 +0000
@@ -3,10 +3,10 @@
 	�u‘åŒêœb˜A‘±‰¹�º”FŽ¯ƒGƒ“ƒWƒ“ Julius�v
 			—˜—p‹–‘ø�‘
 
-  Copyright (c)   1991-2010 ‹ž“s‘åŠw ‰ÍŒ´Œ¤‹†Žº
+  Copyright (c)   1991-2012 ‹ž“s‘åŠw ‰ÍŒ´Œ¤‹†Žº
   Copyright (c)   1997-2000 �î•ñ�ˆ—��U‹»Ž–‹Æ‹¦‰ï(IPA)
   Copyright (c)   2000-2005 “Þ—Ç�æ’[‰ÈŠw‹Z�p‘åŠw‰@‘åŠw Ž­–쌤‹†Žº
-  Copyright (c)   2005-2010 –¼ŒÃ‰®�H‹Æ‘åŠw JuliusŠJ”­ƒ`�[ƒ€
+  Copyright (c)   2005-2012 –¼ŒÃ‰®�H‹Æ‘åŠw JuliusŠJ”­ƒ`�[ƒ€
 
 ----------------------------------------------------------------------------
 
@@ -40,10 +40,10 @@
 ‚È‚­‚»‚Ì‚Ü‚Ü•\Ž¦‚µ“Y•t‚µ‚È‚¯‚ê‚΂Ȃè‚Ü‚¹‚ñ�B
 
 			‹L
-  Copyright (c) 1991-2010 ‹ž“s‘åŠw ‰ÍŒ´Œ¤‹†Žº
+  Copyright (c) 1991-2012 ‹ž“s‘åŠw ‰ÍŒ´Œ¤‹†Žº
   Copyright (c) 1997-2000 �î•ñ�ˆ—��U‹»Ž–‹Æ‹¦‰ï(IPA)
   Copyright (c) 2000-2005 “Þ—Ç�æ’[‰ÈŠw‹Z�p‘åŠw‰@‘åŠw Ž­–쌤‹†Žº
-  Copyright (c) 2005-2010 –¼ŒÃ‰®�H‹Æ‘åŠw JuliusŠJ”­ƒ`�[ƒ€
+  Copyright (c) 2005-2012 –¼ŒÃ‰®�H‹Æ‘åŠw JuliusŠJ”­ƒ`�[ƒ€
 
 3. –{ƒ\ƒtƒgƒEƒFƒA‚ð—˜—p‚µ‚Ä“¾‚ç‚ꂽ’mŒ©‚ÉŠÖ‚µ‚Ä”­•\‚ð�s‚È‚¤�Û‚É‚Í�A
 �u‘åŒêœb˜A‘±‰¹�º”FŽ¯ƒGƒ“ƒWƒ“ Julius�v‚ð—˜—p‚µ‚½‚±‚Ƃ𖾋L‚µ‚ĉº‚³‚¢�B
@@ -57,12 +57,12 @@
 ‚µ‚È‚¢‚±‚Æ‚Ì•Û�Ø‚ðŠÜ‚Ý‚Ü‚·‚ª�A‚»‚ê‚ÉŒÀ’肳‚ê‚é‚à‚Ì‚Å‚Í‚ ‚è‚Ü‚¹‚ñ�B‚ ‚È
 ‚½‚ðŠÜ‚ß–{ƒ\ƒtƒgƒEƒFƒA‚Ì—˜—pŽÒ‚Í�A–{ƒ\ƒtƒgƒEƒFƒA‚ª–³•Û�Ø‚Å‚ ‚邱‚Æ‚ð�³
 ‘ø‚µ�A–{ƒ\ƒtƒgƒEƒFƒA‚ª–³•Û�Ø‚Å‚ ‚邱‚Ƃ̃ŠƒXƒN‚ð—˜—pŽÒŽ©�g‚Å•‰‚¤‚à‚Ì‚Æ
-‚µ‚Ü‚·�B�Ù”»�Š‚Ì”»Œˆ‚»‚Ì‘¼‰½‚ç‚©‚Ì—�—R‚É‚æ‚è‚ ‚È‚½‚ɉۂ¹‚ç‚ꂽ‹`–±‚Æ–{
-—˜—p�ðŒ�‚ª‘Š—e‚ê‚È‚¢‚Æ‚«‚Í�A–{ƒ\ƒtƒgƒEƒFƒA‚ð—˜—p‚µ‚Ä‚Í‚È‚è‚Ü‚¹‚ñ�B–{ƒ\
-ƒtƒgƒEƒFƒA‚Ì—˜—p–”‚Í—˜—p‚Å‚«‚È‚¢‚±‚Æ‚ÉŠÖ‚µ‚Ä‚ ‚È‚½‹y‚Ñ‘æŽOŽÒ‚É�¶‚¶‚é’Ê
-�푹ŠQ�A“Á•Ê‘¹ŠQ�A’¼�Ú“I�AŠÔ�Ú“I�A•t��“I�A”h�¶“I‚È‘¹ŠQ�iˆíŽ¸—˜‰v‚ðŠÜ‚Þ�j
-ˆê�؂ɂ‚«�A‚»‚ꂪŒ_–ñ�A•s–@�sˆ×�Ó”C�Aàêár’S•Û�Ó”C�A�»‘¢•¨�Ó”C“™‚¢‚©‚È
-‚é�‘‚Ì‚¢‚©‚È‚é–@—¥Œ´ˆö‚É‚æ‚é‚©‚ð–â‚킸�A”…�ž‚µ‚Ü‚¹‚ñ�B
+‚µ‚Ü‚·�B�Ù”»�Š‚Ì”»Œˆ‚É‚æ‚è‚ ‚È‚½‚ɉۂ¹‚ç‚ꂽ‹`–±‚É‚æ‚Á‚Ä‚ ‚È‚½‚ª–{—˜—p
+�ðŒ�‚É�]‚¤‚±‚Æ‚ª•s‰Â”\‚É‚È‚Á‚½‚Æ‚«‚Í�A–{ƒ\ƒtƒgƒEƒFƒA‚ð—˜—p‚µ‚Ä‚Í‚È‚è‚Ü
+‚¹‚ñ�B–{ƒ\ƒtƒgƒEƒFƒA‚Ì—˜—p–”‚Í—˜—p‚Å‚«‚È‚¢‚±‚Æ‚ÉŠÖ‚µ‚Ä‚ ‚È‚½‹y‚Ñ‘æŽOŽÒ
+‚É�¶‚¶‚é’Ê�푹ŠQ�A“Á•Ê‘¹ŠQ�A’¼�Ú“I�AŠÔ�Ú“I�A•t��“I�A”h�¶“I‚È‘¹ŠQ�iˆíŽ¸
+—˜‰v‚ðŠÜ‚Þ�jˆê�؂ɂ‚«�A‚»‚ꂪŒ_–ñ�A•s–@�sˆ×�Ó”C�Aàêár’S•Û�Ó”C�A�»‘¢•¨
+�Ó”C“™‚¢‚©‚È‚é�‘‚Ì‚¢‚©‚È‚é–@—¥Œ´ˆö‚É‚æ‚é‚©‚ð–â‚킸�A”…�ž‚µ‚Ü‚¹‚ñ�B
 
 5. –{ƒ\ƒtƒgƒEƒFƒA‚Ì—˜—p‚ÉŠÖ‚µ‚Ä‚Í�A“ú–{�‘‚Ì–@—¥‚ð�€‹’–@‚Æ‚µ�A‹ž“s’n•û
 �Ù”»�Š‚ð‘æˆê�R‚Ì�ê‘®ŠÇŠ��Ù”»�Š‚Æ‚µ‚Ü‚·�B
@@ -79,10 +79,10 @@
      Large Vocabulary Continuous Speech Recognition Engine Julius
 
 
+ Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan
- Copyright (c) 1991-2010 Kawahara Lab., Kyoto University
  Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- Copyright (c) 2005-2010 Julius project team, Nagoya Institute of Technology
+ Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 
 "Large Vocabulary Continuous Speech Recognition Engine Julius",
 including Julian, is being developed at Kawahara Lab., Kyoto
@@ -129,10 +129,10 @@
 
                       Form of copyright notice:
 
+ Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan
- Copyright (c) 1991-2010 Kawahara Lab., Kyoto University
  Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- Copyright (c) 2005-2010 Julius project team, Nagoya Institute of Technology
+ Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 
 3. When you publish or present any results by using the Software, you
 must explicitly mention your use of "Large Vocabulary Continuous
@@ -151,9 +151,9 @@
 other user of the Software hereby acknowledge that the Software is
 licensed without any warranty or guaranty, and assume all risks
 arising out of the absence of any warranty or guaranty.  In the event
-the terms and conditions of this license are inconsistent with the
-obligations imposed upon you by judgment of a court or for any other
-reason, you may not use the Software.
+that obligations imposed upon you by judgment of a court would make it
+impossible for you to comply with the conditions of this license, you
+may not use the Software.
 
 The Licensers shall not have any liability to you or to any third
 party for damages or liabilities of any nature whatsoever arising out

=== modified file 'Makefile.in'
--- Makefile.in	2009-06-18 13:08:41 +0000
+++ Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,11 +1,11 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 #
 # Makefile.in --- Makefile Template for configure
 #
-# $Id: Makefile.in,v 1.3 2008/10/02 08:57:01 sumomo Exp $
+# $Id: Makefile.in,v 1.5 2012/07/27 08:44:47 sumomo Exp $
 #
 SHELL=/bin/sh
 

=== modified file 'Release-ja.txt'
--- Release-ja.txt	2010-07-04 15:18:40 +0000
+++ Release-ja.txt	2012-08-03 04:20:23 +0000
@@ -1,3 +1,91 @@
+4.2.2 (2012.08.01)
+==================
+
+�›�C�³“_
+
+- Flex ƒ‰ƒCƒuƒ‰ƒŠ–³‚µ‚ŃRƒ“ƒpƒCƒ‹‚Å‚«‚é‚悤‚É‚È‚Á‚½
+- "--enable-words-int" Žw’莞‚É’Ê�í‚̃oƒCƒiƒŠ N-gram ‚ª“Ç‚ß‚È‚¢•s‹ï�‡‚ð�C�³
+- Windows ‚É‚¨‚¢‚Ä jconf “à‚ŃoƒbƒNƒXƒ‰ƒbƒVƒ…‚Ì“ü‚Á‚½ƒpƒX‚ðˆµ‚¦‚È‚¢ƒoƒO‚ð�C�³
+- ƒGƒ‰�[‚ðŠÜ‚Þ’PŒêŽ«�‘‚ð“Ç‚ñ‚¾‚Æ‚«‚É segfault ‚·‚é•s‹ï�‡‚ð�C�³
+- ’T�õ’†‚É‹H‚É segfault ‚·‚é•s‹ï�‡‚ð�C�³
+
+
+4.2.1 (2011.12.25)
+===================
+
+�›�V‹@”\
+- •¶–@”FŽ¯‚É‚¨‚¢‚Ä’PŒê•Ê‚Ì‘}“üƒyƒiƒ‹ƒeƒB�Ý’è‚ðƒTƒ|�[ƒg�D
+  Ž«�‘‚É‚¨‚¢‚Ĉȉº‚̂悤‚ÉŽw’è‚·‚é
+        15 @-2.0 15 [a] a
+  ‘æ‚PƒtƒB�[ƒ‹ƒh‚Í�]—ˆ‚Æ“¯‚¶ƒJƒeƒSƒŠ”Ô�†�B
+�@‘æ‚QƒtƒB�[ƒ‹ƒh‚É "@" ‚É‘±‚¯‚Ä‘}“üƒyƒiƒ‹ƒeƒB‚ð‘Î�”‚ÅŽw’è‚·‚é�B
+�@‘æ‚RƒtƒB�[ƒ‹ƒh‚Í‘æ‚PƒtƒB�[ƒ‹ƒh‚Æ“¯‚¶’l‚ð�‘‚­�B
+
+- �VƒIƒvƒVƒ‡ƒ“ "-chunk_size": ƒI�[ƒfƒBƒI“ü—͂̃oƒbƒtƒ@’·‚ðƒTƒ“ƒvƒ‹�”‚Å
+  Žw’è‰Â”\�iƒfƒtƒHƒ‹ƒg�F 1000�j�¬‚³‚­‚·‚é‚Æ’x‰„‚ð�¬‚³‚­‚Å‚«‚邪�¬‚³‚·
+  ‚¬‚é‚Æ•sˆÀ’è‚É‚È‚é�B
+- adintool ‚Å•W�€“ü—ÍŽž‚ÉŒŸ�o‚ðƒfƒtƒHƒ‹ƒg‚Å—LŒø‰»
+
+�›�C�³‚³‚ꂽƒoƒO
+- “Á’¥—Ê‚É C0 ‚ðŽg‚Á‚Ä‚¢‚é‚Æ‚«�CC0 ‚É CMN ‚ª�s‚í‚ê‚È‚¢
+�@�i‚±‚̃oƒO‚Í4.1.3�`4.2‚Ü‚Å‚ÌJulius‚É‘¶�Ý‚·‚é�j
+- mkbingram�Cgenerate-ngram ‚ª cygwin ‚Å—Ž‚¿‚é
+- "-adddict" ‚ŒljÁ‚µ‚½Ž«�‘‚É "-forcedict" ‚ªŒø‚©‚È‚¢
+- ‰¹�º˜^‰¹Žž�CCTRL+C ‚ÅŽ~‚ß‚é‚Æ WAV ƒwƒbƒ_‚Ƀf�[ƒ^’·‚ª�‘‚«‚±‚Ü‚ê‚È‚¢
+- ƒGƒ‰�[‚ðŠÜ‚ÞŽ«�‘‚ð“Ç‚ñ‚¾‚Æ‚«�AƒGƒ‰�[‚ð“f‚©‚¸‚É segfault ‚·‚é
+- "--enable-word-graph" ‚ŃRƒ“ƒpƒCƒ‹ƒGƒ‰�[‚ª�o‚é
+
+
+4.2 (2011.05.01)
+=================
+
+�›�V‹@”\
+- ‘æ‚PƒpƒX‚̃XƒRƒAƒvƒ‹�[ƒjƒ“ƒO�D"-bs ’l" ‚Å—LŒø‰», "’l" ‚̓XƒRƒA•��D
+  ’Ê�í‚̃‰ƒ“ƒNƒvƒ‹�[ƒjƒ“ƒO(-b ’l) ‚Æ•¹—p�DƒfƒtƒHƒ‹ƒg‚̓Iƒt�D
+- �VƒIƒvƒVƒ‡ƒ“ "-adddict" "-addword"�FŽ«�‘�E’PŒêƒGƒ“ƒgƒŠ‚ð’ljÁ“Ç‚Ý�ž‚Ý�D
+- PulseAudio ƒTƒ|�[ƒg (--with-mictype=pulseaudio)
+- Portaudio ‚ð V19 ‚É�X�V�D
+- Portaudio ‚ðŽg‚¤‘S‚Ä‚Ì�ê�‡‚É‚¨‚¢‚Ä�C•¡�”‚̘^‰¹ƒfƒoƒCƒX‚ª—˜—p‰Â”\‚È‚Æ‚«�C
+  ŠÂ‹«•Ï�” PORTAUDIO_DEV_NUM ‚ÅŽg—p‚·‚é˜^‰¹ƒfƒoƒCƒX‚ðŽw’è‰Â”\‚É‚µ‚½�D
+  ‹N“®Žž‚É�o—Í‚³‚ê‚éƒfƒoƒCƒXˆê——‚Ì’l‚ðŽw’è‚·‚é�D
+
+�›Žd—l•Ï�X‚𔺂¤‰ü‘P
+- mkbinhmmlist ‚ª‰¹‹¿ƒ‚ƒfƒ‹‚©‚ç’Š�o‚µ‚½ pseudo phone �î•ñ‚à�‘‚«‚¾‚·‚æ
+  ‚¤‚É‚È‚Á‚½�D‹N“®‚Ì�‚‘¬‰»‚ÉŠñ—^‚·‚é�D‚½‚¾‚µ�ì�¬‚µ‚½‰¹‹¿ƒ‚ƒfƒ‹‚ƃZƒbƒg
+  ‚ÅŽg—p‚·‚é•K—v‚ª‚ ‚é�D‚Ü‚½�C‚±‚̃o�[ƒWƒ‡ƒ“ˆÈ�~‚Ì mkbinhmmlist ‚Å�ì�¬
+  ‚µ‚½ binhmmlist ƒtƒ@ƒCƒ‹‚͈ȑO‚̃o�[ƒWƒ‡ƒ“‚Å‚ÍŽg—p‚Å‚«‚È‚¢�D
+- ƒI�[ƒfƒBƒIƒ‰ƒCƒuƒ‰ƒŠ‚̃Šƒ“ƒN•û–@‚Ì•Ï�X�Dconfigure ‚É
+  "--with-mictype" ‚ðŽw’肵‚½‚Æ‚«‚Í�C‚»‚ÌŽw’肳‚ꂽƒ‰ƒCƒuƒ‰ƒŠ�–‚Ì‚Ý�–
+  ‚ðƒŠƒ“ƒN‚·‚é‚悤‚É‚È‚Á‚½�DŽw’肪‚È‚¢‚Æ‚«‚Í�C�]—ˆ’Ê‚è�CŒŸ�o‚³‚ꂽ
+  ƒ‰ƒCƒuƒ‰ƒŠ‚ð‘S‚ăŠƒ“ƒN‚·‚é�D
+
+�›ƒ‰ƒCƒuƒ‰ƒŠŠÖ�”
+- j_config_load_string_new(char *str): j_config_load_file() ‚Æ“¯—l�C
+  ‚½‚¾‚µƒtƒ@ƒCƒ‹‚Å‚Í‚È‚­ str ‚ÉŠÜ‚Ü‚ê‚éƒIƒvƒVƒ‡ƒ“Žw’蕶Žš—ñ‚ð’¼�Ú
+  •]‰¿‚·‚é�D
+- add_dict() ‚¨‚æ‚Ñ add_word(): ƒIƒvƒVƒ‡ƒ“ "-adddict" "-addword" ‚Æ“¯
+  ‚¶‚­�CŽ«�‘‚â’PŒê‚ð’ljÁ‚·‚é�DƒGƒ“ƒWƒ“‹N“®Œã“®“I‚É‚Í‚Å‚«‚È‚¢‚Ì‚Å�C
+  ƒGƒ“ƒWƒ“ƒCƒ“ƒXƒ^ƒ“ƒX�¶�¬‘O‚ɌĂԂ±‚Æ�D
+- portaudio Žg—pŽž(Windows“™), ŠÂ‹«•Ï�” PORTAUDIO_DEV_NUM ‚Æ“¯—l‚É�C
+  j_open_stream(recog, NUMSTR) ‚Æ‚µ‚Ĉø�”‚Å‚àƒfƒoƒCƒX‘I‘ð‚ª‰Â”\�D
+- portaudio Žg—pŽž(Windows“™)�Cget_device_list() ‚Å—˜—p‰Â”\‚ȃfƒoƒCƒX
+  ˆê——‚ðŽæ“¾‚Å‚«‚é�D
+
+�›�«”\‰ü‘P�EƒoƒO�C�³
+- –Ø�\‘¢‰»Ž«�‘‚ðˆê•”�Å“K‰»�C“Á‚É‘åŒêœb‚Ń�ƒ‚ƒŠ—Ê‚ð�팸
+- N-gram“Ç‚Ý�ž‚ÝŽž�C�ê�‡‚É‚æ‚Á‚Ä‚Í�”–œ‰ñmalloc‚µ‚Ä‚¢‚½‚Ì‚ðŒ¸‚ç‚µ‚½
+- ƒ�ƒ‚ƒŠƒŠ�[ƒN‚ð‚Ù‚Ú–o–Å�iValgrindŽg—p�j
+- j_close_stream() ‚ÉŠÖ‚·‚é•s‹ï�‡‚ð•¡�”�C�³
+- "-iwsp" ‚ðƒ}ƒ‹ƒ`ƒpƒX‰¹‹¿ƒ‚ƒfƒ‹‚¾‚¯‚ÅŽg‚¦‚é‚悤�C�³
+
+
+4.1.5.1 (2010.12.25)
+=====================
+
+�›�C�³
+ - ƒ‰ƒCƒZƒ“ƒX‚ÉŠÖ‚·‚é–â‘è‚ð�C�³
+
+
 4.1.5 (2010.06.04)
 ===================
 

=== modified file 'Release.txt'
--- Release.txt	2010-07-04 15:18:40 +0000
+++ Release.txt	2012-08-03 04:20:23 +0000
@@ -1,3 +1,89 @@
+4.2.2 (2012.08.01)
+==================
+
+Fixes:
+- Now can be compiled without flex library
+- Fix failure of reading binary N-gram when compiled with "--enable-words-int"
+- Fix incorrect handling of file paths with backslash in jconf file at Windows
+- Fix segfault when reading an errorous word dictionary.
+- Fix occasional segfault which may occur while search.
+
+
+4.2.1 (2011.12.25)
+===================
+
+New features:
+- Add support for per-word insertion penalty setting at grammar
+  recognition. You can set different word insertion score for each word
+  entry at .dict file. For example, if you have an entry
+        15 [a] a
+  in .dict file and want to assign word insertion score of "-2.0" to
+  this word, you can write like this:
+        15 @-2.0 15 [a] a
+  The figure after "@" is the insertion penalty. The third
+  element should be the same as the first element.
+
+- New option "-chunk_size" can specify the audio fragment size in
+  number of samples. The default value is 1000.
+
+- At "adintool", enable input detection by default for standard input.
+
+Fixed bugs:
+- (IMPORTANT) CMN is not performed for C0 coef.  This bug exists in
+  the versions from 4.1.3 to 4.2.
+- "-forcedict" won't work for additional dictionaries given by "-adddict".
+- Corrupted header of recorded WAV file when interrupted by CTRL+C.
+- Occasional segfault when reading a wrongly formatted dictionary.
+- Won't compile with configure option "--enable-word-graph".
+- Segfault of "mkbingram" and "generate-ngram" at cygwin.
+
+
+4.2 (2011.05.01)
+=================
+
+New features:
+- Additional score-based pruning at the 1st pass.  It is disabled by
+  default, you can enable by using an option "-bs arg". The argument
+  is score range.
+- New support for PulseAudio (--with-mictype=pulseaudio)
+- New Option "-adddict", "-addword" to read additional dictionaries / words.
+- Portaudio library updated to V19.  Audio capture device can be
+  changed by env. "PORTAUDIO_DEV_NUM".  The device list will be
+  output at start up.
+
+Changed behavior:
+- "mkbinhmmlist" now saves pseudo phone list extracted from AM for
+  faster start up. The output should be used with the same AM
+  specified at generation.  Note that the converted binhmmlist file
+  can not be used with older Julius.
+- Audio library linking was modified at configure script.
+  When "--with-mictype=..." is explicitly specified, Julius will link
+  ONLY the audio library.  If not specified, Julius will link all the
+  audio devices whose development file was detected by the configure.
+
+Library functions:
+- j_config_load_string_new(char *str): like j_config_load_file(), but
+  parse the given string to set parameters.
+- add_dict(), add_word(): the same as "-adddict" and "-addword".
+  (They should be called at start up before starting engine)
+- (portaudio/Windows) j_open_stream(recog, NUMSTR) to choose device NUM.
+  ex. 'j_open_stream(recog, "1")' will open device number one.
+- (portaudio/Windows) get_device_list(): obtain list of available devices.
+
+Fixes:
+- Improved tree lexicon structure for better memory management.
+- Reduce malloc calls at reading N-gram.
+- Eliminated memory leaks using Valgrind.
+- Workarounds to avoid crash with j_close_stream().
+- Now allow "-iwsp" only with multi-path acoustic model.
+
+
+4.1.5.1 (2010.12.25)
+=====================
+
+Modified:
+ - Fixed problem related to the license.
+
 4.1.5 (2010.06.04)
 ===================
 Bug fixes:

=== modified file 'Sample.jconf'
--- Sample.jconf	2009-06-18 13:08:41 +0000
+++ Sample.jconf	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
 #
 # Sample Jconf configuration file
-# for Julius library rev.4.1.1
+# for Julius library rev.4.2
 #
 # 1) Options can also be specified in command line option.
 #    The values are default values in Julius.
@@ -204,6 +204,8 @@
 #-iwspword			# add a pause word to the dictionary
 #-iwspentry "<UNK> [sp] sp sp"	# word that will be added by "-iwspword"
 #-sepnum 150			# num of high freq words to linearize 
+#-adddict dictfile              # append additional word dictionary
+#-addword entry                 # append additional word entry
 
 ####
 #### Grammar
@@ -326,6 +328,7 @@
 #-lmp weight penalty		# LM weight and word insertion penalty (pass1)
 #-penalty1 penalty		# word insertion penalty for grammar (pass1)
 #-b width			# beam width (# of nodes)
+#-bs score                      # beam width (score)
 #-nlimit 3			# with enable-wpair-nlimit, set max N at nodes
 #-progout			# progressive output while decoding
 #-proginterval 300		# output interval in msec for "-progout"

=== modified file 'adinrec/00readme-ja.txt'
--- adinrec/00readme-ja.txt	2009-06-18 13:08:41 +0000
+++ adinrec/00readme-ja.txt	2012-08-03 04:20:23 +0000
@@ -46,6 +46,10 @@
           esd‚Í�C‰¹�ºƒfƒoƒCƒX‚Ì‹¤—LŽè’i‚Æ‚µ‚Ä‘½‚­‚Ì Linux‚̃fƒXƒNƒgƒbƒvŠÂ‹«‚Å
           —˜—p‚³‚ê‚Ä‚¢‚é EsounD daemon ‚©‚ç“ü—Í‚·‚é�D
 
+        -chunk_size  samples
+          ‰¹�º“ü—Í‚Ì�ˆ—�ƒoƒbƒtƒ@�iƒtƒ‰ƒOƒ�ƒ“ƒg�j‚̃TƒCƒY�D’l‚̓Tƒ“ƒvƒ‹
+          �”�D(default: 1000)
+
         -lv  thres
           �U•�ƒŒƒxƒ‹‚Ì‚µ‚«‚¢’l�D’l‚Í 0 ‚©‚ç 32767 ‚͈̔͂Ŏw’è‚·‚é�D (default:
           2000)

=== modified file 'adinrec/00readme.txt'
--- adinrec/00readme.txt	2009-06-18 13:08:41 +0000
+++ adinrec/00readme.txt	2012-08-03 04:20:23 +0000
@@ -49,6 +49,9 @@
           At Linux, you can choose API at run time by specifying alsa, oss and
           esd.
 
+        -chunk_size  samples
+          Audio fragment size in number of samples. (default: 1000)
+
         -lv  thres
           Level threshold for speech input detection. Values should be in
           range from 0 to 32767. (default: 2000)

=== modified file 'adinrec/Makefile.in'
--- adinrec/Makefile.in	2010-07-04 15:18:40 +0000
+++ adinrec/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,9 +1,9 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved 
 #
-# $Id: Makefile.in,v 1.5 2010/02/03 10:11:57 sumomo Exp $
+# $Id: Makefile.in,v 1.7 2012/07/27 08:44:48 sumomo Exp $
 #
 SHELL=/bin/sh
 .SUFFIXES:

=== modified file 'adinrec/adinrec.c'
--- adinrec/adinrec.c	2010-07-04 15:18:40 +0000
+++ adinrec/adinrec.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Wed Mar 23 20:33:01 2005
  *
- * $Revision: 1.4 $
+ * $Revision: 1.10 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -44,13 +44,14 @@
 {
   fprintf(stderr, "adinrec --- record one sentence input to a file\n");
   fprintf(stderr, "Usage: adinrec [options..] filename\n");
-  fprintf(stderr, "    [-input mic|alsa|oss|esd|...]  input source       (mic)\n");
+  fprintf(stderr, "    [-input mic|pulseaudio|alsa|oss|esd|...]  input source       (mic)\n");
   fprintf(stderr, "    [-freq frequency]     sampling frequency in Hz    (%ld)\n", jconf->am_root->analysis.para_default.smp_freq);
   fprintf(stderr, "    [-48]                 48000Hz recording with down sampling (16kHz only)\n");
   fprintf(stderr, "    [-lv unsignedshort]   silence cut level threshold (%d)\n", jconf->detect.level_thres);
   fprintf(stderr, "    [-zc zerocrossnum]    silence cut zerocross num   (%d)\n", jconf->detect.zero_cross_num);
   fprintf(stderr, "    [-headmargin msec]    head margin length          (%d)\n", jconf->detect.head_margin_msec);
   fprintf(stderr, "    [-tailmargin msec]    tail margin length          (%d)\n", jconf->detect.tail_margin_msec);
+  fprintf(stderr, "    [-chunksize sample]   chunk size for processing   (%d)\n", jconf->detect.chunk_size);
   fprintf(stderr, "    [-nostrip]            not strip off zero samples\n");
   fprintf(stderr, "    [-zmean]              remove DC by zero mean\n");
   fprintf(stderr, "    [-nocutsilence]       disable VAD, record all stream\n");
@@ -280,10 +281,23 @@
       }
     }
   }
-  /* set interrupt signal handler to properly close output file */
+  /* set signal handlers to properly close output file */
   if (signal(SIGINT, interrupt_record) == SIG_ERR) {
     fprintf(stderr, "Warning: signal intterupt may collapse output\n");
   }
+  if (signal(SIGTERM, interrupt_record) == SIG_ERR) {
+    fprintf(stderr, "Warning: signal intterupt may collapse output\n");
+  }
+#ifdef SIGPIPE
+  if (signal(SIGPIPE, interrupt_record) == SIG_ERR) {
+    fprintf(stderr, "Warning: signal intterupt may collapse output\n");
+  }
+#endif
+#ifdef SIGQUIT
+  if (signal(SIGQUIT, interrupt_record) == SIG_ERR) {
+    fprintf(stderr, "Warning: signal intterupt may collapse output\n");
+  }
+#endif
 
   recog = j_recog_new();
   recog->jconf = jconf;

=== modified file 'adintool/00readme-ja.txt'
--- adintool/00readme-ja.txt	2009-06-18 13:08:41 +0000
+++ adintool/00readme-ja.txt	2012-08-03 04:20:23 +0000
@@ -123,6 +123,10 @@
           �i�ÅŒã‚ÉŽw’肵‚½‚Ù‚¤‚ª—D�悳‚ê‚é�j�Desd ‚âƒvƒ‰ƒOƒCƒ““ü—Í‚ª Žw’è‰Â”\
           ‚Å‚ ‚é�D
 
+        -chunk_size  samples
+          ‰¹�º“ü—Í‚Ì�ˆ—�ƒoƒbƒtƒ@�iƒtƒ‰ƒOƒ�ƒ“ƒg�j‚̃TƒCƒY�D’l‚̓Tƒ“ƒvƒ‹
+          �”�D(default: 1000)
+
         -lv  thres
           �U•�ƒŒƒxƒ‹‚Ì‚µ‚«‚¢’l�D’l‚Í 0 ‚©‚ç 32767 ‚͈̔͂Ŏw’è‚·‚é�D (default:
           2000)

=== modified file 'adintool/00readme.txt'
--- adintool/00readme.txt	2009-06-18 13:08:41 +0000
+++ adintool/00readme.txt	2012-08-03 04:20:23 +0000
@@ -123,6 +123,9 @@
           At Linux, you can choose API at run time by specifying alsa, oss and
           esd.
 
+        -chunk_size  samples
+          Audio fragment size in number of samples. (default: 1000)
+
         -lv  thres
           Level threshold for speech input detection. Values should be in
           range from 0 to 32767. (default: 2000)

=== modified file 'adintool/Makefile.in'
--- adintool/Makefile.in	2010-07-04 15:18:40 +0000
+++ adintool/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,9 +1,9 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved 
 #
-# $Id: Makefile.in,v 1.5 2010/02/03 10:11:57 sumomo Exp $
+# $Id: Makefile.in,v 1.7 2012/07/27 08:44:48 sumomo Exp $
 #
 SHELL=/bin/sh
 .SUFFIXES:

=== modified file 'adintool/adintool.c'
--- adintool/adintool.c	2010-07-04 15:18:40 +0000
+++ adintool/adintool.c	2012-08-03 04:20:23 +0000
@@ -35,13 +35,13 @@
  * @author Akinobu LEE
  * @date   Wed Mar 23 20:43:32 2005
  *
- * $Revision: 1.8 $
+ * $Revision: 1.15 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2001-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -102,7 +102,7 @@
   fprintf(stderr, "    file        speech file (filename given from prompt)\n");
   fprintf(stderr, "    adinnet     from adinnet client (I'm server)\n");
   fprintf(stderr, "    stdin       standard tty input\n");
-  fprintf(stderr, "    (\"-input xxx\" can be used instead, as same as Julius)\n");
+  fprintf(stderr, "  (other input can be specified by \"-input xxx\" as in Julius)\n");
   fprintf(stderr, "outputdev: output data to:\n");
   fprintf(stderr, "    file        speech file (\"foo.0000.wav\" - \"foo.N.wav\"\n");
   fprintf(stderr, "    adinnet     to adinnet server (I'm client)\n");
@@ -119,7 +119,11 @@
   fprintf(stderr, "    -startid id     (file-out) recording start id (%04d)\n", startid);
 
   fprintf(stderr, "Recording and Pause segmentation options:\n");
+
+  fprintf(stderr, " (input segmentation: on for file/mic/stdin, off for adinnet)\n");
   fprintf(stderr, "  [-nosegment]          not segment input speech\n");
+  fprintf(stderr, "  [-segment]            force segmentation of input speech\n");
+  fprintf(stderr, "  [-cutsilence]         (same as \"-segment\")\n");
   fprintf(stderr, "  [-oneshot]            record only the first segment\n");
   fprintf(stderr, "  [-freq frequency]     sampling frequency in Hz    (%ld)\n", jconf->am_root->analysis.para_default.smp_freq);
   fprintf(stderr, "  [-48]                 48000Hz recording with down sampling (16kHz only)\n");
@@ -127,12 +131,15 @@
   fprintf(stderr, "  [-zc zerocrossnum]    silence cut zerocross num   (%d)\n", jconf->detect.zero_cross_num);
   fprintf(stderr, "  [-headmargin msec]    head margin length          (%d)\n", jconf->detect.head_margin_msec);
   fprintf(stderr, "  [-tailmargin msec]    tail margin length          (%d)\n", jconf->detect.tail_margin_msec);
+  fprintf(stderr, "  [-chunksize sample]   chunk size for processing   (%d)\n", jconf->detect.chunk_size);
   fprintf(stderr, "  [-nostrip]            do not strip zero samples\n");
   fprintf(stderr, "  [-zmean]              remove DC by zero mean\n");
   fprintf(stderr, "  [-raw]                output in RAW format\n");
   fprintf(stderr, "  [-autopause]          automatically pause at each input end\n");
   fprintf(stderr, "  [-loosesync]          loose sync of resume among servers\n");
   fprintf(stderr, "  [-rewind msec]        rewind input if spoken while pause at resume\n");
+  fprintf(stderr, "  [-C jconffile]        load jconf to set parameters (ignore other options\n");
+  
   fprintf(stderr, "\nLibrary configuration: ");
   confout_version(stderr);
   confout_audio(stderr);
@@ -162,6 +169,7 @@
     break;
   case 's':
     jconf->input.speech_input = SP_STDIN;
+    jconf->detect.silence_cut = 1;
     break;
   case 'a':
     jconf->input.speech_input = SP_ADINNET;
@@ -289,6 +297,12 @@
   return TRUE;
 }
 static boolean
+opt_segment(Jconf *jconf, char *arg[], int argnum)
+{
+  jconf->detect.silence_cut = 1;
+  return TRUE;
+}
+static boolean
 opt_oneshot(Jconf *jconf, char *arg[], int argnum)
 {
   continuous_segment = FALSE;
@@ -377,6 +391,7 @@
     case SP_INPUT_ALSA: fprintf(stderr, "alsa\n"); break;
     case SP_INPUT_OSS: fprintf(stderr, "oss\n"); break;
     case SP_INPUT_ESD: fprintf(stderr, "esd\n"); break;
+    case SP_INPUT_PULSEAUDIO: fprintf(stderr, "pulseaudio\n"); break;
     }
   }
 
@@ -1006,6 +1021,7 @@
   j_add_option("-startid", 1, 1, "recording start id (-out file)", opt_startid);
   j_add_option("-freq", 1, 1, "sampling frequency in Hz", opt_freq);
   j_add_option("-nosegment", 0, 0, "not segment input speech, record all", opt_nosegment);
+  j_add_option("-segment", 0, 0, "force segment input speech", opt_segment);
   j_add_option("-oneshot", 0, 0, "exit after the first input", opt_oneshot);
   j_add_option("-raw", 0, 0, "save in raw (BE) format", opt_raw);
   j_add_option("-autopause", 0, 0, "automatically pause at each input end", opt_autopause);
@@ -1111,8 +1127,21 @@
   /* interrupt handling */
   /**********************/
   if (signal(SIGINT, interrupt_record) == SIG_ERR) {
-    fprintf(stderr, "Warning: signal intterupt may collapse output\n");
-  }
+    fprintf(stderr, "Warning: signal interruption may collapse output\n");
+  }
+  if (signal(SIGTERM, interrupt_record) == SIG_ERR) {
+    fprintf(stderr, "Warning: signal interruption may collapse output\n");
+  }
+#ifdef SIGPIPE
+  if (signal(SIGPIPE, interrupt_record) == SIG_ERR) {
+    fprintf(stderr, "Warning: signal interruption may collapse output\n");
+  }
+#endif
+#ifdef SIGQUIT
+  if (signal(SIGQUIT, interrupt_record) == SIG_ERR) {
+    fprintf(stderr, "Warning: signal interruption may collapse output\n");
+  }
+#endif
 
   /***************************/
   /* initialize input device */

=== modified file 'configure'
--- configure	2010-07-04 15:18:40 +0000
+++ configure	2012-08-03 04:20:23 +0000
@@ -1065,7 +1065,7 @@
   if { (eval echo configure:1066: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.$ac_ext | *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1446,7 +1446,7 @@
       fi
     fi
 
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 

=== modified file 'configure.in'
--- configure.in	2010-07-04 15:18:40 +0000
+++ configure.in	2012-08-03 04:20:23 +0000
@@ -1,9 +1,9 @@
-dnl Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+dnl Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 dnl Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-dnl Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 dnl All rights reserved
 dnl
-dnl $Id: configure.in,v 1.4 2010/02/03 10:11:57 sumomo Exp $
+dnl $Id: configure.in,v 1.6 2012/07/27 08:44:47 sumomo Exp $
 dnl
 AC_INIT(Sample.jconf)
 AC_CONFIG_AUX_DIR(support)

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-04 15:18:40 +0000
+++ debian/changelog	2012-08-03 04:20:23 +0000
@@ -1,3 +1,10 @@
+julius (4.2.2-0ubuntu1) quantal; urgency=low
+
+  * New upstream release. (LP: #1032429)
+  * Bump Standards-Version to 3.9.3.
+
+ -- Logan Rosen <[e-mail]>  Fri, 03 Aug 2012 00:14:06 -0400
+
 julius (4.1.5-0ubuntu1) maverick; urgency=low
 
   * New upstream version. See Release.txt for a list of changes.

=== modified file 'debian/control'
--- debian/control	2010-07-04 15:18:40 +0000
+++ debian/control	2012-08-03 04:20:23 +0000
@@ -9,7 +9,7 @@
  debhelper (>= 5),
  flex,
  perl
-Standards-Version: 3.8.4
+Standards-Version: 3.9.3
 
 Package: julius
 Architecture: any

=== modified file 'generate-ngram/Makefile.in'
--- generate-ngram/Makefile.in	2010-07-04 15:18:40 +0000
+++ generate-ngram/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,9 +1,9 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 #
-# $Id: Makefile.in,v 1.8 2010/02/03 10:11:57 sumomo Exp $
+# $Id: Makefile.in,v 1.10 2012/07/27 08:44:48 sumomo Exp $
 #
 SHELL=/bin/sh
 .SUFFIXES:

=== modified file 'gramtools/Makefile.in'
--- gramtools/Makefile.in	2009-06-18 13:08:41 +0000
+++ gramtools/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,10 +1,10 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 
 # All rights reserved
 #
-# $Id: Makefile.in,v 1.3 2008/10/02 08:57:02 sumomo Exp $
+# $Id: Makefile.in,v 1.5 2012/07/27 08:44:48 sumomo Exp $
 #
 SHELL=/bin/sh
 RM=@RM@ -f

=== modified file 'gramtools/accept_check/Makefile.in'
--- gramtools/accept_check/Makefile.in	2010-07-04 15:18:40 +0000
+++ gramtools/accept_check/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 SHELL=/bin/sh

=== modified file 'gramtools/accept_check/accept_check.c'
--- gramtools/accept_check/accept_check.c	2008-07-25 17:44:08 +0000
+++ gramtools/accept_check/accept_check.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/accept_check/common.h'
--- gramtools/accept_check/common.h	2008-07-25 17:44:08 +0000
+++ gramtools/accept_check/common.h	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/accept_check/rdterm.c'
--- gramtools/accept_check/rdterm.c	2008-07-25 17:44:08 +0000
+++ gramtools/accept_check/rdterm.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/configure'
--- gramtools/configure	2010-07-04 15:18:40 +0000
+++ gramtools/configure	2012-08-03 04:20:23 +0000
@@ -1024,7 +1024,7 @@
   if { (eval echo configure:1025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.$ac_ext | *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done
@@ -1130,58 +1130,10 @@
 	{ echo "configure: error: perl not found! installation terminated" 1>&2; exit 1; }
 fi
 
-echo $ac_n "checking for yywrap in -lfl""... $ac_c" 1>&6
-echo "configure:1135: checking for yywrap in -lfl" >&5
-ac_lib_var=`echo fl'_'yywrap | sed 'y%./+-%__p_%'`
-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  ac_save_LIBS="$LIBS"
-LIBS="-lfl  $LIBS"
-cat > conftest.$ac_ext <<EOF
-#line 1143 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char yywrap();
-
-int main() {
-yywrap()
-; return 0; }
-EOF
-if { (eval echo configure:1154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-LIBS="$ac_save_LIBS"
-
-fi
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo fl | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-
-  LIBS="-lfl $LIBS"
-
-else
-  echo "$ac_t""no" 1>&6
-{ echo "configure: error: flex library not found! installation terminated" 1>&2; exit 1; }
-fi
-
 # Extract the first word of "iconv", so it can be a program name with args.
 set dummy iconv; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1185: checking for $ac_word" >&5
+echo "configure:1137: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_ICONV'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1217,7 +1169,7 @@
 	echo "configure: warning: no iconv, gram2sapixml.pl may not work" 1>&2
 else
     echo $ac_n "checking for Jcode module in perl""... $ac_c" 1>&6
-echo "configure:1221: checking for Jcode module in perl" >&5
+echo "configure:1173: checking for Jcode module in perl" >&5
     if $PERL -mJcode -e "print;"; then
         echo "$ac_t""yes" 1>&6
     else
@@ -1228,17 +1180,17 @@
 READLINE_LIBS=""
 ac_safe=`echo "readline/readline.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for readline/readline.h""... $ac_c" 1>&6
-echo "configure:1232: checking for readline/readline.h" >&5
+echo "configure:1184: checking for readline/readline.h" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1237 "configure"
+#line 1189 "configure"
 #include "confdefs.h"
 #include <readline/readline.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1242: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -1255,7 +1207,7 @@
 if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6
-echo "configure:1259: checking for readline in -lreadline" >&5
+echo "configure:1211: checking for readline in -lreadline" >&5
 ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -1263,7 +1215,7 @@
   ac_save_LIBS="$LIBS"
 LIBS="-lreadline  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 1267 "configure"
+#line 1219 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -1274,7 +1226,7 @@
 readline()
 ; return 0; }
 EOF
-if { (eval echo configure:1278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -1294,11 +1246,11 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for readline in -lreadline with -ltermcap""... $ac_c" 1>&6
-echo "configure:1298: checking for readline in -lreadline with -ltermcap" >&5
+echo "configure:1250: checking for readline in -lreadline with -ltermcap" >&5
 	ac_save_LIBS="$LIBS"
 	LIBS="$ac_save_LIBS -lreadline -ltermcap"
 	cat > conftest.$ac_ext <<EOF
-#line 1302 "configure"
+#line 1254 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <readline/readline.h>
@@ -1306,7 +1258,7 @@
 readline("");
 ; return 0; }
 EOF
-if { (eval echo configure:1310: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 	    READLINE_LIBS="-lreadline -ltermcap"
@@ -1318,10 +1270,10 @@
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 	  echo $ac_n "checking for readline in -lreadline with -lncurses""... $ac_c" 1>&6
-echo "configure:1322: checking for readline in -lreadline with -lncurses" >&5
+echo "configure:1274: checking for readline in -lreadline with -lncurses" >&5
 	  LIBS="$ac_save_LIBS -lreadline -lncurses"
 	  cat > conftest.$ac_ext <<EOF
-#line 1325 "configure"
+#line 1277 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <readline/readline.h>
@@ -1329,7 +1281,7 @@
 readline("");
 ; return 0; }
 EOF
-if { (eval echo configure:1333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 	      READLINE_LIBS="-lreadline -lncurses"
@@ -1362,9 +1314,9 @@
 EOF
 
         echo $ac_n "checking for readline verion > 4.1""... $ac_c" 1>&6
-echo "configure:1366: checking for readline verion > 4.1" >&5
+echo "configure:1318: checking for readline verion > 4.1" >&5
     cat > conftest.$ac_ext <<EOF
-#line 1368 "configure"
+#line 1320 "configure"
 #include "confdefs.h"
 #include <readline/readline.h>
 EOF
@@ -1390,17 +1342,17 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:1394: checking for $ac_hdr" >&5
+echo "configure:1346: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 1399 "configure"
+#line 1351 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:1404: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:1356: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*

=== modified file 'gramtools/configure.in'
--- gramtools/configure.in	2010-07-04 15:18:40 +0000
+++ gramtools/configure.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-dnl Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+dnl Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 dnl Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-dnl Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 dnl All rights reserved
 
 AC_INIT(00readme.txt)
@@ -57,7 +57,6 @@
 dnl if test -z "$FLEX"; then
 dnl 	AC_MSG_ERROR([flex not found! installation terminated])
 dnl fi
-AC_CHECK_LIB(fl, yywrap,,AC_MSG_ERROR([flex library not found! installation terminated]))
 AC_PATH_PROG(ICONV,iconv)
 if test -z "$ICONV"; then
 	AC_MSG_WARN([no iconv, gram2sapixml.pl may not work])

=== modified file 'gramtools/dfa_determinize/Makefile.in'
--- gramtools/dfa_determinize/Makefile.in	2010-07-04 15:18:40 +0000
+++ gramtools/dfa_determinize/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 SHELL=/bin/sh

=== modified file 'gramtools/dfa_determinize/dfa_determinize.c'
--- gramtools/dfa_determinize/dfa_determinize.c	2008-07-25 17:44:08 +0000
+++ gramtools/dfa_determinize/dfa_determinize.c	2012-08-03 04:20:23 +0000
@@ -6,12 +6,12 @@
  * @author Akinobu Lee
  * @date   Wed Oct  4 17:42:16 2006
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 2006 Kawahara Lab., Kyoto University
- * Copyright (c) 2006 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2006-2012 Kawahara Lab., Kyoto University
+ * Copyright (c) 2006-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 #include <sent/stddefs.h>

=== modified file 'gramtools/dfa_minimize/Makefile.in'
--- gramtools/dfa_minimize/Makefile.in	2010-07-04 15:18:40 +0000
+++ gramtools/dfa_minimize/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 SHELL=/bin/sh

=== modified file 'gramtools/dfa_minimize/dfa_minimize.c'
--- gramtools/dfa_minimize/dfa_minimize.c	2008-07-25 17:44:08 +0000
+++ gramtools/dfa_minimize/dfa_minimize.c	2012-08-03 04:20:23 +0000
@@ -6,12 +6,12 @@
  * @author Akinobu Lee
  * @date   Wed Oct  4 17:42:16 2006
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 2006 Kawahara Lab., Kyoto University
- * Copyright (c) 2006 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2006-2012 Kawahara Lab., Kyoto University
+ * Copyright (c) 2006-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/generate/Makefile.in'
--- gramtools/generate/Makefile.in	2010-07-04 15:18:40 +0000
+++ gramtools/generate/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 SHELL=/bin/sh

=== modified file 'gramtools/generate/common.h'
--- gramtools/generate/common.h	2008-07-25 17:44:08 +0000
+++ gramtools/generate/common.h	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/generate/gen_next.c'
--- gramtools/generate/gen_next.c	2008-07-25 17:44:08 +0000
+++ gramtools/generate/gen_next.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/generate/gen_next.h'
--- gramtools/generate/gen_next.h	2008-07-25 17:44:08 +0000
+++ gramtools/generate/gen_next.h	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/generate/generate.c'
--- gramtools/generate/generate.c	2009-06-18 13:08:41 +0000
+++ gramtools/generate/generate.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/generate/rdterm.c'
--- gramtools/generate/rdterm.c	2008-07-25 17:44:08 +0000
+++ gramtools/generate/rdterm.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/gram2sapixml/00readme-ja.txt'
--- gramtools/gram2sapixml/00readme-ja.txt	2009-06-18 13:08:41 +0000
+++ gramtools/gram2sapixml/00readme-ja.txt	2012-08-03 04:20:23 +0000
@@ -37,13 +37,7 @@
        �‡�CƒGƒ‰�[‚Æ‚È‚è‚Ü‚·�D
 
 COPYRIGHT
-       Copyright (c) 1991-2008 ‹ž“s‘åŠw ‰ÍŒ´Œ¤‹†Žº
-
-       Copyright (c) 1997-2000 �î•ñ�ˆ—��U‹»Ž–‹Æ‹¦‰ï(IPA)
-
-       Copyright (c) 2000-2008 “Þ—Ç�æ’[‰ÈŠw‹Z�p‘åŠw‰@‘åŠw Ž­–쌤‹†Žº
-
-       Copyright (c) 2005-2008 –¼ŒÃ‰®�H‹Æ‘åŠw JuliusŠJ”­ƒ`�[ƒ€
+       Copyright (c) 2002  Takashi Sumiyoshi
 
 LICENSE
        Julius ‚ÌŽg—p‹–‘ø‚É�€‚¶‚Ü‚·�D

=== modified file 'gramtools/gram2sapixml/00readme.txt'
--- gramtools/gram2sapixml/00readme.txt	2009-06-18 13:08:41 +0000
+++ gramtools/gram2sapixml/00readme.txt	2012-08-03 04:20:23 +0000
@@ -37,15 +37,7 @@
        application.
 
 COPYRIGHT
-       Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan
-
-       Copyright (c) 1991-2008 Kawahara Lab., Kyoto University
-
-       Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and
-       Technology
-
-       Copyright (c) 2005-2008 Julius project team, Nagoya Institute of
-       Technology
+       Copyright (c) 2002  Takashi Sumiyoshi
 
 LICENSE
        The same as Julius.

=== modified file 'gramtools/gram2sapixml/Makefile.in'
--- gramtools/gram2sapixml/Makefile.in	2008-07-25 17:44:08 +0000
+++ gramtools/gram2sapixml/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 SHELL=/bin/sh

=== modified file 'gramtools/mkdfa/Makefile.in'
--- gramtools/mkdfa/Makefile.in	2008-07-25 17:44:08 +0000
+++ gramtools/mkdfa/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 SHELL=/bin/sh

=== modified file 'gramtools/mkdfa/mkdfa.pl.in'
--- gramtools/mkdfa/mkdfa.pl.in	2008-07-25 17:44:08 +0000
+++ gramtools/mkdfa/mkdfa.pl.in	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 #!@PERL@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 #
 # @configure_input@ 
 #

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/Makefile.in'
--- gramtools/mkdfa/mkfa-1.44-flex/Makefile.in	2010-07-04 15:18:40 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 ## Makefile for mkfa, DFA compiler

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/dfa.c'
--- gramtools/mkdfa/mkfa-1.44-flex/dfa.c	2009-06-18 13:08:41 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/dfa.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 #include "mkfa.h"

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/dfa.h'
--- gramtools/mkdfa/mkfa-1.44-flex/dfa.h	2008-07-25 17:44:08 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/dfa.h	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/gram.y'
--- gramtools/mkdfa/mkfa-1.44-flex/gram.y	2008-07-25 17:44:08 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/gram.y	2012-08-03 04:20:23 +0000
@@ -1,8 +1,8 @@
 %{
 /*
- * Copyright (c) 1991-2005 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005      Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 #include "mkfa.h"

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c'
--- gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c	2009-06-18 13:08:41 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c	2012-08-03 04:20:23 +0000
@@ -1,14 +1,14 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
- * $Header: /cvsroot/julius/julius4/gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c,v 1.3 2008/12/05 06:45:36 sumomo Exp $
+ * $Header: /cvsroot/julius/julius4/gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c,v 1.6 2012/07/27 08:44:48 sumomo Exp $
  */
 
 #define FLEX_SCANNER
@@ -77,6 +77,10 @@
 #define YY_PROTO(proto) ()
 #endif
 
+
+#define YY_SKIP_YYWRAP
+int yywrap(void){ return 1; }
+
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/main.c'
--- gramtools/mkdfa/mkfa-1.44-flex/main.c	2008-07-25 17:44:08 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/main.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 #include "mkfa.h"

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/mkfa.h'
--- gramtools/mkdfa/mkfa-1.44-flex/mkfa.h	2008-07-25 17:44:08 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/mkfa.h	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 #include <stdio.h>

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/nfa.c'
--- gramtools/mkdfa/mkfa-1.44-flex/nfa.c	2008-07-25 17:44:08 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/nfa.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 #include "mkfa.h"

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/nfa.h'
--- gramtools/mkdfa/mkfa-1.44-flex/nfa.h	2008-07-25 17:44:08 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/nfa.h	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 void makeNFA( void );

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/triplet.c'
--- gramtools/mkdfa/mkfa-1.44-flex/triplet.c	2009-06-18 13:08:41 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/triplet.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 #include "mkfa.h"

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/triplet.h'
--- gramtools/mkdfa/mkfa-1.44-flex/triplet.h	2008-07-25 17:44:08 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/triplet.h	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 void makeTriplet( void );

=== modified file 'gramtools/mkdfa/mkfa-1.44-flex/voca.c'
--- gramtools/mkdfa/mkfa-1.44-flex/voca.c	2008-07-25 17:44:08 +0000
+++ gramtools/mkdfa/mkfa-1.44-flex/voca.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 #include "mkfa.h"

=== modified file 'gramtools/nextword/Makefile.in'
--- gramtools/nextword/Makefile.in	2010-07-04 15:18:40 +0000
+++ gramtools/nextword/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 SHELL=/bin/sh

=== modified file 'gramtools/nextword/common.h'
--- gramtools/nextword/common.h	2008-07-25 17:44:08 +0000
+++ gramtools/nextword/common.h	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/nextword/get_next.c'
--- gramtools/nextword/get_next.c	2008-07-25 17:44:08 +0000
+++ gramtools/nextword/get_next.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/nextword/nextword.c'
--- gramtools/nextword/nextword.c	2008-07-25 17:44:08 +0000
+++ gramtools/nextword/nextword.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/nextword/nextword.h'
--- gramtools/nextword/nextword.h	2008-07-25 17:44:08 +0000
+++ gramtools/nextword/nextword.h	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/nextword/rdterm.c'
--- gramtools/nextword/rdterm.c	2008-07-25 17:44:08 +0000
+++ gramtools/nextword/rdterm.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/nextword/readline.c'
--- gramtools/nextword/readline.c	2008-07-25 17:44:08 +0000
+++ gramtools/nextword/readline.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/nextword/wtoken.c'
--- gramtools/nextword/wtoken.c	2008-07-25 17:44:08 +0000
+++ gramtools/nextword/wtoken.c	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'gramtools/yomi2voca/Makefile.in'
--- gramtools/yomi2voca/Makefile.in	2008-07-25 17:44:08 +0000
+++ gramtools/yomi2voca/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 SHELL=/bin/sh

=== modified file 'gramtools/yomi2voca/yomi2voca.pl.in'
--- gramtools/yomi2voca/yomi2voca.pl.in	2009-06-18 13:08:41 +0000
+++ gramtools/yomi2voca/yomi2voca.pl.in	2012-08-03 04:20:23 +0000
@@ -1,7 +1,7 @@
 #!@PERL@
-# Copyright (c) 1991-2008 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2008 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 #
 # @configure_input@ 

=== modified file 'jclient-perl/Makefile.in'
--- jclient-perl/Makefile.in	2009-06-18 13:08:41 +0000
+++ jclient-perl/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 SHELL=/bin/sh

=== modified file 'jcontrol/Makefile.in'
--- jcontrol/Makefile.in	2010-07-04 15:18:40 +0000
+++ jcontrol/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,9 +1,9 @@
-# Copyright (c) 2002-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 2002-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 #
-# $Id: Makefile.in,v 1.4 2010/02/03 10:11:58 sumomo Exp $
+# $Id: Makefile.in,v 1.6 2012/07/27 08:44:49 sumomo Exp $
 #
 SHELL=/bin/sh
 .SUFFIXES:

=== modified file 'jcontrol/configure'
--- jcontrol/configure	2010-07-04 15:18:40 +0000
+++ jcontrol/configure	2012-08-03 04:20:23 +0000
@@ -1046,7 +1046,7 @@
   if { (eval echo configure:1047: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then
     for file in conftest.*; do
       case $file in
-      *.$ac_ext | *.c | *.o | *.obj) ;;
+      *.c | *.o | *.obj) ;;
       *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;;
       esac
     done

=== modified file 'jcontrol/configure.in'
--- jcontrol/configure.in	2010-07-04 15:18:40 +0000
+++ jcontrol/configure.in	2012-08-03 04:20:23 +0000
@@ -1,6 +1,6 @@
-dnl Copyright (c) 2002-2007 Kawahara Lab., Kyoto University
+dnl Copyright (c) 2002-2012 Kawahara Lab., Kyoto University
 dnl Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology
-dnl Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 dnl All rights reserved
 AC_INIT(jcontrol.c)
 AC_CANONICAL_HOST

=== modified file 'jcontrol/japi.h'
--- jcontrol/japi.h	2009-06-18 13:08:41 +0000
+++ jcontrol/japi.h	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Thu Mar 24 07:12:32 2005
  *
- * $Revision: 1.3 $
+ * $Revision: 1.5 $
  * 
  */
 /*
- * Copyright (c) 2002-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'jcontrol/japi_grammar.c'
--- jcontrol/japi_grammar.c	2010-07-04 15:18:40 +0000
+++ jcontrol/japi_grammar.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Thu Mar 24 07:13:41 2005
  *
- * $Revision: 1.4 $
+ * $Revision: 1.6 $
  * 
  */
 /*
- * Copyright (c) 2002-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'jcontrol/japi_misc.c'
--- jcontrol/japi_misc.c	2008-07-25 17:44:08 +0000
+++ jcontrol/japi_misc.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Thu Mar 24 11:24:18 2005
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 2002-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'jcontrol/japi_process.c'
--- jcontrol/japi_process.c	2008-07-25 17:44:08 +0000
+++ jcontrol/japi_process.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Thu Mar 24 11:24:18 2005
  *
- * $Revision: 1.1 $
+ * $Revision: 1.3 $
  * 
  */
 /*
- * Copyright (c) 2002-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'jcontrol/jcontrol.c'
--- jcontrol/jcontrol.c	2009-06-18 13:08:41 +0000
+++ jcontrol/jcontrol.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Thu Mar 24 11:49:27 2005
  *
- * $Revision: 1.4 $
+ * $Revision: 1.6 $
  * 
  */
 /*
- * Copyright (c) 2002-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 #include "japi.h"

=== modified file 'jcontrol/server.c'
--- jcontrol/server.c	2008-07-25 17:44:08 +0000
+++ jcontrol/server.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Thu Mar 24 12:07:24 2005
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 2002-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 2002-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2002-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'julius/00readme-ja.txt'
--- julius/00readme-ja.txt	2009-06-18 13:08:41 +0000
+++ julius/00readme-ja.txt	2012-08-03 04:20:23 +0000
@@ -113,6 +113,10 @@
                  ƒfƒoƒCƒX‚Ì‹¤—LŽè’i‚Æ‚µ‚Ä‘½‚­‚Ì Linux‚̃fƒXƒNƒgƒbƒvŠÂ‹«‚Å—˜—p
                  ‚³‚ê‚Ä‚¢‚é EsounD daemon ‚©‚ç‚Ì“ü —Í‚ð”FŽ¯‚·‚é�D
 
+               -chunk_size  samples
+                 ‰¹�º“ü—Í‚Ì�ˆ—�ƒoƒbƒtƒ@�iƒtƒ‰ƒOƒ�ƒ“ƒg�j‚̃TƒCƒY�D’l‚̓Tƒ“ƒvƒ‹
+                 �”�D(default: 1000)
+
                -filelist  filename
                  (-input rawfile|mfcfile Žž) filename“à‚É—ñ‹“‚³‚ê‚Ä‚¢‚é‘S‚Ä‚Ì
                  ƒtƒ@ ƒCƒ‹‚ɂ‚¢‚Ä”FŽ¯‚ð�‡ŽŸ�s‚¤�D filename‚É‚Í”FŽ¯‚·‚é“ü—Í
@@ -343,6 +347,11 @@
                  �‘ƒtƒ@ ƒCƒ‹‚Ì�s”Ô�†-1�j‚ÅŽw’è‚·‚é�DƒfƒtƒHƒ‹ƒg‚Í‚»‚ꂼ‚ê
                  "<s>", "</s>" ‚Å‚ ‚é�D
 
+               -mapunk  word_string
+                 unknown ‚ɑΉž‚·‚é’PŒê–¼‚ðŽw’è‚·‚é�DƒfƒtƒHƒ‹ƒg‚Í�C "<unk>" ‚ 
+                 ‚é‚¢‚Í "<UNK>" ‚Å‚ ‚é�D‚±‚Ì’PŒê‚Í�C ”FŽ¯Ž«�‘‚É‚¨‚¢‚Ä N-gram
+                 ‚É‚È‚¢’PŒê‚ðŽw’肵‚½�ê�‡‚Ƀ}ƒbƒsƒ“ƒO‚³‚ê ‚é’PŒê‚Å‚ ‚é�D
+
                -iwspword
                  ƒ|�[ƒY‚ɑΉž‚·‚é–³‰¹’PŒê‚ðŽ«�‘‚ɒljÁ‚·‚é�D’ljÁ‚³‚ê‚é’PŒê‚Ì“à
                  —e‚Í ƒIƒvƒVƒ‡ƒ“-iwspentry‚Å•Ï�X‚Å‚«‚é�D
@@ -999,4 +1008,4 @@
 
 
 
-                                  10/02/2008                         JULIUS(1)
+                                  02/11/2009                         JULIUS(1)

=== modified file 'julius/00readme.txt'
--- julius/00readme.txt	2009-06-18 13:08:41 +0000
+++ julius/00readme.txt	2012-08-03 04:20:23 +0000
@@ -196,6 +196,9 @@
                  At Linux, you can choose API at run time by specifying alsa,
                  oss and esd.
 
+               -chunk_size  samples
+                 Audio fragment size in number of samples. (default: 1000)
+
                -filelist  filename
                  (With -input rawfile|mfcfile) perform recognition on all
                  files listed in the file. The file should contain input file
@@ -494,6 +497,11 @@
                  beginning of sentence and end of sentence. (default: "<s>",
                  "</s>")
 
+               -mapunk  word_string
+                 Specify unknown word. Default is "<unk>" or "<UNK>". This
+                 will be used to assign word probability on unknown words,
+                 i.e. words in dictionary that are not in N-gram vocabulary.
+
                -iwspword
                  Add a word entry to the dictionary that should correspond to
                  inter-word pauses. This may improve recognition accuracy in
@@ -1279,4 +1287,4 @@
 
 
 
-                                  10/02/2008                         JULIUS(1)
+                                  02/11/2009                         JULIUS(1)

=== modified file 'julius/Makefile.in'
--- julius/Makefile.in	2010-07-04 15:18:40 +0000
+++ julius/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,11 +1,11 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 #
-# $Id: Makefile.in,v 1.8 2010/02/04 05:22:35 sumomo Exp $
+# $Id: Makefile.in,v 1.10 2012/07/27 08:44:49 sumomo Exp $
 #
 SHELL=/bin/sh
 .SUFFIXES:

=== modified file 'julius/charconv.c'
--- julius/charconv.c	2008-07-25 17:44:08 +0000
+++ julius/charconv.c	2012-08-03 04:20:23 +0000
@@ -19,13 +19,13 @@
  * @author Akinobu LEE
  * @date   Thu Feb 17 16:02:41 2005
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'julius/charconv_iconv.c'
--- julius/charconv_iconv.c	2008-07-25 17:44:08 +0000
+++ julius/charconv_iconv.c	2012-08-03 04:20:23 +0000
@@ -14,13 +14,13 @@
  * @author Akinobu LEE
  * @date   Thu Feb 17 16:02:41 2005
  *
- * $Revision: 1.3 $
+ * $Revision: 1.5 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'julius/charconv_libjcode.c'
--- julius/charconv_libjcode.c	2008-07-25 17:44:08 +0000
+++ julius/charconv_libjcode.c	2012-08-03 04:20:23 +0000
@@ -19,13 +19,13 @@
  * @author Akinobu LEE
  * @date   Thu Feb 17 16:02:41 2005
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'julius/charconv_win32.c'
--- julius/charconv_win32.c	2008-07-25 17:44:08 +0000
+++ julius/charconv_win32.c	2012-08-03 04:20:23 +0000
@@ -29,13 +29,13 @@
  * @author Akinobu LEE
  * @date   Thu Feb 17 16:02:41 2005
  *
- * $Revision: 1.3 $
+ * $Revision: 1.5 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'julius/configure.in'
--- julius/configure.in	2010-07-04 15:18:40 +0000
+++ julius/configure.in	2012-08-03 04:20:23 +0000
@@ -1,10 +1,10 @@
-dnl Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+dnl Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 dnl Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan
 dnl Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-dnl Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 dnl All rights reserved
 dnl
-dnl $Id: configure.in,v 1.5 2010/02/03 10:11:58 sumomo Exp $
+dnl $Id: configure.in,v 1.7 2012/07/27 08:44:49 sumomo Exp $
 dnl
 
 AC_INIT(main.c)

=== modified file 'julius/main.c'
--- julius/main.c	2008-07-25 17:44:08 +0000
+++ julius/main.c	2012-08-03 04:20:23 +0000
@@ -12,14 +12,14 @@
  * @author Akinobu Lee
  * @date   Wed May 18 15:02:55 2005
  *
- * $Revision: 1.3 $
+ * $Revision: 1.5 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'julius/output_file.c'
--- julius/output_file.c	2009-06-18 13:08:41 +0000
+++ julius/output_file.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Wed Dec 12 11:07:46 2007
  * 
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'julius/output_module.c'
--- julius/output_module.c	2010-07-04 15:18:40 +0000
+++ julius/output_module.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Tue Sep 06 14:46:49 2005
  *
- * $Revision: 1.6 $
+ * $Revision: 1.8 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'julius/output_stdout.c'
--- julius/output_stdout.c	2009-06-18 13:08:41 +0000
+++ julius/output_stdout.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Tue Sep 06 17:18:46 2005
  *
- * $Revision: 1.7 $
+ * $Revision: 1.10 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -555,8 +555,8 @@
     /* debug: output all graph word info */
     wordgraph_dump(stdout, r->result.wg1, winfo);
     for(wg=r->result.wg1;wg;wg=wg->next) {
-      tw1 = (TEXTWIDTH * wg->lefttime) / recog->peseqlen;
-      tw2 = (TEXTWIDTH * wg->righttime) / recog->peseqlen;
+      tw1 = (TEXTWIDTH * wg->lefttime) / r->peseqlen;
+      tw2 = (TEXTWIDTH * wg->righttime) / r->peseqlen;
       printf("%4d:", wg->id);
       for(i=0;i<tw1;i++) printf(" ");
       myprintf(" %s\n", winfo->woutput[wg->wid]);

=== modified file 'julius/recogloop.c'
--- julius/recogloop.c	2010-07-04 15:18:40 +0000
+++ julius/recogloop.c	2012-08-03 04:20:23 +0000
@@ -12,14 +12,14 @@
  * @author Akinobu Lee
  * @date   Sun Sep 02 21:12:52 2007
  *
- * $Revision: 1.3 $
+ * $Revision: 1.5 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'julius/record.c'
--- julius/record.c	2009-06-18 13:08:41 +0000
+++ julius/record.c	2012-08-03 04:20:23 +0000
@@ -29,13 +29,13 @@
  * @author Akinobu Lee
  * @date   Tue Sep 06 14:13:54 2005
  *
- * $Revision: 1.4 $
+ * $Revision: 1.6 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'julius/visual.c'
--- julius/visual.c	2008-07-25 17:44:08 +0000
+++ julius/visual.c	2012-08-03 04:20:23 +0000
@@ -21,12 +21,12 @@
  * @author Akinobu Lee
  * @date   Mon Sep 12 01:49:44 2005
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
  * Copyright (c) 2003-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/Makefile.in'
--- libjulius/Makefile.in	2009-06-18 13:08:41 +0000
+++ libjulius/Makefile.in	2012-08-03 04:20:23 +0000
@@ -1,11 +1,11 @@
-# Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+# Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 # Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan
 # Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-# Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+# Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 # All rights reserved
 
 #
-# $Id: Makefile.in,v 1.6 2008/10/02 15:01:59 sumomo Exp $
+# $Id: Makefile.in,v 1.8 2012/07/27 08:44:49 sumomo Exp $
 #
 SHELL=/bin/sh
 .SUFFIXES:

=== modified file 'libjulius/configure'
--- libjulius/configure	2010-07-04 15:18:40 +0000
+++ libjulius/configure	2012-08-03 04:20:23 +0000
@@ -592,7 +592,7 @@
 
 
 JULIUS_PRODUCTNAME=JuliusLib
-JULIUS_VERSION=4.1.5
+JULIUS_VERSION=4.2.2
 
 
 # Check whether --enable-pthread or --disable-pthread was given.

=== modified file 'libjulius/configure.in'
--- libjulius/configure.in	2010-07-04 15:18:40 +0000
+++ libjulius/configure.in	2012-08-03 04:20:23 +0000
@@ -1,10 +1,10 @@
-dnl Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+dnl Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
 dnl Copyright (c) 1997-2000 Information-technology Promotion Agency, Japan
 dnl Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
-dnl Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+dnl Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
 dnl All rights reserved
 dnl
-dnl $Id: configure.in,v 1.13 2010/05/17 09:04:17 sumomo Exp $
+dnl $Id: configure.in,v 1.17 2012/07/27 10:02:04 sumomo Exp $
 dnl
 
 AC_INIT(src/search_bestfirst_main.c)
@@ -12,7 +12,7 @@
 AC_CONFIG_AUX_DIR(../support)
 
 JULIUS_PRODUCTNAME=JuliusLib
-JULIUS_VERSION=4.1.5
+JULIUS_VERSION=4.2.2
 
 dnl Checks for options
 

=== modified file 'libjulius/include/julius/beam.h'
--- libjulius/include/julius/beam.h	2008-07-25 17:44:08 +0000
+++ libjulius/include/julius/beam.h	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Mon Mar  7 15:12:29 2005
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/include/julius/callback.h'
--- libjulius/include/julius/callback.h	2008-07-25 17:44:08 +0000
+++ libjulius/include/julius/callback.h	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Mon Nov  5 18:30:04 2007
  * 
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/include/julius/define.h'
--- libjulius/include/julius/define.h	2009-06-18 13:08:41 +0000
+++ libjulius/include/julius/define.h	2012-08-03 04:20:23 +0000
@@ -27,13 +27,13 @@
  * @author Akinobu LEE
  * @date   Mon Mar  7 15:17:26 2005
  *
- * $Revision: 1.4 $
+ * $Revision: 1.8 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -57,6 +57,7 @@
 #define LM_NGRAM_USER 3		///< User-defined statistical LM
 
 /* recognition status */
+#define J_RESULT_STATUS_BUFFER_OVERFLOW -7 ///< Input buffer overflow
 #define J_RESULT_STATUS_REJECT_POWER -6 ///< Input rejected by power
 #define J_RESULT_STATUS_TERMINATE -5 ///< Input was terminated by app. request
 #define J_RESULT_STATUS_ONLY_SILENCE -4 ///< Input contains only silence
@@ -282,6 +283,11 @@
  */
 #define FAST_FACTOR1_SUCCESSOR_LIST
 
+/**
+ * Enable score based pruning at the 1st pass.
+ * 
+ */
+#define SCORE_PRUNING
 
 #endif /* __J_DEFINE_H__ */
 

=== modified file 'libjulius/include/julius/extern.h'
--- libjulius/include/julius/extern.h	2010-07-04 15:18:40 +0000
+++ libjulius/include/julius/extern.h	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Mon Mar  7 23:19:14 2005
  *
- * $Revision: 1.16 $
+ * $Revision: 1.19 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -171,6 +171,7 @@
 void opt_release(Jconf *jconf);
 /* m_jconf.c */
 void get_dirname(char *path);
+boolean config_string_parse(char *str, Jconf *jconf);
 boolean config_file_parse(char *conffile, Jconf *jconf);
 /* m_chkparam.c */
 boolean checkpath(char *filename);

=== modified file 'libjulius/include/julius/global.h'
--- libjulius/include/julius/global.h	2009-06-18 13:08:41 +0000
+++ libjulius/include/julius/global.h	2012-08-03 04:20:23 +0000
@@ -14,13 +14,13 @@
  * @author Akinobu Lee
  * @date   Sun Sep 18 23:53:17 2005
  *
- * $Revision: 1.4 $
+ * $Revision: 1.6 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/include/julius/graph.h'
--- libjulius/include/julius/graph.h	2008-07-25 17:44:08 +0000
+++ libjulius/include/julius/graph.h	2012-08-03 04:20:23 +0000
@@ -17,13 +17,13 @@
  * @author Akinobu Lee
  * @date   Thu Aug 16 00:30:54 2007
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/include/julius/jconf.h'
--- libjulius/include/julius/jconf.h	2009-06-18 13:08:41 +0000
+++ libjulius/include/julius/jconf.h	2012-08-03 04:20:23 +0000
@@ -23,13 +23,13 @@
  * @author Akinobu Lee
  * @date   Fri Feb 16 13:42:28 2007
  *
- * $Revision: 1.8 $
+ * $Revision: 1.13 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -220,6 +220,22 @@
 } JCONF_AM;
 
 /**
+ * Name lister for language model configurations
+ * 
+ */
+typedef struct __jconf_lm_namelist__ {
+  /**
+   * Entry name
+   */
+  char *name;
+  /**
+   * Pointer to next object
+   */
+  struct __jconf_lm_namelist__ *next;
+
+} JCONF_LM_NAMELIST;
+
+/**
  * Language models (N-gram / DFA), dictionary, and related parameters.
  * 
  */
@@ -340,6 +356,16 @@
   char unknown_name[UNK_WORD_MAXLEN];
 
   /**
+   * List of additional dictionary files
+   */
+  JCONF_LM_NAMELIST *additional_dict_files;
+
+  /**
+   * List of additional dictionary entries
+   */
+  JCONF_LM_NAMELIST *additional_dict_entries;
+
+  /**
    * Pointer to next instance
    * 
    */
@@ -444,11 +470,20 @@
    */
   struct {
     /**
-     * Beam width of 1st pass. If value is -1 (not specified), system
-     * will guess the value from dictionary size.  If 0, a possible
-     * maximum value will be assigned to do full search.
+     * Beam width of rank pruning for the 1st pass. If value is -1
+     * (not specified), system will guess the value from dictionary
+     * size.  If 0, a possible maximum value will be assigned to do
+     * full search.
      */
     int specified_trellis_beam_width;
+
+#ifdef SCORE_PRUNING
+    /**
+     * Another beam width for score pruning at the 1st pass. If value
+     * is -1, or not specified, score pruning will be disabled.
+     */
+#endif
+    LOGPROB score_pruning_width;
     
 #if defined(WPAIR) && defined(WPAIR_KEEP_NLIMIT)
     /**
@@ -869,6 +904,12 @@
      * (-cutsilence / -nocutsilence)
      */
     int silence_cut;
+    /**
+     * Chunk size in samples, i.e. processing unit for audio input
+     * detection.  Segmentation will be done by this unit.
+     * 
+     */
+    int chunk_size;
 #ifdef GMM_VAD
     /**
      * (GMM_VAD) Backstep margin when speech trigger is detected.

=== modified file 'libjulius/include/julius/jfunc.h'
--- libjulius/include/julius/jfunc.h	2010-07-04 15:18:40 +0000
+++ libjulius/include/julius/jfunc.h	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Tue Nov  6 22:41:00 2007
  * 
- * $Revision: 1.7 $
+ * $Revision: 1.10 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -52,9 +52,13 @@
 void j_internal_error(char *fmt, ...);
 
 int j_config_load_args(Jconf *jconf, int argc, char *argv[]);
+int j_config_load_string(Jconf *jconf, char *string);
 int j_config_load_file(Jconf *jconf, char *filename);
 Jconf *j_config_load_args_new(int argc, char *argv[]);
+Jconf *j_config_load_string_new(char *string);
 Jconf *j_config_load_file_new(char *filename);
+void j_add_dict(JCONF_LM *lm, char *dictfile);
+void j_add_word(JCONF_LM *lm, char *wordentry);
 boolean j_adin_init(Recog *recog);
 char *j_get_current_filename(Recog *recog);
 void j_recog_info(Recog *recog);

=== modified file 'libjulius/include/julius/julius.h'
--- libjulius/include/julius/julius.h	2010-07-04 15:18:40 +0000
+++ libjulius/include/julius/julius.h	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Thu Mar 17 21:08:21 2005
  *
- * $Revision: 1.6 $
+ * $Revision: 1.8 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/include/julius/juliuslib.h'
--- libjulius/include/julius/juliuslib.h	2008-07-25 17:44:08 +0000
+++ libjulius/include/julius/juliuslib.h	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Tue Nov  6 22:42:12 2007
  * 
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/include/julius/misc.h'
--- libjulius/include/julius/misc.h	2008-07-25 17:44:08 +0000
+++ libjulius/include/julius/misc.h	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Mon May 30 15:58:16 2005
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/include/julius/multi-gram.h'
--- libjulius/include/julius/multi-gram.h	2008-07-25 17:44:08 +0000
+++ libjulius/include/julius/multi-gram.h	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Fri Jul  8 14:47:05 2005
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/include/julius/plugin.h'
--- libjulius/include/julius/plugin.h	2009-06-18 13:08:41 +0000
+++ libjulius/include/julius/plugin.h	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Sat Aug  2 13:04:15 2008
  * 
- * $Revision: 1.1 $
+ * $Revision: 1.3 $
  * 
  */
 /*
- * Copyright (c) 1991-2008 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2008 Julius project team, Nagoya Institute of Technology, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/include/julius/recog.h'
--- libjulius/include/julius/recog.h	2010-07-04 15:18:40 +0000
+++ libjulius/include/julius/recog.h	2012-08-03 04:20:23 +0000
@@ -70,13 +70,13 @@
  * @author Akinobu Lee
  * @date   Fri Feb 16 13:42:28 2007
  *
- * $Revision: 1.11 $
+ * $Revision: 1.16 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -123,6 +123,11 @@
   int n_end;            ///< end index of in-beam nodes on @a tindex
   int tl;               ///< Current work area id (0 or 1, swapped for each frame)
   int tn;               ///< Next work area id (0 or 1, swapped for each frame)
+#ifdef SCORE_PRUNING
+  LOGPROB score_pruning_max;	  ///< Maximum score at current frame
+  LOGPROB score_pruning_threshold;///< Score threshold for score pruning
+  int score_pruning_count;	  ///< Number of tokens pruned by score (debug)
+#endif
     
   /* Active token list */
   TOKENID *token;       ///< Active token list that holds currently assigned tokens for each tree node
@@ -224,6 +229,7 @@
   LOGPROB *sentcm = NULL;       ///< Confidence score of each sentence
   LOGPROB *wordcm = NULL;       ///< Confidence score of each word voted from @a sentcm
   int sentnum;          ///< Allocated length of @a sentcm
+  int wordnum;          ///< Allocated length of @a wordcm
 # endif
 #endif /* CONFIDENCE_MEASURE */
 
@@ -356,6 +362,7 @@
   int thres;            ///< Input Level threshold (0-32767)
   int noise_zerocross;  ///< Computed threshold of zerocross num in the cycle buffer
   int nc_max;           ///< Computed number of fragments for tail margin
+  int chunk_size;	///< audio process unit
   boolean adin_cut_on;  ///< TRUE if do input segmentation by silence
   boolean silence_cut_default; ///< Device-dependent default value of adin_cut_on()
   boolean strip_flag;   ///< TRUE if skip invalid zero samples
@@ -426,6 +433,7 @@
 
   unsigned int total_captured_len; ///< Total number of recorded samples from start until now
   unsigned int last_trigger_sample; ///< Last speech area was triggeed at this sample
+  unsigned int last_trigger_len; // Length of last speech area 
 
   char current_input_name[MAXPATHLEN]; ///< File or device name of current input
 

=== modified file 'libjulius/include/julius/search.h'
--- libjulius/include/julius/search.h	2008-07-25 17:44:08 +0000
+++ libjulius/include/julius/search.h	2012-08-03 04:20:23 +0000
@@ -29,13 +29,13 @@
  * @author Akinobu Lee
  * @date   Wed Sep 07 07:40:11 2005
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/include/julius/useropt.h'
--- libjulius/include/julius/useropt.h	2008-07-25 17:44:08 +0000
+++ libjulius/include/julius/useropt.h	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Sun Sep 02 03:09:12 2007
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/include/julius/wchmm.h'
--- libjulius/include/julius/wchmm.h	2009-06-18 13:08:41 +0000
+++ libjulius/include/julius/wchmm.h	2012-08-03 04:20:23 +0000
@@ -28,13 +28,13 @@
  * @author Akinobu Lee
  * @date   Sun Sep 18 21:31:32 2005
  *
- * $Revision: 1.4 $
+ * $Revision: 1.7 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -43,16 +43,6 @@
 
 //#define		MAXWCNSTEP  40000 ///< Number of states to be allocated at once
 
-/**
- * Element of successor word list for LM factoring computation.
- * 
- */
-typedef struct s_cell {
-  WORD_ID word;			///< N-gram word ID
-  struct s_cell *next;		///< Pointer to next element, or NULL if terminated
-} S_CELL;
-
-
 #ifdef PASS1_IWCD
 
 /* Cross-word triphone handling */
@@ -251,13 +241,16 @@
 #endif
   /* Successor lists on the tree are stored on sequencial list at @a sclist,
      and each node has index to the list */
-  S_CELL **sclist;		///< List of successor list [scid]
-  int *sclist2node;		///< Mapping successor list [scid] to node
-  int   scnum;			///< Number of factoring nodes that has successor list
+  /* sclist and sclen are used at 2-gram factoring only */
+  /* scword is used at 1-gram factoring only */
 #ifdef UNIGRAM_FACTORING
+  WORD_ID *scword;		///< successor word[scid]
   LOGPROB *fscore;		///< List of 1-gram factoring score [-scid]
   int fsnum;			///< Number of @a fscore
 #endif
+  WORD_ID **sclist;		///< List of successor list [scid]
+  WORD_ID *sclen;		///< Length of each succcessor list [scid]
+  int   scnum;			///< Total number of factoring nodes that has successor list
   BMALLOC_BASE *malloc_root;	///< Pointer for block memory allocation
 #ifdef PASS1_IWCD
   APATNODE *lcdset_category_root; ///< Index of lexicon-dependent category-aware pseudo phone set when used on Julian

=== modified file 'libjulius/src/adin-cut.c'
--- libjulius/src/adin-cut.c	2010-07-04 15:18:40 +0000
+++ libjulius/src/adin-cut.c	2012-08-03 04:20:23 +0000
@@ -95,13 +95,13 @@
  * @author Akinobu LEE
  * @date   Sat Feb 12 13:20:53 2005
  *
- * $Revision: 1.12 $
+ * $Revision: 1.18 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -162,12 +162,17 @@
   /* calc & set internal parameter from configuration */
   freq = jconf->input.sfreq;
   samples_in_msec = (float) freq / (float)1000.0;
+  adin->chunk_size = jconf->detect.chunk_size;
   /* cycle buffer length = head margin length */
   adin->c_length = (int)((float)jconf->detect.head_margin_msec * samples_in_msec);	/* in msec. */
+  if (adin->chunk_size > adin->c_length) {
+    jlog("ERROR: adin_setup_param: chunk size (%d) > header margin (%d)\n", adin->chunk_size, adin->c_length);
+    return FALSE;
+  }
   /* compute zerocross trigger count threshold in the cycle buffer */
   adin->noise_zerocross = jconf->detect.zero_cross_num * adin->c_length / freq;
   /* variables that comes from the tail margin length (in wstep) */
-  adin->nc_max = (int)((float)(jconf->detect.tail_margin_msec * samples_in_msec / (float)DEFAULT_WSTEP)) + 2;
+  adin->nc_max = (int)((float)(jconf->detect.tail_margin_msec * samples_in_msec / (float)adin->chunk_size)) + 2;
   adin->sbsize = jconf->detect.tail_margin_msec * samples_in_msec + (adin->c_length * jconf->detect.zero_cross_num / 200);
   adin->c_offset = 0;
 
@@ -299,7 +304,7 @@
   int ad_process_ret;
   int imax, len, cnt;
   int wstep;
-  int end_status;	/* return value */
+  int end_status = 0;	/* return value */
   boolean transfer_online_local;	/* local repository of transfer_online */
   int zc;		/* count of zero cross */
 
@@ -363,7 +368,7 @@
 	If no data exists in the device (in case of mic input), ad_read()
 	will return 0.  If reached end of stream (in case end of file or
 	receive end ack from tcpip client), it will return -1.
-	If error, returns -2.
+	If error, returns -2. If the device requests segmentation, returns -3.
       */
       if (a->down_sample) {
 	/* get 48kHz samples to temporal buffer */
@@ -493,7 +498,7 @@
     /* prepare for processing samples in temporary buffer */
     /******************************************************/
     
-    wstep = DEFAULT_WSTEP;	/* process unit (should be smaller than cycle buffer) */
+    wstep = a->chunk_size;	/* process unit (should be smaller than cycle buffer) */
 
     /* imax: total length that should be processed at one ad_read() call */
     /* if in real-time mode and not threaded, recognition process 
@@ -562,6 +567,10 @@
 	    /* record time */
 	    a->last_trigger_sample = a->total_captured_len - a->current_len + i + wstep - a->zc.valid_len;
 	    callback_exec(CALLBACK_EVENT_SPEECH_START, recog);
+	    a->last_trigger_len = 0;
+	    if (a->zc.valid_len > wstep) {
+	      a->last_trigger_len += a->zc.valid_len - wstep;
+	    }
 
 	    /****************************************/
 	    /* flush samples stored in cycle buffer */
@@ -638,6 +647,10 @@
 	      /* reset noise counter */
 	      a->nc = 0;
 
+	      if (a->sblen > 0) {
+		a->last_trigger_len += a->sblen;
+	      }
+
 #ifdef TMP_FIX_200602
 	      if (ad_process != NULL
 #ifdef HAVE_PTHREAD
@@ -771,6 +784,8 @@
 	    jlog("DEBUG: %d processed, rest_tail=%d\n", wstep, a->rest_tail);
 #endif
 	  }
+	  a->last_trigger_len += wstep;
+
 #ifdef TMP_FIX_200602
 	  if (ad_process != NULL
 #ifdef HAVE_PTHREAD
@@ -875,7 +890,9 @@
       /* reset status */
       a->need_init = TRUE;		/* bufer status shoule be reset at next call */
     }
-    end_status = (a->bp) ? 1 : 0;
+    if (end_status >= 0) {
+      end_status = (a->bp) ? 1 : 0;
+    }
   }
   
   return(end_status);
@@ -948,7 +965,9 @@
 
   ret = adin_cut(adin_store_buffer, NULL, recog);
 
-  if (ret == -1) {		/* error */
+  if (ret == -2) {		/* termination request by ad_check? */
+    jlog("Error: adin thread exit with termination request by checker\n");
+  } else if (ret == -1) {	/* error */
     jlog("Error: adin thread exit with error\n");
   } else if (ret == 0) {	/* EOF */
     jlog("Stat: adin thread end with EOF\n");
@@ -1021,17 +1040,40 @@
 
   if (recog->adin->adinthread_ended) return TRUE;
 
+  /* send a cencellation request to the A/D-in thread */
   ret = pthread_cancel(recog->adin->adin_thread);
-  if (ret == 0) {
-    jlog("STAT: AD-in thread deleted\n");
-  } else {
+  if (ret != 0) {
     if (ret == ESRCH) {
       jlog("STAT: adin_thread_cancel: no A/D-in thread\n");
+      recog->adin->adinthread_ended = TRUE;
+      return TRUE;
     } else {
       jlog("Error: adin_thread_cancel: failed to cancel A/D-in thread\n");
       return FALSE;
     }
   }
+  /* wait for the thread to terminate */
+  ret = pthread_join(recog->adin->adin_thread, NULL);
+  if (ret != 0) {
+    if (ret == EINVAL) {
+      jlog("InternalError: adin_thread_cancel: AD-in thread is invalid\n");
+      recog->adin->adinthread_ended = TRUE;
+      return FALSE;
+    } else if (ret == ESRCH) {
+      jlog("STAT: adin_thread_cancel: no A/D-in thread\n");
+      recog->adin->adinthread_ended = TRUE;
+      return TRUE;
+    } else if (ret == EDEADLK) {
+      jlog("InternalError: adin_thread_cancel: dead lock or self thread?\n");
+      recog->adin->adinthread_ended = TRUE;
+      return FALSE;
+    } else {
+      jlog("Error: adin_thread_cancel: failed to wait end of A/D-in thread\n");
+      return FALSE;
+    }
+  }
+
+  jlog("STAT: AD-in thread deleted\n");
   recog->adin->adinthread_ended = TRUE;
   return TRUE;
 }
@@ -1084,6 +1126,7 @@
 #ifdef THREAD_DEBUG
   jlog("DEBUG: process: reset, speechlen = %d, online=%d\n", a->speechlen, a->transfer_online);
 #endif
+  a->adinthread_buffer_overflowed = FALSE;
   pthread_mutex_unlock(&(a->mutex));
 
   /* main processing loop */
@@ -1106,7 +1149,6 @@
       jlog("WARNING: adin_thread_process: too long input (> %d samples), segmented now\n", MAXSPEECHLEN);
       /* segment input here */
       pthread_mutex_lock(&(a->mutex));
-      a->adinthread_buffer_overflowed = FALSE;
       a->speechlen = 0;
       a->transfer_online = transfer_online_local = FALSE;
       pthread_mutex_unlock(&(a->mutex));
@@ -1289,6 +1331,7 @@
   if (debug2_flag && a->input_side_segment) jlog("Stat: adin_begin: skip\n");
   if (a->input_side_segment == FALSE) {
     a->total_captured_len = 0;
+    a->last_trigger_len = 0;
     if (a->need_zmean) zmean_reset();
     if (a->ad_begin != NULL) return(a->ad_begin(file_or_dev_name));
   }

=== modified file 'libjulius/src/backtrellis.c'
--- libjulius/src/backtrellis.c	2008-07-25 17:44:08 +0000
+++ libjulius/src/backtrellis.c	2012-08-03 04:20:23 +0000
@@ -46,13 +46,13 @@
  * @author Akinobu LEE
  * @date   Tue Feb 22 15:40:01 2005
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/src/beam.c'
--- libjulius/src/beam.c	2010-07-04 15:18:40 +0000
+++ libjulius/src/beam.c	2012-08-03 04:20:23 +0000
@@ -42,13 +42,13 @@
  * @author Akinobu LEE
  * @date   Tue Feb 22 17:00:45 2005
  *
- * $Revision: 1.14 $
+ * $Revision: 1.21 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -219,6 +219,7 @@
 static void
 re_compute_lattice_lm(WordGraph *root, WCHMM_INFO *wchmm)
 {
+  WordGraph *wg;
   int i;
   
   for(wg=root;wg;wg=wg->next) {
@@ -1707,6 +1708,10 @@
 	      new->last_lscore = 0.0;
 #else
 	      new->last_lscore = d->penalty1;
+#ifdef CLASS_NGRAM
+	      /* add per-word penalty */
+	      new->last_lscore += wchmm->winfo->cprob[i];
+#endif
 #endif
 	      if (wchmm->hmminfo->multipath) {
 		new->score = new->last_lscore;
@@ -1875,6 +1880,11 @@
   }
 #endif
 
+#ifdef SCORE_PRUNING
+  d->score_pruning_threshold = LOG_ZERO;
+  d->score_pruning_count = 0;
+#endif
+
   return TRUE;
 }
 
@@ -1907,6 +1917,9 @@
   TOKEN2 *tknext;
   TOKENID tknextid;
 
+  /* does not propagate invalid token */
+  if (next_score <= LOG_ZERO) return;
+
   if ((tknextid = node_exist_token(d, d->tn, next_node, last_tre->wid)) != TOKENID_UNDEFINED) {
     /* Á«°ÜÀè¥Î¡¼¥É¤Ë¤Ï´û¤Ë¾¥Î¡¼¥É¤«¤éÅÁȺѤß: ¥¹¥³¥¢¤¬¹â¤¤¤Û¤¦¤ò»Ä¤¹ */
     /* the destination node already has a token: compare score */
@@ -1922,9 +1935,7 @@
   } else {
     /* Á«°ÜÀè¥Î¡¼¥É¤Ï̤ÅÁÈÂ: ¿·µ¬¥È¡¼¥¯¥ó¤òºî¤Ã¤Æ³ä¤êÉÕ¤±¤ë */
     /* token unassigned: create new token and assign */
-    if (next_score > LOG_ZERO) { /* valid token */
-      tknextid = create_token(d); /* get new token */
-    }
+    tknextid = create_token(d); /* get new token */
     tknext = &(d->tlist[d->tn][tknextid]);
     tknext->last_tre = last_tre; /* propagate last word info */
     tknext->last_cword = last_cword; /* propagate last context word info */
@@ -2387,6 +2398,10 @@
       /* grammar: ñ¸ìÁÞÆþ¥Ú¥Ê¥ë¥Æ¥£¤òÄɲà */
       /* grammar: add insertion penalty */
       ngram_score_cache = d->penalty1;
+#ifdef CLASS_NGRAM
+      /* add per-word penalty of last word as delayed penalty */
+      ngram_score_cache += wchmm->winfo->cprob[last_word];
+#endif
       tmpsum += ngram_score_cache;
 
       /* grammar: deterministic factoring (in case category-tree not enabled) */
@@ -2514,7 +2529,12 @@
     if (wchmm->winfo->is_transparent[sword] && wchmm->winfo->is_transparent[d->wordend_best_last_cword]) {
       tmpsum += d->lm_penalty_trans;
     }
-
+#ifdef SCORE_PRUNING
+    if (tmpsum < d->score_pruning_threshold) {
+      d->score_pruning_count++;
+      continue;
+    }
+#endif
     if (wchmm->hmminfo->multipath) {
       /* since top node has no ouput, we should go one more step further */
       if (wchmm->self_a[next_node] != LOG_ZERO) {
@@ -2605,6 +2625,7 @@
   FSBeam *d;
   int j;
   TOKEN2  *tk;
+  LOGPROB minscore;
 
   /* local copied variables */
   int tn, tl;
@@ -2686,6 +2707,12 @@
       /* tk: token data  node: lexicon tree node ID that holds the 'tk' */
       tk = &(d->tlist[tl][d->tindex[tl][j]]);
       if (tk->score <= LOG_ZERO) continue; /* invalid node */
+#ifdef SCORE_PRUNING
+      if (tk->score < d->score_pruning_threshold) {
+	d->score_pruning_count++;
+	continue;
+      }
+#endif
       node = tk->node;
       /*********************************/
       /* 2.1. ñ¸ìÆâÁ«°Ü               */
@@ -2706,7 +2733,12 @@
     for(j = d->n_start; j <= d->n_end; j++) {
       tk = &(d->tlist[tn][d->tindex[tn][j]]);
       node = tk->node;
-      
+#ifdef SCORE_PRUNING
+      if (tk->score < d->score_pruning_threshold) {
+	d->score_pruning_count++;
+	continue;
+      }
+#endif
       /* Á«°Ü¸µ¥Î¡¼¥É¤¬Ã±¸ì½ªÃ¼¤Ê¤é¤Ð */
       /* if source node is end state of a word, */
       if (wchmm->stend[node] != WORD_INVALID) {
@@ -2761,6 +2793,12 @@
       /* tk: token data  node: lexicon tree node ID that holds the 'tk' */
       tk = &(d->tlist[tl][d->tindex[tl][j]]);
       if (tk->score <= LOG_ZERO) continue; /* invalid node */
+#ifdef SCORE_PRUNING
+      if (tk->score < d->score_pruning_threshold) {
+	d->score_pruning_count++;
+	continue;
+      }
+#endif
       node = tk->node;
       
       /*********************************/
@@ -2838,6 +2876,10 @@
   /* º£°·¤Ã¤Æ¤¤¤ë¤Î¤¬ÆþÎϤκǽª¥Õ¥ì¡¼¥à¤Î¾ì¹ç½ÐÎϳÎΨ¤Ï·×»»¤·¤Ê¤¤ */
   /* don't calculate the last frame (transition only) */
 
+#ifdef SCORE_PRUNING
+  d->score_pruning_max = LOG_ZERO;
+  minscore = 0.0;
+#endif
   if (wchmm->hmminfo->multipath) {
     if (! final_for_multipath) {
       for (j = 0; j < d->tnum[tn]; j++) {
@@ -2845,15 +2887,31 @@
 	/* skip non-output state */
 	if (wchmm->state[tk->node].out.state == NULL) continue;
 	tk->score += outprob_style(wchmm, tk->node, tk->last_tre->wid, t, param);
+#ifdef SCORE_PRUNING
+	if (d->score_pruning_max < tk->score) d->score_pruning_max = tk->score;
+	if (minscore > tk->score) minscore = tk->score;
+#endif
       }
     }
   } else {
     for (j = 0; j < d->tnum[tn]; j++) {
       tk = &(d->tlist[tn][d->tindex[tn][j]]);
       tk->score += outprob_style(wchmm, tk->node, tk->last_tre->wid, t, param);
+#ifdef SCORE_PRUNING
+      if (d->score_pruning_max < tk->score) d->score_pruning_max = tk->score;
+      if (minscore > tk->score) minscore = tk->score;
+#endif
     }
   }
-
+#ifdef SCORE_PRUNING
+  if (r->config->pass1.score_pruning_width >= 0.0) {
+    d->score_pruning_threshold = d->score_pruning_max - r->config->pass1.score_pruning_width;
+    //printf("width=%f, tnum=%d\n", d->score_pruning_max - minscore, d->tnum[tn]);
+  } else {
+    // disable score pruning
+    d->score_pruning_threshold = LOG_ZERO;
+  }
+#endif
   /*******************************************************/
   /* 4. ¥¹¥³¥¢¤Ç¥È¡¼¥¯¥ó¤ò¥½¡¼¥È¤·¥Ó¡¼¥àÉýʬ¤Î¾å°Ì¤ò·èÄê */
   /*    sort tokens by score up to beam width            */
@@ -2980,6 +3038,9 @@
     }
 
   }
+#ifdef SCORE_PRUNING
+  if (debug2_flag) jlog("STAT: %d tokens pruned by score beam\n", d->score_pruning_count);
+#endif
     
 }
 

=== modified file 'libjulius/src/confnet.c'
--- libjulius/src/confnet.c	2010-07-04 15:18:40 +0000
+++ libjulius/src/confnet.c	2012-08-03 04:20:23 +0000
@@ -16,13 +16,13 @@
  * @author Akinobu Lee
  * @date   Thu Aug 16 00:15:51 2007
  *
- * $Revision: 1.4 $
+ * $Revision: 1.6 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/src/default.c'
--- libjulius/src/default.c	2009-06-18 13:08:41 +0000
+++ libjulius/src/default.c	2012-08-03 04:20:23 +0000
@@ -17,13 +17,13 @@
  * @author Akinobu Lee
  * @date   Fri Feb 16 15:05:43 2007
  *
- * $Revision: 1.10 $
+ * $Revision: 1.15 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -77,6 +77,7 @@
   j->detect.tail_margin_msec		= 400;
   j->detect.zero_cross_num		= 60;
   j->detect.silence_cut			= 2; /* accept device default */
+  j->detect.chunk_size			= 1000;
 #ifdef GMM_VAD
   j->detect.gmm_margin			= DEFAULT_GMM_MARGIN;
   j->detect.gmm_uptrigger_thres		= 0.7;
@@ -194,6 +195,8 @@
   strcpy(j->wordrecog_tail_silence_model_name, "silE");
   j->wordrecog_silence_context_name[0] = '\0';
   strcpy(j->unknown_name, UNK_WORD_DEFAULT); // or UNK_WORD_DEFAULT2
+  j->additional_dict_files		= NULL;
+  j->additional_dict_entries		= NULL;
 }
 
 /** 
@@ -233,6 +236,9 @@
   j->lmp.lmp_specified			= FALSE;
 
   j->pass1.specified_trellis_beam_width	= -1;
+#ifdef SCORE_PRUNING
+  j->pass1.score_pruning_width		= -1.0;
+#endif
 #if defined(WPAIR) && defined(WPAIR_KEEP_NLIMIT)
   j->pass1.wpair_keep_nlimit		= 3;
 #endif

=== modified file 'libjulius/src/dfa_decode.c'
--- libjulius/src/dfa_decode.c	2010-07-04 15:18:40 +0000
+++ libjulius/src/dfa_decode.c	2012-08-03 04:20:23 +0000
@@ -47,13 +47,13 @@
  * @author Akinobu LEE
  * @date   Mon Mar  7 15:31:00 2005
  *
- * $Revision: 1.3 $
+ * $Revision: 1.6 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -115,6 +115,10 @@
 	      nw[num]->lscore = 0.0;
 #else
 	      nw[num]->lscore = r->config->lmp.penalty2;
+#ifdef CLASS_NGRAM
+	      /* add per-word penalty */
+	      nw[num]->lscore += r->wchmm->winfo->cprob[nw[num]->id];
+#endif
 #endif
 	      num++;
 	      if (num >= maxnw) return -1; /* buffer overflow */
@@ -179,6 +183,10 @@
 	  nw[num]->next_state = ns2;
 	  nw[num]->can_insert_sp = TRUE;
 	  nw[num]->lscore = r->config->lmp.penalty2;
+#ifdef CLASS_NGRAM
+	  /* add per-word penalty */
+	  nw[num]->lscore += r->wchmm->winfo->cprob[nw[num]->id];
+#endif
 	  num++;
 	  if (num >= maxnw) return -1; /* buffer overflow */
 	}
@@ -189,8 +197,11 @@
 	nw[num]->id = dfa->term.tw[cate][iw];
 	nw[num]->next_state = ns;
 	nw[num]->can_insert_sp = FALSE;
-
 	nw[num]->lscore = r->config->lmp.penalty2;
+#ifdef CLASS_NGRAM
+	/* add per-word penalty */
+	nw[num]->lscore += r->wchmm->winfo->cprob[nw[num]->id];
+#endif
 	num++;
 	if (num >= maxnw) return -1; /* buffer overflow */
       }

=== modified file 'libjulius/src/factoring_sub.c'
--- libjulius/src/factoring_sub.c	2009-06-18 13:08:41 +0000
+++ libjulius/src/factoring_sub.c	2012-08-03 04:20:23 +0000
@@ -152,14 +152,14 @@
  * @author Akinobu LEE
  * @date   Mon Mar  7 23:20:26 2005
  *
- * $Revision: 1.3 $
+ * $Revision: 1.6 $
  * 
  */
 
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -169,193 +169,6 @@
 
 /** 
  * <JA>
- * @brief  ÌÚ¹½Â¤²½¼­½ñ¾å¤Î¤¢¤ë¥Î¡¼¥É¤Î successor list ¤Ëñ¸ì¤òÄɲ乤ë. 
- * 
- * ¤¹¤Ç¤ËƱ¤¸Ã±¸ì¤¬ÅÐÏ¿¤µ¤ì¤Æ¤¤¤ì¤Ð¡¤¿·¤¿¤ËÅÐÏ¿¤Ï¤µ¤ì¤Ê¤¤. 
- * ñ¸ì¤ÏID¤Ç¾º½ç¤ËÊݸ¤µ¤ì¤ë. 
- * 
- * @param wchmm [i/o] ÌÚ¹½Â¤²½¼­½ñ
- * @param node [in] ¥Î¡¼¥ÉÈÖ¹æ
- * @param w [in] ñ¸ìID
- * </JA>
- * <EN>
- * @brief  Add a word to the successor list on a node in tree lexicon.
- * Words in lists should be ordered by ID.
- * 
- * @param wchmm [i/o] tree lexicon
- * @param node [in] node id
- * @param w [in] word id
- * </EN>
- */
-static void
-add_successor(WCHMM_INFO *wchmm, int node, WORD_ID w)
-{
-  S_CELL *sctmp, *sc;
-
-  /* malloc a new successor list element */
-  sctmp=(S_CELL *) mymalloc(sizeof(S_CELL));
-  /* assign word ID to the new element */
-  sctmp->word = w;
-  /* add the new element to existing list (keeping order) */
-  if (wchmm->state[node].scid == 0) {
-    j_internal_error("add_successor: sclist id not assigned to branch node?\n");
-  }
-  sc = wchmm->sclist[wchmm->state[node].scid];
-  if (sc == NULL || sctmp->word < sc->word) {
-    sctmp->next = sc;
-    wchmm->sclist[wchmm->state[node].scid] = sctmp;
-  } else {
-    for(;sc;sc=sc->next) {
-      if (sc->next == NULL || sctmp->word < (sc->next)->word) {
-	if (sctmp->word == sc->word) break; /* avoid duplication */
-	sctmp->next = sc->next;
-	sc->next = sctmp;
-	break;
-      }
-    }
-  }
-}
-
-/** 
- * <JA>
- * £²¤Ä¤Î¥Î¡¼¥É¾å¤Î successor list ¤¬°ìÃפ¹¤ë¤«¤É¤¦¤«¥Á¥§¥Ã¥¯¤¹¤ë
- * 
- * @param wchmm [in] ÌÚ¹½Â¤²½¼­½ñ
- * @param node1 [in] £±¤Ä¤á¤Î¥Î¡¼¥ÉID
- * @param node2 [in] £²¤Ä¤á¤Î¥Î¡¼¥ÉID
- * 
- * @return ´°Á´¤Ë°ìÃפ¹¤ì¤Ð TRUE¡¤°ìÃפ·¤Ê¤±¤ì¤Ð FALSE. 
- * </JA>
- * <EN>
- * Check if successor lists on two nodes are the same.
- * 
- * @param wchmm [in] tree lexicon
- * @param node1 [in] 1st node id
- * @param node2 [in] 2nd node id
- * 
- * @return TRUE if they have the same successor list, or FALSE if they differ.
- * </EN>
- */
-static boolean
-match_successor(WCHMM_INFO *wchmm, int node1, int node2)
-{
-  S_CELL *sc1,*sc2;
-
-  /* assume successor is sorted by ID */
-  if (wchmm->state[node1].scid == 0 || wchmm->state[node2].scid == 0) {
-    j_internal_error("match_successor: sclist id not assigned to branch node?\n");
-  }
-  sc1 = wchmm->sclist[wchmm->state[node1].scid];
-  sc2 = wchmm->sclist[wchmm->state[node2].scid];
-  for (;;) {
-    if (sc1 == NULL || sc2 == NULL) {
-      if (sc1 == NULL && sc2 == NULL) {
-	return TRUE;
-      } else {
-	return FALSE;
-      }
-    } else if (sc1->word != sc2->word) {
-      return FALSE;
-    }
-    sc1 = sc1->next;
-    sc2 = sc2->next;
-  }
-}
-
-/** 
- * <JA>
- * »ØÄê¥Î¡¼¥É¾å¤Î successor list ¤ò¶õ¤Ë¤¹¤ë. 
- * 
- * @param wchmm [i/o] ÌÚ¹½Â¤²½¼­½ñ
- * @param scid [in] node id
- * </JA>
- * <EN>
- * Free successor list at the node
- * 
- * @param wchmm [i/o] tree lexicon
- * @param scid [in] node id
- * </EN>
- */
-static void
-free_successor(WCHMM_INFO *wchmm, int scid)
-{
-  S_CELL *sc;
-  S_CELL *sctmp;
-
-  /* free sclist */
-  sc = wchmm->sclist[scid];
-  while (sc != NULL) {
-    sctmp = sc;
-    sc = sc->next;
-    free(sctmp);
-  }
-}
-
-/** 
- * <JA>
- * ÌÚ¹½Â¤²½¼­½ñ¾å¤«¤é¥ê¥ó¥¯¤¬¾Ã¤µ¤ì¤¿ successor list ¤Ë¤Ä¤¤¤Æ¡¤
- * ¤½¤Î¼ÂÂΤòºï½ü¤·¤Æ¥ê¥¹¥È¤òµÍ¤á¤ë¥¬¡¼¥Ù¡¼¥¸¥³¥ì¥¯¥·¥ç¥ó¤ò¹Ô¤¦. 
- * 
- * @param wchmm [i/o] ÌÚ¹½Â¤²½¼­½ñ
- * </JA>
- * <EN>
- * Garbage collection of the successor list, by deleting successor lists
- * to which the link was deleted on the lexicon tree.
- * 
- * @param wchmm [i/o] tree lexiton
- * </EN>
- */
-static void
-compaction_successor(WCHMM_INFO *wchmm)
-{
-  int src, dst;
-
-  dst = 1;
-  for(src=1;src<wchmm->scnum;src++) {
-    if (wchmm->state[wchmm->sclist2node[src]].scid <= 0) {
-      /* already freed, skip */
-      continue;
-    }
-    if (dst != src) {
-      wchmm->sclist[dst] = wchmm->sclist[src];
-      wchmm->sclist2node[dst] = wchmm->sclist2node[src];
-      wchmm->state[wchmm->sclist2node[dst]].scid = dst;
-    }
-    dst++;
-  }
-  if (debug2_flag) {
-    jlog("DEBUG: successor list shrinked from %d to %d\n", wchmm->scnum, dst);
-  }
-  wchmm->scnum = dst;
-}
-
-/** 
- * <JA>
- * successor list ÍѤ˳ä¤êÉÕ¤±¤é¤ì¤¿¥á¥â¥êÎΰè¤òÍ­¸ú¤ÊŤµ¤Ë½Ì¤á¤ë. 
- * ½é´ü¹½ÃÛ»þ¤ä¡¤1-gram factoring ¤Î¤¿¤á¤Ëºï½ü¤µ¤ì¤¿ successor list ʬ¤Î
- * ¥á¥â¥ê¤ò²òÊü¤¹¤ë. 
- * 
- * @param wchmm [i/o] ÌÚ¹½Â¤²½¼­½ñ
- * </JA>
- * <EN>
- * Shrink the memory area that has been allocated for building successor list.
- * 
- * @param wchmm [i/o] tree lexicon
- * </EN>
- */
-static void
-shrink_successor(WCHMM_INFO *wchmm)
-{
-  if (wchmm->sclist) {
-    wchmm->sclist = (S_CELL **)myrealloc(wchmm->sclist, sizeof(S_CELL *) * wchmm->scnum);
-  }
-  if (wchmm->sclist2node) {
-    wchmm->sclist2node = (int *)myrealloc(wchmm->sclist2node, sizeof(int) * wchmm->scnum);
-  }
-}
-
-/** 
- * <JA>
  * ÌÚ¹½Â¤²½¼­½ñ¾å¤ÎÁ´¥Î¡¼¥É¤Ë successor list ¤ò¹½ÃÛ¤¹¤ë¥á¥¤¥ó´Ø¿ô
  * 
  * @param wchmm [i/o] ÌÚ¹½Â¤²½¼­½ñ
@@ -375,9 +188,13 @@
 {
   int node;
   WORD_ID w;
-  int i;
+  int i, j;
+  int s;
+  WORD_ID *scnumlist;
+  WORD_ID *sclen;
+  int scnum, new_scnum;
+  int *scidmap;
   boolean *freemark;
-  int s;
 
   jlog("STAT: make successor lists for factoring\n");
 
@@ -385,49 +202,38 @@
   /* initialize node->sclist index on wchmm tree */
   for (node=0;node<wchmm->n;node++) wchmm->state[node].scid = 0;
 
-  /* parse the tree to get the maximum size of successor list */
-  s = 1;
+  /* parse the tree to assign unique scid and get the maximum size of
+     successor list */
+  scnum = 1;
   for (w=0;w<wchmm->winfo->num;w++) {
     for (i=0;i<wchmm->winfo->wlen[w];i++) {
       if (wchmm->state[wchmm->offset[w][i]].scid == 0) {
-	wchmm->state[wchmm->offset[w][i]].scid = s;
-	s++;
+	wchmm->state[wchmm->offset[w][i]].scid = scnum;
+	scnum++;
       }
     }
     if (wchmm->state[wchmm->wordend[w]].scid == 0) {
-      wchmm->state[wchmm->wordend[w]].scid = s;
-      s++;
+      wchmm->state[wchmm->wordend[w]].scid = scnum;
+      scnum++;
     }
   }
-  wchmm->scnum = s;
   if (debug2_flag) {
-    jlog("DEBUG: initial successor list size = %d\n", wchmm->scnum);
+    jlog("DEBUG: initial successor list size = %d\n", scnum);
   }
 
-  /* allocate successor list for the maximum size */
-  wchmm->sclist = (S_CELL **)mymalloc(sizeof(S_CELL *) * wchmm->scnum);
-  for (i=1;i<wchmm->scnum;i++) wchmm->sclist[i] = NULL;
-  wchmm->sclist2node = (int *)mymalloc(sizeof(int) * wchmm->scnum);
-
-  /* allocate misc. work area */
-  freemark = (boolean *)mymalloc(sizeof(boolean) * wchmm->scnum);
-  for (i=1;i<wchmm->scnum;i++) freemark[i] = FALSE;
-
-  /* 2. make initial successor list: assign at all possible nodes */
+  /* 2. count number of each successor */
+  sclen = (WORD_ID *)mymalloc(sizeof(WORD_ID) * scnum);
+  for (i=1;i<scnum;i++) sclen[i] = 0;
   for (w=0;w<wchmm->winfo->num;w++) {
-    /* at each start node of phonemes */
     for (i=0;i<wchmm->winfo->wlen[w];i++) {
-      wchmm->sclist2node[wchmm->state[wchmm->offset[w][i]].scid] = wchmm->offset[w][i];
-      add_successor(wchmm, wchmm->offset[w][i], w);
+      sclen[wchmm->state[wchmm->offset[w][i]].scid]++;
     }
-    /* at word end */
-    wchmm->sclist2node[wchmm->state[wchmm->wordend[w]].scid] = wchmm->wordend[w];
-    add_successor(wchmm, wchmm->wordend[w], w);
+    sclen[wchmm->state[wchmm->wordend[w]].scid]++;
   }
-  
-  /* 3. erase unnecessary successor list */
-  /* sucessor list same as the previous node is not needed, so */
-  /* parse lexicon tree from every leaf to find the same succesor list */
+
+  /* 3. delete bogus successor lists */
+  freemark = (boolean *)mymalloc(sizeof(boolean) * scnum);
+  for (i=1;i<scnum;i++) freemark[i] = FALSE;
   for (w=0;w<wchmm->winfo->num;w++) {
     node = wchmm->wordend[w];	/* begin from the word end node */
     i = wchmm->winfo->wlen[w]-1;
@@ -437,30 +243,82 @@
 	i--;
 	continue;
       }
-      if (match_successor(wchmm, node, wchmm->offset[w][i])) {
+      if (wchmm->state[node].scid == 0) break; /* already parsed */
+      if (sclen[wchmm->state[node].scid] == sclen[wchmm->state[wchmm->offset[w][i]].scid]) {
 	freemark[wchmm->state[node].scid] = TRUE;	/* mark the node */
+	wchmm->state[node].scid = 0;
       }
-/* 
- *	 if (freemark[wchmm->offset[w][i]] != FALSE) {
- *	   break;
- *	 }
- */
       node = wchmm->offset[w][i];
       i--;
     }
   }
-  /* really free */
-  for (i=1;i<wchmm->scnum;i++) {
-    if (freemark[i] == TRUE) {
-      free_successor(wchmm, i);
-      /* reset node -> sclist link */
-      wchmm->state[wchmm->sclist2node[i]].scid = 0;
-    }
-  }
-  /* garbage collection of deleted sclist */
-  compaction_successor(wchmm);
-
+  /* build compaction map */
+  scidmap = (int *)mymalloc(sizeof(int) * scnum);
+  scidmap[0] = 0;
+  j = 1;
+  for (i=1;i<scnum;i++) {
+    if (freemark[i]) {
+      scidmap[i] = 0;
+    } else {
+      scidmap[i] = j;
+      j++;
+    }
+  }
+  new_scnum = j;
+  if (debug2_flag) {
+    jlog("DEBUG: compacted successor list size = %d\n", new_scnum);
+  }
+
+  /* 4. rewrite scid and do compaction for new sclen */
+  for (node=0;node<wchmm->n;node++) {
+    if (wchmm->state[node].scid > 0) {
+      wchmm->state[node].scid = scidmap[wchmm->state[node].scid];
+    }
+  }
+  wchmm->sclen = (WORD_ID *)mybmalloc2(sizeof(WORD_ID) * new_scnum, &(wchmm->malloc_root));
+  for (i=1;i<scnum;i++) {
+    if (scidmap[i] != 0) wchmm->sclen[scidmap[i]] = sclen[i];
+  }
+  wchmm->scnum = new_scnum;
+
+  free(scidmap);
   free(freemark);
+  free(sclen);
+
+  /* 5. now index completed, make word list for each list */
+  wchmm->sclist = (WORD_ID **)mybmalloc2(sizeof(WORD_ID *) * wchmm->scnum, &(wchmm->malloc_root));
+  scnumlist = (WORD_ID *)mymalloc(sizeof(WORD_ID) * wchmm->scnum);
+  for(i=1;i<wchmm->scnum;i++) {
+    wchmm->sclist[i] = (WORD_ID *)mybmalloc2(sizeof(WORD_ID) * wchmm->sclen[i], &(wchmm->malloc_root));
+    scnumlist[i] = 0;
+  }
+  {
+    int scid;
+    for (w=0;w<wchmm->winfo->num;w++) {
+      for (i=0;i<wchmm->winfo->wlen[w];i++) {
+	scid = wchmm->state[wchmm->offset[w][i]].scid;
+	if (scid != 0) {
+	  wchmm->sclist[scid][scnumlist[scid]] = w;
+	  scnumlist[scid]++;
+	  if (scnumlist[scid] > wchmm->sclen[scid]) {
+	    jlog("hogohohoho\n");
+	    exit(1);
+	  }
+	}
+      }
+      /* at word end */
+      scid = wchmm->state[wchmm->wordend[w]].scid;
+      if (scid != 0) {
+	wchmm->sclist[scid][scnumlist[scid]] = w;
+	scnumlist[scid]++;
+	  if (scnumlist[scid] > wchmm->sclen[scid]) {
+	    jlog("hogohohoho\n");
+	    exit(1);
+	  }
+      }
+    }
+  }
+  free(scnumlist);
 
   jlog("STAT: done\n");
 }
@@ -502,6 +360,7 @@
   int i, j, n, f;
   int s;
   LOGPROB tmpprob;
+  WORD_ID *mtmp;
 
   jlog("STAT: make successor lists for unigram factoring\n");
 
@@ -515,10 +374,8 @@
     jlog("DEBUG: successor list size = %d\n", wchmm->scnum);
   }
 
-  /* allocate successor list */
-  wchmm->sclist = (S_CELL **)mymalloc(sizeof(S_CELL *) * wchmm->scnum);
-  for (i=1;i<wchmm->scnum;i++) wchmm->sclist[i] = NULL;
-  /* sclist2node is not used */
+  /* allocate successor list for 1-gram factoring */
+  wchmm->scword = (WORD_ID *)mybmalloc2(sizeof(WORD_ID) * wchmm->scnum, &(wchmm->malloc_root));
 
   /* 2. make successor list, and count needed fscore num */
   f = 1;
@@ -532,17 +389,18 @@
       }
       if (wchmm->state[node].scid == 0) { /* not assigned */
 	/* new node found, assign new and exit here */
-	wchmm->state[node].scid = s++;
+	wchmm->state[node].scid = s;
+	wchmm->scword[s] = w;
+	s++;
 	if (s > wchmm->scnum) {
 	  jlog("InternalError: make_successor_list_unigram_factoring: scid num exceeded?\n");
 	  return;
 	}
-	add_successor(wchmm, node, w);
 	break;
       } else if (wchmm->state[node].scid > 0) {
-	/* that node has sclist */
+	/* that node has successor */
 	/* move it to the current first isolated node in that word */
-	w2 = wchmm->sclist[wchmm->state[node].scid]->word;
+	w2 = wchmm->scword[wchmm->state[node].scid];
 	for(j=i+1;j<wchmm->winfo->wlen[w2] + 1;j++) {
 	  if (j < wchmm->winfo->wlen[w2]) {
 	    node2 = wchmm->offset[w2][j];
@@ -550,7 +408,7 @@
 	    node2 = wchmm->wordend[w2];
 	  }
 	  if (wchmm->state[node2].scid == 0) { /* not assigned */
-	    /* move sclist to there */
+	    /* move successor to there */
 	    wchmm->state[node2].scid = wchmm->state[node].scid;
 	    break;
 	  }
@@ -732,9 +590,6 @@
   LM_PROB_CACHE *l;
   WORD_ID wnum;
 
-  /* finally shrink the memory area of successor list here */
-  shrink_successor(wchmm);
-
   /* for word-internal */
   l = &(wchmm->lmcache);
 
@@ -880,6 +735,8 @@
   wchmm->isolatenum = num;
 }
 
+#ifndef FAST_FACTOR1_SUCCESSOR_LIST
+
 /** 
  * <JA>
  * @brief  ÌÚ¹½Â¤²½¼­½ñ¾å¤Î 1-gram factoring Ãͤò·×»»¤·¤Æ³ÊǼ¤¹¤ë. 
@@ -977,6 +834,8 @@
   compaction_successor(wchmm);
 }
 
+#endif
+
 #else  /* ~UNIGRAM_FACTORING */
 
 /** 
@@ -1004,27 +863,31 @@
 static LOGPROB
 calc_successor_prob(WCHMM_INFO *wchmm, WORD_ID lastword, int node)
 {
-  S_CELL *sc;
   LOGPROB tmpprob, maxprob;
-  WORD_ID lw;
+  WORD_ID lw, w;
+  int i;
+  int scid;
 
   maxprob = LOG_ZERO;
   if (wchmm->ngram) {
     lw = wchmm->winfo->wton[lastword];
   }
 
-  for (sc = wchmm->sclist[wchmm->state[node].scid]; sc; sc = sc->next) {
+  scid = wchmm->state[node].scid;
+
+  for (i = 0; i < wchmm->sclen[scid]; i++) {
+    w = wchmm->sclist[scid][i];
     if (wchmm->ngram) {
-      tmpprob = (*(wchmm->ngram->bigram_prob))(wchmm->ngram, lw , wchmm->winfo->wton[sc->word])
+      tmpprob = (*(wchmm->ngram->bigram_prob))(wchmm->ngram, lw , wchmm->winfo->wton[w])
 #ifdef CLASS_NGRAM
-	+ wchmm->winfo->cprob[sc->word]
+	+ wchmm->winfo->cprob[w]
 #endif
 	;
     } else {
       tmpprob = LOG_ZERO;
     }
     if (wchmm->lmvar == LM_NGRAM_USER) {
-      tmpprob = (*(wchmm->bi_prob_user))(wchmm->winfo, lastword, sc->word, tmpprob);
+      tmpprob = (*(wchmm->bi_prob_user))(wchmm->winfo, lastword, w, tmpprob);
     }
     if (maxprob < tmpprob) maxprob = tmpprob;
   }
@@ -1102,7 +965,7 @@
       /* return precise 2-gram score */
       if (last_nword != l->lastwcache[scid]) {
 	/* calc and cache */
-	w = (wchmm->sclist[scid])->word;
+	w = wchmm->scword[scid];
 	if (wchmm->ngram) {
 	  maxprob = (*(wchmm->ngram->bigram_prob))(wchmm->ngram, last_nword, wchmm->winfo->wton[w])
 #ifdef CLASS_NGRAM
@@ -1251,7 +1114,7 @@
       /* should not happen!!! below is just for debugging */
       j_internal_error("max_successor_prob_iw: isolated (not shared) tree root node has unigram factoring value??\n");
     } else {
-      w = (wchmm->sclist[wchmm->state[node].scid])->word;
+      w = wchmm->scword[wchmm->state[node].scid];
       if (wchmm->ngram) {
 	p = (*(wchmm->ngram->bigram_prob))(wchmm->ngram, last_nword, wchmm->winfo->wton[w])
 #ifdef CLASS_NGRAM
@@ -1333,19 +1196,22 @@
 can_succeed(WCHMM_INFO *wchmm, WORD_ID lastword, int node)
 {
   int lc;
-  S_CELL *sc;
+  int i;
+  int s;
 
   /* return TRUE if at least one subtree word can connect */
 
+  s = wchmm->state[node].scid;
+
   if (lastword == WORD_INVALID) { /* case at beginning-of-word */
-    for (sc=wchmm->sclist[wchmm->state[node].scid];sc;sc=sc->next) {
-      if (dfa_cp_begin(wchmm->dfa, sc->word) == TRUE) return(TRUE);
+    for (i = 0; i < wchmm->sclen[s]; i++) {
+      if (dfa_cp_begin(wchmm->dfa, wchmm->sclist[s][i]) == TRUE) return(TRUE);
     }
     return(FALSE);
   } else {
     lc = wchmm->winfo->wton[lastword];
-    for (sc=wchmm->sclist[wchmm->state[node].scid];sc;sc=sc->next) {
-      if (dfa_cp(wchmm->dfa, lc, sc->word) == TRUE) return(TRUE);
+    for (i = 0; i < wchmm->sclen[s]; i++) {
+      if (dfa_cp(wchmm->dfa, lc, wchmm->sclist[s][i]) == TRUE) return(TRUE);
     }
     return(FALSE);
   }

=== modified file 'libjulius/src/gmm.c'
--- libjulius/src/gmm.c	2009-06-18 13:08:41 +0000
+++ libjulius/src/gmm.c	2012-08-03 04:20:23 +0000
@@ -41,13 +41,13 @@
  * @author Akinobu LEE
  * @date   Tue Mar 15 05:14:10 2005
  *
- * $Revision: 1.4 $
+ * $Revision: 1.6 $
  * 
  */
 
 /*
  * Copyright (c) 2003-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/src/gramlist.c'
--- libjulius/src/gramlist.c	2008-07-25 17:44:08 +0000
+++ libjulius/src/gramlist.c	2012-08-03 04:20:23 +0000
@@ -28,13 +28,13 @@
  * @author Akinobu Lee
  * @date   Tue Oct 30 12:27:53 2007
  *
- * $Revision: 1.1 $
+ * $Revision: 1.3 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/src/graphout.c'
--- libjulius/src/graphout.c	2008-07-25 17:44:08 +0000
+++ libjulius/src/graphout.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Thu Mar 17 12:46:31 2005
  *
- * $Revision: 1.5 $
+ * $Revision: 1.7 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/src/hmm_check.c'
--- libjulius/src/hmm_check.c	2008-07-25 17:44:08 +0000
+++ libjulius/src/hmm_check.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Thu Mar 17 20:50:07 2005
  *
- * $Revision: 1.2 $
+ * $Revision: 1.4 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/src/instance.c'
--- libjulius/src/instance.c	2010-07-04 15:18:40 +0000
+++ libjulius/src/instance.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Sun Oct 28 18:06:20 2007
  *
- * $Revision: 1.4 $
+ * $Revision: 1.8 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -160,11 +160,11 @@
 void
 j_process_am_free(PROCESS_AM *am)
 {
+  /* HMMWork hmmwrk */
+  outprob_free(&(am->hmmwrk));
   if (am->hmminfo) hmminfo_free(am->hmminfo);
   if (am->hmm_gs) hmminfo_free(am->hmm_gs);
   /* not free am->jconf  */
-  /* HMMWork hmmwrk */
-  outprob_free(&(am->hmmwrk));
   free(am);
 }
 
@@ -300,6 +300,10 @@
   /* not free jconf, am, lm here */
   /* free part of StackDecode work area */
   wchmm_fbs_free(process);
+  /* free cache */
+  if (process->lmtype == LM_PROB) {
+    max_successor_cache_free(process->wchmm);
+  }
   /* free wchmm */
   if (process->wchmm) wchmm_free(process->wchmm);
   /* free backtrellis */
@@ -457,6 +461,21 @@
 void
 j_jconf_lm_free(JCONF_LM *lmconf)
 {
+  JCONF_LM_NAMELIST *nl, *nltmp;
+  nl = lmconf->additional_dict_files;
+  while (nl) {
+    nltmp = nl->next;
+    free(nl->name);
+    free(nl);
+    nl = nltmp;
+  }
+  nl = lmconf->additional_dict_entries;
+  while (nl) {
+    nltmp = nl->next;
+    free(nl->name);
+    free(nl);
+    nl = nltmp;
+  }
   free(lmconf);
 }
 

=== modified file 'libjulius/src/jfunc.c'
--- libjulius/src/jfunc.c	2010-07-04 15:18:40 +0000
+++ libjulius/src/jfunc.c	2012-08-03 04:20:23 +0000
@@ -19,13 +19,13 @@
  * @author Akinobu Lee
  * @date   Wed Aug  8 15:04:28 2007
  *
- * $Revision: 1.6 $
+ * $Revision: 1.9 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -315,6 +315,45 @@
 
 /** 
  * <EN>
+ * If multiple instances defined from init, remove initial one (id=0)
+ * </EN>
+ * <JA>
+ * Ê£¿ô¥¤¥ó¥¹¥¿¥ó¥¹¤¬ÄêµÁ¤µ¤ì¤Æ¤¤¤ë¾ì¹ç¡¢½é´ü¥¤¥ó¥¹¥¿¥ó¥¹(id=0)¤Ï
+ * ̵¸ú¤Ê¤Î¤Ç¾Ã¤¹. 
+ * </JA>
+ * 
+ * @param jconf [i/o] global configuration instance
+ * 
+ * @callgraph
+ * @callergraph
+ * @ingroup jconf
+ */
+static void
+j_config_remove_initial(Jconf *jconf)
+{
+  JCONF_AM *am;
+  JCONF_LM *lm;
+  JCONF_SEARCH *s;
+
+  if(jconf->am_root->next != NULL && jconf->am_root->id == 0) {
+    am = jconf->am_root->next;
+    free(jconf->am_root);
+    jconf->am_root = am;
+  }
+  if(jconf->lm_root->next != NULL && jconf->lm_root->id == 0) {
+    lm = jconf->lm_root->next;
+    free(jconf->lm_root);
+    jconf->lm_root = lm;
+  }
+  if(jconf->search_root->next != NULL && jconf->search_root->id == 0) {
+    s = jconf->search_root->next;
+    free(jconf->search_root);
+    jconf->search_root = s;
+  }
+}
+
+/** 
+ * <EN>
  * Load parameters from command argments, and set to each configuration
  * instances in jconf.
  * </EN>
@@ -336,30 +375,49 @@
 int
 j_config_load_args(Jconf *jconf, int argc, char *argv[])
 {
-  JCONF_AM *am;
-  JCONF_LM *lm;
-  JCONF_SEARCH *s;
-
   /* parse options and set variables */
   if (opt_parse(argc, argv, NULL, jconf) == FALSE) {
     return -1;
   }
   /* if multiple instances defined from init, remove initial one (id=0) */
-  if(jconf->am_root->next != NULL && jconf->am_root->id == 0) {
-    am = jconf->am_root->next;
-    free(jconf->am_root);
-    jconf->am_root = am;
-  }
-  if(jconf->lm_root->next != NULL && jconf->lm_root->id == 0) {
-    lm = jconf->lm_root->next;
-    free(jconf->lm_root);
-    jconf->lm_root = lm;
-  }
-  if(jconf->search_root->next != NULL && jconf->search_root->id == 0) {
-    s = jconf->search_root->next;
-    free(jconf->search_root);
-    jconf->search_root = s;
-  }
+  j_config_remove_initial(jconf);
+
+  return 0;
+}
+
+/** 
+ * <EN>
+ * Load parameters from command argment string, and set to each configuration
+ * instances in jconf.
+ * </EN>
+ * <JA>
+ * ¥³¥Þ¥ó¥É°ú¿ô¤ò´Þ¤àʸ»úÎ󤫤é¥Ñ¥é¥á¡¼¥¿¤òÆɤ߹þ¤ß¡¤jconf Æâ¤Î³ÆÀßÄꥤ¥ó¥¹¥¿¥ó¥¹¤Ë
+ * Ãͤò³ÊǼ¤¹¤ë. 
+ * </JA>
+ * 
+ * @param jconf [i/o] global configuration instance
+ * @param argstr [in] argument string
+ * 
+ * @return 0 on success, or -1 on failure.
+ * 
+ * @callgraph
+ * @callergraph
+ * @ingroup jconf
+ */
+int
+j_config_load_string(Jconf *jconf, char *string)
+{
+  int argc;
+  char **argv;
+  char *buf;
+  
+  /* parse options and set variables */
+  if (config_string_parse(string, jconf) == FALSE) {
+    return -1;
+  }
+  /* if multiple instances defined from init, remove initial one (id=0) */
+  j_config_remove_initial(jconf);
+
   return 0;
 }
 
@@ -385,30 +443,13 @@
 int
 j_config_load_file(Jconf *jconf, char *filename)
 {
-  JCONF_AM *am;
-  JCONF_LM *lm;
-  JCONF_SEARCH *s;
-
   /* parse options and set variables */
   if (config_file_parse(filename, jconf) == FALSE) {
     return -1;
   }
   /* if multiple instances defined from init, remove initial one (id=0) */
-  if(jconf->am_root->next != NULL && jconf->am_root->id == 0) {
-    am = jconf->am_root->next;
-    free(jconf->am_root);
-    jconf->am_root = am;
-  }
-  if(jconf->lm_root->next != NULL && jconf->lm_root->id == 0) {
-    lm = jconf->lm_root->next;
-    free(jconf->lm_root);
-    jconf->lm_root = lm;
-  }
-  if(jconf->search_root->next != NULL && jconf->search_root->id == 0) {
-    s = jconf->search_root->next;
-    free(jconf->search_root);
-    jconf->search_root = s;
-  }
+  j_config_remove_initial(jconf);
+
   return 0;
 }
 
@@ -435,32 +476,11 @@
 j_config_load_args_new(int argc, char *argv[])
 {
   Jconf *jconf;
-  JCONF_AM *am;
-  JCONF_LM *lm;
-  JCONF_SEARCH *s;
-
   jconf = j_jconf_new();
-  /* parse options and set variables */
-  if (opt_parse(argc, argv, NULL, jconf) == FALSE) {
+  if (j_config_load_args(jconf, argc, argv) == -1) {
     j_jconf_free(jconf);
     return NULL;
   }
-  /* if multiple instances defined from init, remove initial one (id=0) */
-  if(jconf->am_root->next != NULL && jconf->am_root->id == 0) {
-    am = jconf->am_root->next;
-    free(jconf->am_root);
-    jconf->am_root = am;
-  }
-  if(jconf->lm_root->next != NULL && jconf->lm_root->id == 0) {
-    lm = jconf->lm_root->next;
-    free(jconf->lm_root);
-    jconf->lm_root = lm;
-  }
-  if(jconf->search_root->next != NULL && jconf->search_root->id == 0) {
-    s = jconf->search_root->next;
-    free(jconf->search_root);
-    jconf->search_root = s;
-  }
   return jconf;
 }
 
@@ -486,33 +506,104 @@
 j_config_load_file_new(char *filename)
 {
   Jconf *jconf;
-  JCONF_AM *am;
-  JCONF_LM *lm;
-  JCONF_SEARCH *s;
-
-  jconf = j_jconf_new();
-  /* parse options and set variables */
-  if (config_file_parse(filename, jconf) == FALSE) {
-    j_jconf_free(jconf);
-    return NULL;
-  }
-  /* if multiple instances defined from init, remove initial one (id=0) */
-  if(jconf->am_root->next != NULL && jconf->am_root->id == 0) {
-    am = jconf->am_root->next;
-    free(jconf->am_root);
-    jconf->am_root = am;
-  }
-  if(jconf->lm_root->next != NULL && jconf->lm_root->id == 0) {
-    lm = jconf->lm_root->next;
-    free(jconf->lm_root);
-    jconf->lm_root = lm;
-  }
-  if(jconf->search_root->next != NULL && jconf->search_root->id == 0) {
-    s = jconf->search_root->next;
-    free(jconf->search_root);
-    jconf->search_root = s;
-  }
-  return jconf;
+  jconf = j_jconf_new();
+  if (j_config_load_file(jconf, filename) == -1) {
+    j_jconf_free(jconf);
+    return NULL;
+  }
+  return jconf;
+}
+
+/** 
+ * <EN>
+ * Create a new configuration instance and load parameters from string
+ * file.
+ * </EN>
+ * <JA>
+ * ¿·¤¿¤ÊÀßÄꥤ¥ó¥¹¥¿¥ó¥¹¤ò³ä¤êÉÕ¤±¡¤¤½¤³¤Ë
+ * ʸ»úÎ󤫤éÀßÄê¥Ñ¥é¥á¡¼¥¿¤òÆɤ߹þ¤ó¤ÇÊÖ¤¹. 
+ * </JA>
+ * 
+ * @param string [in] option string
+ * 
+ * @return the newly allocated global configuration instance.
+ * 
+ * @callgraph
+ * @callergraph
+ * @ingroup jconf
+ */
+Jconf *
+j_config_load_string_new(char *string)
+{
+  Jconf *jconf;
+  jconf = j_jconf_new();
+  if (j_config_load_string(jconf, string) == -1) {
+    j_jconf_free(jconf);
+    return NULL;
+  }
+  return jconf;
+}
+
+/** 
+ * <EN>
+ * Book to read an additional dictionary file to be read.
+ * when called multiple times, all the file name will be stored and read.
+ * The file will be read just after the normal dictionary at startup.
+ * </EN>
+ * <JA>
+ * Äɲü­½ñ¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ß¤ò»ØÄꤹ¤ë.
+ * Ê£¿ô²ó¸Æ¤Ð¤ì¤¿¾ì¹ç¡¢¤¹¤Ù¤ÆÆɤ߹þ¤Þ¤ì¤ë¡£
+ * »ØÄꤵ¤ì¤¿¼­½ñ¤Ïµ¯Æ°»þ¤ËÄ̾ï¤Î¼­½ñ¤Î¤¢¤È¤Ë³¤±¤ÆÆɤ߹þ¤Þ¤ì¤ë.
+ * </JA>
+ *
+ * @param lm [i/o] a LM configuration
+ * @param dictfile [in] dictinoary file name
+ * 
+ * @return the newly allocated global configuration instance.
+ * 
+ * @callgraph
+ * @callergraph
+ * @ingroup jconf
+ */
+void
+j_add_dict(JCONF_LM *lm, char *dictfile)
+{
+  JCONF_LM_NAMELIST *nl;
+  nl = (JCONF_LM_NAMELIST *)mymalloc(sizeof(JCONF_LM_NAMELIST));
+  nl->name = (char *)mymalloc(strlen(dictfile) + 1);
+  strcpy(nl->name, dictfile);
+  nl->next = lm->additional_dict_files;
+  lm->additional_dict_files = nl;
+}
+
+/** 
+ * <EN>
+ * Add an additional word entry.
+ * The string should contain a word entry in as the same format as dictionary.
+ * If called multiple times, all the specified words will be appended.
+ * </EN>
+ * <JA>
+ * ÄɲäÎñ¸ì¥¨¥ó¥È¥ê¤ò»ØÄꤹ¤ë.
+ * ÆâÍƤϼ­½ñ¥Õ¥¡¥¤¥ë¤ÈƱ¤¸¥Õ¥©¡¼¥Þ¥Ã¥È.
+ * µ¯Æ°¤Þ¤Ç¤ËÊ£¿ô²ó¸Æ¤Ð¤ì¤¿¾ì¹ç¡¢¤½¤Î¤¹¤Ù¤Æ¤¬µ¯Æ°»þ¤ËÄɲ䵤ì¤ë.
+ * </JA>
+ *
+ * @param lm [i/o] a LM configuration
+ * @param wordentry [in] word entry string in dictionary format
+ * 
+ * @callgraph
+ * @callergraph
+ * @ingroup jconf
+ */
+void
+j_add_word(JCONF_LM *lm, char *wordentry)
+{
+  JCONF_LM_NAMELIST *nl;
+  nl = (JCONF_LM_NAMELIST *)mymalloc(sizeof(JCONF_LM_NAMELIST));
+  nl->name = (char *)mymalloc(strlen(wordentry) + 1);
+  strcpy(nl->name, wordentry);
+  nl->next = lm->additional_dict_entries;
+  lm->additional_dict_entries = nl;
 }
 
 /** 

=== modified file 'libjulius/src/m_adin.c'
--- libjulius/src/m_adin.c	2010-07-04 15:18:40 +0000
+++ libjulius/src/m_adin.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu LEE
  * @date   Fri Mar 18 16:17:23 2005
  *
- * $Revision: 1.11 $
+ * $Revision: 1.14 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -107,6 +107,15 @@
       a->ad_input_name	     = adin_esd_input_name;
       break;
 #endif
+#ifdef HAS_PULSEAUDIO
+    case SP_INPUT_PULSEAUDIO:
+      a->ad_standby 	     = adin_pulseaudio_standby;
+      a->ad_begin 	     = adin_pulseaudio_begin;
+      a->ad_end 	     = adin_pulseaudio_end;
+      a->ad_read 	     = adin_pulseaudio_read;
+      a->ad_input_name	     = adin_pulseaudio_input_name;
+      break;
+#endif
     default:
       jlog("ERROR: m_adin: invalid input device specified\n");
     }

=== modified file 'libjulius/src/m_chkparam.c'
--- libjulius/src/m_chkparam.c	2009-06-18 13:08:41 +0000
+++ libjulius/src/m_chkparam.c	2012-08-03 04:20:23 +0000
@@ -20,13 +20,13 @@
  * @author Akinobu LEE
  * @date   Fri Mar 18 16:31:45 2005
  *
- * $Revision: 1.5 $
+ * $Revision: 1.7 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 

=== modified file 'libjulius/src/m_fusion.c'
--- libjulius/src/m_fusion.c	2010-07-04 15:18:40 +0000
+++ libjulius/src/m_fusion.c	2012-08-03 04:20:23 +0000
@@ -20,13 +20,13 @@
  * @author Akinobu Lee
  * @date   Thu May 12 13:31:47 2005
  *
- * $Revision: 1.14 $
+ * $Revision: 1.22 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -122,12 +122,17 @@
 #ifdef PASS1_IWCD
   /* make state clusters of same context for inter-word triphone approx. */
   if (hmminfo->is_triphone) {
-    jlog("STAT: making pseudo bi/mono-phone for IW-triphone\n");
-    if (make_cdset(hmminfo) == FALSE) {
-      jlog("ERROR: m_fusion: failed to make context-dependent state set\n");
-      hmminfo_free(hmminfo);
-      return NULL;
+    if (hmminfo->cdset_root == NULL) {
+      jlog("STAT: making pseudo bi/mono-phone for IW-triphone\n");
+      if (make_cdset(hmminfo) == FALSE) {
+	jlog("ERROR: m_fusion: failed to make context-dependent state set\n");
+	hmminfo_free(hmminfo);
+	return NULL;
+      }
+    } else {
+      jlog("STAT: pseudo phones are loaded from binary hmmlist file\n");
     }
+
     /* add those `pseudo' biphone and monophone to the logical HMM names */
     /* they points not to the defined HMM, but to the CD_Set structure */
     hmm_add_pseudo_phones(hmminfo);
@@ -285,6 +290,9 @@
 initialize_dict(JCONF_LM *lmconf, HTK_HMM_INFO *hmminfo)
 {
   WORD_INFO *winfo;
+  JCONF_LM_NAMELIST *nl;
+  char buf[MAXLINELEN];
+  int n;
 
   /* allocate new word dictionary */
   winfo = word_info_new();
@@ -302,6 +310,50 @@
     return NULL;
   }
 
+  /* load additional entries */
+  for (nl = lmconf->additional_dict_files; nl; nl=nl->next) {
+    FILE *fp;
+    if ((fp = fopen(nl->name, "rb")) == NULL) {
+      jlog("ERROR: m_fusion: failed to open %s\n",nl->name);
+      word_info_free(winfo);
+      return NULL;
+    }
+    n = winfo->num;
+    while (getl_fp(buf, MAXLINELEN, fp) != NULL) {
+      if (voca_load_line(buf, winfo, hmminfo) == FALSE) break;
+    }
+    if (voca_load_end(winfo) == FALSE) {
+      if (lmconf->forcedict_flag) {
+	jlog("Warning: m_fusion: the error words above are ignored\n");
+      } else {
+	jlog("ERROR: m_fusion: error in reading dictionary %s\n", nl->name);
+	fclose(fp);
+	word_info_free(winfo);
+	return NULL;
+      }
+    }
+    if (fclose(fp) == -1) {
+      jlog("ERROR: m_fusion: failed to close %s\n", nl->name);
+      word_info_free(winfo);
+      return NULL;
+    }
+    jlog("STAT: + additional dictionary: %s (%d words)\n", nl->name, winfo->num - n);
+  }
+  n = winfo->num;
+  for (nl = lmconf->additional_dict_entries; nl; nl=nl->next) {
+    if (voca_load_line(nl->name, winfo, hmminfo) == FALSE) {
+      jlog("ERROR: m_fusion: failed to set entry: %s\n", nl->name);
+    }
+  }
+  if (lmconf->additional_dict_entries) {
+    if (voca_load_end(winfo) == FALSE) {
+      jlog("ERROR: m_fusion: failed to read additinoal word entry\n");
+      word_info_free(winfo);
+      return NULL;
+    }
+    jlog("STAT: + additional entries: %d words\n", winfo->num - n);
+  }
+
   if (lmconf->lmtype == LM_PROB) {
     /* if necessary, append a IW-sp word to the dict if "-iwspword" specified */
     if (lmconf->enable_iwspword) {
@@ -409,7 +461,9 @@
   }
 
   /* set unknown (=OOV) word id */
-  set_unknown_id(ngram, lmconf->unknown_name);
+  if (strcmp(lmconf->unknown_name, UNK_WORD_DEFAULT)) {
+    set_unknown_id(ngram, lmconf->unknown_name);
+  }
 
   /* map dict item to N-gram entry */
   if (make_voca_ref(ngram, winfo) == FALSE) {
@@ -976,7 +1030,9 @@
       }
       p->am->hmminfo->iwsp_penalty = p->am->config->iwsp_penalty;
     } else {
-      jlog("Warning: \"-iwsp\" is supported on multi-path mode, ignored\n");
+      jlog("ERROR: \"-iwsp\" needs multi-path mode\n");
+      jlog("ERROR: you should use multi-path AM, or specify \"-multipath\" with \"-iwsp\"\n");
+      return FALSE;
     }
   }
 

=== modified file 'libjulius/src/m_info.c'
--- libjulius/src/m_info.c	2009-06-18 13:08:41 +0000
+++ libjulius/src/m_info.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Thu May 12 14:14:01 2005
  *
- * $Revision: 1.9 $
+ * $Revision: 1.15 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -434,6 +434,24 @@
       if (lm->config->enable_iwspword) {
 	jlog("\tIW-sp word added to dict= \"%s\"\n", lm->config->iwspentry);
       }
+      if (lm->config->additional_dict_files) {
+	JCONF_LM_NAMELIST *nl;
+	jlog("\tadditional dictionaries:\n");
+	for(nl=lm->config->additional_dict_files;nl;nl=nl->next) {
+	  jlog("\t\t\t%s\n", nl->name);
+	}
+	jlog("\n");
+      }
+      if (lm->config->additional_dict_entries) {
+	JCONF_LM_NAMELIST *nl;
+	int n = 0;
+	jlog("\tadditional dict entries:\n");
+	for(nl=lm->config->additional_dict_entries;nl;nl=nl->next) {
+	  jlog("\t\t\t%s\n", nl->name);
+	  n++;
+	}
+	jlog("--- total %d entries\n", n);
+      }
     }
 
     if (lm->lmtype == LM_PROB) {    
@@ -557,6 +575,13 @@
     } else {
       jlog("\n");
     }
+#ifdef SCORE_PRUNING
+    if (r->config->pass1.score_pruning_width < 0.0) {
+      jlog("\t(-bs)score pruning thres= disabled\n");
+    } else {
+      jlog("\t(-bs)score pruning thres= %f\n", r->config->pass1.score_pruning_width);
+    }
+#endif
     jlog("\t(-n)search candidate num= %d\n", r->config->pass2.nbest);
     jlog("\t(-s)  search stack size = %d\n", r->config->pass2.stack_size);
     jlog("\t(-m)    search overflow = after %d hypothesis poped\n", r->config->pass2.hypo_overflow);
@@ -811,6 +836,7 @@
     case SP_INPUT_ALSA: jlog("alsa\n"); break;
     case SP_INPUT_OSS: jlog("oss\n"); break;
     case SP_INPUT_ESD: jlog("esd\n"); break;
+    case SP_INPUT_PULSEAUDIO: jlog("pulseaudio\n"); break;
     }
   }
   if (jconf->input.type == INPUT_WAVEFORM) {
@@ -852,6 +878,7 @@
       jlog("\t         zerocross thres = %d / sec.\n", jconf->detect.zero_cross_num);
       jlog("\t             head margin = %d msec.\n", jconf->detect.head_margin_msec);
       jlog("\t             tail margin = %d msec.\n", jconf->detect.tail_margin_msec);
+      jlog("\t              chunk size = %d samples\n", jconf->detect.chunk_size);
     } else {
       jlog("\t         silence cutting = off\n");
     }

=== modified file 'libjulius/src/m_jconf.c'
--- libjulius/src/m_jconf.c	2010-07-04 15:18:40 +0000
+++ libjulius/src/m_jconf.c	2012-08-03 04:20:23 +0000
@@ -37,13 +37,13 @@
  * @author Akinobu Lee
  * @date   Thu May 12 14:16:18 2005
  *
- * $Revision: 1.6 $
+ * $Revision: 1.10 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -54,6 +54,7 @@
 #endif
 
 #define ISTOKEN(A) (A == ' ' || A == '\t' || A == '\n') ///< Determine token characters
+#define BUFLEN 512
 
 /** 
  * <JA>
@@ -359,13 +360,147 @@
 /* read-in and parse jconf file and process those using m_options */
 /** 
  * <JA>
- * jconf ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ó¤Ç²òÀϤ·¡¤Âбþ¤¹¤ë¥ª¥×¥·¥ç¥ó¤òÀßÄꤹ¤ë. 
+ * @brief  ¥ª¥×¥·¥ç¥óʸ»úÎó¤òʬ²ò¤·¤ÆÄɲóÊǼ¤¹¤ë.
+ *
+ * @param buf [in] ʸ»úÎó
+ * @param argv [i/o] ¥ª¥×¥·¥ç¥óÎó¤Ø¤Î¥Ý¥¤¥ó¥¿
+ * @param argc [i/o] ¥ª¥×¥·¥ç¥óÎó¤Î¿ô¤Ø¤Î¥Ý¥¤¥ó¥¿
+ * @param maxnum [i/o] ¥ª¥×¥·¥ç¥óÎó¤Î³äÉÕºÇÂç¿ô
+ * </JA>
+ * <EN>
+ * @brief  Divide option string into option arguments and append to array.
+ *
+ * @param buf [in] option string
+ * @param argv [i/o] pointer to option array
+ * @param argc [i/o] pointer to the length of option array
+ * @param maxnum [i/o] pointer to the allocated length of option array
+ * </EN>
+ */
+static void
+add_to_arglist(char *buf, char ***argv_ret, int *argc_ret, int *maxnum_ret)
+{
+  char *p = buf;
+  char cpy[BUFLEN];
+  char *dst, *dst_from;
+  char **argv = *argv_ret;
+  int argc = *argc_ret;
+  int maxnum = *maxnum_ret;
+
+  dst = cpy;
+  while (1) {
+    while (*p != '\0' && ISTOKEN(*p)) p++;
+    if (*p == '\0') break;
+      
+    dst_from = dst;
+      
+    while (*p != '\0' && (!ISTOKEN(*p))) {
+#if !defined(_WIN32)
+      if (*p == '\\') {     /* escape by '\' */
+	if (*(++p) == '\0') break;
+	*(dst++) = *(p++);
+      } else {
+#endif
+	if (*p == '"') { /* quote by "" */
+	  p++;
+	  while (*p != '\0' && *p != '"') *(dst++) = *(p++);
+	  if (*p == '\0') break;
+	  p++;
+	} else if (*p == '\'') { /* quote by '' */
+	  p++;
+	  while (*p != '\0' && *p != '\'') *(dst++) = *(p++);
+	  if (*p == '\0') break;
+	  p++;
+	} else if (*p == '#') { /* comment out by '#' */
+	  *p = '\0';
+	  break;
+	} else {		/* other */
+	  *(dst++) = *(p++);
+	}
+#if !defined(_WIN32)
+      }
+#endif
+    }
+    if (dst != dst_from) {
+      *dst = '\0'; dst++;
+      if ( argc >= maxnum) {
+	maxnum += 20;
+	argv = (char **)myrealloc(argv, sizeof(char *) * maxnum);
+      }
+      argv[argc++] = strcpy((char*)mymalloc(strlen(dst_from)+1), dst_from);
+    }
+  }
+  *argv_ret = argv;
+  *argc_ret = argc;
+  *maxnum_ret = maxnum;
+}
+
+/** 
+ * <JA>
+ * ¥ª¥×¥·¥ç¥ó»ØÄê¤ò´Þ¤àʸ»úÎó¤ò²òÀϤ·¤ÆÃͤò¥»¥Ã¥È¤¹¤ë.
+ * ÁêÂХѥ¹Ì¾¤Ï¥«¥ì¥ó¥È¤«¤é¤ÎÁêÂФȤ·¤Æ°·¤ï¤ì¤ë.
+ * 
+ * @param str [in] ¥ª¥×¥·¥ç¥ó»ØÄê¤ò´Þ¤àʸ»úÎó
+ * @param jconf [out] Ãͤò¥»¥Ã¥È¤¹¤ë jconf ÀßÄê¥Ç¡¼¥¿
+ * </JA>
+ * <EN>
+ * Parse a string and set the specified option values.
+ * Relative paths will be treated as relative to current directory.
+ * 
+ * @param str [in] string which contains options
+ * @param jconf [out] global configuration data to be written.
+ * </EN>
+ *
+ * @callgraph
+ * @callergraph
+ */
+boolean
+config_string_parse(char *str, Jconf *jconf)
+{
+  int c_argc;
+  char **c_argv;
+  int maxnum;
+  char buf[BUFLEN];
+  char *cdir;
+  int i;
+  boolean ret;
+
+  jlog("STAT: parsing option string: \"%s\"\n", str);
+  
+  /* set the content of jconf file into argument list c_argv[1..c_argc-1] */
+  maxnum = 20;
+  c_argv = (char **)mymalloc(sizeof(char *) * maxnum);
+  c_argv[0] = strcpy((char *)mymalloc(7), "string");
+  c_argc = 1;
+  add_to_arglist(str, &c_argv, &c_argc, &maxnum);
+  /* env expansion */
+  for (i=1;i<c_argc;i++) {
+    c_argv[i] = expand_env(c_argv[i]);
+  }
+  /* now that options are in c_argv[][], call opt_parse() to process them */
+  /* relative paths in string are relative to current */
+  ret = opt_parse(c_argc, c_argv, NULL, jconf);
+
+  /* free arguments */
+  while (c_argc-- > 0) {
+    free(c_argv[c_argc]);
+  }
+  free(c_argv);
+
+  return(ret);
+}
+
+/** 
+ * <JA>
+ * jconf ÀßÄê¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ó¤Ç²òÀϤ·¡¤Âбþ¤¹¤ë¥ª¥×¥·¥ç¥ó¤òÀßÄꤹ¤ë.
+ * ¥ª¥×¥·¥ç¥óÆâ¤ÎÁêÂХѥ¹¤Ï¡¢¤½¤Î jconf ÀßÄê¥Õ¥¡¥¤¥ë¤«¤é¤ÎÁêÂФȤʤë.
  * 
  * @param conffile [in] jconf ¥Õ¥¡¥¤¥ë¤Î¥Ñ¥¹Ì¾
  * @param jconf [out] Ãͤò¥»¥Ã¥È¤¹¤ë jconf ÀßÄê¥Ç¡¼¥¿
  * </JA>
  * <EN>
  * Read and parse a jconf file, and set the specified option values.
+ * Relative paths in the file will be treated as relative to the file,
+ * not the application current.
  * 
  * @param conffile [in] jconf file path name
  * @param jconf [out] global configuration data to be written.
@@ -380,10 +515,8 @@
   int c_argc;
   char **c_argv;
   FILE *fp;
-  int maxnum, step;
-#define BUFLEN 512
-  char buf[BUFLEN], cpy[BUFLEN];
-  char *p, *dst, *dst_from;
+  int maxnum;
+  char buf[BUFLEN];
   char *cdir;
   int i;
   boolean ret;
@@ -397,52 +530,13 @@
     jlog("ERROR: m_jconf: failed to open jconf file: %s\n", conffile);
     return FALSE;
   }
-  step = 20;
-  maxnum = step;
+  maxnum = 20;
   c_argv = (char **)mymalloc(sizeof(char *) * maxnum);
   c_argv[0] = strcpy((char *)mymalloc(strlen(conffile)+1), conffile);
   c_argc = 1;
   while (fgets_jconf(buf, BUFLEN, fp) != NULL) {
     if (buf[0] == '\0') continue;
-    p = buf; dst = cpy;
-    while (1) {
-      while (*p != '\0' && ISTOKEN(*p)) p++;
-      if (*p == '\0') break;
-      
-      dst_from = dst;
-      
-      while (*p != '\0' && (!ISTOKEN(*p))) {
-	if (*p == '\\') {     /* escape by '\' */
-	  if (*(++p) == '\0') break;
-	  *(dst++) = *(p++);
-	} else {
-	  if (*p == '"') { /* quote by "" */
-	    p++;
-	    while (*p != '\0' && *p != '"') *(dst++) = *(p++);
-	    if (*p == '\0') break;
-	    p++;
-	  } else if (*p == '\'') { /* quote by '' */
-	    p++;
-	    while (*p != '\0' && *p != '\'') *(dst++) = *(p++);
-	    if (*p == '\0') break;
-	    p++;
-	  } else if (*p == '#') { /* comment out by '#' */
-	    *p = '\0';
-	    break;
-	  } else {		/* other */
-	    *(dst++) = *(p++);
-	  }
-	}
-      }
-      if (dst != dst_from) {
-	*dst = '\0'; dst++;
-	if (c_argc >= maxnum) {
-	  maxnum += step;
-	  c_argv = (char **)myrealloc(c_argv, sizeof(char *) * maxnum);
-	}
-	c_argv[c_argc++] = strcpy((char*)mymalloc(strlen(dst_from)+1), dst_from);
-      }
-    }
+    add_to_arglist(buf, &c_argv, &c_argc, &maxnum);
   }
   if (fclose(fp) == -1) {
     jlog("ERROR: m_jconf: cannot close jconf file\n");

=== modified file 'libjulius/src/m_options.c'
--- libjulius/src/m_options.c	2010-07-04 15:18:40 +0000
+++ libjulius/src/m_options.c	2012-08-03 04:20:23 +0000
@@ -18,13 +18,13 @@
  * @author Akinobu Lee
  * @date   Thu May 12 18:52:07 2005
  *
- * $Revision: 1.19 $
+ * $Revision: 1.26 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -374,7 +374,17 @@
 	jconf->input.device = SP_INPUT_ESD;
 	jconf->decodeopt.realtime_flag = TRUE;
 #else
-	jlog("ERROR: m_options: \"-input oss\": OSS support is not built-in\n");
+	jlog("ERROR: m_options: \"-input esd\": ESounD support is not built-in\n");
+	return FALSE;
+#endif
+      } else if (strmatch(tmparg,"pulseaudio")) {
+#ifdef HAS_PULSEAUDIO
+	jconf->input.type = INPUT_WAVEFORM;
+	jconf->input.speech_input = SP_MIC;
+	jconf->input.device = SP_INPUT_PULSEAUDIO;
+	jconf->decodeopt.realtime_flag = TRUE;
+#else
+	jlog("ERROR: m_options: \"-input pulseaudio\": PulseAudio support is not built-in\n");
 	return FALSE;
 #endif
 #endif
@@ -559,6 +569,13 @@
       jlog("WARNING: m_options: SCAN_BEAM disabled, \"-sb\" ignored\n");
 #endif
       continue;
+#ifdef SCORE_PRUNING
+    } else if (strmatch(argv[i],"-bs")) { /* score beam width for 1st pass */
+      if (!check_section(jconf, argv[i], JCONF_OPT_SR)) return FALSE;
+      GET_TMPARG;
+      jconf->searchnow->pass1.score_pruning_width = atof(tmparg);
+      continue;
+#endif
     } else if (strmatch(argv[i],"-discount")) {	/* (bogus) */
       jlog("WARNING: m_options: option \"-discount\" is now bogus, ignored\n");
       continue;
@@ -598,6 +615,11 @@
       GET_TMPARG;
       jconf->detect.tail_margin_msec = atoi(tmparg);
       continue;
+    } else if (strmatch(argv[i],"-chunksize")) { /* chunk size for detection */
+      if (!check_section(jconf, argv[i], JCONF_OPT_GLOBAL)) return FALSE; 
+      GET_TMPARG;
+      jconf->detect.chunk_size = atoi(tmparg);
+      continue;
     } else if (strmatch(argv[i],"-hipass")||strmatch(argv[i],"-hifreq")) { /* frequency of upper band limit */
       if (!check_section(jconf, argv[i], JCONF_OPT_AM)) return FALSE; 
       GET_TMPARG;
@@ -1270,6 +1292,18 @@
       plugin_load_dirs(tmparg);
       continue;
 #endif
+    } else if (strmatch(argv[i],"-adddict")) {
+	if (!check_section(jconf, argv[i], JCONF_OPT_LM)) return FALSE; 
+	GET_TMPARG;
+	tmparg = filepath(tmparg, cwd);
+	j_add_dict(jconf->lmnow, tmparg);
+	free(tmparg);
+	continue;
+    } else if (strmatch(argv[i],"-addentry")) {
+	if (!check_section(jconf, argv[i], JCONF_OPT_LM)) return FALSE; 
+	GET_TMPARG;
+	j_add_word(jconf->lmnow, tmparg);
+	continue;
     }
     if (argv[i][0] == '-' && strlen(argv[i]) == 2) {
       /* 1-letter options */

=== modified file 'libjulius/src/m_usage.c'
--- libjulius/src/m_usage.c	2009-06-18 13:08:41 +0000
+++ libjulius/src/m_usage.c	2012-08-03 04:20:23 +0000
@@ -12,13 +12,13 @@
  * @author Akinobu Lee
  * @date   Fri May 13 15:04:34 2005
  *
- * $Revision: 1.12 $
+ * $Revision: 1.17 $
  * 
  */
 /*
- * Copyright (c) 1991-2007 Kawahara Lab., Kyoto University
+ * Copyright (c) 1991-2012 Kawahara Lab., Kyoto University
  * Copyright (c) 2000-2005 Shikano Lab., Nara Institute of Science and Technology
- * Copyright (c) 2005-2007 Julius project team, Nagoya Institute of Technology
+ * Copyright (c) 2005-2012 Julius project team, Nagoya Institute of Technology
  * All rights reserved
  */
 
@@ -77,6 +77,9 @@
 # ifdef HAS_ESD
   fprintf(fp, "         esd               use ESounD interface\n");
 # endif
+# ifdef HAS_PULSEAUDIO
+  fprintf(fp, "         pulseaudio        use PulseAudio interface\n");