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

00readme-ja.txt (+12/-13)
00readme.txt (+14/-19)
LICENSE.txt (+17/-17)
Makefile.in (+3/-3)
Release-ja.txt (+88/-0)
Release.txt (+86/-0)
Sample.jconf (+4/-1)
adinrec/00readme-ja.txt (+4/-0)
adinrec/00readme.txt (+3/-0)
adinrec/Makefile.in (+3/-3)
adinrec/adinrec.c (+19/-5)
adintool/00readme-ja.txt (+4/-0)
adintool/00readme.txt (+3/-0)
adintool/Makefile.in (+3/-3)
adintool/adintool.c (+35/-6)
configure (+2/-2)
configure.in (+3/-3)
debian/changelog (+7/-0)
debian/control (+1/-1)
generate-ngram/Makefile.in (+3/-3)
gramtools/Makefile.in (+3/-3)
gramtools/accept_check/Makefile.in (+2/-2)
gramtools/accept_check/accept_check.c (+2/-2)
gramtools/accept_check/common.h (+2/-2)
gramtools/accept_check/rdterm.c (+2/-2)
gramtools/configure (+20/-68)
gramtools/configure.in (+2/-3)
gramtools/dfa_determinize/Makefile.in (+2/-2)
gramtools/dfa_determinize/dfa_determinize.c (+3/-3)
gramtools/dfa_minimize/Makefile.in (+2/-2)
gramtools/dfa_minimize/dfa_minimize.c (+3/-3)
gramtools/generate/Makefile.in (+2/-2)
gramtools/generate/common.h (+2/-2)
gramtools/generate/gen_next.c (+2/-2)
gramtools/generate/gen_next.h (+2/-2)
gramtools/generate/generate.c (+2/-2)
gramtools/generate/rdterm.c (+2/-2)
gramtools/gram2sapixml/00readme-ja.txt (+1/-7)
gramtools/gram2sapixml/00readme.txt (+1/-9)
gramtools/gram2sapixml/Makefile.in (+2/-2)
gramtools/mkdfa/Makefile.in (+2/-2)
gramtools/mkdfa/mkdfa.pl.in (+2/-2)
gramtools/mkdfa/mkfa-1.44-flex/Makefile.in (+2/-2)
gramtools/mkdfa/mkfa-1.44-flex/dfa.c (+2/-2)
gramtools/mkdfa/mkfa-1.44-flex/dfa.h (+2/-2)
gramtools/mkdfa/mkfa-1.44-flex/gram.y (+2/-2)
gramtools/mkdfa/mkfa-1.44-flex/lex.yy.c (+7/-3)
gramtools/mkdfa/mkfa-1.44-flex/main.c (+2/-2)
gramtools/mkdfa/mkfa-1.44-flex/mkfa.h (+2/-2)
gramtools/mkdfa/mkfa-1.44-flex/nfa.c (+2/-2)
gramtools/mkdfa/mkfa-1.44-flex/nfa.h (+2/-2)
gramtools/mkdfa/mkfa-1.44-flex/triplet.c (+2/-2)
gramtools/mkdfa/mkfa-1.44-flex/triplet.h (+2/-2)
gramtools/mkdfa/mkfa-1.44-flex/voca.c (+2/-2)
gramtools/nextword/Makefile.in (+2/-2)
gramtools/nextword/common.h (+2/-2)
gramtools/nextword/get_next.c (+2/-2)
gramtools/nextword/nextword.c (+2/-2)
gramtools/nextword/nextword.h (+2/-2)
gramtools/nextword/rdterm.c (+2/-2)
gramtools/nextword/readline.c (+2/-2)
gramtools/nextword/wtoken.c (+2/-2)
gramtools/yomi2voca/Makefile.in (+2/-2)
gramtools/yomi2voca/yomi2voca.pl.in (+2/-2)
jclient-perl/Makefile.in (+2/-2)
jcontrol/Makefile.in (+3/-3)
jcontrol/configure (+1/-1)
jcontrol/configure.in (+2/-2)
jcontrol/japi.h (+3/-3)
jcontrol/japi_grammar.c (+3/-3)
jcontrol/japi_misc.c (+3/-3)
jcontrol/japi_process.c (+3/-3)
jcontrol/jcontrol.c (+3/-3)
jcontrol/server.c (+3/-3)
julius/00readme-ja.txt (+10/-1)
julius/00readme.txt (+9/-1)
julius/Makefile.in (+3/-3)
julius/charconv.c (+3/-3)
julius/charconv_iconv.c (+3/-3)
julius/charconv_libjcode.c (+3/-3)
julius/charconv_win32.c (+3/-3)
julius/configure.in (+3/-3)
julius/main.c (+3/-3)
julius/output_file.c (+3/-3)
julius/output_module.c (+3/-3)
julius/output_stdout.c (+5/-5)
julius/recogloop.c (+3/-3)
julius/record.c (+3/-3)
julius/visual.c (+2/-2)
libjulius/Makefile.in (+3/-3)
libjulius/configure (+1/-1)
libjulius/configure.in (+4/-4)
libjulius/include/julius/beam.h (+3/-3)
libjulius/include/julius/callback.h (+3/-3)
libjulius/include/julius/define.h (+9/-3)
libjulius/include/julius/extern.h (+4/-3)
libjulius/include/julius/global.h (+3/-3)
libjulius/include/julius/graph.h (+3/-3)
libjulius/include/julius/jconf.h (+47/-6)
libjulius/include/julius/jfunc.h (+7/-3)
libjulius/include/julius/julius.h (+3/-3)
libjulius/include/julius/juliuslib.h (+3/-3)
libjulius/include/julius/misc.h (+3/-3)
libjulius/include/julius/multi-gram.h (+3/-3)
libjulius/include/julius/plugin.h (+3/-3)
libjulius/include/julius/recog.h (+11/-3)
libjulius/include/julius/search.h (+3/-3)
libjulius/include/julius/useropt.h (+3/-3)
libjulius/include/julius/wchmm.h (+9/-16)
libjulius/src/adin-cut.c (+56/-13)
libjulius/src/backtrellis.c (+3/-3)
libjulius/src/beam.c (+70/-9)
libjulius/src/confnet.c (+3/-3)
libjulius/src/default.c (+9/-3)
libjulius/src/dfa_decode.c (+15/-4)
libjulius/src/factoring_sub.c (+128/-262)
libjulius/src/gmm.c (+2/-2)
libjulius/src/gramlist.c (+3/-3)
libjulius/src/graphout.c (+3/-3)
libjulius/src/hmm_check.c (+3/-3)
libjulius/src/instance.c (+24/-5)
libjulius/src/jfunc.c (+181/-90)
libjulius/src/m_adin.c (+12/-3)
libjulius/src/m_chkparam.c (+3/-3)
libjulius/src/m_fusion.c (+66/-10)
libjulius/src/m_info.c (+30/-3)
libjulius/src/m_jconf.c (+143/-49)
libjulius/src/m_options.c (+38/-4)
libjulius/src/m_usage.c (+13/-3)
libjulius/src/multi-gram.c (+3/-3)
libjulius/src/ngram_decode.c (+3/-3)
libjulius/src/outprob_style.c (+3/-3)
libjulius/src/pass1.c (+3/-3)
libjulius/src/plugin.c (+3/-3)
libjulius/src/realtime-1stpass.c (+7/-6)
libjulius/src/recogmain.c (+26/-7)
libjulius/src/search_bestfirst_main.c (+9/-5)
libjulius/src/search_bestfirst_v1.c (+3/-3)
libjulius/src/search_bestfirst_v2.c (+3/-3)
libjulius/src/spsegment.c (+5/-5)
libjulius/src/useropt.c (+6/-3)
libjulius/src/version.c.in (+5/-5)
libjulius/src/wav2mfcc.c (+3/-3)
libjulius/src/wchmm.c (+19/-39)
libjulius/src/wchmm_check.c (+12/-8)
libjulius/src/word_align.c (+3/-3)
libsent/Makefile.in (+5/-5)
libsent/configure (+277/-84)
libsent/configure.in (+119/-35)
libsent/include/sent/adin.h (+10/-18)
libsent/include/sent/config.h.in (+16/-1)
libsent/include/sent/dfa.h (+3/-3)
libsent/include/sent/hmm.h (+3/-3)
libsent/include/sent/hmm_calc.h (+3/-3)
libsent/include/sent/htk_defs.h (+3/-3)
libsent/include/sent/htk_hmm.h (+8/-3)
libsent/include/sent/htk_param.h (+3/-3)
libsent/include/sent/machines.h (+3/-3)
libsent/include/sent/ngram2.h (+7/-3)
libsent/include/sent/ptree.h (+6/-7)
libsent/include/sent/speech.h (+3/-3)
libsent/include/sent/stddefs.h (+3/-3)
libsent/include/sent/tcpip.h (+3/-3)
libsent/include/sent/util.h (+3/-3)
libsent/include/sent/vocabulary.h (+5/-3)
libsent/libsent-config-dist.in (+8/-7)
libsent/libsent-config.in (+8/-7)
libsent/src/adin/adin_esd.c (+2/-2)
libsent/src/adin/adin_file.c (+3/-3)
libsent/src/adin/adin_mic_freebsd.c (+3/-3)
libsent/src/adin/adin_mic_linux.c (+26/-13)
libsent/src/adin/adin_mic_linux_alsa.c (+3/-3)
libsent/src/adin/adin_mic_linux_oss.c (+3/-3)
libsent/src/adin/adin_mic_o2.c (+3/-3)
libsent/src/adin/adin_mic_sol2.c (+3/-3)
libsent/src/adin/adin_mic_sun4.c (+3/-3)
libsent/src/adin/adin_na.c (+3/-3)
libsent/src/adin/adin_netaudio.c (+3/-3)
libsent/src/adin/adin_portaudio.c (+253/-105)
libsent/src/adin/adin_pulseaudio.c (+167/-0)
libsent/src/adin/adin_sndfile.c (+3/-3)
libsent/src/adin/adin_tcpip.c (+3/-3)
libsent/src/adin/ds48to16.c (+3/-3)
libsent/src/adin/pa/COPYRIGHT.txt (+25/-0)
libsent/src/adin/pa/common/pa_allocation.c (+243/-0)
libsent/src/adin/pa/common/pa_allocation.h (+104/-0)
libsent/src/adin/pa/common/pa_converters.c (+1935/-0)
libsent/src/adin/pa/common/pa_converters.h (+263/-0)
libsent/src/adin/pa/common/pa_cpuload.c (+105/-0)
libsent/src/adin/pa/common/pa_cpuload.h (+72/-0)
libsent/src/adin/pa/common/pa_debugprint.c (+107/-0)
libsent/src/adin/pa/common/pa_debugprint.h (+149/-0)
libsent/src/adin/pa/common/pa_dither.c (+213/-0)
libsent/src/adin/pa/common/pa_dither.h (+100/-0)
libsent/src/adin/pa/common/pa_endianness.h (+141/-0)
libsent/src/adin/pa/common/pa_front.c (+1760/-0)
libsent/src/adin/pa/common/pa_hostapi.h (+253/-0)
libsent/src/adin/pa/common/pa_process.c (+1772/-0)
libsent/src/adin/pa/common/pa_process.h (+750/-0)
libsent/src/adin/pa/common/pa_ringbuffer.c (+285/-0)
libsent/src/adin/pa/common/pa_ringbuffer.h (+198/-0)
libsent/src/adin/pa/common/pa_skeleton.c (+816/-0)
libsent/src/adin/pa/common/pa_stream.c (+150/-0)
libsent/src/adin/pa/common/pa_stream.h (+205/-0)
libsent/src/adin/pa/common/pa_trace.c (+97/-0)
libsent/src/adin/pa/common/pa_trace.h (+79/-0)
libsent/src/adin/pa/common/pa_types.h (+107/-0)
libsent/src/adin/pa/common/pa_util.h (+159/-0)
libsent/src/adin/pa/dsound_wrapper.c (+0/-466)
libsent/src/adin/pa/dsound_wrapper.h (+0/-106)
libsent/src/adin/pa/hostapi/alsa/pa_linux_alsa.c (+3563/-0)
libsent/src/adin/pa/hostapi/asihpi/pa_linux_asihpi.c (+2910/-0)
libsent/src/adin/pa/hostapi/asio/ASIO-README.txt (+137/-0)
libsent/src/adin/pa/hostapi/asio/iasiothiscallresolver.cpp (+563/-0)
libsent/src/adin/pa/hostapi/asio/iasiothiscallresolver.h (+197/-0)
libsent/src/adin/pa/hostapi/asio/pa_asio.cpp (+3023/-0)
libsent/src/adin/pa/hostapi/coreaudio/notes.txt (+196/-0)
libsent/src/adin/pa/hostapi/coreaudio/pa_mac_core.c (+2327/-0)
libsent/src/adin/pa/hostapi/coreaudio/pa_mac_core_blocking.c (+585/-0)
libsent/src/adin/pa/hostapi/coreaudio/pa_mac_core_blocking.h (+136/-0)
libsent/src/adin/pa/hostapi/coreaudio/pa_mac_core_internal.h (+164/-0)
libsent/src/adin/pa/hostapi/coreaudio/pa_mac_core_old.c (+913/-0)
libsent/src/adin/pa/hostapi/coreaudio/pa_mac_core_utilities.c (+620/-0)
libsent/src/adin/pa/hostapi/coreaudio/pa_mac_core_utilities.h (+205/-0)
libsent/src/adin/pa/hostapi/dsound/pa_win_ds.c (+2510/-0)
libsent/src/adin/pa/hostapi/dsound/pa_win_ds_dynlink.c (+180/-0)
libsent/src/adin/pa/hostapi/dsound/pa_win_ds_dynlink.h (+95/-0)
libsent/src/adin/pa/hostapi/jack/pa_jack.c (+1761/-0)
libsent/src/adin/pa/hostapi/oss/pa_unix_oss.c (+1957/-0)
libsent/src/adin/pa/hostapi/oss/recplay.c (+114/-0)
libsent/src/adin/pa/hostapi/wasapi/pa_win_wasapi.cpp (+1911/-0)
libsent/src/adin/pa/hostapi/wdmks/pa_win_wdmks.c (+3283/-0)
libsent/src/adin/pa/hostapi/wdmks/readme.txt (+82/-0)
libsent/src/adin/pa/hostapi/wmme/pa_win_wmme.c (+3900/-0)
libsent/src/adin/pa/include/pa_asio.h (+129/-0)
libsent/src/adin/pa/include/pa_jack.h (+75/-0)
libsent/src/adin/pa/include/pa_linux_alsa.h (+93/-0)
libsent/src/adin/pa/include/pa_mac_core.h (+171/-0)
libsent/src/adin/pa/include/pa_win_ds.h (+100/-0)
libsent/src/adin/pa/include/pa_win_waveformat.h (+180/-0)
libsent/src/adin/pa/include/pa_win_wmme.h (+176/-0)
libsent/src/adin/pa/include/portaudio.h (+1133/-0)
libsent/src/adin/pa/os/mac_osx/pa_mac_hostapis.c (+87/-0)
libsent/src/adin/pa/os/unix/pa_unix_hostapis.c (+78/-0)
libsent/src/adin/pa/os/unix/pa_unix_util.c (+666/-0)
libsent/src/adin/pa/os/unix/pa_unix_util.h (+224/-0)
libsent/src/adin/pa/os/win/pa_win_hostapis.c (+100/-0)
libsent/src/adin/pa/os/win/pa_win_util.c (+147/-0)
libsent/src/adin/pa/os/win/pa_win_waveformat.c (+159/-0)
libsent/src/adin/pa/os/win/pa_win_wdmks_utils.c (+260/-0)
libsent/src/adin/pa/os/win/pa_win_wdmks_utils.h (+65/-0)
libsent/src/adin/pa/os/win/pa_x86_plain_converters.c (+1219/-0)
libsent/src/adin/pa/os/win/pa_x86_plain_converters.h (+60/-0)
libsent/src/adin/pa/pa_convert.c (+0/-470)
libsent/src/adin/pa/pa_dsound.c (+0/-1042)
libsent/src/adin/pa/pa_host.h (+0/-189)
libsent/src/adin/pa/pa_lib.c (+0/-806)
libsent/src/adin/pa/pa_trace.c (+0/-83)
libsent/src/adin/pa/pa_trace.h (+0/-67)
libsent/src/adin/pa/pa_unix.c (+0/-1122)
libsent/src/adin/pa/pa_unix.h (+0/-141)
libsent/src/adin/pa/pa_unix_oss.c (+0/-385)
libsent/src/adin/pa/pa_unix_solaris.c (+0/-397)
libsent/src/adin/pa/pa_win_wmme.c (+0/-1714)
libsent/src/adin/pa/pablio.c (+0/-327)
libsent/src/adin/pa/pablio.h (+0/-109)
libsent/src/adin/pa/portaudio.h (+0/-463)
libsent/src/adin/pa/ringbuffer.c (+0/-199)
libsent/src/adin/pa/ringbuffer.h (+0/-102)
libsent/src/adin/zc-e.c (+3/-3)
libsent/src/adin/zmean.c (+3/-3)
libsent/src/anlz/param_malloc.c (+3/-3)
libsent/src/anlz/paramselect.c (+3/-3)
libsent/src/anlz/paramtypes.c (+3/-3)
libsent/src/anlz/rdparam.c (+3/-3)
libsent/src/anlz/strip.c (+3/-3)
libsent/src/anlz/strip_mfcc.c (+3/-3)
libsent/src/anlz/wrsamp.c (+3/-3)
libsent/src/anlz/wrwav.c (+3/-3)
libsent/src/dfa/cpair.c (+3/-3)
libsent/src/dfa/dfa_lookup.c (+3/-3)
libsent/src/dfa/dfa_malloc.c (+3/-3)
libsent/src/dfa/dfa_util.c (+3/-3)
libsent/src/dfa/init_dfa.c (+3/-3)
libsent/src/dfa/mkcpair.c (+3/-3)
libsent/src/dfa/mkterminfo.c (+3/-3)
libsent/src/dfa/rddfa.c (+3/-3)
libsent/src/hmminfo/cdhmm.c (+3/-3)
libsent/src/hmminfo/cdset.c (+12/-7)
libsent/src/hmminfo/check_hmm_restriction.c (+3/-3)
libsent/src/hmminfo/check_hmmtype.c (+3/-3)
libsent/src/hmminfo/chkhmmlist.c (+3/-3)
libsent/src/hmminfo/guess_cdHMM.c (+3/-3)
libsent/src/hmminfo/hmm_lookup.c (+3/-3)
libsent/src/hmminfo/init_phmm.c (+10/-5)
libsent/src/hmminfo/put_htkdata_info.c (+3/-3)
libsent/src/hmminfo/rdhmmdef.c (+23/-15)
libsent/src/hmminfo/rdhmmdef_data.c (+3/-3)
libsent/src/hmminfo/rdhmmdef_dens.c (+4/-4)
libsent/src/hmminfo/rdhmmdef_mpdf.c (+3/-3)
libsent/src/hmminfo/rdhmmdef_options.c (+3/-3)
libsent/src/hmminfo/rdhmmdef_regtree.c (+3/-3)
libsent/src/hmminfo/rdhmmdef_state.c (+3/-3)
libsent/src/hmminfo/rdhmmdef_streamweight.c (+2/-2)
libsent/src/hmminfo/rdhmmdef_tiedmix.c (+3/-3)
libsent/src/hmminfo/rdhmmdef_trans.c (+3/-3)
libsent/src/hmminfo/rdhmmdef_var.c (+3/-3)
libsent/src/hmminfo/rdhmmlist.c (+3/-3)
libsent/src/hmminfo/read_binhmm.c (+20/-2)
libsent/src/hmminfo/read_binhmmlist.c (+102/-4)
libsent/src/hmminfo/write_binhmm.c (+3/-3)
libsent/src/hmminfo/write_binhmmlist.c (+59/-4)
libsent/src/net/rdwt.c (+3/-3)
libsent/src/net/server-client.c (+3/-3)
libsent/src/ngram/init_ngram.c (+44/-22)
libsent/src/ngram/ngram_access.c (+3/-3)
libsent/src/ngram/ngram_compact_context.c (+3/-3)
libsent/src/ngram/ngram_lookup.c (+4/-4)
libsent/src/ngram/ngram_malloc.c (+5/-4)
libsent/src/ngram/ngram_read_arpa.c (+6/-6)
libsent/src/ngram/ngram_read_bin.c (+14/-3)
libsent/src/ngram/ngram_util.c (+8/-6)
libsent/src/ngram/ngram_write_bin.c (+3/-3)
libsent/src/phmm/addlog.c (+3/-3)
libsent/src/phmm/calc_mix.c (+3/-3)
libsent/src/phmm/calc_tied_mix.c (+3/-3)
libsent/src/phmm/gms.c (+3/-3)
libsent/src/phmm/gms_gprune.c (+3/-3)
libsent/src/phmm/gprune_beam.c (+3/-3)
libsent/src/phmm/gprune_common.c (+3/-3)
libsent/src/phmm/gprune_heu.c (+3/-3)
libsent/src/phmm/gprune_none.c (+3/-3)
libsent/src/phmm/gprune_safe.c (+4/-4)
libsent/src/phmm/mkwhmm.c (+3/-3)
libsent/src/phmm/outprob.c (+3/-3)
libsent/src/phmm/outprob_init.c (+3/-3)
libsent/src/phmm/vsegment.c (+3/-3)
libsent/src/util/aptree.c (+3/-3)
libsent/src/util/confout.c (+6/-3)
libsent/src/util/endian.c (+3/-3)
libsent/src/util/gzfile.c (+3/-3)
libsent/src/util/jlog.c (+3/-3)
libsent/src/util/mybmalloc.c (+3/-3)
libsent/src/util/mymalloc.c (+3/-3)
libsent/src/util/mystrtok.c (+3/-3)
libsent/src/util/ptree.c (+26/-35)
libsent/src/util/readfile.c (+3/-3)
libsent/src/util/strcasecmp.c (+3/-3)
libsent/src/voca/init_voca.c (+3/-3)
libsent/src/voca/voca_load_htkdict.c (+52/-20)
libsent/src/voca/voca_load_wordlist.c (+27/-3)
libsent/src/voca/voca_lookup.c (+3/-3)
libsent/src/voca/voca_malloc.c (+19/-10)
libsent/src/voca/voca_util.c (+3/-3)
libsent/src/wav2mfcc/mfcc-core.c (+3/-3)
libsent/src/wav2mfcc/para.c (+3/-3)
libsent/src/wav2mfcc/ss.c (+3/-3)
libsent/src/wav2mfcc/wav2mfcc-buffer.c (+3/-3)
libsent/src/wav2mfcc/wav2mfcc-pipe.c (+4/-4)
man/Makefile.in (+3/-3)
man/adinrec.1 (+5/-0)
man/adintool.1 (+5/-0)
man/gram2sapixml.pl.1 (+1/-7)
man/ja/adinrec.1 (+6/-0)
man/ja/adintool.1 (+6/-0)
man/ja/gram2sapixml.pl.1 (+1/-7)
man/ja/julius.1 (+6/-0)
man/julius.1 (+5/-0)
mkbingram/00readme-ja.txt (+4/-1)
mkbingram/00readme.txt (+4/-1)
mkbingram/Makefile.in (+3/-3)
mkbingram/mkbingram.c (+4/-4)
mkbinhmm/Makefile.in (+3/-3)
mkbinhmm/mkbinhmm.c (+3/-3)
mkbinhmm/mkbinhmmlist.c (+13/-5)
mkgshmm/Makefile.in (+2/-2)
mkgshmm/configure (+1/-1)
mkgshmm/configure.in (+2/-2)
mkgshmm/mkgshmm.in (+2/-2)
mkss/Makefile.in (+3/-3)
mkss/mkss.c (+3/-3)
msvc/00README-ja.txt (+153/-0)
msvc/00README.txt (+5/-0)
msvc/Debug/LICENSE_portaudio.txt (+25/-0)
msvc/Release/LICENSE_portaudio.txt (+25/-0)
msvc/SampleApp/Julius.cpp (+2/-2)
msvc/SampleApp/Julius.h (+1/-1)
msvc/config/config-msvc-libjulius.h (+7/-7)
msvc/config/config-msvc-libsent.h (+4/-1)
msvc/config/version.c (+21/-15)
plugin/plugin_defs.h (+3/-3)
support/build-all.sh (+1/-1)