From galateatalk-dev ＠ lists.sourceforge.jp Thu Oct 19 12:26:33 2006 From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp) Date: Thu, 19 Oct 2006 12:26:33 +0900 Subject: [gtalk-dev 0001] CVS update: gtalk Message-ID: <20061019032633.608882AC0E9@users.sourceforge.jp> Index: gtalk/do_output.c diff -u gtalk/do_output.c:1.19 gtalk/do_output.c:1.20 --- gtalk/do_output.c:1.19 Thu Sep 14 22:01:25 2006 +++ gtalk/do_output.c Thu Oct 19 12:26:33 2006 @@ -8,7 +8,8 @@ /* Keiichi Tokuda, Takayoshi Yoshimura, Heiga Zen */ /* (Nagoya Institute of Technology) */ /* All rights reserved */ - +/* */ +/* $Id: do_output.c,v 1.20 2006/10/19 03:26:33 sako Exp $ */ /* 波形を生成しながらの音声出力処理は pthread を用いて実装されている。 これは AUTO_DA が定義されていれば，組み込まれる。 @@ -39,6 +40,7 @@ void inqSpeakUtt(); void inqSpeakStat(); void do_output_file(char *); +void abort_auto_output(); #ifdef USE_SPLIB #include "do_output_sp.c" @@ -58,6 +60,8 @@ int org_vol, org_channels, org_precision, org_freq; int forced_stereo; #endif /* LINUX */ +int current_pos; +int prev_tell_pos_ms; #ifdef SOLARIS audio_info_t org_data; @@ -113,7 +117,11 @@ short *out; { int i; + int pos, pos_ms, interval_ms; + int samp_rate; + samp_rate = data_type[DTYPE].sample; + // fwrite( out, sizeof(short), leng, adfp); for( i=0; i 0 && interval_ms >= slot_Speak_syncinterval ) { + RepMsg("tell Speak.sync = %d\n", pos_ms); + /*prev_tell_pos_ms = pos_ms;*/ + while( prev_tell_pos_ms + slot_Speak_syncinterval <= pos_ms ) { + prev_tell_pos_ms += slot_Speak_syncinterval; + } + } + } + ++current_pos; } write( ADFD, out, 0); fflush( adfp); + } void init_audiodev(dtype) @@ -184,6 +221,8 @@ ioctl(ADFD,AUDIO_SETINFO,&data); #endif /* SOLARIS */ + current_pos = 0; + prev_tell_pos_ms = 0; } void reset_audiodev() @@ -206,6 +245,8 @@ ioctl( ACFD, AUDIO_SETINFO, &org_data); close( ACFD); #endif /* SOLARIS */ + current_pos = 0; + prev_tell_pos_ms = 0; } /*---------------------------------------------------------------------*/ Index: gtalk/do_output_sp.c diff -u gtalk/do_output_sp.c:1.3 gtalk/do_output_sp.c:1.4 --- gtalk/do_output_sp.c:1.3 Sat Sep 2 09:58:09 2006 +++ gtalk/do_output_sp.c Thu Oct 19 12:26:33 2006 @@ -1,18 +1,22 @@ +/* $Id: do_output_sp.c,v 1.4 2006/10/19 03:26:33 sako Exp $ */ #include #include #define GTALK_AUDIO_BLOCKSIZE 1024 +#define GTALK_USE_SP_PLUGIN_OUTPUT +int RepMsg(char *, ...); void abort_auto_output(); static volatile spAudio gtalk_sp_audio = NULL; static volatile int gtalk_aborted_flag = 0; - -int in_auto_play; +static volatile long gtalk_prev_tell_pos_ms = 0; /* nonzero value restarts play from beginning on replay */ static int gtalk_replay_init_flag = 0; +int in_auto_play; + void output_speaker(int total) {} void init_output() {} @@ -21,16 +25,28 @@ void set_da_signal() {} -void abort_demanded_output() { - if (gtalk_sp_audio != NULL) { - long position; +static int get_current_pos(spAudio audio) +{ + int pos_ms; + long position; - if (spGetAudioOutputPosition(gtalk_sp_audio, &position) == SP_TRUE) { - talked_DA_msec = (1000 * position) / SAMPLE_RATE; - spDebug(1, "abort_output", + pos_ms = -1; + + if (audio != NULL) { + if (spGetAudioOutputPosition(audio, &position) == SP_TRUE) { + pos_ms = (1000 * position) / SAMPLE_RATE; + spDebug(80, "get_current_pos", "spGetAudioOutputPosition: position = %ld, da_msec = %d, SAMPLE_RATE = %d\n", - position, talked_DA_msec, SAMPLE_RATE); + position, pos_ms, SAMPLE_RATE); } + } + + return pos_ms; +} + +void abort_demanded_output() { + if (gtalk_sp_audio != NULL) { + talked_DA_msec = get_current_pos(gtalk_sp_audio); if (!gtalk_aborted_flag) { spDebug(1, "abort_output", "output aborted\n"); @@ -44,6 +60,32 @@ } +spBool output_pos_func(spAudio audio, spAudioCallbackType call_type, + void *data1, void *data2, void *user_data) +{ + long pos_ms; + long *pos; + long current_interval; + + if (call_type == SP_AUDIO_OUTPUT_POSITION_CALLBACK) { + pos = (long *)data1; + pos_ms = 1000 * (*pos) / SAMPLE_RATE; + current_interval = pos_ms - gtalk_prev_tell_pos_ms; + spDebug(100, "output_pos_func", + "pos = %ld, pos_ms = %ld, slot_Speak_syncinterval = %d, current_interval = %ld\n", + *pos, pos_ms, slot_Speak_syncinterval, current_interval); + + if (slot_Speak_syncinterval > 0 && current_interval >= (long)slot_Speak_syncinterval) { + if (!gtalk_aborted_flag) { + RepMsg("tell Speak.sync = %ld\n", pos_ms); + } + gtalk_prev_tell_pos_ms = pos_ms; + } + } + + return SP_TRUE; +} + static spThreadReturn do_output_thread(void *data) { int total; @@ -55,10 +97,16 @@ total = *(int *)data; + if (in_auto_play && slot_Auto_play_delay > 0) { + spMSleep(slot_Auto_play_delay); + } + if (gtalk_sp_audio == NULL) { gtalk_sp_audio = spInitAudio(); spSetAudioSampleRate(gtalk_sp_audio, (double)SAMPLE_RATE); spSetAudioBufferSize(gtalk_sp_audio, GTALK_AUDIO_BLOCKSIZE); + spSetAudioCallbackFunc(gtalk_sp_audio, SP_AUDIO_OUTPUT_POSITION_CALLBACK, + output_pos_func, NULL); } /* open "write only" mode */ @@ -70,6 +118,8 @@ offset = 0; block_length = GTALK_AUDIO_BLOCKSIZE * sizeof(short); + gtalk_prev_tell_pos_ms = 0; + while (!gtalk_aborted_flag && offset < total) { spDebug(80, "do_output_thread", "offset = %ld, total = %ld\n", offset, total); @@ -79,18 +129,13 @@ offset += block_length; } - if (!gtalk_aborted_flag) { - long position; + spCloseAudioDevice(gtalk_sp_audio); - if (spGetAudioOutputPosition(gtalk_sp_audio, &position) == SP_TRUE) { - talked_DA_msec = (1000 * position) / SAMPLE_RATE; - } + if (!gtalk_aborted_flag) { if ( prop_Speak_len == AutoOutput ) inqSpeakLen(); if ( prop_Speak_utt == AutoOutput ) inqSpeakUtt(); } - spCloseAudioDevice(gtalk_sp_audio); - strcpy( slot_Speak_stat, "IDLE" ); if( prop_Speak_stat == AutoOutput ) inqSpeakStat(); @@ -103,7 +148,7 @@ void do_output_file_sp(char *sfile) { -#if 1 +#ifdef GTALK_USE_SP_PLUGIN_OUTPUT static char o_plugin_name[SP_MAX_LINE]; spPlugin *o_plugin; spWaveInfo wave_info; @@ -132,50 +177,46 @@ return; } -void do_output(char *fn) +void do_output_da() { static int total; - - in_auto_play = 0; + static void *thread = NULL; /*total = SAMPLE_RATE * FRAME_RATE * (totalframe - 1) / 1000;*/ total = wave.nsample; - if(fn == NULL){ - static void *thread = NULL; - talked_DA_msec = -1; - already_talked = 1; + talked_DA_msec = -1; + already_talked = 1; - if (thread != NULL) { - if (gtalk_sp_audio != NULL && gtalk_replay_init_flag) { - spStopAudio(gtalk_sp_audio); - } - - spWaitThread(thread); - spDestroyThread(thread); + if (thread != NULL) { + if (gtalk_sp_audio != NULL && gtalk_replay_init_flag) { + spStopAudio(gtalk_sp_audio); } - spDebug(1, "do_output", "creating thread...\n"); - gtalk_aborted_flag = 0; + spWaitThread(thread); + spDestroyThread(thread); + } + spDebug(1, "do_output_da", "creating thread...\n"); - if ((thread = spCreateThread(0, SP_THREAD_PRIORITY_NORMAL, - do_output_thread, (void *)&total)) == NULL) { - spDebug(1, "do_output", "Can't create audio thread\n"); - return; - } + gtalk_aborted_flag = 0; - spDebug(1, "do_output", "creating thread done\n"); + if ((thread = spCreateThread(0, SP_THREAD_PRIORITY_NORMAL, + do_output_thread, (void *)&total)) == NULL) { + spDebug(1, "do_output", "Can't create audio thread\n"); + return; + } + + spDebug(1, "do_output_da", "creating thread done\n"); +} + +void do_output(char *fn) +{ + in_auto_play = 0; + + if(fn == NULL){ + do_output_da(); } else { -#if 0 - FILE *fp; - - if ((fp = fopen(fn, "wb")) != NULL) { - fwrite(wave.data, sizeof (short), total, fp); - fclose(fp); - } -#else do_output_file_sp( fn ); -#endif } } @@ -197,62 +238,15 @@ --------------------------------------------------------------------*/ #ifdef AUTO_DA - void do_auto_output() { - static int total; - static void *thread = NULL; - - in_auto_play = 1; - - /*total = SAMPLE_RATE * FRAME_RATE * (totalframe - 1) / 1000;*/ - total = wave.nsample; - - talked_DA_msec = -1; - already_talked = 1; - - if (thread != NULL) { - if (gtalk_sp_audio != NULL && gtalk_replay_init_flag) { - spStopAudio(gtalk_sp_audio); - } + in_auto_play = 1; - spWaitThread(thread); - spDestroyThread(thread); - } - spDebug(1, "do_output", "creating thread...\n"); - - gtalk_aborted_flag = 0; - - if ((thread = spCreateThread(0, SP_THREAD_PRIORITY_NORMAL, - do_output_thread, (void *)&total)) == NULL) { - spDebug(1, "do_output", "Can't create audio thread\n"); - return; - } - - spDebug(1, "do_output", "creating thread done\n"); + do_output_da(); } void abort_auto_output() { - if (gtalk_sp_audio != NULL) { - long position; - - if (spGetAudioOutputPosition(gtalk_sp_audio, &position) == SP_TRUE) { - talked_DA_msec = (1000 * position) / SAMPLE_RATE; - spDebug(1, "abort_output", - "spGetAudioOutputPosition: position = %ld, da_msec = %d, SAMPLE_RATE = %d\n", - position, talked_DA_msec, SAMPLE_RATE); - } - - if (!gtalk_aborted_flag) { - spDebug(1, "abort_output", "output aborted\n"); - spStopAudio(gtalk_sp_audio); - gtalk_aborted_flag = 1; - } - - if ( prop_Speak_len == AutoOutput ) inqSpeakLen(); - if ( prop_Speak_utt == AutoOutput ) inqSpeakUtt(); - } - + abort_demanded_output(); } #endif /* AUTO_DA */ Index: gtalk/main.c diff -u gtalk/main.c:1.28 gtalk/main.c:1.29 --- gtalk/main.c:1.28 Fri Oct 13 18:44:44 2006 +++ gtalk/main.c Thu Oct 19 12:26:33 2006 @@ -1,8 +1,10 @@ /* Copyright (c) 2003-2006 */ /* Interactive Speech Technology Consortium (ISTC) */ /* All rights reserved */ - +/* */ /* The code is developed by Yamashita-lab, Ritsumeikan University */ +/* */ +/* $Id: main.c,v 1.29 2006/10/19 03:26:33 sako Exp $ */ #include #include @@ -121,6 +123,7 @@ SlotProp prop_Speak_utt; SlotProp prop_Speak_len; SlotProp prop_Speak_stat; +SlotProp prop_Speak_syncinterval; /* slots */ char slot_Run[20]; @@ -146,6 +149,7 @@ int slot_Log_text; int slot_Log_arranged_text; int slot_Log_sentence; +int slot_Speak_syncinterval; /* chaone */ #ifdef WIN32 @@ -219,6 +223,7 @@ int server_getline ( char *buf, int buf_size ); void server_destroy ( void ); /********↑***********************/ +void SetRun( char *rel, char *val); extern FILE *fp_err; @@ -242,6 +247,7 @@ prop_Speak_utt = AutoOutput; prop_Speak_len = AutoOutput; prop_Speak_stat = AutoOutput; + prop_Speak_syncinterval = AutoOutput; } /* 初期化: プログラム起動時に一度だけ実行 */ @@ -282,6 +288,7 @@ slot_Speech_file[0] = '\0'; slot_Pros_file[0] = '\0'; prosBuf.nPhoneme = 0; + slot_Speak_syncinterval = 1000; } void refresh_prosBuf() @@ -496,6 +503,11 @@ RepMsg( "rep Speak.stat = %s\n", slot_Speak_stat ); } +void inqSpeakSyncinterval() +{ + RepMsg( "rep Speak.syncinterval = %d\n", slot_Speak_syncinterval ); +} + /*---------------------------------------------------------*/ /* set command */ /*---------------------------------------------------------*/ @@ -632,6 +644,20 @@ */ } +void setSpeakSyncinterval( char *rel, char *val ) +{ + int interval; + + if( strcmp(rel,"=")!=0 ) { unknown_com(); return; } + + interval = atoi( val ); + + if( interval >= 0) { + slot_Speak_syncinterval = interval; + if( prop_Speak_syncinterval == AutoOutput ) inqSpeakSyncinterval(); + } +} + /*-------------------*/ void setSave( char *rel, char *filename ) @@ -945,6 +971,7 @@ case S_SpeechFile: setSpeechFile( v_arg[2], v_arg[3] ); break; case S_ProsFile: setProsFile( v_arg[2], v_arg[3] ); break; case S_ParsedText: setParsedText( v_arg[2], v_arg[3] ); break; + case S_Speak_syncinterval: setSpeakSyncinterval( v_arg[2], v_arg[3] ); break; case S_AutoPlay: slot_Auto_play = setLogYesNo( v_arg[2], v_arg[3] ); break; case S_AutoPlayDelay: @@ -997,6 +1024,7 @@ case S_Speak_utt: inqSpeakUtt(); break; case S_Speak_len: inqSpeakLen(); break; case S_Speak_stat: inqSpeakStat(); break; + case S_Speak_syncinterval: inqSpeakSyncinterval(); break; case S_Log: RepMsg( "rep Log = %s\n", slot_Log_file ); break; case S_Log_conf: @@ -1056,6 +1084,7 @@ case S_Speak_utt: prop_Speak_utt = prop; break; case S_Speak_len: prop_Speak_len = prop; break; case S_Speak_stat: prop_Speak_stat = prop; break; + case S_Speak_syncinterval: prop_Speak_syncinterval = prop; break; default: unknown_com(); } Index: gtalk/read_conf.c diff -u gtalk/read_conf.c:1.16 gtalk/read_conf.c:1.17 --- gtalk/read_conf.c:1.16 Sat Sep 2 09:58:09 2006 +++ gtalk/read_conf.c Thu Oct 19 12:26:33 2006 @@ -1,7 +1,8 @@ /* Copyright (c) 2000-2006 */ /* Yamashita Lab., Ritsumeikan University */ /* All rights reserved */ - +/* */ +/* $Id: read_conf.c,v 1.17 2006/10/19 03:26:33 sako Exp $ */ #include #include @@ -99,6 +100,8 @@ } } else if( strcmp(cpara,"AUTO-PLAY-DELAY")==0 ) { slot_Auto_play_delay = atoi( val ); + } else if( strcmp(cpara,"SYNC-INTERVAL")==0 ) { + slot_Speak_syncinterval = atoi( val ); } else if( strcmp(cpara,"SPEAKER-ID")==0 ) { if( n_speaker > 0 ) check_speaker_conf( n_speaker-1 ); speaker[n_speaker].code = malloc_char( val, "speaker.code" ); Index: gtalk/slot.h diff -u gtalk/slot.h:1.14 gtalk/slot.h:1.15 --- gtalk/slot.h:1.14 Sat Sep 2 09:58:09 2006 +++ gtalk/slot.h Thu Oct 19 12:26:33 2006 @@ -1,6 +1,8 @@ /* Copyright (c) 2000-2006 */ /* Yamashita Lab., Ritsumeikan University */ /* All rights reserved */ +/* */ +/* $Id: slot.h,v 1.15 2006/10/19 03:26:33 sako Exp $ */ /* List of Slot */ @@ -22,6 +24,7 @@ #define S_Speak_utt 34 #define S_Speak_len 35 #define S_Speak_stat 36 +#define S_Speak_syncinterval 37 #define S_Save 40 #define S_SpeechFile 41 #define S_SavePros 42 @@ -67,6 +70,7 @@ { S_Speak_utt, "Speak.utt" }, { S_Speak_len, "Speak.len" }, { S_Speak_stat, "Speak.stat" }, + { S_Speak_syncinterval, "Speak.syncinterval" }, { S_Save, "Save" }, { S_SpeechFile, "SpeechFile" }, { S_SavePros, "SavePros" }, @@ -113,6 +117,7 @@ extern SlotProp prop_Speak_utt; extern SlotProp prop_Speak_len; extern SlotProp prop_Speak_stat; +extern SlotProp prop_Speak_syncinterval; /* slots */ @@ -141,3 +146,4 @@ extern int slot_Log_aphrase; extern int slot_Log_breath; extern int slot_Log_sentence; +extern int slot_Speak_syncinterval; From galateatalk-dev ＠ lists.sourceforge.jp Thu Oct 19 21:31:24 2006 From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp) Date: Thu, 19 Oct 2006 21:31:24 +0900 Subject: [gtalk-dev 0002] CVS update: gtalk Message-ID: <20061019123124.B00542AC123@users.sourceforge.jp> Index: gtalk/syn.c diff -u gtalk/syn.c:1.16 gtalk/syn.c:removed --- gtalk/syn.c:1.16 Thu Oct 19 12:27:08 2006 +++ gtalk/syn.c Thu Oct 19 21:31:24 2006 @@ -1,707 +0,0 @@ -/* */ -/* $Id: syn.c,v 1.16 2006/10/19 03:27:08 sako Exp $ */ - -#include -#include -#include -#include -#include "command.h" -#include "confpara.h" - -#define INIT_SLOT_TABLE -#include "slot.h" - -char *moduleVersion = "Speech Synthesis Module Ver. 1.01 (syn-020703)"; -char *protocolVersion = "Protocol Ver. 0"; - -void init_conf(); -void read_conf(char *); -int speakerID(char *); -void set_default_conf(); -void init_text_analysis(); -void init_hmmsynth(); -void set_da_signal(); -void read_phonemes(char *); -void init_tag(); -void init_mora(); -void init_morph(); -void init_aphrase(); -void init_breath(); -void init_phoneme(); -void init_sentence(); -void refresh_tag(); -void refresh_mora(); -void refresh_morph(); -void refresh_aphrase(); -void refresh_breath(); -void refresh_phoneme(); -void refresh_sentence(); -void refresh_hmmsynth(); -int RepMsg(char *, ...); -int TmpMsg(char *, ...); -int ErrMsg(char *, ...); -void init_parameter(); -void make_duration(); -void make_parameter(); -void unknown_com(); -void restart(int); -void text_analysis(); -void send_speakerset(); -void send_speaker(); -void send_text(char *); -void send_phoneme(char *); -void send_duration(char *); -void do_synthesis(); -void do_output(char *); -void abort_output(); -void text_analysis_file(); -void reset_output(); -void parameter_generation(); -void modify_duration(); -void make_cumul_time(); -void modify_f0(); -void modify_power(); -void modify_voice(); -int make_sleep_time(char *, long *); -long sleepMs(long); - -void init_slot_prop() -{ - prop_Run = AutoOutput; - prop_ModuleVersion = AutoOutput; - prop_ProtocolVersion = AutoOutput; - prop_SpeakerSet = AutoOutput; - prop_Speaker = AutoOutput; - prop_Text = AutoOutput; - prop_Text_text = AutoOutput; - prop_Text_pho = AutoOutput; - prop_Text_dur = AutoOutput; - prop_Speak = AutoOutput; - prop_Speak_text = AutoOutput; - prop_Speak_pho = AutoOutput; - prop_Speak_dur = AutoOutput; - prop_Speak_utt = AutoOutput; - prop_Speak_len = AutoOutput; - prop_Speak_stat = AutoOutput; -} - -/* 初期化: プログラム起動時に一度だけ実行 */ -void initialize() -{ - void setRun(); - - set_da_signal(); - - init_slot_prop(); - init_text_analysis(); - init_hmmsynth(); - read_phonemes( phlist_file ); - init_tag(); - init_mora(); - init_morph(); - init_aphrase(); - init_breath(); - init_phoneme(); - init_sentence(); - strcpy( slot_Speak_stat, "IDLE" ); - setRun( "=", "LIVE" ); - slot_Log_file[0] = '\0'; logfp = NULL; - slot_Log_chasen= slot_Log_tag = slot_Log_phoneme = 0; - slot_Log_mora = slot_Log_morph = slot_Log_aphrase = 0; - slot_Log_breath = slot_Log_sentence = 0; -} - -/* 初期化: 合成を行うたびに実行 */ -void refresh() -{ - refresh_tag(); - refresh_mora(); - refresh_morph(); - refresh_aphrase(); - refresh_breath(); - refresh_phoneme(); - refresh_sentence(); - refresh_hmmsynth(); -} - -int commandID( char *com ) -{ - int i; - for( i=0; i= MAX_CLINE ) { - ErrMsg( "* Command line is too long\n" ); - restart( 1 ); - } - }; - cline[p++] = '\0'; ++n; - - return n; -} - - -/*---------------------------------------------------------*/ -/* inq command */ -/*---------------------------------------------------------*/ - -void inqRun() -{ - RepMsg( "rep Run = %s\n", slot_Run ); -} - -void inqModuleVersion() -{ - RepMsg( "rep ModuleVersion = \"%s\"\n", moduleVersion ); -} - -void inqProtocolVersion() -{ - RepMsg( "rep ProtocolVersion = \"%s\"\n", protocolVersion ); -} - -void inqSpeakerSet() -{ - send_speakerset(); -} - -void inqSpeaker() -{ - send_speaker(); -} - -void inqTextText() -{ - send_text( "Text.text" ); -} - -void inqTextPho() -{ - send_phoneme( "Text.pho" ); -} - -void inqTextDur() -{ - send_duration( "Text.dur" ); -} - -void inqSpeakText() -{ - send_text( "Speak.text" ); -} - -void inqSpeakPho() -{ - send_phoneme( "Speak.pho" ); -} - -void inqSpeakDur() -{ - send_duration( "Speak.dur" ); -} - -void inqSpeakUtt() -{ - TmpMsg( "Sorry. Not implemented ...\n" ); -} - -void inqSpeakLen() -{ - TmpMsg( "Sorry. Not implemented ...\n" ); -} - -void inqSpeakStat() -{ - RepMsg( "rep Speak.stat = %s\n", slot_Speak_stat ); -} - -/*---------------------------------------------------------*/ -/* set command */ -/*---------------------------------------------------------*/ - -void setRun( char *rel, char *val ) -{ - if( strcmp(rel,"=")!=0 ) { unknown_com(); return; } - - if( strcmp(val,"EXIT")==0 ) { - strcpy( slot_Run, "EXIT" ); - if( prop_Run == AutoOutput ) inqRun(); - exit(0); - } else if( strcmp(val,"LIVE")==0 ) { - strcpy( slot_Run, "LIVE" ); - if( prop_Run == AutoOutput ) inqRun(); - } else { - unknown_com(); - } -} - -void setSpeaker( char *rel, char *val ) -{ - int s; - - if( strcmp(rel,"=")!=0 ) { unknown_com(); return; } - - s = speakerID( val ); - if( s >= 0 ) { - spid = s; - if( prop_Speaker == AutoOutput ) inqSpeaker(); - } -} - -void setText( char *rel, char *val ) -{ - strcpy( slot_Speak_stat, "PROCESSING" ); - if( prop_Speak_stat == AutoOutput ) inqSpeakStat(); - - if( strcmp(rel,"=")==0 ) { - refresh(); - text_analysis( val ); /* テキスト解析 */ - if( prop_Text_text == AutoOutput ) inqTextText(); - if( prop_Speak_text == AutoOutput ) inqSpeakText(); - - parameter_generation(); /* パラメータ生成(F0,MLSAフィルタ係数,継続長) */ - do_synthesis(); /* 合成波形の生成 */ -#ifdef PRINTDATA - TmpMsg( "Synthesis Done.\n" ); -#endif -/* } else if( strcmp(rel,"<")==0 ) { - } else if( strcmp(rel,"<<")==0 ) { -*/ - } else { - unknown_com(); - } - strcpy( slot_Speak_stat, "READY" ); - if( prop_Speak_stat == AutoOutput ) inqSpeakStat(); -} - -void setSpeak( char *rel, char *val ) -{ - int error; - long sleep_ms; - - if( strcmp(rel,"=")!=0 ) { unknown_com(); return; } - - if( strcmp(val,"NOW")==0 ) { - strcpy( slot_Speak_stat, "SPEAKING" ); - if( prop_Speak_stat == AutoOutput ) inqSpeakStat(); - do_output(NULL); /* 音声出力 */ - - } else if( strcmp(val,"STOP")==0 ) { -/* TmpMsg( "Sorry. Not implemented ...\n" ); */ - abort_output(); - - } else { - /* val = "12:34:56.789" or "+1000" */ - error = make_sleep_time( val, &sleep_ms ); - if( error ) { - unknown_com(); - } else { -#ifdef PRINTDATA - TmpMsg( "sleep_ms: %d\n", sleep_ms ); -#endif - if( sleep_ms > 0 ) sleepMs( sleep_ms ); - strcpy( slot_Speak_stat, "SPEAKING" ); - if( prop_Speak_stat == AutoOutput ) inqSpeakStat(); - do_output(NULL); /* 音声出力 */ - } - } -/* strcpy( slot_Speak_stat, "IDLE" ); - if( prop_Speak_stat == AutoOutput ) inqSpeakStat(); -*/ -} - -/*-------------------*/ - -void setSave( char *rel, char *filename ) -{ - if( strcmp(rel,"=")==0 ) { - do_output( filename ); - } else { - unknown_com(); - } -} - -/* 茶筌の結果をファイルから読み込み */ -void setFile( char *rel, char *filename ) -{ - if( strcmp(rel,"=")==0 ) { - refresh(); - text_analysis_file( filename ); /* テキスト解析 */ - parameter_generation(); /* パラメータ生成(F0,MLSAフィルタ係数,継続長) */ - do_synthesis(); /* 合成波形の生成 */ - TmpMsg( "Synthesis Done.\n" ); - } else { - unknown_com(); - } -} - -void setLog( char *rel, char *filename ) -{ - if( strcmp(rel,"=")==0 ) { - if( logfp && strcmp(slot_Log_file,"CONSOLE")!=0 ) fclose( logfp ); - strcpy( slot_Log_file, filename ); - if( strcmp(filename,"CONSOLE")==0 ) { - logfp = stderr; - } else { - logfp = fopen( filename, "a" ); - if( logfp == NULL ) { - ErrMsg( "log file open error ... $s\n", filename ); - } - } - } else { - unknown_com(); - } -} - -void setLogChasen( char *rel, char *val ) -{ - if( strcmp(rel,"=")==0 ) { - if( strcmp( val, "YES" )==0 ) { - slot_Log_chasen = 1; - } else { - slot_Log_chasen = 0; - } - } else { - unknown_com(); - } -} - -void setLogTag( char *rel, char *val ) -{ - if( strcmp(rel,"=")==0 ) { - if( strcmp( val, "YES" )==0 ) { - slot_Log_tag = 1; - } else { - slot_Log_tag = 0; - } - } else { - unknown_com(); - } -} - -void setLogPhoneme( char *rel, char *val ) -{ - if( strcmp(rel,"=")==0 ) { - if( strcmp( val, "YES" )==0 ) { - slot_Log_phoneme = 1; - } else { - slot_Log_phoneme = 0; - } - } else { - unknown_com(); - } -} - -void setLogMora( char *rel, char *val ) -{ - if( strcmp(rel,"=")==0 ) { - if( strcmp( val, "YES" )==0 ) { - slot_Log_mora = 1; - } else { - slot_Log_mora = 0; - } - } else { - unknown_com(); - } -} - -void setLogMorph( char *rel, char *val ) -{ - if( strcmp(rel,"=")==0 ) { - if( strcmp( val, "YES" )==0 ) { - slot_Log_morph = 1; - } else { - slot_Log_morph = 0; - } - } else { - unknown_com(); - } -} - -void setLogAphrase( char *rel, char *val ) -{ - if( strcmp(rel,"=")==0 ) { - if( strcmp( val, "YES" )==0 ) { - slot_Log_aphrase = 1; - } else { - slot_Log_aphrase = 0; - } - } else { - unknown_com(); - } -} - -void setLogBreath( char *rel, char *val ) -{ - if( strcmp(rel,"=")==0 ) { - if( strcmp( val, "YES" )==0 ) { - slot_Log_breath = 1; - } else { - slot_Log_breath = 0; - } - } else { - unknown_com(); - } -} - -void setLogSentence( char *rel, char *val ) -{ - if( strcmp(rel,"=")==0 ) { - if( strcmp( val, "YES" )==0 ) { - slot_Log_sentence = 1; - } else { - slot_Log_sentence = 0; - } - } else { - unknown_com(); - } -} - -/*---------------------------------------------------------*/ - -void parameter_generation() -{ -/* 音声合成の初期設定 */ - init_parameter(); - -/* 音素継続長の決定 */ - make_duration(); -/* 音素継続長の変更 */ - modify_duration(); - make_cumul_time(); - modify_voice(); - - if( prop_Text_pho == AutoOutput ) inqTextPho(); - if( prop_Speak_pho == AutoOutput ) inqSpeakPho(); - if( prop_Text_dur == AutoOutput ) inqTextDur(); - if( prop_Speak_dur == AutoOutput ) inqSpeakDur(); - - -/* パラメータ生成 F0,MLSAフィルタ係数 */ - make_parameter(); - -/* F0, ゲイン b(0) の変更 */ - modify_f0(); - modify_power(); -} - -/*---------------------------------------------------------*/ - -int n_arg; -char *v_arg[10]; - -void unknown_com() -{ - int i; - ErrMsg( "* Unknown command line ... \n" ); - for( i=0; i 0 && argv[0][0] == '-' ) { - switch( argv[0][1] ) { - case 'C': - if( argc < 2 ) usage( com ); - read_conf( argv[1] ); - --argc; ++argv; - break; - default: - usage( com ); - } - --argc; ++argv; - } - set_default_conf(); - - fp_err = stderr; - - initialize(); - - n = setjmp( ebuf ); - if( n > 0 ) chasen_process = 0; /* to restart 'chasen' process */ - - for( ;; ) { -#ifdef PRINTDATA - TmpMsg( "> " ); -#endif - n_arg = read_command( v_arg ); - -#ifdef PRINTDATA - { - int i; - TmpMsg( "command is \n" ); - for( i=0; i Index: gtalk/text.c diff -u gtalk/text.c:1.27 gtalk/text.c:1.28 --- gtalk/text.c:1.27 Thu Oct 19 12:27:08 2006 +++ gtalk/text.c Thu Oct 19 21:32:18 2006 @@ -6,7 +6,7 @@ /* by Studio ARC */ /* 2003.08.10 */ /* version as of 2003.08.18 */ -/* $Id: text.c,v 1.27 2006/10/19 03:27:08 sako Exp $ */ +/* $Id: text.c,v 1.28 2006/10/19 12:32:18 sako Exp $ */ #include #include @@ -790,7 +790,7 @@ ++text; while ( *text != '>' ) { buf[tp++] = *text; -/* buf[tp++] = toupper( *text ); /* タグ名は大文字に変換 */ +/* buf[tp++] = toupper( *text ); タグ名は大文字に変換 */ ++text; } buf[tp++] = *text; @@ -871,7 +871,7 @@ } else { /* 開始タグの始まり */ while ( *text != '>' ) { buf[tp++] = *text; -/* buf[tp++] = toupper( *text ); /* 大文字に変換 */ +/* buf[tp++] = toupper( *text ); 大文字に変換 */ ++text; } buf[tp++] = *text; From galateatalk-dev ＠ lists.sourceforge.jp Thu Oct 19 21:47:47 2006 From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp) Date: Thu, 19 Oct 2006 21:47:47 +0900 Subject: [gtalk-dev 0004] CVS update: gtalk Message-ID: <20061019124747.6226B2AC124@users.sourceforge.jp> Index: gtalk/configure.in diff -u gtalk/configure.in:1.4 gtalk/configure.in:1.5 --- gtalk/configure.in:1.4 Thu Oct 19 12:27:08 2006 +++ gtalk/configure.in Thu Oct 19 21:47:47 2006 @@ -1,6 +1,6 @@ -dnl $Id: configure.in,v 1.4 2006/10/19 03:27:08 sako Exp $ +dnl $Id: configure.in,v 1.5 2006/10/19 12:47:47 sako Exp $ dnl Process this file with autoconf to produce a configure script. -AC_INIT(gtalk, 1.4) +AC_INIT(gtalk, 1.4, galateatalk-dev ＠ lists.sourceforge.jp) dnl install-sh will be searched (and found) here AC_CONFIG_AUX_DIR(config) @@ -17,7 +17,9 @@ AC_CANONICAL_HOST dnl Checks for libraries. -AC_CHECK_LIB(m, main) +AC_CHECK_LIB(m, log, + have_libm=1; LIBS="-lm ${LIBS}", + AC_MSG_ERROR( [libm not found])) if test "x$GCC = xyes"; then CFLAGS="-Wall -O2" @@ -64,14 +66,14 @@ [ --enable-threadda Use Thread DA (default=no)], [ if test "x$enable_threadda" = "xyes" -a "$use_da" = "yes"; then AC_DEFINE(THREAD_DA) - AC_CHECK_LIB(pthread,main) + AC_CHECK_LIB(pthread, pthrad_create) fi]) dnl Check option AC_CHECK_LIB(pthread,pthread_create,have_pthread=1,have_pthread=0) if test $have_pthread = 1 -a "$use_da" = "yes"; then AC_DEFINE(AUTO_DA) - LIBS="$LIBS -lpthread" + LIBS="$LIBS -lpthread -ldl" fi dnl check byte order @@ -117,4 +119,164 @@ ) fi -AC_OUTPUT(Makefile) +dnl check splib +use_splib=no + +AC_ARG_ENABLE(splib, +[ --enable-splib Use spLib (default=no)], +[ if test "$enable_splib" = "yes"; then + use_splib=yes +fi]) + +if test "$use_splib" = "yes"; then + AC_ARG_WITH( splib-inc, + [ --with-splib-inc=DIR location for splib headers], + [CFLAGS="-I${withval} ${CFLAGS}"]) + + AC_ARG_WITH( splib-lib, + [ --with-splib-lib=DIR location for splib lib], + LDFLAGS="-L${withval} ${LDFLAGS}") + + AC_CHECK_HEADER( sp/spBaseLib.h, + [], + AC_MSG_ERROR( [splib header not found])) + + AC_CHECK_HEADER( sp/spAudioLib.h, + [], + AC_MSG_ERROR( [splib header not found])) + + AC_CHECK_LIB( spb.linux-glibc ,spDebug, + have_libspb=1; LIBS="-lspa.linux-glibc ${LIBS}", + AC_MSG_ERROR( [spBase library not found]), + -lm) + + AC_CHECK_LIB( spa.linux-glibc ,spInitAudioDriver, + have_libspa=1; LIBS="${LIBS} -lspb.linux-glibc ${LIBS}", + AC_MSG_ERROR( [spAudio library not found]), + -lm -lspb.linux-glibc -lpthread -ldl) + + AC_DEFINE( USE_SPLIB) +fi + +dnl check chasenlib + +use_chasenlib=no +AC_ARG_ENABLE( chasenlib, + [ --enable-chasenlib Use chasenlib], + [ if test "$enable_chasenlib" = "yes"; then + use_chasenlib=yes +fi]) + +if test "$use_chasenlib" = "yes"; then + AC_ARG_WITH( chasen-config, + [ --with-chasen-config set chasen-config location [search path]], + AC_MSG_RESULT( using $with_chasen_config for chasen-config) + CHASEN_CONFIG=$with_chasen_config, + [AC_PATH_PROGS( CHASEN_CONFIG, chasen-config, no)]) + +dnl without chasen-config + if test "$CHASEN_CONFIG" = "no"; then + AC_ARG_WITH( chasen-inc, + [ --with-chasen-inc=DIR location for libchasen headers], + [CFLAGS="-I${withval} ${CFLAGS}"]) + + AC_ARG_WITH( chasen-lib, + [ --with-chasen-lib=DIR location for libchasen library], + [LDFLAGS="-L${withval} ${LDFLAGS}"]) +dnl with chasen-config + + else + CFLAGS="`$CHASEN_CONFIG --cflags` ${CFLAGS}" + LDFLAGS="`$CHASEN_CONFIG --libs` ${LDFLAGS}" + fi + + AC_CHECK_LIB( stdc++, main, + LIBS="-lstdc++ ${LIBS}", + AC_MSG_ERROR( [libstdc++ not found])) + + AC_CHECK_HEADER( chasen.h, + [], + AC_MSG_ERROR( [chasen.h not found])) + + AC_CHECK_LIB( chasen, chasen_sparse, + LIBS="-lchasen ${LIBS}", + AC_MSG_ERROR( [chasenlib not found])) + + AC_DEFINE( USE_CHASENLIB) + +dnl check version + CHASEN_VERSION=`$CHASEN_CONFIG --version` + echo -n "checking for chasen-version (= 2.3.3) ... " + if test "$CHASEN_VERSION" = "2.3.3"; then + echo "yes" + else + echo "no" + AC_MSG_ERROR( [chasen version missmach]) + fi + +fi + +dnl check chaone(depend on xml/xlst) +use_chaone=no +AC_ARG_ENABLE( chaone, + [ --enable-chaone Use chaone], + [ if test "$enable_chaone" = "yes"; then + use_chaone=yes +fi]) + +dnl check libxml2/libxslt +if test "$use_chaone" = "yes"; then + AC_ARG_WITH( libxml2-config, + [ --with-xml2-config set xml2-config location [search path]], + AC_MSG_RESULT( using $with_xml2_config for xml2-config) + XML2_CONFIG=$with_xml2_config, + [AC_PATH_PROGS( XML2_CONFIG, xml2-config, no)]) + + if test "$XML2_CONFIG" = "no"; then + AC_ARG_WITH( libxml2-inc, + [ --with-libxml2-inc=DIR location for libxml2 headers], + [CFLAGS="-I${withval} ${CFLAGS}"]) + + AC_ARG_WITH( libxml2-lib, + [ --with-libxml2-lib=DIR location for libxml2 library], + [LDFLAGS="-L${withval} ${LDFLAGS}" + LIBS="-lxml2 ${LIBS}"]) + else + CFLAGS_="`$XML2_CONFIG --cflags` ${CFLAGS}" + LDFLAGS_="`$XML2_CONFIG --libs` ${CFLAGS}" + fi + + AC_CHECK_LIB( xml2, xmlMalloc,have_libxml2=1,AC_MSG_ERROR(libxml2 not found)) + + AC_ARG_WITH( xslt-config, + [ --with-xslt-config set xslt-config location [search path]], + AC_MSG_RESULT( using $with_xslt_config for xslt-config) + XSLT_CONFIG=$with_xslt_config, + [AC_PATH_PROGS( XSLT_CONFIG, xslt-config, no)]) + + if test "$XSLT_CONFIG" = "no"; then + AC_ARG_WITH( libxlst-inc, + [ --with-libxlst-inc=DIR location for libxlst headers], + [CFLAGS="-I${withval} ${CFLAGS}"]) + + AC_ARG_WITH( libxlst-lib, + [ --with-libxlst-lib=DIR location for libxlst library], + [LDFLAGS="-L${withval} ${LDFLAGS}"; + LIBS="-lxslt ${LIBS}"]) + else + CFLAGS="`$XSLT_CONFIG --cflags` ${CFLAGS}" + LDFLAGS="`$XSLT_CONFIG --libs` ${LDFLAGS}" + fi +dnl AC_LANG_CPLUSPLUS +dnl AC_CHECK_HEADERS( transform.h xsltutils.h exslt.h) + + AC_CHECK_LIB( xslt, xsltText, + have_libxslt=1, + AC_MSG_ERROR(libxslt not found)) + + AC_CHECK_LIB( exslt, exsltStrRegister, + have_libexslt=1; LIBS="${LIBS} -lexslt", + AC_MSG_ERROR(libexslt not found)) +fi + +AC_OUTPUT(Makefile) \ No newline at end of file Index: gtalk/configure diff -u gtalk/configure:1.5 gtalk/configure:1.6 --- gtalk/configure:1.5 Thu Oct 19 12:27:08 2006 +++ gtalk/configure Thu Oct 19 21:47:47 2006 @@ -2,6 +2,8 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for gtalk 1.4. # +# Report bugs to . +# # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. @@ -269,7 +271,7 @@ PACKAGE_TARNAME='gtalk' PACKAGE_VERSION='1.4' PACKAGE_STRING='gtalk 1.4' -PACKAGE_BUGREPORT='' +PACKAGE_BUGREPORT='galateatalk-dev ＠ lists.sourceforge.jp' # Factoring default headers for most tests. ac_includes_default="\ @@ -308,7 +310,7 @@ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP RM TAR GZIP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP RM TAR GZIP build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP CHASEN_CONFIG XML2_CONFIG XSLT_CONFIG LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -848,6 +850,24 @@ --enable-debug Turn on debug mode (default=no) --enable-da Use audio output (default=yes) --enable-threadda Use Thread DA (default=no) + --enable-splib Use spLib (default=no) + --enable-chasenlib Use chasenlib + --enable-chaone Use chaone + +Optional Packages: + --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] + --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-splib-inc=DIR location for splib headers + --with-splib-lib=DIR location for splib lib + --with-chasen-config set chasen-config location search path + --with-chasen-inc=DIR location for libchasen headers + --with-chasen-lib=DIR location for libchasen library + --with-xml2-config set xml2-config location search path + --with-libxml2-inc=DIR location for libxml2 headers + --with-libxml2-lib=DIR location for libxml2 library + --with-xslt-config set xslt-config location search path + --with-libxlst-inc=DIR location for libxlst headers + --with-libxlst-lib=DIR location for libxlst library Some influential environment variables: CC C compiler command @@ -861,6 +881,7 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. +Report bugs to . _ACEOF fi @@ -2672,10 +2693,9 @@ - -echo "$as_me:$LINENO: checking for main in -lm" >&5 -echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6 -if test "${ac_cv_lib_m_main+set}" = set; then +echo "$as_me:$LINENO: checking for log in -lm" >&5 +echo $ECHO_N "checking for log in -lm... $ECHO_C" >&6 +if test "${ac_cv_lib_m_log+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -2687,11 +2707,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char log (); int main () { -main (); +log (); ; return 0; } @@ -2718,26 +2744,25 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_m_main=yes + ac_cv_lib_m_log=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_m_main=no +ac_cv_lib_m_log=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5 -echo "${ECHO_T}$ac_cv_lib_m_main" >&6 -if test $ac_cv_lib_m_main = yes; then - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBM 1 -_ACEOF - - LIBS="-lm $LIBS" - +echo "$as_me:$LINENO: result: $ac_cv_lib_m_log" >&5 +echo "${ECHO_T}$ac_cv_lib_m_log" >&6 +if test $ac_cv_lib_m_log = yes; then + have_libm=1; LIBS="-lm ${LIBS}" +else + { { echo "$as_me:$LINENO: error: libm not found" >&5 +echo "$as_me: error: libm not found" >&2;} + { (exit 1); exit 1; }; } fi @@ -3150,9 +3175,9 @@ echo "$as_me: WARNING: sys/audioio.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to the gtalk lists. ## -## -------------------------------- ## +## --------------------------------------------------- ## +## Report this to galateatalk-dev ＠ lists.sourceforge.jp ## +## --------------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -3230,9 +3255,9 @@ _ACEOF -echo "$as_me:$LINENO: checking for main in -lpthread" >&5 -echo $ECHO_N "checking for main in -lpthread... $ECHO_C" >&6 -if test "${ac_cv_lib_pthread_main+set}" = set; then +echo "$as_me:$LINENO: checking for pthrad_create in -lpthread" >&5 +echo $ECHO_N "checking for pthrad_create in -lpthread... $ECHO_C" >&6 +if test "${ac_cv_lib_pthread_pthrad_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -3244,11 +3269,17 @@ cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ - +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char pthrad_create (); int main () { -main (); +pthrad_create (); ; return 0; } @@ -3275,20 +3306,20 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then - ac_cv_lib_pthread_main=yes + ac_cv_lib_pthread_pthrad_create=yes else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -ac_cv_lib_pthread_main=no +ac_cv_lib_pthread_pthrad_create=no fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_main" >&5 -echo "${ECHO_T}$ac_cv_lib_pthread_main" >&6 -if test $ac_cv_lib_pthread_main = yes; then +echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthrad_create" >&5 +echo "${ECHO_T}$ac_cv_lib_pthread_pthrad_create" >&6 +if test $ac_cv_lib_pthread_pthrad_create = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBPTHREAD 1 _ACEOF @@ -3375,7 +3406,7 @@ #define AUTO_DA 1 _ACEOF - LIBS="$LIBS -lpthread" + LIBS="$LIBS -lpthread -ldl" fi echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 @@ -3734,9 +3765,9 @@ echo "$as_me: WARNING: readline/readline.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## -------------------------------- ## -## Report this to the gtalk lists. ## -## -------------------------------- ## +## --------------------------------------------------- ## +## Report this to galateatalk-dev ＠ lists.sourceforge.jp ## +## --------------------------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -3972,176 +4003,1418 @@ fi - ac_config_files="$ac_config_files Makefile" -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -{ - (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +use_splib=no -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' +# Check whether --enable-splib or --disable-splib was given. +if test "${enable_splib+set}" = set; then + enableval="$enable_splib" + if test "$enable_splib" = "yes"; then + use_splib=yes fi +fi; -# Transform confdefs.h into DEFS. -# Protect against shell expansion while executing Makefile rules. -# Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed - - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs +if test "$use_splib" = "yes"; then +# Check whether --with-splib-inc or --without-splib-inc was given. +if test "${with_splib_inc+set}" = set; then + withval="$with_splib_inc" + CFLAGS="-I${withval} ${CFLAGS}" +fi; -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. +# Check whether --with-splib-lib or --without-splib-lib was given. +if test "${with_splib_lib+set}" = set; then + withval="$with_splib_lib" + LDFLAGS="-L${withval} ${LDFLAGS}" +fi; -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} + if test "${ac_cv_header_sp_spBaseLib_h+set}" = set; then + echo "$as_me:$LINENO: checking for sp/spBaseLib.h" >&5 +echo $ECHO_N "checking for sp/spBaseLib.h... $ECHO_C" >&6 +if test "${ac_cv_header_sp_spBaseLib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_sp_spBaseLib_h" >&5 +echo "${ECHO_T}$ac_cv_header_sp_spBaseLib_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking sp/spBaseLib.h usability" >&5 +echo $ECHO_N "checking sp/spBaseLib.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix +ac_header_compiler=no fi -DUALCASE=1; export DUALCASE # for MKS sh +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset +# Is the header present? +echo "$as_me:$LINENO: checking sp/spBaseLib.h presence" >&5 +echo $ECHO_N "checking sp/spBaseLib.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi else - as_unset=false + ac_cpp_err=yes fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: sp/spBaseLib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sp/spBaseLib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spBaseLib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sp/spBaseLib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sp/spBaseLib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sp/spBaseLib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spBaseLib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sp/spBaseLib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spBaseLib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sp/spBaseLib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spBaseLib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sp/spBaseLib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spBaseLib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sp/spBaseLib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spBaseLib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sp/spBaseLib.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## --------------------------------------------------- ## +## Report this to galateatalk-dev ＠ lists.sourceforge.jp ## +## --------------------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for sp/spBaseLib.h" >&5 +echo $ECHO_N "checking for sp/spBaseLib.h... $ECHO_C" >&6 +if test "${ac_cv_header_sp_spBaseLib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_sp_spBaseLib_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_sp_spBaseLib_h" >&5 +echo "${ECHO_T}$ac_cv_header_sp_spBaseLib_h" >&6 + +fi +if test $ac_cv_header_sp_spBaseLib_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: splib header not found" >&5 +echo "$as_me: error: splib header not found" >&2;} + { (exit 1); exit 1; }; } +fi + + + + if test "${ac_cv_header_sp_spAudioLib_h+set}" = set; then + echo "$as_me:$LINENO: checking for sp/spAudioLib.h" >&5 +echo $ECHO_N "checking for sp/spAudioLib.h... $ECHO_C" >&6 +if test "${ac_cv_header_sp_spAudioLib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_sp_spAudioLib_h" >&5 +echo "${ECHO_T}$ac_cv_header_sp_spAudioLib_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking sp/spAudioLib.h usability" >&5 +echo $ECHO_N "checking sp/spAudioLib.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking sp/spAudioLib.h presence" >&5 +echo $ECHO_N "checking sp/spAudioLib.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: sp/spAudioLib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sp/spAudioLib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spAudioLib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sp/spAudioLib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sp/spAudioLib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sp/spAudioLib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spAudioLib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sp/spAudioLib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spAudioLib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sp/spAudioLib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spAudioLib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sp/spAudioLib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spAudioLib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sp/spAudioLib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sp/spAudioLib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sp/spAudioLib.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## --------------------------------------------------- ## +## Report this to galateatalk-dev ＠ lists.sourceforge.jp ## +## --------------------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for sp/spAudioLib.h" >&5 +echo $ECHO_N "checking for sp/spAudioLib.h... $ECHO_C" >&6 +if test "${ac_cv_header_sp_spAudioLib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_sp_spAudioLib_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_sp_spAudioLib_h" >&5 +echo "${ECHO_T}$ac_cv_header_sp_spAudioLib_h" >&6 + +fi +if test $ac_cv_header_sp_spAudioLib_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: splib header not found" >&5 +echo "$as_me: error: splib header not found" >&2;} + { (exit 1); exit 1; }; } +fi + + + + echo "$as_me:$LINENO: checking for spDebug in -lspb.linux-glibc " >&5 +echo $ECHO_N "checking for spDebug in -lspb.linux-glibc ... $ECHO_C" >&6 +if test "${ac_cv_lib_spb_linux_glibc__spDebug+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lspb.linux-glibc -lm $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char spDebug (); +int +main () +{ +spDebug (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_spb_linux_glibc__spDebug=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_spb_linux_glibc__spDebug=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_spb_linux_glibc__spDebug" >&5 +echo "${ECHO_T}$ac_cv_lib_spb_linux_glibc__spDebug" >&6 +if test $ac_cv_lib_spb_linux_glibc__spDebug = yes; then + have_libspb=1; LIBS="-lspa.linux-glibc ${LIBS}" +else + { { echo "$as_me:$LINENO: error: spBase library not found" >&5 +echo "$as_me: error: spBase library not found" >&2;} + { (exit 1); exit 1; }; } +fi + + + echo "$as_me:$LINENO: checking for spInitAudioDriver in -lspa.linux-glibc " >&5 +echo $ECHO_N "checking for spInitAudioDriver in -lspa.linux-glibc ... $ECHO_C" >&6 +if test "${ac_cv_lib_spa_linux_glibc__spInitAudioDriver+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lspa.linux-glibc -lm -lspb.linux-glibc -lpthread -ldl $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char spInitAudioDriver (); +int +main () +{ +spInitAudioDriver (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_spa_linux_glibc__spInitAudioDriver=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_spa_linux_glibc__spInitAudioDriver=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_spa_linux_glibc__spInitAudioDriver" >&5 +echo "${ECHO_T}$ac_cv_lib_spa_linux_glibc__spInitAudioDriver" >&6 +if test $ac_cv_lib_spa_linux_glibc__spInitAudioDriver = yes; then + have_libspa=1; LIBS="${LIBS} -lspb.linux-glibc ${LIBS}" +else + { { echo "$as_me:$LINENO: error: spAudio library not found" >&5 +echo "$as_me: error: spAudio library not found" >&2;} + { (exit 1); exit 1; }; } +fi + + + cat >>confdefs.h <<\_ACEOF +#define USE_SPLIB 1 +_ACEOF + +fi + + +use_chasenlib=no +# Check whether --enable-chasenlib or --disable-chasenlib was given. +if test "${enable_chasenlib+set}" = set; then + enableval="$enable_chasenlib" + if test "$enable_chasenlib" = "yes"; then + use_chasenlib=yes +fi +fi; + +if test "$use_chasenlib" = "yes"; then + +# Check whether --with-chasen-config or --without-chasen-config was given. +if test "${with_chasen_config+set}" = set; then + withval="$with_chasen_config" + echo "$as_me:$LINENO: result: using $with_chasen_config for chasen-config" >&5 +echo "${ECHO_T}using $with_chasen_config for chasen-config" >&6 + CHASEN_CONFIG=$with_chasen_config +else + for ac_prog in chasen-config +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_CHASEN_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $CHASEN_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_CHASEN_CONFIG="$CHASEN_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_CHASEN_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +CHASEN_CONFIG=$ac_cv_path_CHASEN_CONFIG + +if test -n "$CHASEN_CONFIG"; then + echo "$as_me:$LINENO: result: $CHASEN_CONFIG" >&5 +echo "${ECHO_T}$CHASEN_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$CHASEN_CONFIG" && break +done +test -n "$CHASEN_CONFIG" || CHASEN_CONFIG="no" + +fi; + + if test "$CHASEN_CONFIG" = "no"; then + +# Check whether --with-chasen-inc or --without-chasen-inc was given. +if test "${with_chasen_inc+set}" = set; then + withval="$with_chasen_inc" + CFLAGS="-I${withval} ${CFLAGS}" +fi; + + +# Check whether --with-chasen-lib or --without-chasen-lib was given. +if test "${with_chasen_lib+set}" = set; then + withval="$with_chasen_lib" + LDFLAGS="-L${withval} ${LDFLAGS}" +fi; + + else + CFLAGS="`$CHASEN_CONFIG --cflags` ${CFLAGS}" + LDFLAGS="`$CHASEN_CONFIG --libs` ${LDFLAGS}" + fi + + echo "$as_me:$LINENO: checking for main in -lstdc++" >&5 +echo $ECHO_N "checking for main in -lstdc++... $ECHO_C" >&6 +if test "${ac_cv_lib_stdcpp_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lstdc++ $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + +int +main () +{ +main (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_stdcpp_main=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_stdcpp_main=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_stdcpp_main" >&5 +echo "${ECHO_T}$ac_cv_lib_stdcpp_main" >&6 +if test $ac_cv_lib_stdcpp_main = yes; then + LIBS="-lstdc++ ${LIBS}" +else + { { echo "$as_me:$LINENO: error: libstdc++ not found" >&5 +echo "$as_me: error: libstdc++ not found" >&2;} + { (exit 1); exit 1; }; } +fi + + + if test "${ac_cv_header_chasen_h+set}" = set; then + echo "$as_me:$LINENO: checking for chasen.h" >&5 +echo $ECHO_N "checking for chasen.h... $ECHO_C" >&6 +if test "${ac_cv_header_chasen_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_chasen_h" >&5 +echo "${ECHO_T}$ac_cv_header_chasen_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking chasen.h usability" >&5 +echo $ECHO_N "checking chasen.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking chasen.h presence" >&5 +echo $ECHO_N "checking chasen.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: chasen.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: chasen.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: chasen.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: chasen.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: chasen.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: chasen.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: chasen.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: chasen.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: chasen.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: chasen.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: chasen.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: chasen.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: chasen.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: chasen.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: chasen.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: chasen.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## --------------------------------------------------- ## +## Report this to galateatalk-dev ＠ lists.sourceforge.jp ## +## --------------------------------------------------- ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for chasen.h" >&5 +echo $ECHO_N "checking for chasen.h... $ECHO_C" >&6 +if test "${ac_cv_header_chasen_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_chasen_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_chasen_h" >&5 +echo "${ECHO_T}$ac_cv_header_chasen_h" >&6 + +fi +if test $ac_cv_header_chasen_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: chasen.h not found" >&5 +echo "$as_me: error: chasen.h not found" >&2;} + { (exit 1); exit 1; }; } +fi + + + + echo "$as_me:$LINENO: checking for chasen_sparse in -lchasen" >&5 +echo $ECHO_N "checking for chasen_sparse in -lchasen... $ECHO_C" >&6 +if test "${ac_cv_lib_chasen_chasen_sparse+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lchasen $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char chasen_sparse (); +int +main () +{ +chasen_sparse (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_chasen_chasen_sparse=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_chasen_chasen_sparse=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_chasen_chasen_sparse" >&5 +echo "${ECHO_T}$ac_cv_lib_chasen_chasen_sparse" >&6 +if test $ac_cv_lib_chasen_chasen_sparse = yes; then + LIBS="-lchasen ${LIBS}" +else + { { echo "$as_me:$LINENO: error: chasenlib not found" >&5 +echo "$as_me: error: chasenlib not found" >&2;} + { (exit 1); exit 1; }; } +fi + + + cat >>confdefs.h <<\_ACEOF +#define USE_CHASENLIB 1 +_ACEOF + + + CHASEN_VERSION=`$CHASEN_CONFIG --version` + echo -n "checking for chasen-version (= 2.3.3) ... " + if test "$CHASEN_VERSION" = "2.3.3"; then + echo "yes" + else + echo "no" + { { echo "$as_me:$LINENO: error: chasen version missmach" >&5 +echo "$as_me: error: chasen version missmach" >&2;} + { (exit 1); exit 1; }; } + fi + +fi + +use_chaone=no +# Check whether --enable-chaone or --disable-chaone was given. +if test "${enable_chaone+set}" = set; then + enableval="$enable_chaone" + if test "$enable_chaone" = "yes"; then + use_chaone=yes +fi +fi; + +if test "$use_chaone" = "yes"; then + +# Check whether --with-libxml2-config or --without-libxml2-config was given. +if test "${with_libxml2_config+set}" = set; then + withval="$with_libxml2_config" + echo "$as_me:$LINENO: result: using $with_xml2_config for xml2-config" >&5 +echo "${ECHO_T}using $with_xml2_config for xml2-config" >&6 + XML2_CONFIG=$with_xml2_config +else + for ac_prog in xml2-config +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XML2_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $XML2_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_XML2_CONFIG="$XML2_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XML2_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +XML2_CONFIG=$ac_cv_path_XML2_CONFIG + +if test -n "$XML2_CONFIG"; then + echo "$as_me:$LINENO: result: $XML2_CONFIG" >&5 +echo "${ECHO_T}$XML2_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$XML2_CONFIG" && break +done +test -n "$XML2_CONFIG" || XML2_CONFIG="no" + +fi; + + if test "$XML2_CONFIG" = "no"; then + +# Check whether --with-libxml2-inc or --without-libxml2-inc was given. +if test "${with_libxml2_inc+set}" = set; then + withval="$with_libxml2_inc" + CFLAGS="-I${withval} ${CFLAGS}" +fi; + + +# Check whether --with-libxml2-lib or --without-libxml2-lib was given. +if test "${with_libxml2_lib+set}" = set; then + withval="$with_libxml2_lib" + LDFLAGS="-L${withval} ${LDFLAGS}" + LIBS="-lxml2 ${LIBS}" +fi; + else + CFLAGS_="`$XML2_CONFIG --cflags` ${CFLAGS}" + LDFLAGS_="`$XML2_CONFIG --libs` ${CFLAGS}" + fi + + echo "$as_me:$LINENO: checking for xmlMalloc in -lxml2" >&5 +echo $ECHO_N "checking for xmlMalloc in -lxml2... $ECHO_C" >&6 +if test "${ac_cv_lib_xml2_xmlMalloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxml2 $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char xmlMalloc (); +int +main () +{ +xmlMalloc (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_xml2_xmlMalloc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_xml2_xmlMalloc=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_xml2_xmlMalloc" >&5 +echo "${ECHO_T}$ac_cv_lib_xml2_xmlMalloc" >&6 +if test $ac_cv_lib_xml2_xmlMalloc = yes; then + have_libxml2=1 +else + { { echo "$as_me:$LINENO: error: libxml2 not found" >&5 +echo "$as_me: error: libxml2 not found" >&2;} + { (exit 1); exit 1; }; } +fi + + + +# Check whether --with-xslt-config or --without-xslt-config was given. +if test "${with_xslt_config+set}" = set; then + withval="$with_xslt_config" + echo "$as_me:$LINENO: result: using $with_xslt_config for xslt-config" >&5 +echo "${ECHO_T}using $with_xslt_config for xslt-config" >&6 + XSLT_CONFIG=$with_xslt_config +else + for ac_prog in xslt-config +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XSLT_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $XSLT_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_XSLT_CONFIG="$XSLT_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XSLT_CONFIG="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + ;; +esac +fi +XSLT_CONFIG=$ac_cv_path_XSLT_CONFIG + +if test -n "$XSLT_CONFIG"; then + echo "$as_me:$LINENO: result: $XSLT_CONFIG" >&5 +echo "${ECHO_T}$XSLT_CONFIG" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + test -n "$XSLT_CONFIG" && break +done +test -n "$XSLT_CONFIG" || XSLT_CONFIG="no" + +fi; + + if test "$XSLT_CONFIG" = "no"; then + +# Check whether --with-libxlst-inc or --without-libxlst-inc was given. +if test "${with_libxlst_inc+set}" = set; then + withval="$with_libxlst_inc" + CFLAGS="-I${withval} ${CFLAGS}" +fi; + + +# Check whether --with-libxlst-lib or --without-libxlst-lib was given. +if test "${with_libxlst_lib+set}" = set; then + withval="$with_libxlst_lib" + LDFLAGS="-L${withval} ${LDFLAGS}"; + LIBS="-lxslt ${LIBS}" +fi; + else + CFLAGS="`$XSLT_CONFIG --cflags` ${CFLAGS}" + LDFLAGS="`$XSLT_CONFIG --libs` ${LDFLAGS}" + fi + + echo "$as_me:$LINENO: checking for xsltText in -lxslt" >&5 +echo $ECHO_N "checking for xsltText in -lxslt... $ECHO_C" >&6 +if test "${ac_cv_lib_xslt_xsltText+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxslt $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char xsltText (); +int +main () +{ +xsltText (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_xslt_xsltText=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_xslt_xsltText=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_xslt_xsltText" >&5 +echo "${ECHO_T}$ac_cv_lib_xslt_xsltText" >&6 +if test $ac_cv_lib_xslt_xsltText = yes; then + have_libxslt=1 +else + { { echo "$as_me:$LINENO: error: libxslt not found" >&5 +echo "$as_me: error: libxslt not found" >&2;} + { (exit 1); exit 1; }; } +fi + + + echo "$as_me:$LINENO: checking for exsltStrRegister in -lexslt" >&5 +echo $ECHO_N "checking for exsltStrRegister in -lexslt... $ECHO_C" >&6 +if test "${ac_cv_lib_exslt_exsltStrRegister+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lexslt $LIBS" +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char exsltStrRegister (); +int +main () +{ +exsltStrRegister (); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_lib_exslt_exsltStrRegister=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_exslt_exsltStrRegister=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_exslt_exsltStrRegister" >&5 +echo "${ECHO_T}$ac_cv_lib_exslt_exsltStrRegister" >&6 +if test $ac_cv_lib_exslt_exsltStrRegister = yes; then + have_libexslt=1; LIBS="${LIBS} -lexslt" +else + { { echo "$as_me:$LINENO: error: libexslt not found" >&5 +echo "$as_me: error: libexslt not found" >&2;} + { (exit 1); exit 1; }; } +fi + +fi + + ac_config_files="$ac_config_files Makefile" +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, don't put newlines in cache variables' values. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +{ + (set) 2>&1 | + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" + ;; + esac; +} | + sed ' + t clear + : clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + : end' >>confcache +if diff $cache_file confcache >/dev/null 2>&1; then :; else + if test -w $cache_file; then + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" + cat confcache >$cache_file + else + echo "not updating unwritable cache $cache_file" + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/; +s/:*\${srcdir}:*/:/; +s/:*@srcdir@:*/:/; +s/^\([^=]*=[ ]*\):*/\1/; +s/:*$//; +s/^[^=]*=[ ]*$//; +}' +fi + +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then we branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +cat >confdef2opt.sed <<\_ACEOF +t clear +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g +t quote +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g +t quote +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed + + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + +: ${CONFIG_STATUS=./config.status} +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix +fi +DUALCASE=1; export DUALCASE # for MKS sh + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH +PS1='$ ' PS2='> ' PS4='+ ' @@ -4627,6 +5900,9 @@ s, ＠ host_vendor@,$host_vendor,;t t s, ＠ host_os@,$host_os,;t t s, ＠ EGREP@,$EGREP,;t t +s, ＠ CHASEN_CONFIG@,$CHASEN_CONFIG,;t t +s, ＠ XML2_CONFIG@,$XML2_CONFIG,;t t +s, ＠ XSLT_CONFIG@,$XSLT_CONFIG,;t t s, ＠ LIBOBJS@,$LIBOBJS,;t t s, ＠ LTLIBOBJS@,$LTLIBOBJS,;t t CEOF @@ -4891,4 +6167,3 @@ # would make configure fail if this is the last instruction. $ac_cs_success || { (exit 1); exit 1; } fi - From galateatalk-dev ＠ lists.sourceforge.jp Sun Oct 22 14:42:02 2006 From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp) Date: Sun, 22 Oct 2006 14:42:02 +0900 Subject: [gtalk-dev 0005] CVS update: chaone Message-ID: <20061022054202.C845F2AC019@users.sourceforge.jp> Index: chaone/accent.xsl diff -u chaone/accent.xsl:1.1.1.1 chaone/accent.xsl:1.2 --- chaone/accent.xsl:1.1.1.1 Thu Sep 14 14:45:38 2006 +++ chaone/accent.xsl Sun Oct 22 14:42:02 2006 @@ -3,8 +3,9 @@ - - + + + + + + + + + + @@ -385,9 +393,9 @@ - PAU - SILE + SILE NON Index: chaone/ap_rule.xml diff -u chaone/ap_rule.xml:1.1.1.1 chaone/ap_rule.xml:1.2 --- chaone/ap_rule.xml:1.1.1.1 Thu Sep 14 14:44:13 2006 +++ chaone/ap_rule.xml Sun Oct 22 14:42:02 2006 @@ -2,8 +2,9 @@ - - + + + @@ -24,14 +25,6 @@ - - - - - - - - @@ -54,8 +47,8 @@ - - + + @@ -65,20 +58,62 @@ - - + + - - + + - + + + + 
+          
+        
+        
+        
+          
+        
+        
+          
+        
+      
+    
+  
+  
+
+
+
+
+  
+    
       
-    
+      
+        
+          
+          
+        
+        
+          
+          
+        
+        
+          
+        
+        
+          
+        
+      
+    
   
   
 
Index: chaone/chaone_t_main.xsl
diff -u chaone/chaone_t_main.xsl:1.1.1.1 chaone/chaone_t_main.xsl:1.2
--- chaone/chaone_t_main.xsl:1.1.1.1	Thu Sep 14 14:44:58 2006
+++ chaone/chaone_t_main.xsl	Sun Oct 22 14:42:02 2006
@@ -2,14 +2,15 @@
 
 
 
-
+
+
 
 
 
 
 
-
-
+
+
 
 
 
@@ -47,8 +48,10 @@
 
   
   
-  
-  
+  
+  
+  
+  
   
   
   
@@ -65,7 +68,14 @@
         
       
     
-    
+    
+  
+
+  
+    
+      
+      
+    
   
 
   
Index: chaone/chunk_rules.xml
diff -u chaone/chunk_rules.xml:1.1.1.1 chaone/chunk_rules.xml:1.2
--- chaone/chunk_rules.xml:1.1.1.1	Thu Sep 14 14:41:42 2006
+++ chaone/chunk_rules.xml	Sun Oct 22 14:42:02 2006
@@ -1,14 +1,20 @@
 
 
+
+
+
+
+
+
 
   
-    
+    
     
       
     
     
       
-        
+        
       
       
         
@@ -17,13 +23,13 @@
     
   
   
-    
+    
     
       
     
     
       
-        
+        
       
       
         
@@ -42,13 +48,13 @@
     
   
   
-    
+    
     
       
     
     
       
-        
+        
       
       
         
@@ -57,13 +63,13 @@
     
   
   
-    
+    
     
       
     
     
       
-        
+        
       
       
         
@@ -82,28 +88,28 @@
     
   
   
-    
+    
     
       
     
     
       
-        
+        
       
       
         
       
-      
+      
     
   
   
-    
+    
     
       
     
     
       
-        
+        
       
       
         
@@ -122,34 +128,31 @@
     
   
   
-    
+    
     
       
     
     
       
-        
+        
       
-      
+      
       
-        
+        
       
-      
-        
-      
       
         
-    
+    
     
       
     
     
       
-        
+        
       
       
         
@@ -158,13 +161,13 @@
     
   
   
-    
+    
     
       
     
     
       
-        
+        
       
       
         
@@ -192,19 +195,19 @@
     
   
   
-    
+    
     
       
     
     
       
       
-        
+        
       
     
   
   
-    
+    
     
       
     
@@ -214,12 +217,12 @@
       
       
       
-        
+        
       
     
   
   
-    
+    
     
       
     
@@ -229,19 +232,19 @@
       
       
       
-        
+        
       
     
   
   
-    
+    
     
       
     
     
       
       
-        
+        
       
     
   
@@ -255,7 +258,7 @@
     
   
   
-    
+    
     
       
     
@@ -268,7 +271,7 @@
         
       
       
-        
+        
       
     
   
Index: chaone/chunker.xsl
diff -u chaone/chunker.xsl:1.1.1.1 chaone/chunker.xsl:1.2
--- chaone/chunker.xsl:1.1.1.1	Thu Sep 14 14:44:58 2006
+++ chaone/chunker.xsl	Sun Oct 22 14:42:02 2006
@@ -2,10 +2,10 @@
 
 
 
-
+
 
-
-
+
+
 
 
 
   
-    
+    
+  
+
+  
+    
+      
+      
+    
   
 
   
@@ -851,7 +858,8 @@
     
       
         
-          
+          
+          
           
         
       
Index: chaone/phonetic.xsl
diff -u chaone/phonetic.xsl:1.1.1.1 chaone/phonetic.xsl:1.2
--- chaone/phonetic.xsl:1.1.1.1	Thu Sep 14 14:44:58 2006
+++ chaone/phonetic.xsl	Sun Oct 22 14:42:02 2006
@@ -2,11 +2,12 @@
 
 
 
-
+
+
 
 
-
-
+
+
 
 
 
-  
-  
+  
+  
+  
+  
 
   
-    
+    
+  
+
+  
+    
+      
+      
+    
   
 
   
@@ -57,142 +67,290 @@
 
   
   
-    
-      
-        
+    
+      
+        
       
     
-    
-      
-        
+    
+      
+        
       
     
-    
-      
-        
-        
-      
+    
+      
+        
+          
+        
+        
+          
+        
+        
+          
+
+          
+
+        
+      
     
     
-      
-      
-        
-          
-        
-      
-      
-        
-          
-        
-      
-      
-        
-          
-        
-      
+      
+        
+          
+        
+      
     
   
 
-  
-    
-    
-    
-    
-    
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-      
+  
+    
+    
+    
+    
+      
+        
+          
+            
+            
+            
+            
+          
+        
+        
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+    
+      
         
-          
-            
+          
+            
           
           
-            
+            
           
         
-      
-      
-    
+      
+      
+        
+          
+          
+          
+          
+        
+      
+    
   
 
-  
+  
     
-    
-    
-    
-    
-      
-      
-        
-          
-          
+    
+    
+      
+      
+        
+          
         
       
+      
+      
+      
+      
+      
     
   
 
-  
-    
-    
-    
-    
-    
+  
+    
     
-      
-        
-          
-          
-          
+      
+        
+          
+          
+          
         
       
       
-        
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+      
+        
+        
+          
+            
+              
+              
+              
+            
+          
+          
+            
+          
+        
+      
+      
+        
       
     
   
 
-  
+  
     
-    
-    
-    
-    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+      
+        
+          
+        
+        
+          
+        
+      
+    
+    
+      
+        
+      
+    
     
-      
-        
-          
-          
-          
+      
+        
+      
+      
+        
+          
+          
+          
+          
+          
+          
+          
+            
+              
+                
+              
+              
+                
+              
+            
+          
         
       
       
-        
+        
       
     
   
 
-  
-    
-    
-    
-    
-    
+  
+    
+    
+    
+    
+      
+        
+          
+        
+      
+      
+        
+          
+            
+          
+          
+            
+          
+        
+      
+      
+      
+      
+      
+      
+    
   
 
-  
-    
-    
-    
-    
-    
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+      
+        
+          
+        
+        
+          
+        
+      
+    
+    
+      
+        
+      
+    
+    
+      
+        
+      
+      
+        
+          
+          
+          
+          
+          
+          
+          
+            
+              
+                
+              
+              
+                
+              
+            
+          
+        
+      
+      
+        
+      
+    
   
 
 
Index: chaone/prep.xsl
diff -u chaone/prep.xsl:1.1.1.1 chaone/prep.xsl:1.2
--- chaone/prep.xsl:1.1.1.1	Thu Sep 14 14:45:41 2006
+++ chaone/prep.xsl	Sun Oct 22 14:42:02 2006
@@ -1,125 +1,132 @@
-
-
-
-
-
-
-
-
-
-
-
-  
-
-  
-
-  
-  
-  
-  
-  
-
-  
-    
-  
-
-  
-    
-      
-    
-  
-
-  
-    
-      
-        
-          
-        
-      
-      
-        
-      
-      
-        
-          
-          
-        
-      
-    
-  
-
-  
-    
-    
-      
-        
-      
-    
-    
-    
-      
-        
-      
-      
-        
-      
-      
-        
-          
-            
-          
-        
-      
-      
-    
-  
-
-  
-  
-    
-    
-      
-        
-        
-      
-    
-    
-      
-        
-          
-          
-        
-      
-      
-        
-      
-    
-  
-
-  
-    
-    
-    
-      
-        
-        
-          
-          
-            
-          
-        
-      
-      
-        
-      
-    
-  
-
-
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+  
+  
+  
+  
+
+  
+    
+  
+
+  
+    
+      
+      
+    
+  
+
+  
+    
+      
+    
+  
+
+  
+    
+      
+        
+          
+        
+      
+      
+        
+      
+      
+        
+          
+          
+        
+      
+    
+  
+
+  
+    
+    
+      
+        
+      
+    
+    
+    
+      
+        
+      
+      
+        
+      
+      
+        
+          
+            
+          
+        
+      
+      
+    
+  
+
+  
+  
+    
+    
+      
+        
+        
+      
+    
+    
+      
+        
+          
+          
+        
+      
+      
+        
+      
+    
+  
+
+  
+    
+    
+    
+      
+        
+        
+          
+          
+            
+          
+        
+      
+      
+        
+      
+    
+  
+
+

From galateatalk-dev ＠ lists.sourceforge.jp  Sun Oct 22 14:42:54 2006
From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp)
Date: Sun, 22 Oct 2006 14:42:54 +0900
Subject: [gtalk-dev 0006] CVS update: chaone
Message-ID: <20061022054254.8A97C2AC019@users.sourceforge.jp>

Index: chaone/FPAfn.xml
diff -u /dev/null chaone/FPAfn.xml:1.1
--- /dev/null	Sun Oct 22 14:42:54 2006
+++ chaone/FPAfn.xml	Sun Oct 22 14:42:54 2006
@@ -0,0 +1,642 @@
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+
Index: chaone/IPAfn.xml
diff -u /dev/null chaone/IPAfn.xml:1.1
--- /dev/null	Sun Oct 22 14:42:54 2006
+++ chaone/IPAfn.xml	Sun Oct 22 14:42:54 2006
@@ -0,0 +1,206 @@
+
+
+
+
+
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+

From galateatalk-dev ＠ lists.sourceforge.jp  Sun Oct 22 14:48:18 2006
From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp)
Date: Sun, 22 Oct 2006 14:48:18 +0900
Subject: [gtalk-dev 0007] CVS update: chaone
Message-ID: <20061022054818.3CD082AC097@users.sourceforge.jp>

Index: chaone/pos_sys.xml
diff -u /dev/null chaone/pos_sys.xml:1.1
--- /dev/null	Sun Oct 22 14:48:18 2006
+++ chaone/pos_sys.xml	Sun Oct 22 14:48:18 2006
@@ -0,0 +1,144 @@
+
+  
+    
+    
+    
+  
+  
+  
+  
+  
+  
+  
+    
+    
+    
+    
+  
+  
+  
+    
+    
+  
+  
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+    
+  
+    
+    
+    
+  
+  
+    
+  
+  
+  
+    
+  
+  
+  
+
Index: chaone/postp.xsl
diff -u /dev/null chaone/postp.xsl:1.1
--- /dev/null	Sun Oct 22 14:48:18 2006
+++ chaone/postp.xsl	Sun Oct 22 14:48:18 2006
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+  
+  
+  
+
+  
+    
+  
+
+  
+    
+      
+      
+    
+
+  
+
+  
+    
+      
+    
+
+  
+
+  
+    
+      
+        
+      
+      
+    
+
+  
+
+  
+    
+      
+        
+      
+    
+
+  
+
+  
+    
+    
+    
+      
+        
+          
+            
+            
+            
+          
+        
+        
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+      
+      
+        
+        
+      
+    
+    
+      
+        
+          
+            
+            
+            
+          
+        
+        
+          
+        
+        
+          
+        
+        
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+      
+        
+      
+      
+        
+      
+    
+  
+
+
Index: chaone/chaone_t_main.xsl
diff -u chaone/chaone_t_main.xsl:1.2 chaone/chaone_t_main.xsl:1.3
--- chaone/chaone_t_main.xsl:1.2	Sun Oct 22 14:42:02 2006
+++ chaone/chaone_t_main.xsl	Sun Oct 22 14:48:18 2006
@@ -2,14 +2,15 @@
 
 
 
-
+
 
 
 
 
 
 
-
+
+
 
 
 
@@ -38,8 +39,9 @@
   
   
   
+  
 
-  
+  
 
   
   
@@ -59,6 +61,10 @@
   
   
   
+  
+  
+  
+  
 
   
     
@@ -98,6 +104,9 @@
             
           
         
+        
+          
+        
         
           
             
@@ -134,9 +143,12 @@
           
             
           
-          
-            
-          
+          
+            
+              
+            
+          
+          
         
       
     

From galateatalk-dev ＠ lists.sourceforge.jp  Sun Oct 22 14:48:18 2006
From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp)
Date: Sun, 22 Oct 2006 14:48:18 +0900
Subject: [gtalk-dev 0008] CVS update: chaone/sample
Message-ID: <20061022054818.7C2C72AC099@users.sourceforge.jp>

Index: chaone/sample/test.accent.xml
diff -u chaone/sample/test.accent.xml:1.1.1.1 chaone/sample/test.accent.xml:removed
--- chaone/sample/test.accent.xml:1.1.1.1	Thu Sep 14 14:45:41 2006
+++ chaone/sample/test.accent.xml	Sun Oct 22 14:48:18 2006
@@ -1,32 +0,0 @@
-
-  
-    
-      
-    
-    
-      
-    
-  
-  
-    
-      
-    
-  
-  
-    
-      
-      
-    
-    
-      
-    
-    
-      
-    
-  
-  
-    
-      
-    
-  
-
Index: chaone/sample/test.chasen.xml
diff -u chaone/sample/test.chasen.xml:1.1.1.1 chaone/sample/test.chasen.xml:removed
--- chaone/sample/test.chasen.xml:1.1.1.1	Thu Sep 14 14:45:42 2006
+++ chaone/sample/test.chasen.xml	Sun Oct 22 14:48:18 2006
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Index: chaone/sample/test.chunker.xml
diff -u chaone/sample/test.chunker.xml:1.1.1.1 chaone/sample/test.chunker.xml:removed
--- chaone/sample/test.chunker.xml:1.1.1.1	Thu Sep 14 14:45:42 2006
+++ chaone/sample/test.chunker.xml	Sun Oct 22 14:48:18 2006
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Index: chaone/sample/test.pa.xml
diff -u chaone/sample/test.pa.xml:1.1.1.1 chaone/sample/test.pa.xml:removed
--- chaone/sample/test.pa.xml:1.1.1.1	Thu Sep 14 14:45:42 2006
+++ chaone/sample/test.pa.xml	Sun Oct 22 14:48:18 2006
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Index: chaone/sample/test.prep.xml
diff -u chaone/sample/test.prep.xml:1.1.1.1 chaone/sample/test.prep.xml:removed
--- chaone/sample/test.prep.xml:1.1.1.1	Thu Sep 14 14:45:42 2006
+++ chaone/sample/test.prep.xml	Sun Oct 22 14:48:18 2006
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Index: chaone/sample/test.txt
diff -u chaone/sample/test.txt:1.1.1.1 chaone/sample/test.txt:removed
--- chaone/sample/test.txt:1.1.1.1	Thu Sep 14 14:45:42 2006
+++ chaone/sample/test.txt	Sun Oct 22 14:48:18 2006
@@ -1 +0,0 @@
-これは、何本ですか？

From galateatalk-dev ＠ lists.sourceforge.jp  Sun Oct 22 14:49:53 2006
From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp)
Date: Sun, 22 Oct 2006 14:49:53 +0900
Subject: [gtalk-dev 0009] CVS update: chaone
Message-ID: <20061022054953.94DCD2AC019@users.sourceforge.jp>

Index: chaone/FPAForm.xml
diff -u chaone/FPAForm.xml:1.1.1.1 chaone/FPAForm.xml:removed
--- chaone/FPAForm.xml:1.1.1.1	Thu Sep 14 14:41:20 2006
+++ chaone/FPAForm.xml	Sun Oct 22 14:49:53 2006
@@ -1,712 +0,0 @@
-
-
-
-
-
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-   
-   
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-
Index: chaone/IPAForm.xml
diff -u chaone/IPAForm.xml:1.1.1.1 chaone/IPAForm.xml:removed
--- chaone/IPAForm.xml:1.1.1.1	Thu Sep 14 14:41:42 2006
+++ chaone/IPAForm.xml	Sun Oct 22 14:49:53 2006
@@ -1,299 +0,0 @@
-
-
-
-
-
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-  
-

From galateatalk-dev ＠ lists.sourceforge.jp  Sun Oct 22 14:56:47 2006
From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp)
Date: Sun, 22 Oct 2006 14:56:47 +0900
Subject: [gtalk-dev 0010] CVS update: chaone-win/sample
Message-ID: <20061022055647.31C8C2AC019@users.sourceforge.jp>

Index: chaone-win/sample/test.accent.xml
diff -u chaone-win/sample/test.accent.xml:1.1.1.1 chaone-win/sample/test.accent.xml:removed
--- chaone-win/sample/test.accent.xml:1.1.1.1	Thu Sep 14 14:56:44 2006
+++ chaone-win/sample/test.accent.xml	Sun Oct 22 14:56:47 2006
@@ -1,32 +0,0 @@
-
-  
-    
-      
-    
-    
-      
-    
-  
-  
-    
-      
-    
-  
-  
-    
-      
-      
-    
-    
-      
-    
-    
-      
-    
-  
-  
-    
-      
-    
-  
-
Index: chaone-win/sample/test.chasen.xml
diff -u chaone-win/sample/test.chasen.xml:1.1.1.1 chaone-win/sample/test.chasen.xml:removed
--- chaone-win/sample/test.chasen.xml:1.1.1.1	Thu Sep 14 14:56:46 2006
+++ chaone-win/sample/test.chasen.xml	Sun Oct 22 14:56:47 2006
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Index: chaone-win/sample/test.chunker.xml
diff -u chaone-win/sample/test.chunker.xml:1.1.1.1 chaone-win/sample/test.chunker.xml:removed
--- chaone-win/sample/test.chunker.xml:1.1.1.1	Thu Sep 14 14:56:46 2006
+++ chaone-win/sample/test.chunker.xml	Sun Oct 22 14:56:47 2006
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Index: chaone-win/sample/test.pa.xml
diff -u chaone-win/sample/test.pa.xml:1.1.1.1 chaone-win/sample/test.pa.xml:removed
--- chaone-win/sample/test.pa.xml:1.1.1.1	Thu Sep 14 14:56:46 2006
+++ chaone-win/sample/test.pa.xml	Sun Oct 22 14:56:47 2006
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Index: chaone-win/sample/test.prep.xml
diff -u chaone-win/sample/test.prep.xml:1.1.1.1 chaone-win/sample/test.prep.xml:removed
--- chaone-win/sample/test.prep.xml:1.1.1.1	Thu Sep 14 14:56:46 2006
+++ chaone-win/sample/test.prep.xml	Sun Oct 22 14:56:47 2006
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
Index: chaone-win/sample/test.txt
diff -u chaone-win/sample/test.txt:1.1.1.1 chaone-win/sample/test.txt:removed
--- chaone-win/sample/test.txt:1.1.1.1	Thu Sep 14 14:56:46 2006
+++ chaone-win/sample/test.txt	Sun Oct 22 14:56:47 2006
@@ -1 +0,0 @@
-これは、何本ですか？

From galateatalk-dev ＠ lists.sourceforge.jp  Sun Oct 22 14:57:55 2006
From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp)
Date: Sun, 22 Oct 2006 14:57:55 +0900
Subject: [gtalk-dev 0011] CVS update: chaone-win
Message-ID: <20061022055755.E113B2AC047@users.sourceforge.jp>

Index: chaone-win/accent.xsl
diff -u chaone-win/accent.xsl:1.2 chaone-win/accent.xsl:1.3
--- chaone-win/accent.xsl:1.2	Sun Oct 22 14:56:46 2006
+++ chaone-win/accent.xsl	Sun Oct 22 14:57:55 2006
@@ -17,8 +17,7 @@
   version="1.0"
   xml:lang="ja">
 
-  
-  
+  
 
   
 
Index: chaone-win/chaone_t_main.xsl
diff -u chaone-win/chaone_t_main.xsl:1.2 chaone-win/chaone_t_main.xsl:1.3
--- chaone-win/chaone_t_main.xsl:1.2	Sun Oct 22 14:56:46 2006
+++ chaone-win/chaone_t_main.xsl	Sun Oct 22 14:57:55 2006
@@ -2,14 +2,15 @@
 
 
 
-
+
 
 
 
 
 
 
-
+
+
 
 
 
@@ -38,8 +39,9 @@
   
   
   
+  
 
-  
+  
 
   
   
@@ -59,6 +61,10 @@
   
   
   
+  
+  
+  
+  
 
   
     
@@ -72,14 +78,14 @@
   
 
   
-    
+    
       
       
-    
+    
   
 
   
-    
+    
       
         
           
@@ -98,6 +104,9 @@
             
           
         
+        
+          
+        
         
           
             
@@ -134,12 +143,15 @@
           
             
           
-          
-            
-          
+          
+            
+              
+            
+          
+          
         
       
-    
+    
   
 
   
Index: chaone-win/pos_sys.xml
diff -u /dev/null chaone-win/pos_sys.xml:1.1
--- /dev/null	Sun Oct 22 14:57:55 2006
+++ chaone-win/pos_sys.xml	Sun Oct 22 14:57:55 2006
@@ -0,0 +1,144 @@
+
+  
+    
+    
+    
+  
+  
+  
+  
+  
+  
+  
+    
+    
+    
+    
+  
+  
+  
+    
+    
+  
+  
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+  
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+  
+  
+  
+  
+  
+  
+  
+  
+  
+  
+    
+  
+    
+    
+    
+  
+  
+    
+  
+  
+  
+    
+  
+  
+  
+
Index: chaone-win/postp.xsl
diff -u /dev/null chaone-win/postp.xsl:1.1
--- /dev/null	Sun Oct 22 14:57:55 2006
+++ chaone-win/postp.xsl	Sun Oct 22 14:57:55 2006
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+  
+  
+  
+
+  
+    
+  
+
+  
+    
+      
+      
+    
+
+  
+
+  
+    
+      
+    
+
+  
+
+  
+    
+      
+        
+      
+      
+    
+
+  
+
+  
+    
+      
+        
+      
+    
+
+  
+
+  
+    
+    
+    
+      
+        
+          
+            
+            
+            
+          
+        
+        
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+      
+      
+        
+        
+      
+    
+    
+      
+        
+          
+            
+            
+            
+          
+        
+        
+          
+        
+        
+          
+        
+        
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+      
+        
+      
+      
+        
+      
+    
+  
+
+

From galateatalk-dev ＠ lists.sourceforge.jp  Tue Oct 24 10:02:45 2006
From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp)
Date: Tue, 24 Oct 2006 10:02:45 +0900
Subject: [gtalk-dev 0012] CVS update: chaone
Message-ID: <20061024010245.1513A2AC0F2@users.sourceforge.jp>

Index: chaone/chunker.xsl
diff -u chaone/chunker.xsl:1.2 chaone/chunker.xsl:1.3
--- chaone/chunker.xsl:1.2	Sun Oct 22 14:42:02 2006
+++ chaone/chunker.xsl	Tue Oct 24 10:02:44 2006
@@ -1,956 +1,961 @@
-
-
-
-
-
-
-
-
-
-
-
-  
-
-  
-
-  
-    
-  
-
-  
-    
-      
-      
-    
-  
-
-  
-    
-      
-    
-  
-
-  
-    
-    
-      
-      
-    
-  
-
-  
-    
-    
-    
-  
-
-  
-    
-    
-    
-      
-    
-    
-      
-        
-      
-    
-    
-      
-        
-        
-        
-      
-    
-    
-      
-      
-      
-      
-        
-          
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-      
-        
-          
-            
-          
-          
-            
-          
-        
-      
-    
-    
-      
-        
-          
-            
-              
-            
-            
-              
-            
-          
-        
-        
-          
-            
-          
-          
-            
-          
-        
-      
-    
-    
-      
-    
-    
-      
-        
-          
-            
-          
-          
-            
-          
-        
-      
-      
-        
-      
-      
-        
-      
-      
-        
-          
-            
-          
-          
-            
-          
-        
-      
-    
-  
-
-  
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-        
-          
-          
-          
-        
-      
-    
-    
-    
-      
-        
-        
-      
-    
-    
-  
-
-  
-    
-    
-    
-      
-        
-          
-            T
-          
-          
-            F
-          
-        
-      
-    
-    
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-    
-      
-        
-        
-        
-      
-    
-    
-    
-    
-      
-    
-  
-
-  
-    
-    
-      
-        
-      
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-
-    
-      
-      
-        
-        
-        
-        
-        
-          
-            
-              
-                
-                  
-                
-                
-            
-            
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
-            
-          
-          
-            F
-          
-        
-      
-      
-      
-      
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-      
-        
-          
-          
-          
-          
-        
-      
-    
-    
-      
-        
-          
-          
-          
-          
-        
-      
-    
-    
-      
-        F
-      
-      
-        
-          
-            
-              
-                
-              
-              
-                
-              
-            
-          
-          
-            
-              
-                
-              
-              
-                
-              
-            
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-      
-      
-      
-      
-      
-      
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-      
-      
-      
-      
-      
-      
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-      
-        
-          
-        
-        
-          
-        
-      
-    
-    
-      
-        
-          
-            
-              
-              
-              
-              
-              
-            
-          
-          
-            F
-          
-        
-      
-      
-      
-        
-          
-            
-              
-                
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-              
-                
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
-          
-          
-            
-            
-              
-                
-                  T
-                
-              
-            
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-              
-                
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
-          
-        
-      
-      
-      
-        
-        
-          
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                
-              
-              
-                
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
-          
-          
-            
-            
-              
-                
-                  T
-                
-              
-            
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                
-              
-              
-                
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
-          
-        
-      
-      
-        
-        
-          
-            
-              T
-            
-          
-        
-        
-          
-            
-              
-              
-              
-              
-              
-            
-          
-          
-            F
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-      
-        
-          
-            
-            
-              
-                
-                  
-                
-                
-              
-              
-                
-              
-                  
-          
-          
-            
-              
-                
-                
-                  
-                    
-                      T
-                    
-                  
-                
-                
-                  #
-                  
-                  #
-                
-              
-            
-            
-            
-              
-                
-                  
-                
-                
-              
-              
-                
-              
-                  
-          
-        
-      
-      
-        
-          
-            
-            
-              
-                
-                  
-                
-                
-              
-              
-                
-              
-                  
-          
-          
-            
-              
-                
-                
-                  
-                    
-                      T
-                    
-                  
-                
-                
-                  #
-                  
-                  #
-                
-              
-            
-            
-            
-              
-                
-                  
-                
-                
-              
-              
-                
-              
-                  
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-      
-      
-      
-      
-      
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-      
-      
-      
-      
-        
-          
-          
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-      
-      
-      
-      
-        
-          
-            
-          
-          
-            
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-       	
-          
-            
-            
-              
-              
-              
-              
-              
-              
-              
-              
-            
-          
-          
-            
-            
-              
-              
-              
-              
-              
-              
-              
-              
-            
-          
-        
-      
-    
-    
-      
-        F
-      
-      
-        
-          
-            
-          
-          
-            
-          
-        
-      
-    
-  
-
-
-
-  
-    
-    
-    
-    
-    
-      
-      
-      
-      
-    
-    
-    
-      
-        
-          
-        
-        
-          
-        
-      
-    
-    
-      
-        
-          
-        
-      
-    
-  
-
-  
-    
-    
-      
-        
-          
-          
-          
-        
-      
-      
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-      
-        
-          
-        
-        
-          
-        
-      
-    
-    
-    
-    
-    
-      
-        
-          
-        
-      
-    
-    
-      
-        
-          
-        
-      
-      
-       
-      
-      
-      
-        
-          
-        
-      
-      
-      
-        
-          
-        
-      
-      
-        
-      
-    
-  
-
-
-
-  
-    
-    
-      
-        
-          
-        
-      
-      
-      
-       
-    
-  
-
-  
-    
-      
-        
-          
-        
-      
-      
-  
-
-  
-  
-
-  
-  
-
-
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+    
+  
+
+  
+    
+      
+      
+    
+  
+
+  
+    
+      
+    
+  
+
+  
+    
+    
+      
+      
+    
+  
+
+  
+    
+    
+    
+  
+
+  
+    
+    
+    
+      
+    
+    
+      
+        
+      
+    
+    
+      
+        
+        
+        
+      
+    
+    
+      
+      
+      
+      
+        
+          
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+      
+        
+          
+            
+          
+          
+            
+          
+        
+      
+    
+    
+      
+        
+          
+            
+              
+            
+            
+              
+            
+          
+        
+        
+          
+            
+          
+          
+            
+          
+        
+      
+    
+    
+      
+    
+    
+      
+        
+          
+            
+          
+          
+            
+          
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+          
+            
+          
+          
+            
+          
+        
+      
+    
+  
+
+  
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+        
+          
+          
+          
+        
+      
+    
+    
+    
+      
+        
+        
+      
+    
+    
+  
+
+  
+    
+    
+    
+      
+        
+          
+            T
+          
+          
+            F
+          
+        
+      
+    
+    
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+    
+      
+        
+        
+        
+      
+    
+    
+    
+    
+      
+    
+  
+
+  
+    
+    
+      
+        
+      
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+      
+        
+        
+        
+        
+        
+          
+            
+              
+                
+                  
+                
+                
+            
+            
+            
+              
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+            
+            
+          
+          
+            F
+          
+        
+      
+      
+      
+      
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+      
+        
+          
+          
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+          
+          
+        
+      
+    
+    
+      
+        F
+      
+      
+        
+          
+            
+              
+                
+              
+              
+                
+              
+              
+                
+              
+            
+          
+          
+            
+              
+                
+              
+              
+                
+              
+              
+                
+              
+            
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+      
+      
+      
+      
+      
+      
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+      
+      
+      
+      
+      
+      
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+      
+        
+          
+        
+        
+          
+        
+      
+    
+    
+      
+        
+          
+            
+              
+              
+              
+              
+              
+            
+          
+          
+            F
+          
+        
+      
+      
+      
+        
+          
+            
+              
+                
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+              
+                
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+            
+          
+          
+            
+            
+              
+                
+                  T
+                
+              
+            
+            
+              
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+              
+                
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+            
+          
+        
+      
+      
+      
+        
+        
+          
+            
+              
+                
+                  
+                  
+                  
+                  
+                  
+                
+              
+              
+                
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+            
+          
+          
+            
+            
+              
+                
+                  T
+                
+              
+            
+            
+              
+                
+                  
+                  
+                  
+                  
+                  
+                
+              
+              
+                
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+            
+          
+        
+      
+      
+        
+        
+          
+            
+              T
+            
+          
+        
+        
+          
+            
+              
+              
+              
+              
+              
+            
+          
+          
+            F
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+      
+        
+          
+            
+            
+              
+                
+                  
+                
+                
+              
+              
+                
+              
+                  
+          
+          
+            
+              
+                
+                
+                  
+                    
+                      T
+                    
+                  
+                
+                
+                  #
+                  
+                  #
+                
+              
+            
+            
+            
+              
+                
+                  
+                
+                
+              
+              
+                
+              
+                  
+          
+        
+      
+      
+        
+          
+            
+            
+              
+                
+                  
+                
+                
+              
+              
+                
+              
+                  
+          
+          
+            
+              
+                
+                
+                  
+                    
+                      T
+                    
+                  
+                
+                
+                  #
+                  
+                  #
+                
+              
+            
+            
+            
+              
+                
+                  
+                
+                
+              
+              
+                
+              
+                  
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+      
+      
+      
+      
+      
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+      
+      
+      
+      
+        
+          
+          
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+      
+      
+      
+      
+        
+          
+            
+          
+          
+            
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+       	
+          
+            
+            
+              
+              
+              
+              
+              
+              
+              
+              
+            
+          
+          
+            
+            
+              
+              
+              
+              
+              
+              
+              
+              
+            
+          
+        
+      
+    
+    
+      
+        F
+      
+      
+        
+          
+            
+          
+          
+            
+          
+        
+      
+    
+  
+
+
+
+  
+    
+    
+    
+    
+    
+      
+      
+      
+      
+    
+    
+    
+      
+        
+          
+        
+        
+          
+        
+      
+    
+    
+      
+        
+          
+        
+      
+    
+  
+
+  
+    
+    
+      
+        
+          
+          
+          
+        
+      
+      
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+      
+        
+          
+        
+        
+          
+        
+      
+    
+    
+    
+    
+    
+      
+        
+          
+        
+      
+    
+    
+      
+        
+          
+        
+      
+      
+       
+      
+      
+      
+        
+          
+        
+      
+      
+      
+        
+          
+        
+      
+      
+        
+      
+    
+  
+
+
+
+  
+    
+    
+      
+        
+          
+        
+      
+      
+      
+       
+    
+  
+
+  
+    
+      
+        
+          
+        
+      
+      
+  
+
+  
+  
+
+  
+  
+
+

From galateatalk-dev ＠ lists.sourceforge.jp  Tue Oct 24 10:05:34 2006
From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp)
Date: Tue, 24 Oct 2006 10:05:34 +0900
Subject: [gtalk-dev 0013] CVS update: chaone-win
Message-ID: <20061024010534.EBF0A2AC102@users.sourceforge.jp>

Index: chaone-win/chunker.xsl
diff -u chaone-win/chunker.xsl:1.2 chaone-win/chunker.xsl:1.3
--- chaone-win/chunker.xsl:1.2	Sun Oct 22 14:56:46 2006
+++ chaone-win/chunker.xsl	Tue Oct 24 10:05:34 2006
@@ -1,956 +1,961 @@
-
-
-
-
-
-
-
-
-
-
-
-  
-
-  
-
-  
-    
-  
-
-  
-    
-      
-      
-    
-  
-
-  
-    
-      
-    
-  
-
-  
-    
-    
-      
-      
-    
-  
-
-  
-    
-    
-    
-  
-
-  
-    
-    
-    
-      
-    
-    
-      
-        
-      
-    
-    
-      
-        
-        
-        
-      
-    
-    
-      
-      
-      
-      
-        
-          
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-      
-        
-          
-            
-          
-          
-            
-          
-        
-      
-    
-    
-      
-        
-          
-            
-              
-            
-            
-              
-            
-          
-        
-        
-          
-            
-          
-          
-            
-          
-        
-      
-    
-    
-      
-    
-    
-      
-        
-          
-            
-          
-          
-            
-          
-        
-      
-      
-        
-      
-      
-        
-      
-      
-        
-          
-            
-          
-          
-            
-          
-        
-      
-    
-  
-
-  
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-        
-          
-          
-          
-        
-      
-    
-    
-    
-      
-        
-        
-      
-    
-    
-  
-
-  
-    
-    
-    
-      
-        
-          
-            T
-          
-          
-            F
-          
-        
-      
-    
-    
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-    
-      
-        
-        
-        
-      
-    
-    
-    
-    
-      
-    
-  
-
-  
-    
-    
-      
-        
-      
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-
-    
-      
-      
-        
-        
-        
-        
-        
-          
-            
-              
-                
-                  
-                
-                
-            
-            
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
-            
-          
-          
-            F
-          
-        
-      
-      
-      
-      
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-      
-        
-          
-          
-          
-          
-        
-      
-    
-    
-      
-        
-          
-          
-          
-          
-        
-      
-    
-    
-      
-        F
-      
-      
-        
-          
-            
-              
-                
-              
-              
-                
-              
-            
-          
-          
-            
-              
-                
-              
-              
-                
-              
-            
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-      
-      
-      
-      
-      
-      
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-      
-      
-      
-      
-      
-      
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-      
-        
-          
-        
-        
-          
-        
-      
-    
-    
-      
-        
-          
-            
-              
-              
-              
-              
-              
-            
-          
-          
-            F
-          
-        
-      
-      
-      
-        
-          
-            
-              
-                
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-              
-                
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
-          
-          
-            
-            
-              
-                
-                  T
-                
-              
-            
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-              
-                
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
-          
-        
-      
-      
-      
-        
-        
-          
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                
-              
-              
-                
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
-          
-          
-            
-            
-              
-                
-                  T
-                
-              
-            
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                
-              
-              
-                
-                
-                  
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
-          
-        
-      
-      
-        
-        
-          
-            
-              T
-            
-          
-        
-        
-          
-            
-              
-              
-              
-              
-              
-            
-          
-          
-            F
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-      
-        
-          
-            
-            
-              
-                
-                  
-                
-                
-              
-              
-                
-              
-                  
-          
-          
-            
-              
-                
-                
-                  
-                    
-                      T
-                    
-                  
-                
-                
-                  #
-                  
-                  #
-                
-              
-            
-            
-            
-              
-                
-                  
-                
-                
-              
-              
-                
-              
-                  
-          
-        
-      
-      
-        
-          
-            
-            
-              
-                
-                  
-                
-                
-              
-              
-                
-              
-                  
-          
-          
-            
-              
-                
-                
-                  
-                    
-                      T
-                    
-                  
-                
-                
-                  #
-                  
-                  #
-                
-              
-            
-            
-            
-              
-                
-                  
-                
-                
-              
-              
-                
-              
-                  
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-      
-      
-      
-      
-      
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-      
-      
-      
-      
-        
-          
-          
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-      
-      
-      
-      
-        
-          
-            
-          
-          
-            
-          
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-    
-    
-      
-       	
-          
-            
-            
-              
-              
-              
-              
-              
-              
-              
-              
-            
-          
-          
-            
-            
-              
-              
-              
-              
-              
-              
-              
-              
-            
-          
-        
-      
-    
-    
-      
-        F
-      
-      
-        
-          
-            
-          
-          
-            
-          
-        
-      
-    
-  
-
-
-
-  
-    
-    
-    
-    
-    
-      
-      
-      
-      
-    
-    
-    
-      
-        
-          
-        
-        
-          
-        
-      
-    
-    
-      
-        
-          
-        
-      
-    
-  
-
-  
-    
-    
-      
-        
-          
-          
-          
-        
-      
-      
-        
-      
-    
-  
-
-  
-    
-    
-    
-    
-    
-      
-        
-          
-        
-        
-          
-        
-      
-    
-    
-    
-    
-    
-      
-        
-          
-        
-      
-    
-    
-      
-        
-          
-        
-      
-      
-       
-      
-      
-      
-        
-          
-        
-      
-      
-      
-        
-          
-        
-      
-      
-        
-      
-    
-  
-
-
-
-  
-    
-    
-      
-        
-          
-        
-      
-      
-      
-       
-    
-  
-
-  
-    
-      
-        
-          
-        
-      
-      
-  
-
-  
-  
-
-  
-  
-
-
+
+
+
+
+
+
+
+
+
+
+
+  
+
+  
+
+  
+    
+  
+
+  
+    
+      
+      
+    
+  
+
+  
+    
+      
+    
+  
+
+  
+    
+    
+      
+      
+    
+  
+
+  
+    
+    
+    
+  
+
+  
+    
+    
+    
+      
+    
+    
+      
+        
+      
+    
+    
+      
+        
+        
+        
+      
+    
+    
+      
+      
+      
+      
+        
+          
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+      
+        
+          
+            
+          
+          
+            
+          
+        
+      
+    
+    
+      
+        
+          
+            
+              
+            
+            
+              
+            
+          
+        
+        
+          
+            
+          
+          
+            
+          
+        
+      
+    
+    
+      
+    
+    
+      
+        
+          
+            
+          
+          
+            
+          
+        
+      
+      
+        
+      
+      
+        
+      
+      
+        
+          
+            
+          
+          
+            
+          
+        
+      
+    
+  
+
+  
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+        
+          
+          
+          
+        
+      
+    
+    
+    
+      
+        
+        
+      
+    
+    
+  
+
+  
+    
+    
+    
+      
+        
+          
+            T
+          
+          
+            F
+          
+        
+      
+    
+    
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+    
+      
+        
+        
+        
+      
+    
+    
+    
+    
+      
+    
+  
+
+  
+    
+    
+      
+        
+      
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+      
+        
+        
+        
+        
+        
+          
+            
+              
+                
+                  
+                
+                
+            
+            
+            
+              
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+            
+            
+          
+          
+            F
+          
+        
+      
+      
+      
+      
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+      
+        
+          
+          
+          
+          
+        
+      
+    
+    
+      
+        
+          
+          
+          
+          
+        
+      
+    
+    
+      
+        F
+      
+      
+        
+          
+            
+              
+                
+              
+              
+                
+              
+              
+                
+              
+            
+          
+          
+            
+              
+                
+              
+              
+                
+              
+              
+                
+              
+            
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+      
+      
+      
+      
+      
+      
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+      
+      
+      
+      
+      
+      
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+      
+        
+          
+        
+        
+          
+        
+      
+    
+    
+      
+        
+          
+            
+              
+              
+              
+              
+              
+            
+          
+          
+            F
+          
+        
+      
+      
+      
+        
+          
+            
+              
+                
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+              
+                
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+            
+          
+          
+            
+            
+              
+                
+                  T
+                
+              
+            
+            
+              
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+              
+                
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+            
+          
+        
+      
+      
+      
+        
+        
+          
+            
+              
+                
+                  
+                  
+                  
+                  
+                  
+                
+              
+              
+                
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+            
+          
+          
+            
+            
+              
+                
+                  T
+                
+              
+            
+            
+              
+                
+                  
+                  
+                  
+                  
+                  
+                
+              
+              
+                
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+            
+          
+        
+      
+      
+        
+        
+          
+            
+              T
+            
+          
+        
+        
+          
+            
+              
+              
+              
+              
+              
+            
+          
+          
+            F
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+      
+        
+          
+            
+            
+              
+                
+                  
+                
+                
+              
+              
+                
+              
+                  
+          
+          
+            
+              
+                
+                
+                  
+                    
+                      T
+                    
+                  
+                
+                
+                  #
+                  
+                  #
+                
+              
+            
+            
+            
+              
+                
+                  
+                
+                
+              
+              
+                
+              
+                  
+          
+        
+      
+      
+        
+          
+            
+            
+              
+                
+                  
+                
+                
+              
+              
+                
+              
+                  
+          
+          
+            
+              
+                
+                
+                  
+                    
+                      T
+                    
+                  
+                
+                
+                  #
+                  
+                  #
+                
+              
+            
+            
+            
+              
+                
+                  
+                
+                
+              
+              
+                
+              
+                  
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+      
+      
+      
+      
+      
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+      
+      
+      
+      
+        
+          
+          
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+      
+      
+      
+      
+        
+          
+            
+          
+          
+            
+          
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+    
+    
+      
+       	
+          
+            
+            
+              
+              
+              
+              
+              
+              
+              
+              
+            
+          
+          
+            
+            
+              
+              
+              
+              
+              
+              
+              
+              
+            
+          
+        
+      
+    
+    
+      
+        F
+      
+      
+        
+          
+            
+          
+          
+            
+          
+        
+      
+    
+  
+
+
+
+  
+    
+    
+    
+    
+    
+      
+      
+      
+      
+    
+    
+    
+      
+        
+          
+        
+        
+          
+        
+      
+    
+    
+      
+        
+          
+        
+      
+    
+  
+
+  
+    
+    
+      
+        
+          
+          
+          
+        
+      
+      
+        
+      
+    
+  
+
+  
+    
+    
+    
+    
+    
+      
+        
+          
+        
+        
+          
+        
+      
+    
+    
+    
+    
+    
+      
+        
+          
+        
+      
+    
+    
+      
+        
+          
+        
+      
+      
+       
+      
+      
+      
+        
+          
+        
+      
+      
+      
+        
+          
+        
+      
+      
+        
+      
+    
+  
+
+
+
+  
+    
+    
+      
+        
+          
+        
+      
+      
+      
+       
+    
+  
+
+  
+    
+      
+        
+          
+        
+      
+      
+  
+
+  
+  
+
+  
+  
+
+

From galateatalk-dev ＠ lists.sourceforge.jp  Tue Oct 24 12:51:51 2006
From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp)
Date: Tue, 24 Oct 2006 12:51:51 +0900
Subject: [gtalk-dev 0014] CVS update: chaone-win
Message-ID: <20061024035151.8E6DE2AC012@users.sourceforge.jp>

Index: chaone-win/chunker.xsl
diff -u chaone-win/chunker.xsl:1.3 chaone-win/chunker.xsl:1.4
--- chaone-win/chunker.xsl:1.3	Tue Oct 24 10:05:34 2006
+++ chaone-win/chunker.xsl	Tue Oct 24 12:51:51 2006
@@ -11,7 +11,7 @@
   xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:exsl="http://exslt.org/common"
   xmlns:msxml="urn:schemas-microsoft-com:xslt"
-  xmlns:ext="http://exslt.org/common"
+  xmlns:ext="urn:schemas-microsoft-com:xslt"
   exclude-result-prefixes="exsl msxml ext"
   version="1.0"
   xml:lang="ja">

From galateatalk-dev ＠ lists.sourceforge.jp  Fri Oct 27 09:49:44 2006
From: galateatalk-dev ＠ lists.sourceforge.jp (galateatalk-dev ＠ lists.sourceforge.jp)
Date: Fri, 27 Oct 2006 09:49:44 +0900
Subject: [gtalk-dev 0015] CVS update: gtalk
Message-ID: <20061027004944.CFB132AC035@users.sourceforge.jp>

Index: gtalk/strings_eucjp.h
diff -u gtalk/strings_eucjp.h:1.3 gtalk/strings_eucjp.h:1.4
--- gtalk/strings_eucjp.h:1.3	Thu Oct 19 12:27:08 2006
+++ gtalk/strings_eucjp.h	Fri Oct 27 09:49:44 2006
@@ -1,4 +1,4 @@
-/* $Id: strings_eucjp.h,v 1.3 2006/10/19 03:27:08 sako Exp $                                        */
+/* $Id: strings_eucjp.h,v 1.4 2006/10/27 00:49:44 sako Exp $                                        */
 #define TOKEN_MEISHI "名詞"
 #define TOKEN_DOUSHI "動詞"
 #define TOKEN_KEIYOUSHI "形容詞"
@@ -100,3 +100,4 @@
 #define ZENKAKU_ALPHABET_SECOND_BYTE_MAX 0xFA
 
 #define ACCENT_MARK "’"
+#define is_ZENKAKU_ALPNUM(x,y) ((x) == ZENKAKU_ALPHABET_FIRST_BYTE)
Index: gtalk/strings_sjis.h
diff -u gtalk/strings_sjis.h:1.3 gtalk/strings_sjis.h:1.4
--- gtalk/strings_sjis.h:1.3	Thu Oct 19 12:27:08 2006
+++ gtalk/strings_sjis.h	Fri Oct 27 09:49:44 2006
@@ -1,4 +1,4 @@
-/* $Id: strings_sjis.h,v 1.3 2006/10/19 03:27:08 sako Exp $                                            */
+/* $Id: strings_sjis.h,v 1.4 2006/10/27 00:49:44 sako Exp $                                            */
 #define TOKEN_MEISHI "??"
 #define TOKEN_DOUSHI "??"
 #define TOKEN_KEIYOUSHI "???"
@@ -100,3 +100,5 @@
 #define ZENKAKU_ALPHABET_SECOND_BYTE_MAX 0x9A
 
 #define ACCENT_MARK "?"
+#define is_ZENKAKU_ALPNUM(x,y) ( (x) == ZENKAKU_ALPHABET_FIRST_BYTE & ( \
+( ((y) >= ZENKAKU_NUMBER_SECOND_BYTE_MIN) & ((y) <= ZENKAKU_ALPHABET_SECOND_BYTE_MAX))))
Index: gtalk/text.c
diff -u gtalk/text.c:1.28 gtalk/text.c:1.29
--- gtalk/text.c:1.28	Thu Oct 19 21:32:18 2006
+++ gtalk/text.c	Fri Oct 27 09:49:44 2006
@@ -6,7 +6,7 @@
 /*                            by Studio ARC */
 /*                             2003.08.10   */
 /*               version as of 2003.08.18   */
-/* $Id: text.c,v 1.28 2006/10/19 12:32:18 sako Exp $                                     */
+/* $Id: text.c,v 1.29 2006/10/27 00:49:44 sako Exp $                                     */
 
 #include	
 #include	
@@ -1012,7 +1012,8 @@
 	    } else {
 	      strncpy( utterance+p, ZENKAKU_COLON, 2 );  p += 2;
 	    }
-	  } else if ( *text == (char)ZENKAKU_ALPHABET_FIRST_BYTE ) {
+	    /*	  } else if ( *text == (char)ZENKAKU_ALPHABET_FIRST_BYTE ) { */
+	  } else if( is_ZENKAKU_ALPNUM( *text, *(text+1))){
 	    text++;
 	    if ( *text >= (char)ZENKAKU_NUMBER_SECOND_BYTE_MIN && *text <= (char)ZENKAKU_NUMBER_SECOND_BYTE_MAX ) {
 	      char han;