Attachment #1299 for bug #3319

View | Details | Raw Unified | Return to bug 3319
Collapse All | Expand All

Lines 131-138 Link Here

(-)Canna.conf (-31 / +45 lines)
131	cannaBinDir = /usr/local/canna/bin	131	cannaBinDir = /usr/bin
132	cannaSrvDir = /usr/local/canna/bin	132	cannaSrvDir = /usr/sbin
133	cannaLibDir = /usr/local/canna/lib	133	cannaLibDir = /etc/canna
134	cannaManDir = /usr/local/canna/man	134	cannaEtcDir = /etc/canna
135	cannaIncDir = /usr/local/canna/include/canna	135	cannaManDir = /usr/share/man
136	libCannaDir = /usr/lib	136	cannaIncDir = /usr/include/canna
137		137	libCannaDir = /usr/lib
138	ErrDir = /usr/spool/canna	138	cannaDocDir = /usr/share/doc/canna-3.5_beta2
139	--	139	cannaShareDir = /usr/share/canna
		140
		141	ErrDir = /var/log/canna
		142	LockDir = /tmp/.iroha_unix
		143	LockFile = IROHA
Line 151 Link Here
151	cannaDsoRev = 1	156	cannaDsoRev = 1.0
152	--
Line 170 Link Here
170	#define JAPANESEMAN	175	/* #define JAPANESEMAN */
171	--
Line 207 Link Here
207	DicDir = $(cannaLibDir)/dic	212	DicDir = /var/lib/canna/dic
208	--
Line 286 Link Here
		291	/*
Line 291 Link Here
		297	*/
Line 307 Link Here
		314	echo "s%@(DicDir)%$(DicDir)%g"; \ @@\
		315	echo "s%@(LockDir)%$(LockDir)%g"; \ @@\
		316	echo "s%@(LockFile)%$(LockFile)%g"; \ @@\
Line 320 Link Here
		330	echo "s%@(DicDir)%$(DicDir)%g" >> $(MANUALSED) @@\
		331	echo "s%@(LockDir)%$(LockDir)%g" >> $(MANUALSED) @@\
		332	echo "s%@(LockFile)%$(LockFile)%g" >> $(MANUALSED) @@\
Line 325 Link Here
		338	MANSUFFIX = 1 /* man section for user programs */
		339
Lines 329-330 Link Here
329	ConvertPathName(file.tmp,file.$(MANSRCSUFF)) @@\	344	ConvertPathName(file.tmp,file.man) @@\
330	install.man:: file.tmp @@\	345	ConvertPathName(file.jtmp,file.jmn) @@\
331	--	346	install.man:: file.tmp file.jtmp @@\
Line 332 Link Here
		348	MakeDir($(DESTDIR)destdir/ja/man$(MANSUFFIX)) @@\
Line 333 Link Here
333	$(RM) file.tmp @@\	350	$(INSTALL) -c $(INSTMANFLAGS) file.jtmp $(DESTDIR)destdir/ja/man$(MANSUFFIX)/dest.$(MANSUFFIX) @@\
334	--	351	$(RM) file.tmp file.jtmp @@\
Line 335 Link Here
335	$(RM) file.tmp	353	$(RM) file.tmp file.jtmp
336	--
Line 343 Link Here
		361	LIBMANSUFFIX = 3 /* man section for libraries */
		362
Lines 347-348 Link Here
347	ConvertPathName(file.tmp,file.$(MANSRCSUFF)) @@\	367	ConvertPathName(file.tmp,file.man) @@\
348	install.man:: file.tmp @@\	368	ConvertPathName(file.jtmp,file.jmn) @@\
349	--	369	install.man:: file.tmp file.jtmp @@\
Line 350 Link Here
		371	MakeDir($(DESTDIR)destdir/ja/man$(LIBMANSUFFIX)) @@\
Line 351 Link Here
351	$(RM) file.tmp @@\	373	$(INSTALL) -c $(INSTMANFLAGS) file.jtmp $(DESTDIR)destdir/ja/man$(LIBMANSUFFIX)/dest.$(LIBMANSUFFIX) @@\
352	--	374	$(RM) file.tmp file.jtmp @@\
Line 353 Link Here
353	$(RM) file.tmp	376	$(RM) file.tmp file.jtmp
354	--
Line 378 Link Here
378	set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i;$(CHOWN) owner $(DESTDIR)$$i;$(CHGRP) group $(DESTDIR)$$i); fi \ @@\	401	set +x; else (set -x; $(MKDIRHIER) $(DESTDIR)$$i;$(CHOWN) owner $(DESTDIR)$$i;$(CHGRP) group $(DESTDIR)$$i); fi; \ @@\
379	--
Line 426 Link Here
		449	echo "#define CANNASHAREDIR '$(cannaShareDir)'" >> junk @@\
Line 449 Link Here
		473	echo "#define CANNASHAREDIR \"$(cannaShareDir)\""; \ @@\

Line 6 Link Here

(-)Imakefile (-4 / +2 lines)
6	WORLDOPTS = -k	6	WORLDOPTS =
7	--
Line 14 Link Here
14	$(RM) -r include cannaconf.h	14	$(RM) -r include
15	--

Line 44 Link Here

(-)ccustom/canna.h (-2 / +1 lines)
44	# if defined(SYSV) \|\| defined(SVR4)	44	# if defined(SYSV) \|\| defined(SVR4) \|\| defined(linux) \|\| defined(__GNU__)
45	--

Line 49 Link Here

(-)cmd/cannacheck/ccheck.man (-6 / +3 lines)
49	Name of the host under which \fIcannaserver(1M)\fP is in operation.	49	Name of the host under which \fIcannaserver(1)\fP is in operation.
50	--
Line 52 Link Here
52	cannaserver(1M), cannakill(1M), cannastat(1)	52	cannaserver(1), cannakill(1), cannastat(1)
53	--
Line 55 Link Here
55	Specifies the name of the host under which \fIcannaserver(1M)\fP is in	55	Specifies the name of the host under which \fIcannaserver(1)\fP is in
56	--

Line 32 Link Here

(-)cmd/cannastat/cstat.man (-8 / +4 lines)
32	server \fIcannaserver(1M)\fP. The information includes the	32	server \fIcannaserver(1)\fP. The information includes the
33	--
Line 34 Link Here
34	exists, the \fIcannaserver(1M)\fP's version, the number of clients	34	exists, the \fIcannaserver(1)\fP's version, the number of clients
35	--
Line 88 Link Here
88	cannaserver(1M), cannakill(1M), cannacheck(1)	88	cannaserver(1), cannakill(1), cannacheck(1)
89	--
Line 93 Link Here
93	Specifies the name of the host under which \fIcannaserver(1M)\fP is in	93	Specifies the name of the host under which \fIcannaserver(1)\fP is in
94	--




/* gentoo: use hard links so that the image can be merged correctly */
              LN = ln


	$(RM) $(DESTDIR)$(cannaBinDir)/cpdic.exe
	$(RM) $(DESTDIR)$(cannaBinDir)/lsdic.exe
	$(RM) $(DESTDIR)$(cannaBinDir)/mkdic.exe
	$(RM) $(DESTDIR)$(cannaBinDir)/mvdic.exe
	$(RM) $(DESTDIR)$(cannaBinDir)/rmdic.exe
	$(RM) $(DESTDIR)$(cannaBinDir)/syncdic.exe
	$(RM) $(DESTDIR)$(cannaBinDir)/chmoddic.exe
	$(RM) $(DESTDIR)$(cannaBinDir)/addwords.exe
	$(RM) $(DESTDIR)$(cannaBinDir)/delwords.exe
	$(RM) $(DESTDIR)$(cannaBinDir)/cannakill.exe
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cpdic.exe
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/lsdic.exe
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/mkdic.exe
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/mvdic.exe
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/rmdic.exe
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/syncdic.exe
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/chmoddic.exe
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/addwords.exe
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/delwords.exe
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cannakill.exe
--

	$(RM) $(DESTDIR)$(cannaBinDir)/cpdic
	$(RM) $(DESTDIR)$(cannaBinDir)/lsdic
	$(RM) $(DESTDIR)$(cannaBinDir)/mkdic
	$(RM) $(DESTDIR)$(cannaBinDir)/mvdic
	$(RM) $(DESTDIR)$(cannaBinDir)/rmdic
	$(RM) $(DESTDIR)$(cannaBinDir)/syncdic
	$(RM) $(DESTDIR)$(cannaBinDir)/chmoddic
	$(RM) $(DESTDIR)$(cannaBinDir)/addwords
	$(RM) $(DESTDIR)$(cannaBinDir)/delwords
	$(RM) $(DESTDIR)$(cannaBinDir)/cannakill
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cpdic
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/lsdic
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mkdic
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mvdic
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/rmdic
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/syncdic
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/addwords
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/delwords
	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cannakill
--

Line 32 Link Here

(-)cmd/catdic/cannakill.man (-7 / +4 lines)
32	cannaserver(1M). This causes the server to delete the lock file and	32	cannaserver(1). This causes the server to delete the lock file and
33	--
Lines 35-36 Link Here
35	The user who has started cannaserver(1M) or the super user can only	35	The user who has started cannaserver(1) or the super user can only
36	use cannakill(1M) to terminate operation of canncannaer.	36	use cannakill(1) to terminate operation of canncannaer.
37	--
Line 42 Link Here
42	cannaserver(1M), cannastat(1), cannacheck(1)	42	cannaserver(1), cannastat(1), cannacheck(1)
43	--

Line 33 Link Here

(-)cmd/catdic/catdic.man (-4 / +2 lines)
33	on which \fIcannaserver\fP(1M) is in operation. (Hereafter, this machine	33	on which \fIcannaserver\fP(1) is in operation. (Hereafter, this machine
34	--
Line 64 Link Here
64	cannaserver(1M), lsdic(1), mkdic(1)	64	cannaserver(1), lsdic(1), mkdic(1)
65	--

Line 31 Link Here

(-)cmd/catdic/mkdic.man (-4 / +2 lines)
31	directory of the remote host, on which \fIcannaserver\fP(1M) is in operation.	31	directory of the remote host, on which \fIcannaserver\fP(1) is in operation.
32	--
Line 99 Link Here
99	catdic(1), cannaserver(1M), lsdic(1)	99	catdic(1), cannaserver(1), lsdic(1)
100	--

Line 72 Link Here

(-)cmd/crxgram/crxgram.c (+2 lines)
	72	#if !defined(__GLIBC__)
Line 86 Link Here
	87	#endif /* __GLIBC__ */

Line 9 Link Here

(-)cmd/cshost/cshost.man (-4 / +2 lines)
9	connections to \fIcannaserver\fP(1M).	9	connections to \fIcannaserver\fP(1).
10	--
Line 11 Link Here
11	\fIcannaserver\fP(1M) allows network connections only from programs	11	\fIcannaserver\fP(1) allows network connections only from programs
12	--

Lines 88-90 Link Here

(-)dic/ideo/grammar/Imakefile (-4 / +3 lines)
88	$(CHGRP) $(cannaGroup) $(CANNADICDIR)	88	$(CHGRP) $(cannaGroup) $(DESTDIR)$(CANNADICDIR)
89	$(CHOWN) $(cannaOwner) $(CANNADICDIR)	89	$(CHOWN) $(cannaOwner) $(DESTDIR)$(CANNADICDIR)
90	$(CHMOD) ug+w $(CANNADICDIR)	90	$(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
91	--

Line 33 Link Here

(-)dic/ideo/grammar/gram.code (-41 / +31 lines)
33	* ¿·¤·¤¯¤Ä¤±Â¤·¤¿·Á¼°Ì¾»ì¡¥Æ¯¤¤ÏÆ±¤¸¡¥	33	* ¡Ö¤Ê¡×¤¬JTNO¤Î¤è¤¦¤ËÆ¯¤¯¸å¤Ë°ú¤Â³¤¯¡£¡Ö¤Ï¤º¡×¡Ö¤ï¤±¡×¤ÎÆó¸ì¡£
34	--
Line 49 Link Here
49	/* ¤¢¤È/¤¦¤Á/¤ª¤ê/¤³¤È/¤¿¤á/¤È¤/¤È¤³¤í/¤Ï¤º/¤Û¤¦/¤Û¤«/¤Þ¤¨/¤Þ¤Þ/¤â¤Î/¤ï¤±/ */	49	/* ¤¢¤È/¤¦¤Á/¤ª¤ê/¤³¤È/¤¿¤á/¤È¤/¤È¤³¤í/¤Ï¤º/¤Û¤¦/¤Û¤«/¤Þ¤¨/¤Þ¤Þ/¤â¤Î/¤ï¤±//¤¢¤¤¤À/¤¢¤Þ¤ê/¤¦¤¨/¤ª¤«¤²/¤«¤®¤ê/¤«¤¿/¤¯¤»/¤´¤È/¤Ä¤â¤ê/¤Õ¤·/¤ä¤Ä/¤è¤¦/¤è¤¦¤Ê/¤è¤· */
50	--
Line 51 Link Here
51	/* ¤¢¤¤¤À/¤¢¤Þ¤ê/¤¦¤¨/¤ª¤«¤²/¤«¤®¤ê/¤«¤¿/¤¯¤»/¤´¤È/¤Ä¤â¤ê/¤Õ¤·/¤ä¤Ä/¤è¤¦/¤è¤¦¤Ê/¤è¤· */	51	/* ¤Ï¤º/¤ï¤± (KN¤È¤ÎÆó½ÅÅÐÏ¿¤ò¤¹¤ë) */
52	--
Line 221 Link Here
221	* ¤¿¤À¤·¡¤C5r(¹Ô¤¯)¤Ë¤Ä¤¤¤Æ¤Ï°ì¸ì¤Î¤ß¤Ê¤Î¤ÇÏ¢ÍÑ·Á¤Î¥³¡¼¥É¤È¤¹¤ë
Lines 226-227 Link Here
226	k5 a ¤« /* ÃÖ¤«_¤Ê¤¤,½ñ¤«_¤Ê¤¤ */	225	k5 iO ¤¤ /* ÃÖ¤¤_¤¿¤é,½ñ¤¤_¤¿ */
227	iO ¤¤ /* ÃÖ¤¤_¤¿¤é,½ñ¤¤_¤¿ */
228	--
Line 233 Link Here
		231	k5a _ ¤« /* ÃÖ¤«_¤Ê¤¤,½ñ¤«_¤Ê¤¤: ktek5a»²¾È */
Lines 237-243 Link Here
237	c5r a ¤« /* ¹Ô¤«_¤Ê¤¤ */	236	/* ÉÊ»ì¿ôºï¸º¤Î¤¿¤á¼ç¤ËK5r¤È³èÍÑ¸ìÈø¤ò¶¦Í
238	i ¤ /* ¹Ô¤_¤Þ¤¹ */	237	* ¹Ô¤«_¤Ê¤¤ k5a
239	tO ¤Ã /* ¹Ô¤Ã_¤¿¤é */	238	* ¹Ô¤_¤Þ¤¹ k5ir
240	u ¤¯ /* ¹Ô¤¯_¤È¤ */	239	* ¹Ô¤¯_¤È¤ k5u
241	e ¤± /* ¹Ô¤± */	240	* ¹Ô¤± k5e
242	o ¤³ /* ¹Ô¤³_¤¦ */	241	* ¹Ô¤³_¤¦ k5o
243	ya _ /* ¹Ô¤¤ã */	242	* ¹Ô¤¤ã k5ya
244	--	243	* ¹Ô¤Ã_¤¿¤é t5tO
		244	*/
Line 266 Link Here
266	tO ¤Ã /* Àä¤Ã_¤¿¤é,ÂÇ¤Ã_¤¿ */
Line 273 Link Here
		273	t5tO _ ¤Ã /* Àä¤Ã_¤¿¤é,ÂÇ¤Ã_¤¿ */
Lines 397-400 Link Here
397	des ho ¤Ç¤·¤ç	398	des i ¤Ç¤·
398	hou ¤Ç¤·¤ç¤¦	399	u ¤Ç¤¹
399	i ¤Ç¤·	400	desho _ ¤Ç¤·¤ç
400	u ¤Ç¤¹	401	deshou _ ¤Ç¤·¤ç¤¦
401	--	402
Lines 432-433 Link Here
432	dd at ¤À¤Ã /* ·ÁÆ°¤Î¸ìÈø¤ò·ó¤Í¤ë ? */	434	ddat _ ¤À¤Ã /* ·ÁÆ°¤Î¸ìÈø¤ò·ó¤Í¤ë ? */
433	emo ¤Ç¤â /* ÀÜÂ³½õ»ì ? */	435	ddemo _ ¤Ç¤â /* ÀÜÂ³½õ»ì ? */
434	--
Line 438 Link Here
		440	dde3 _ ¤Ç /* ¡Ö¤·¤Ê¤¤_¤Ç_¤¯¤ì¡×:¡Ö¤·_¤Æ_¤¯¤ì¡×¤ÈÂÐ±þ */
Line 439 Link Here
		442	djan _ _ /* ¡Ö¤¸¤ã_¤Ê¤¤¡×¤ÈÆ±¤¸Á°¸å¤ÎÀÜÂ³ */
Line 452 Link Here
452	sugiru _ ¤¹¤® /* ¹Ô¤_¤¹¤®¤ë */	456	sugiru _ ¤¹¤® /* ¹Ô¤_¤¹¤®¤ë¡¢Î©ÇÉ_¤¹¤®¤ë */
453	--	457	yagaru _ _ /* Æ°»ì¤Î¸å¤Î¤ß */
Line 539 Link Here
539	nainee _ _ /* ¿©¤Ù_¤Í¤¨ */	544	nainee _ ¤Ê¤¤ /* ¿©¤Ù_¤Í¤¨: ËÜÍè¤Î·Á¡Ö¤Ê¤¤¡×¤â¤³¤³¤Ë¼ý¤á¤ë¡£ */
540	--
Line 600 Link Here
600	/* kte ¤ËÀÜÂ³¤¹¤ë¸ý¸ì¤ÎÉÊ»ì */	605	/* k5 ¤¬ÀÜÂ³¤¹¤ë¸ý¸ì¤ÎÉÊ»ì:¡Ö¸º¤Ã¤Æ¤¯¡×¤Ê¤É¡£ */
601	--	606	kte2 _ _ /* ¸º¤Ã_¤Æ_¤«¤Ê¤¤ */
Lines 602-608 Link Here
602	ktec5 a _ /* Ï¢¤ì¤Æ_¤«_¤Ê¤¤ */	608	/* kte2 ¤ËÀÜÂ³¤¹¤ë k5a:¡ÖÉÕ¤¤¤Æ¤«¤ó¤¬¡×ÂÐºö */
603	/* i / / Ï¢¤ì¤Æ_¤_¤Þ¤¹ :¡ÖÏ¢¤ì¤ÆÍè¤Þ¤¹¡×¤â¤¢¤ë¤¿¤áÊÝÎ± */	609	ktek5a _ ¤« /* ¸º¤Ã¤Æ_¤«_¤Ê¤¤ */
604	tO _ /* Ï¢¤ì¤Æ_¤Ã_¤Æ */
605	u _ /* Ï¢¤ì¤Æ_¤¯ */
606	e _ /* Ï¢¤ì¤Æ_¤± */
607	o _ /* Ï¢¤ì¤Æ_¤³_¤¦¤è */
608	ya _ /* Ï¢¤ì¤Æ_¤¤ã */
609	--

Line 40 Link Here

(-)dic/ideo/grammar/gram.goto (-172 / +121 lines)
40	BB+ KJ NN N00 N01 N02 N03 CJ RT KN TKN FKN	40	BB+ KJ NN N00 N01 N02 N03 CJ RT KN FKN
41	--
Line 51 Link Here
51	BB+ rasii youda mitaida dd dda1 dde1 ddar ddeha des JS	51	BB+ rasii youda mitaida ddat ddemo dda1 dde1 ddar ddeha des desho deshou JS
52	--
Line 61 Link Here
		61	#ifdef BUNMATU
		62	BM+ BM
		63	#endif
		64
Line 63 Link Here
63	YOUGEN+ kx sx aru iru oru kureru morau yaru miru oku rasii dd dda1 dde1 ddar ddeha des ssu	67	YOUGEN+ kx sx aru iru oru kureru morau yaru miru oku rasii ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou ssu
64	--
Line 89 Link Here
89	#define T_NA Fdatte kdn dd dda2 dde1 ddar ddeha sugiru mitaida ysouda /* ·ÁÍÆÆ°»ì¤Î³èÍÑ¸ìÈø */	93	#define T_NA Fdatte kdn ddat ddemo dda2 dde1 ddar ddeha djan sugiru mitaida ysouda /* ·ÁÍÆÆ°»ì¤Î³èÍÑ¸ìÈø */
90	--
Line 98 Link Here
98	rasii ppoi dd dde1 ddar ddeha des ssu mitaida buru na\	102	rasii ppoi ddat ddemo dde1 ddar ddeha djan des desho deshou ssu mitaida buru na\
99	--
Line 268 Link Here
268	CNS+ @T35 CNSUC2	272	CN- SUC
269	--	273	CNS+ @CN
		274	CNS- CNSUC1
Lines 270-271 Link Here
270	JNS+ @T35 JNM JNSSUC JNSUC	276	JN- SUC
271	JNM+ @T35 JNMSUC JNSUC	277	JNS+ @JN JNSSUC /* JNM */
272	--	278	JNM+ @JN JNMSUC
Line 338 Link Here
338	CJ+ BB /dd dde1 ddar ddeha des/	345	CJ+ BB /ddat ddemo dde1 ddar ddeha djan des desho deshou/
339	--
Line 340 Link Here
340	RT+ BB KN TKN FKN KJ SX ZX NZX PRE NNPRE CNPRE JNPRE	347	RT+ BB KN FKN KJ SX ZX NZX PRE NNPRE CNPRE JNPRE
341	--
Line 356 Link Here
356	OKX+ nasaru rasii dd dda2 dde1 ddar ddeha des	363	OKX+ nasaru rasii ddat ddemo dda2 dde1 ddar ddeha djan des desho deshou
357	--
Line 364 Link Here
364	JTNN- Fttara Ftte Kto	371	JTNN- Fttara Ftte Fdano ddemo Kto
365	--
Line 366 Link Here
366	TKN+ @T35	373	KN- SUC
367	--
Line 368 Link Here
		375	FKN- SUC
		376	/* TKN: ¡Á¤Ê(¤ï¤±\|¤Ï¤º) */
		377	TKN+ BB Zka Zkai Zkasira Zkana Zsa Zne Znee Zyo
		378	TKN+ Ftoka Fdokoro Fnari Fha Fmo Snara Stte
		379	TKN+ rasii ppoi ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou ssu mitaida na
Line 375 Link Here
375	KS+ mas saseru sugiru nasaru rareru chau	387	KS+ mas saseru sugiru yagaru nasaru rareru chau
376	--
Line 378 Link Here
378	KS+ kt kte kteha ktya ktemo kto gatera	390	KS+ kt kte kte2 kteha ktya ktemo kto gatera
379	--
Line 383 Link Here
383	KSr- N2T35	395	KSr- N2T35 SUC
384	--
Line 388 Link Here
388	ksru+ BB Kni JTNO JTNN KN TKN FKN Kyori	400	ksru+ BB Kni JTNO JTNN KN FKN Kyori
389	--
Line 394 Link Here
394	ksru+ rasii youda mitaida dsouda mai be goto des ssu ddar ddeha	406	ksru+ rasii youda mitaida dsouda mai be goto des desho deshou ssu ddar ddeha djan
395	--
Lines 411-412 Link Here
411	K5+ k5 k5i	423	K5+ k5 k5a k5i
412	C5r+ c5r
413	--
Line 415 Link Here
415	T5+ t5 t5i	426	T5+ t5 t5i t5tO
416	--
Line 428 Link Here
428	K5r+ k5 k5ir	439	K5r+ k5 k5a k5ir
429	--	440	C5r+ k5 k5a k5ir t5tO
Line 431 Link Here
431	T5r+ t5 t5ir	443	T5r+ t5 t5ir t5tO
432	--
Line 449 Link Here
449	k5i+ nasaru tai yasui you ysouda mas sugiru tamae	461	k5i+ nasaru tai yasui you ysouda mas sugiru yagaru tamae
450	--
Line 458 Link Here
458	k5i+ nasaru rasii des dd dda2 dde1 na	470	k5i+ nasaru rasii des desho deshou ddat ddemo dda2 dde1 na
459	--
Line 461 Link Here
461	k5iO+ kt kte kteha ktya ktemo kto chau	473	k5iO+ kt kte kte2 kteha ktya ktemo kto chau
462	--
Line 469 Link Here
		481	k5ir- SUC
Lines 472-479 Link Here
472	c5ra+ @k5a
473	c5ro+ @k5o
474	c5ri+ @k5i @T35
475	c5rtO+ @k5iO
476	c5ru+ @k5u
477	c5re+ @k5e
478	c5rya+ @k5ya
479
Line 488 Link Here
		493	g5ir- SUC
Line 497 Link Here
		503	s5ir- SUC
Line 507 Link Here
		514	t5ir- SUC
Line 525 Link Here
		533	b5ir- SUC
Line 535 Link Here
		544	m5ir- SUC
Line 546 Link Here
		556	r5ir- SUC
Line 566 Link Here
		577	w5ir- SUC
Line 576 Link Here
		588	u5ir- SUC
Line 584 Link Here
584	kxi+ tai yasui ysouda mas kt kte kteha ktya ktemo chau sugiru tamae	597	kxi+ tai yasui ysouda mas kt kte kteha ktya ktemo chau sugiru yagaru tamae
585	--
Lines 603-604 Link Here
603	sxi+ ysouda tai yasui nai nainee naisa mai mas sugiru nasaru you tamae ND2KY N2KYT	616	sxi+ ysouda tai yasui nai nainee naisa mai mas sugiru yagaru nasaru chau you tamae ND2KY N2KYT
604	sxi+ kt kte kteha ktya ktemo kto	617	sxi+ kt kte kte2 kteha ktya ktemo kto
605	--
Line 642 Link Here
642	sugiru+ BB Fka you des dd dda1 dde1 ddar ddeha nai nainya nainee mas ks zu znn z na	655	sugiru+ BB Fka you des desho deshou ddat ddemo dda1 dde1 ddar ddeha djan nai nainya nainee mas ks zu znn z na
643	--
Line 644 Link Here
		657	yagaru+ BB r5 /* r5i, r5ir ¤Ï¤ï¤¶¤ÈÆþ¤ì¤Æ¤Ê¤¤ */
Line 660 Link Here
660	k5siru+ kt kte kteha ktya ktemo	674	k5siru+ kt kte kte2 kteha ktya ktemo
661	--
Line 675 Link Here
675	aru5i+ @r5i Kno Sto Stomo ddar dd dda2 dde1 ddeha	689	aru5i+ @r5i Kno Sto Stomo ddar ddat ddemo dda2 dde1 ddeha djan
676	--
Line 683 Link Here
683	kureru+ BB ks Fto Stte	697	kureru+ BB ks Fto Stte Zi Zya Zyo Zyona
684	--
Line 722 Link Here
722	kyi+ @k5u Kde Kdeno ddeha Ztto	736	kyi+ @k5u /Kde Kdeno/ ddeha djan Ztto
723	--
Line 738 Link Here
		752	kymi- SUC
Line 742 Link Here
742	nainee+ @kyi	757	nainee+ @kyi dde3
743	--	758	nainee- Fsura Zne Znee
Line 764 Link Here
764	kdni+ /* sx sxu2 */ yoru ddar dd naru	780	kdni+ sx sxu2 yoru ddar ddat ddemo naru
765	--
Lines 790-797 Link Here
790	SUC+ @KN @TKN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC	806	SUC+ @KN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC
791	CNSUC1+ @KN @TKN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC	807	CNSUC1+ @KN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC
792	CNSUC2+ @KN @TKN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC	808	CNSUC2+ @KN @FKN N2T10 N2T15 N2T16 JNSUC CNSUC2 JNSSUC JNMSUC
793	JNSUC+ @KN @TKN @FKN N2T10 N2T15 N2T16 CNSUC2	809	JNSUC+ @KN @FKN N2T10 N2T15 N2T16 CNSUC2
794	JNSSUC+ @KN @TKN @FKN N2T10 N2T15 N2T16 CNSUC2	810	JNSSUC+ @KN @FKN N2T10 N2T15 N2T16 CNSUC2
795	JNMSUC+ @KN @TKN @FKN N2T10 N2T15 N2T16 CNSUC2	811	JNMSUC+ @KN @FKN N2T10 N2T15 N2T16 CNSUC2
796	JS+ @KN @TKN @FKN JSSUC @T35 JSmono	812	JS+ @KN @FKN JSSUC @T35 JSmono
797	JSSUC+ @KN @TKN @FKN JSmono	813	JSSUC+ @KN @FKN JSmono
798	--
Line 859 Link Here
859	gotoki+ BB Kni Kno Fha KN TKN FKN	875	gotoki+ BB Kni Kno Fha KN FKN
860	--
Line 864 Link Here
864	beki+ BB Kga Sto Stomo dd dda1 dde1 ddar ddeha des na Fka	880	beki+ BB Kga Sto Stomo ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou na Fka
865	--
Line 872 Link Here
872	zu+ dd dda2 dde2 ddar N2T18	888	zu+ ddat ddemo dda2 dde2 ddar N2T18
873	--
Line 882 Link Here
882	znu+ goto dsouda dd dda1 dde2 ddeha ddar youda mitaida rasii N2T18	898	znu+ goto dsouda ddat ddemo dda1 dde2 ddeha ddar youda mitaida rasii N2T18
883	--
Line 917 Link Here
917	masen+ BB des Fga Sto Stte Stoka Ssi Skara Snode Skeredo Stomo Smono JTNO	933	masen+ BB des desho deshou Fga Sto Stte Stoka Ssi Skara Snode Skeredo Stomo Smono JTNO
918	--
Line 928 Link Here
928	masu+ mai youda JTNO	944	masu+ deshou desho mai youda JTNO
929	--
Line 933 Link Here
		949	masuru- desho mai
Line 943 Link Here
943	kta+ ddeha dsouda youda mitaida rasii des ssu N2T18 JTNO JTNN KN TKN FKN	960	kta+ ddeha djan dsouda youda mitaida rasii des desho deshou ssu N2T18 JTNO JTNN KN FKN
944	--
Line 950 Link Here
950	ktari+ BB Fsika Fsura Fdano Fto Ftoka Fnazo Fha Fbakari Fmo Ssae Skoso sx	967	ktari+ BB Fsika Fsura Fdano Fto Ftoka Fnazo Fha Fbakari Fmo Ssae Skoso
951	--	968	ktari+ sx ddar ddat ddemo dda2 dde1 ddeha djan
Lines 953-955 Link Here
953	kte+ nai nainee naisa dd dda2 dde2 des aru iru oru kureru morau yaru miru oku	971	kte+ nai nainee naisa ddat ddemo dda2 dde2 des desho deshou aru iru oru kureru morau yaru miru oku
954	kte+ Zna Znaa Zne Znee Zya Zyo /* kx ¤Ï¤º¤¹Í½Äê */	972	kte+ Zsa Zna Znaa Zne Znee Zya Zyo /* kx ¤Ï¤º¤¹Í½Äê */
955	kte+ ktec5 nn te	973	kte+ nn te
956	--
Line 963 Link Here
963	ktemo+ dd dda2 dde2 ddar des	981	ktemo+ ddat ddemo dda2 dde2 ddar des desho deshou
964	--
Line 991 Link Here
991	dde1+ nai nainee naisa aru des	1009	dde1+ nai nainee naisa aru des desho deshou
992	--
Line 994 Link Here
994	dde2+ nai nainee naisa aru des	1012	dde2+ nai nainee naisa aru des desho deshou
995	--	1013	dde3+ BB Kno Fsae Fbakari Fkoso Ska iru kureru morau oku
		1014	dde3+ Zna Znaa Zne Znee Zyo
Line 1012 Link Here
		1032	djan+ BB Zka
Line 1014 Link Here
1014	youda+ kdn dd dda1 dde1 ddar ddeha des BB Zne Zyo na Snara	1035	youda+ kdn ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou BB Zne Zyo na Snara
1015	--
Line 1016 Link Here
1016	ysouda+ kdn dd dda1 dde1 ddar ddeha des BM na Fmo	1037	ysouda+ kdn ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou BM na Fmo
1017	--
Line 1019 Link Here
1019	dsouda+ dd dda1 dde1 ddar ddeha des des na Zna Zne Znee Zyo	1040	dsouda+ ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou na Zna Zne Znee Zyo
1020	--
Line 1022 Link Here
1022	u+ BB KN TKN FKN	1043	u+ BB KN FKN
1023	--
Line 1035 Link Here
1035	na+ JTNO JTNN Zno	1056	na+ TKN JTNO JTNN Zno
1036	--
Lines 1037-1045 Link Here
1037	ktec5a+ @c5ra	1058	/* ¿©¤Ù_¤Æ¤«¤Ê¤¤
1038	ktec5a- saseru simeru znn z	1059	* ¡Ö½³¤Ã¤Æ¤¤¤Æ¤¡×¤òÈò¤±¤ë¤¿¤á¡¢k5ir ¤Ï½ü¤¯
1039	ktec5o+ @c5ro	1060	* ¡Ö¤Ä¤¤¤Æ¤«¤ó¤¬¡×¤òÈò¤±¤ë¤¿¤á¡¢k5a ¤Ç¤Ï¤Ê¤¯ ktek5a
1040	ktec5tO+ @c5rtO	1061	*/
1041	ktec5u+ @c5ru	1062	kte2+ k5 ktek5a t5tO
1042	ktec5u- Fkoso Fsae Fnomi Stote Snagara goto	1063	ktek5a+ @k5a
1043	ktec5e+ @c5re	1064	ktek5a- saseru simeru znn z
1044	ktec5e- Sdomo Stote Stutu nainya tamae
1045	ktec5ya+ @c5rya
1046	--
Line 1062 Link Here
1062	nn+ JTNO Zno dd dde2 ddar ddeha des	1081	nn+ JTNO Zno ddat ddemo dde2 ddar ddeha djan des desho deshou
1063	--
Line 1066 Link Here
1066	#define K_BUN dd dda2 dde2 ddar ddeha des rasii/* ¡Á¤«¤é¤À¡¢¡Á¤«¤é¤Ç¤¹¡¢¡Á¤«¤é¤é¤·¤¤ */	1085	#define K_BUN ddat ddemo dda2 dde2 ddar ddeha djan des desho deshou rasii/* ¡Á¤«¤é¤À¡¢¡Á¤«¤é¤Ç¤¹¡¢¡Á¤«¤é¤é¤·¤¤ */
1067	--
Line 1077 Link Here
1077	Kno+ BB KN TKN FKN youda goto	1096	Kno+ BB KN FKN youda goto
1078	--
Line 1090 Link Here
1090	Kto+ ddar dd dda2 dde1	1109	Kto+ ddar ddat ddemo dda2 dde1
1091	--
Line 1093 Link Here
1093	Kni+ Fka Fmade Fya Fdano Fnari Fsae Fsika Fsura Fnomi Fbakari Fkiri	1112	Kni+ Fka Fmade Fya Fdano Fnari Fsae Fsika Fsura Fnomi Fbakari
1094	--
Line 1096 Link Here
		1115	Kni+ naru
Line 1117 Link Here
1117	Fka+ BB @KAKUJS dd dda2 dde1 ddar ddeha	1137	Fka+ BB @KAKUJS ddat ddemo dda2 dde1 ddar ddeha djan
1118	--
Line 1123 Link Here
1123	Fkiri+ BB @KAKUJS dd dda2 dde1 ddar ddeha des rasii N2T18	1143	Fkiri+ BB @KAKUJS ddat ddemo dda2 dde1 ddar ddeha djan des desho deshou rasii na N2T18
1124	--
Line 1131 Link Here
1131	Fkoso+ BB /Kga Kwo Kto Fka Fha/ dd dda2 dde1 ddar ddeha des	1151	Fkoso+ BB /Kga Kwo Kto Fka Fha/ ddat ddemo dda2 dde1 ddar ddeha des desho deshou
1132	--
Line 1141 Link Here
1141	Fzutu+ BB @KAKUJS dd dda2 dde1 ddar ddeha des nai rasii N2T18	1161	Fzutu+ BB @KAKUJS ddat ddemo dda2 dde1 ddar ddeha djan des desho deshou nai rasii N2T18
1142	--
Lines 1153-1155 Link Here
1153	Fto+ BB Kde Kdeno Kni Kwo Kmade Kno dd dda2 dde1 ddar ddeha des rasii	1173	Fto+ BB Kde Kdeno Kni Kwo Kmade Kno ddat ddemo dda2 dde1 ddar ddeha djan des desho deshou rasii
1154	Fto+ Fya Fdano Fnari Fsae Fsika Fsura Fnomi Fbakari Fkiri Fyara Fka Fkoso	1174	Fto+ Fnari Fsae Fsika Fsura Fnomi Fbakari Fkiri Fyara Fka Fkoso
1155	Fto+ Fdeha Fdemo Fdokoro Fnazo Fha Fmade Fmo Snara	1175	Fto+ Fdeha Fdemo Fha Fmade Fmo Snara
1156	--
Line 1177 Link Here
1177	Fnazo+ BB @KAKUJS dd dda2 dde1 ddar ddeha des rasii	1197	Fnazo+ BB @KAKUJS ddat ddemo dda2 dde1 ddar ddeha des desho deshou rasii
1178	--
Line 1188 Link Here
1188	Fnari+ BB Kga Kno Kni Khe Kwo Kkara Kmade Kyori Kto dd dda2 dde1 ddar ddeha	1208	Fnari+ BB Kga Kno Kni Khe Kwo Kkara Kmade Kyori Kto ddat ddemo dda2 dde1 ddar ddeha
1189	--
Line 1192 Link Here
1192	Fnomi+ BB @KAKUJS dd dda2 dde1 ddar ddeha des rasii na /* ¤Î¤ß¡Ü¤Ê¤Î */	1212	Fnomi+ BB @KAKUJS ddat ddemo dda2 dde1 ddar ddeha des desho deshou rasii na /* ¤Î¤ß¡Ü¤Ê¤Î */
1193	--
Line 1199 Link Here
1199	Fbakari+ BB @KAKUJS dd dda1 dde1 ddar ddeha des rasii N2T18	1219	Fbakari+ BB @KAKUJS ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou rasii N2T18
1200	--
Line 1207 Link Here
1207	Fmade+ dd dda1 dde1 ddar ddeha des rasii N2T18 /* kx ¤Ï¤º¤¹Í½Äê */	1227	Fmade+ ddat ddemo dda1 dde1 ddar ddeha djan des desho deshou rasii N2T18 /* kx ¤Ï¤º¤¹Í½Äê */
1208	--
Line 1210 Link Here
1210	Fmo+ BB @KAKUJS Fka Sto nai rasii dd dda2 dde2 ddar ddeha des	1230	Fmo+ BB @KAKUJS Fka Sto nai rasii ddat ddemo dda2 dde2 ddar ddeha djan des desho deshou
1211	--
Line 1223 Link Here
1223	Fyue+ dd dda2 dde1 ddar ddeha des	1243	Fyue+ ddat ddemo dda2 dde1 ddar ddeha des desho deshou
1224	--
Line 1233 Link Here
1233	Skara+ dd dda2 dde1 ddar ddeha des rasii N2T18	1253	Skara+ ddat ddemo dda2 dde1 ddar ddeha djan des desho deshou rasii N2T18
1234	--
Line 1279 Link Here
1279	Snagara+ BB Kga dd dda2 dde1 ddar ddeha	1299	Snagara+ BB Kga ddat ddemo dda2 dde1 ddar ddeha djan
1280	--

Line 662 Link Here

(-)dic/ideo/pubdic/a.p (-6 / +7 lines)
662	¤¢¤¿¤é¤· ¿·¤· #KYmi 255	662	¤¢¤¿¤é¤· ¿·¤· #KYme 255
663	--
Line 1073 Link Here
		1073	¤¢¤é¤ó¤«¤®¤ê¤Î ¤¢¤é¤ó¤«¤®¤ê¤Î #RT 0
		1074	¤¢¤é¤ó¤«¤®¤ê¤Î ¤¢¤é¤ó¸Â¤ê¤Î #RT 0
Line 3706 Link Here
3706	¤¨¤ó¤º¤¤ ±ä¿ï #T35 0	3708	¤¨¤ó¤º¤¤ ±ä¿ñ #T35 0
3707	--
Line 5563 Link Here
5563	¤ª¤Ê¤¸ ¤ª¤Ê¤¸ #T35 0	5565	¤ª¤Ê¤¸ Æ±¤¸ #RT 0
5564	--	5566	¤ª¤Ê¤¸ ¤ª¤Ê¤¸ #T05 0
		5567	¤ª¤Ê¤¸ ¤ª¤Ê¤¸ #RT 0

Line 3484 Link Here

(-)dic/ideo/pubdic/h.p (-2 / +1 lines)
3484	¤Õ¤ë ¸Å #KYmi 138	3484	¤Õ¤ë ¸Å #KYmime 138
3485	--

Lines 2895-2896 Link Here

(-)dic/ideo/pubdic/k.p (-5 / +3 lines)
2895	¤ ÀÚ #R5 152	2895	¤ ÀÚ #R5r 152
2896	¤ ¤ #R5 6	2896	¤ ¤ #R5r 6
2897	--
Line 7804 Link Here
7804	¤³¤Ä¤º¤¤ ¹ü¿ï #T35 0	7804	¤³¤Ä¤º¤¤ ¹ü¿ñ #T35 0
7805	--

Line 2238 Link Here

(-)dic/ideo/pubdic/m.p (-2 / +4 lines)
2238	¤â ÌÏ #SX 45	2238	¤â ÌÏ #KJ 0
2239	--
Line 2367 Link Here
		2367	¤â¤·¤¿ ÌÏ¤·¤¿ #RT 0
		2368	¤â¤·¤Æ ÌÏ¤·¤Æ #F14 0
Line 2641 Link Here
		2643	¤â¤ó¤À¤¤¤Ê ÌäÂê¤Ê #KY 0

Line 10 Link Here

(-)dic/ideo/pubdic/n.p (+2 lines)
	10	¤Ê Ë´ #KY 0
Line 889 Link Here
	890	¤Ë¤·¤á ¼ÑÀ÷¤á #KSr 0

Line 33 Link Here

(-)dic/ideo/pubdic/pod.c (-2 / +4 lines)
		33	#include <stdlib.h>
Line 54 Link Here
54	static FILE in1 = stdin, in2 = stdin;	55	static FILE in1, in2;
55	--
Line 1379 Link Here
		1380
		1381	in1 = stdin, in2 = stdin;

Lines 939-940 Link Here

(-)dic/ideo/pubdic/t.p (-3 / +7 lines)
939	¤¿¤È¤¨¤Ð ¤¿¤È¤¨¤Ð #CJ 5	939	¤¿¤È¤¨¤Ð ¤¿¤È¤¨¤Ð #T36 5
940	¤¿¤È¤¨¤Ð Îã¤¨¤Ð #F14 226	940	¤¿¤È¤¨¤Ð Îã¤¨¤Ð #T36 226
941	--
Line 4497 Link Here
		4497	¤È¤Ã¤Æ ¤È¤Ã¤Æ #T35 0
		4498	¤È¤Ã¤Æ ¼è¤Ã¼ê #T35 0
		4499	¤È¤Ã¤Æ ¼è¼ê #T35 0
		4500	¤È¤Ã¤Æ ÇÄ¤Ã¼ê #T35 0
		4501	¤È¤Ã¤Æ ÇÄ¼ê #T35 0

Lines 72-78 Link Here

(-)dic/ideo/words/Imakefile (-8 / +7 lines)
72	$(CHGRP) $(cannaGroup) $(CANNADICDIR)	72	$(CHGRP) $(cannaGroup) $(DESTDIR)$(CANNADICDIR)
73	$(CHOWN) $(cannaOwner) $(CANNADICDIR)	73	$(CHOWN) $(cannaOwner) $(DESTDIR)$(CANNADICDIR)
74	$(CHMOD) ug+w $(CANNADICDIR)	74	$(CHMOD) ug+w $(DESTDIR)$(CANNADICDIR)
75	$(CHGRP) $(cannaGroup) $(DicDir)	75	$(CHGRP) $(cannaGroup) $(DESTDIR)$(DicDir)
76	$(CHOWN) $(cannaOwner) $(DicDir)	76	$(CHOWN) $(cannaOwner) $(DESTDIR)$(DicDir)
77	$(CHMOD) ug+w $(DicDir)	77	$(CHMOD) ug+w $(DESTDIR)$(DicDir)
78	$(CHMOD) -w $(CANNADICDIR)/dics.dir	78	$(CHMOD) -w $(DESTDIR)$(CANNADICDIR)/dics.dir
79	--

Line 36 Link Here

(-)dic/ideo/words/dics.dir (+1 lines)
	36	suffix.ctd(.swd) -suffix---

Line 25 Link Here

(-)dic/ideo/words/hojomwd.t (-2 / +2 lines)
		25	¤¤ê¤¬¤Ê #KY ¤¤ê¤¬¤Ê
Line 28 Link Here
28	¤Ê¤¢ #T35 @	29	¤Ê¤¢ #CJ ¤Ê¤¢
29	--

Line 25 Link Here

(-)dic/ideo/words/hojoswd.t (-14 / +12 lines)
25	¤« #ktec5a @ #ktok5a @	25	¤« #ktok5a @
26	--
Lines 33-34 Link Here
33	¤¤ã #ktec5ya @ #ktok5ya @ #kykya @ #k5ya @ #c5rya @	33	¤¤ã #ktok5ya @ #kykya @ #k5ya @
34	¤¤ã¤¢ #ktec5ya @ #ktok5ya @ #kykya @ #k5ya @ #c5rya @	34	¤¤ã¤¢ #ktok5ya @ #kykya @ #k5ya @
35	--
Line 37 Link Here
37	¤¯ #ktec5u @ #ktok5u @	37	¤¯ #ktok5u @
38	--
Line 42 Link Here
42	¤± #ktec5e @ #ktok5e @	42	¤± #ktok5e @
43	--
Line 46 Link Here
46	¤³ #ktec5o @ #ktok5o @	46	¤³ #ktok5o @
47	--
Line 57 Link Here
		57	¤¸¤ã¤ó #djan @
Line 70 Link Here
70	¤Ã #ktec5tO @
Line 79 Link Here
		79	¤Æ #kte2 @
Line 96 Link Here
96	¤Ï¤º #KN @	97	¤Ï¤º #KN @ #TKN @
97	--
Line 105 Link Here
		106	¤ä¤¬ #yagaru @
Line 113 Link Here
		115	¤ï¤± #TKN @
Line 116 Link Here
		119	¤ó¤Ç #Snode @

Lines 29-30 Link Here

(-)dic/ideo/words/keishiki.t (-2 lines)
29	¤Û¤¦ #KN @
30	¤Û¤« #KN @

Line 35 Link Here

(-)dic/ideo/words/obsolete.dir (-2 / +1 lines)
35	keishiki.t(.mwd) -keishiki---	35	keishiki.t(.swd) -keishiki---
36	--

Line 3 Link Here

(-)dic/ideo/words/suffix.t (-2 / +1 lines)
3	¤Æ¤ #N2T17*1187 Åª	3	¤Æ¤ #N2T16*1187 Åª
4	--

Lines 30-32 Link Here

(-)dic/phono/Imakefile (-6 / +5 lines)
30	DICDIR = $(cannaLibDir)/dic	30	DICDIR = $(DicDir)
31	SAMPLEDIR = $(cannaLibDir)/sample	31	CANNASHAREDIR = $(cannaShareDir)
32	SAMPLESRCDIR = $(cannaLibDir)/sample/src	32	SAMPLEDIR = $(cannaDocDir)/sample
33	--	33	SAMPLESRCDIR = $(cannaDocDir)/sample/src
Line 72 Link Here
72	InstallMultiple($(ROMKANA_TABLES),$(DICDIR))	73	InstallMultiple($(ROMKANA_TABLES),$(CANNASHAREDIR))
73	--

Line 37 Link Here

(-)lib/RK/RKintern.h (-2 / +10 lines)
		37	#define FUJIEDA_HACK
		38	/* Æ£»Þ¡÷£Ê£Á£É£Ó£Ô¤Î¥Ï¥Ã¥¯¤òÍ¸ú¤Ë¤¹¤ë */
		39
Line 101 Link Here
101	# if defined(SYSV) \|\| defined(SVR4)	104	# if defined(SYSV) \|\| defined(SVR4) \|\| defined(linux) \|\| defined(__GNU__)
102	--
Line 611 Link Here
		614	#ifdef FUJIEDA_HACK
		615	int P_KJ; /* tankanji */
		616	#endif
Line 685 Link Here
		691	#ifdef FUJIEDA_HACK
		692	#define NW_DUMMY 0x08
		693	#endif

Line 178 Link Here

(-)lib/RK/context.c (+3 lines)
	178	#ifdef FUJIEDA_HACK
	179	SG.P_KJ = RkGetGramNum(SG.gramdic, "KJ");
	180	#endif

Line 30 Link Here

(-)lib/RK/dd.c (-4 / +2 lines)
30	#if defined(USG) \|\| defined(SYSV) \|\| defined(SVR4) \|\| defined(WIN)	30	#if defined(USG) \|\| defined(SYSV) \|\| defined(SVR4) \|\| defined(WIN) \|\| defined(linux)
31	--
Line 1746 Link Here
1746	dicsdir = malloc(strlen(dd->dd_path + strlen("/dics.dir") + 1));	1746	dicsdir = malloc(strlen(dd->dd_path) + strlen("/dics.dir") + 1);
1747	--

Line 211 Link Here

(-)lib/RK/nword.c (-17 / +131 lines)
		211	#ifdef FUJIEDA_HACK
		212	conc.nw_flags = p->nw_flags&(NW_PRE\|NW_SUC\|NW_SWD\|NW_DUMMY);
		213	#else
Line 212 Link Here
		215	#endif
Line 240 Link Here
		244	#ifdef FUJIEDA_HACK
		245	conc.nw_flags \|= (q->nw_flags & NW_DUMMY);
		246	#endif
Line 702 Link Here
		709	#ifndef FUJIEDA_HACK
Line 706 Link Here
		714	#endif
Line 746 Link Here
		755	#ifdef FUJIEDA_HACK
		756	w[-1].nw_flags \|= NW_DUMMY;
		757	#endif
Lines 987-988 Link Here
987	/* ¶çÆÉÅÀ¤½¤ÎÂ¾¤Î¾ì¹ç¤Ë¤ÏÊ¸¾ÏËö¸¡ºº¤ÏÉÔÍ× */	999	/* ¶çÆÉÅÀ¤Ê¤É¤Î¾ì¹ç¤È¡¢ÆÉ¤ß¤ò¿Ô¤¯¤·¤Æ¤¤¤ë¾ì¹ç¤Ë¤Ï
988	if (q->nw_class >= ND_OPN)	1000	Ê¸¾ÏËö¸¡ºº¤ÏÉÔÍ× */
989	--	1001	if (q->nw_class >= ND_OPN \|\|
		1002	(doflush && yy + pq->nw_ylen == cx->store->nyomi))
Line 1353 Link Here
		1367	#ifdef BUNMATU
		1368	static
		1369	struct nword *
		1370	modifyPrio(cx, words)
		1371	struct RkContext *cx;
		1372	struct nword *words;
		1373	{
		1374	struct RkKxGram *gram = cx->gram->gramdic;
		1375	struct nword *w;
		1376
		1377	for (w = words; w; w = w->nw_next)
		1378	if (w->nw_prio > 0 && !IsBunmatu(gram, w->nw_rowcol))
		1379	w->nw_prio += 0x2000 << 4;
		1380	return words;
		1381	}
		1382	#endif
		1383
Line 1364 Link Here
		1395	#ifdef BUNMATU
		1396	full = sortWord(modifyPrio(cx, parseBun(cx, yy, ys, ye, 1, 0, &maxclen)));
		1397	#else
Line 1365 Link Here
		1399	#endif
Line 1385 Link Here
		1420	#define FUJIEDA_HACK
		1421	/* Æ£»Þ¡÷£Ê£Á£É£Ó£Ô¤Î¥Ï¥Ã¥¯¤òÍ¸ú¤Ë¤¹¤ë */
		1422
		1423	#ifdef FUJIEDA_HACK
		1424	static
		1425	void
		1426	evalSplit(cx, suc, ul)
		1427	struct RkContext *cx;
		1428	struct nword *suc;
		1429	struct splitParm *ul;
		1430	{
		1431	struct nword *p;
		1432	unsigned l2;
		1433	unsigned long u2;
		1434
		1435	l2 = 0;
		1436	u2 = 0L;
		1437	for (p = suc; p; p = p->nw_next)
		1438	{
		1439	if (!CanSplitWord(p) \|\| /* Ê¸Àá¤Ë¤Ê¤é¤Ê¤¤ */
		1440	OnlyBunmatu(p) \|\| /* ¥ê¥Æ¥é¥ë¤ÎÄ¾Á°¤Ç¤·¤«Ê¸Àá¤Ë¤Ê¤ì¤Ê¤¤ */
		1441	(p->nw_rowcol == cx->gram->P_KJ) \|\| /* Ã±´Á»ú */
		1442	(p->nw_flags & NW_DUMMY) \|\| /* ÙÔÂ¤¤µ¤ì¤¿Ì¾»ì */
		1443	(p->nw_flags & NW_SUC))
		1444	continue;
		1445	if (l2 <= p->nw_ylen) {
		1446	l2 = p->nw_ylen;
		1447	if (u2 < p->nw_prio)
		1448	u2 = p->nw_prio;
		1449	}
		1450	}
		1451	ul->l2 = l2;
		1452	ul->u2 = u2;
		1453	}
		1454	#else /* FUJIEDA_HACK */
Line 1399 Link Here
		1469	#ifdef BUNMATU
		1470	if (!CanSplitWord(p) \|\| OnlyBunmatu(p) \|\| (p->nw_flags & NW_SUC))
		1471	#else
Line 1400 Link Here
		1473	#endif
Line 1403 Link Here
		1477	#ifdef FUJIEDA_HACK
		1478	/* ÆÉ¤ß¤¬°ìÊ¸»ú¤ÎÃ±¸ì¤ÎÍ¥ÀèÅÙ¤Ï¹ÍÎ¸¤·¤Ê¤¤ */
		1479	if (u2 < p->nw_prio && p->nw_ylen > 1)
		1480	#else
Line 1404 Link Here
		1482	#endif
Line 1409 Link Here
		1488	#endif /* FUJIEDA_HACK */
Line 1422 Link Here
		1502	#ifdef FUJIEDA_HACK
		1503	int L, L1 = 0, L2;
		1504	unsigned long U;
		1505	#else
Line 1424 Link Here
		1508	#endif
Line 1451 Link Here
		1536	#ifdef FUJIEDA_HACK
		1537	U = 0L;
		1538	#else
Line 1452 Link Here
		1540	#endif
Line 1457 Link Here
1457	int l, l1;	1546	int l, l1;
1458	--	1547	#ifdef FUJIEDA_HACK
		1548	unsigned long u;
		1549	#endif
Line 1459 Link Here
1459	/* ichido ni 2tu tukomono ha yameru */	1551	/* Ê¸Àá¤Ë¤Ê¤é¤Ê¤¤ */
1460	--
Line 1466 Link Here
1466	/* mijikasugiru/bunsetumatu ni narenai monoha hazusu */	1558	/* ÆÉ¤ß¤ò¾ÃÈñ¤·¤Æ¤¤¤Ê¤¤ */
1467	--
Line 1471 Link Here
1471	/* shuujoushi ha bun no tochuu deha tukanai */	1563	/* °ìÊ¸Àá¤Ë¤¹¤ë¤Î¤¬ºÇÄ¹ */
1472	--
Line 1483 Link Here
1483	/* migi donari no bunsetsu wo kaiseki */	1575	#ifdef FUJIEDA_HACK
1484	--	1576	/* Ã±´Á»ú¤ÏÊ¸¤ÎÅÓÃæ¤ËÅÐ¾ì¤·¤Ê¤¤ */
		1577	if (w->nw_rowcol == cx->gram->P_KJ) {
		1578	DontSplitWord(w);
		1579	continue;
		1580	}
		1581	#endif
		1582	/* ±¦ÎÙ¤ÎÊ¸Àá¤ò²òÀÏ */
Line 1486 Link Here
1486	evalSplit(xq[l1].tree, &ul2[l1]);	1585	#ifdef FUJIEDA_HACK
1487	--	1586	evalSplit(cx, xq[l1].tree, &ul2[l1]);
		1587	#else
		1588	evalSplit(xq[l1].tree, &ul2[l1]);
		1589	#endif
Line 1490 Link Here
1490	evalSplit(xq[l1].tree, &ul);	1593	#ifdef FUJIEDA_HACK
1491	--	1594	evalSplit(cx, xq[l1].tree, &ul);
		1595	#else
		1596	evalSplit(xq[l1].tree, &ul);
		1597	#endif
Line 1494 Link Here
		1601	#ifdef FUJIEDA_HACK
		1602	u = w->nw_prio + ul.u2;
		1603	if ((L < l) \|\| /* ÆóÊ¸ÀáºÇÄ¹ */
		1604	((L == l) &&
		1605	(U < u \|\| /* Í¥ÀèÅÙ¤Î¹ç·× */
		1606	(U == u && (L2 < ul.l2))))) { /* ÆóÊ¸ÀáÌÜ¤ÎÄ¹¤µ */
		1607	L = l;
		1608	U = u;
		1609	L1 = l1;
		1610	L2 = ul.l2;
		1611	}
		1612	#else
Line 1503 Link Here
		1622	#endif
Line 2003 Link Here
		2123	/*
Line 2005 Link Here
		2126	*/

Line 260 Link Here

(-)lib/RK/permdic.c (+3 lines)
	260	#ifdef FUJIEDA_HACK
	261	dm->dm_gram->P_KJ = RkGetGramNum(gram, "KJ");
	262	#endif

Line 45 Link Here

(-)lib/RKC/rkc.h (-2 / +1 lines)
45	# if defined(SYSV) \|\| defined(SVR4) \|\| defined(WIN)	45	# if defined(SYSV) \|\| defined(SVR4) \|\| defined(WIN) \|\| defined(linux) \|\| defined(__GNU__)
46	--

Lines 119-120 Link Here

(-)lib/canna/Imakefile (-3 / +2 lines)
119	sglobal.h: GSYM.awk globnames	119	includes::
120	awk -f GSYM.awk < globnames > $@	120	awk -f GSYM.awk < globnames > sglobal.h
121	--

Line 109 Link Here

(-)lib/canna/canna.h (-2 / +1 lines)
109	# if defined(SYSV) \|\| defined(SVR4)	109	# if defined(SYSV) \|\| defined(SVR4) \|\| defined(linux) \|\| defined(__GNU__)
110	--

Line 208 Link Here

(-)lib/canna/ebind.c (-4 / +2 lines)
208	inbuf[0] = (wchar_t)buffer_return[0];	208	inbuf[0] = (wchar_t)(buffer_return[0] & 0xff);
209	--
Line 210 Link Here
210	inbuf[i] = (wchar_t)buffer_return[i];	210	inbuf[i] = (wchar_t)(buffer_return[i] & 0xff);
211	--

Line 40 Link Here

(-)lib/canna/romaji.c (-22 / +70 lines)
		40	/* Comment out original code.
Line 45 Link Here
		46	*/
		47	/* Canna 3.5b2 have only cbp files. */
		48	#define DEFAULT_ROMKANA_TABLE "/dic/default.cbp"
Line 392 Link Here
392		396
393	--
Line 403 Link Here
403		407
404	--
Line 413 Link Here
		417	}
Lines 414-415 Link Here
414	if (retval == (struct RkRxDic )NULL) { / Á´Éô¥ª¡¼¥×¥ó¤Ç¤¤Ê¤¤ */	419	if (retval == (struct RkRxDic )NULL) { / added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
415	sprintf(rdic,	420	extern jrUserInfoStruct *uinfo;
416	--	421
		422	rdic[0] = '\0';
		423	if (uinfo && uinfo->topdir) {
		424	strcpy(rdic, uinfo->topdir);
		425	}
		426	else {
		427	strcpy(rdic, CANNALIBDIR);
		428	}
		429	strcat(rdic, "/");
		430	strcat(rdic, table);
		431	retval = RkwOpenRoma(rdic);
		432
		433	if (ckverbose) {
		434	if (retval != (struct RkRxDic *)NULL) {
		435	if (ckverbose == CANNA_FULL_VERBOSE) {
Lines 417-428 Link Here
417	"¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë(%s)¤¬¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó¡£",	437	printf("¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë¤Ï \"%s\" ¤òÍÑ¤¤¤Þ¤¹¡£\n", rdic);
418	#else	438	#endif
419	"\245\355\241\274\245\336\273\372\244\253\244\312"	439	}
420	"\312\321\264\271\245\306\241\274\245\326\245\353\50\45\163\51\244\254"	440	}
421	"\245\252\241\274\245\327\245\363\244\307\244\255\244\336\244\273"
422	"\244\363\241\243",
423	#endif
424	table);
425	/* ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë(%s)¤¬¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó¡£ */
426	addWarningMesg(rdic);
427	retval = (struct RkRxDic *)0;
428	goto return_ret;
429	--
Line 431 Link Here
		443
		444	if (retval == (struct RkRxDic )NULL) { / added for Debian by ISHIKAWA Mutsumi <ishikawa@linux.or.jp> */
		445	extern jrUserInfoStruct *uinfo;
		446
		447	rdic[0] = '\0';
		448	if (uinfo && uinfo->topdir) {
		449	strcpy(rdic, uinfo->topdir);
		450	}
		451	else {
		452	strcpy(rdic, CANNASHAREDIR);
		453	}
		454	strcat(rdic, "/");
		455	strcat(rdic, table);
		456	retval = RkwOpenRoma(rdic);
		457
		458	if (ckverbose) {
		459	if (retval != (struct RkRxDic *)NULL) {
		460	if (ckverbose == CANNA_FULL_VERBOSE) {
		461	#ifndef WIN
		462	printf("¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë¤Ï \"%s\" ¤òÍÑ¤¤¤Þ¤¹¡£\n", rdic);
		463	#endif
		464	}
		465	}
		466	}
		467	}
		468
		469	if (retval == (struct RkRxDic )NULL) { / Á´Éô¥ª¡¼¥×¥ó¤Ç¤¤Ê¤¤ */
		470	sprintf(rdic,
		471	#ifndef WIN
		472	"¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë(%s)¤¬¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó¡£",
		473	#else
		474	"\245\355\241\274\245\336\273\372\244\253\244\312"
		475	"\312\321\264\271\245\306\241\274\245\326\245\353\50\45\163\51\244\254"
		476	"\245\252\241\274\245\327\245\363\244\307\244\255\244\336\244\273"
		477	"\244\363\241\243",
		478	#endif
		479	table);
		480	/* ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë(%s)¤¬¥ª¡¼¥×¥ó¤Ç¤¤Þ¤»¤ó¡£ */
		481	addWarningMesg(rdic);
		482	retval = (struct RkRxDic *)0;
		483	}
Line 433 Link Here
433	return_ret:	486
434	--

Line 9 Link Here

(-)misc/Imakefile (-9 / +12 lines)
		9	#ifdef engineSwitch
Line 11 Link Here
		12	#else
		13	PROGRAMS = default.canna
		14	#endif
		15
Line 23 Link Here
		28	#ifdef engineSwitch
Line 25 Link Here
		31	#endif
Line 31 Link Here
31	MakeDirectories(install,$(cannaLibDir)/sample/src)	38	MakeDirectories(install,$(cannaDocDir)/sample/src)
32	--
Line 33 Link Here
33	InstallNamedNonExec(rMakefile,Makefile,$(cannaLibDir)/sample/src)	40	InstallNamedNonExec(rMakefile,Makefile,$(cannaDocDir)/sample/src)
34	--
Line 35 Link Here
35	InstallNamedNonExec(cMakefile,Makefile,$(cannaLibDir)/sample/src)	42	InstallNamedNonExec(cMakefile,Makefile,$(cannaDocDir)/sample/src)
36	--
Lines 46-47 Link Here
46	InstallNonExec(default.canna,$(cannaLibDir))	53	InstallNonExec(default.canna,$(cannaEtcDir))
47	InstallNonExec(is.c,$(cannaLibDir)/sample/src)	54	InstallNonExec(is.c,$(cannaDocDir)/sample/src)
48	--

Line 37 Link Here

(-)misc/default.ca (-4 / +2 lines)
37	;; °ìÍ÷É½¼¨¾õÂÖ¤«¤é¡¢Ê¸»ú¿½Ì¤ò¹Ô¤¦¡£	37	;; key bindings to extend and shrink the conversion area
38	--
Line 41 Link Here
41	;; ¥·¥ó¥Ü¥ë¤ÎÄêµÁ	41	;; symbol definitions
42	--

Line 9 Link Here

(-)misc/initfiles/Imakefile (-2 / +1 lines)
9	SAMPLEDIR = $(cannaLibDir)/sample	9	SAMPLEDIR = $(cannaShareDir)
10	--

Line 31 Link Here

(-)server/IR.h (-2 / +1 lines)
31	# if defined(SYSV) \|\| defined(SVR4)	31	# if defined(SYSV) \|\| defined(SVR4) \|\| defined(linux) \|\| defined(__GNU__)
32	--

Line 88 Link Here

(-)server/connection.c (-12 / +17 lines)
		88	#ifdef USE_INET_SOCKET
		89	/* flag for using INET Domain Socket */
		90	extern int UseInet;
		91	#endif
		92
Lines 223-231 Link Here
223	if ((request = open_inet_socket ()) != -1)	228	if(UseInet){
224	{	229	if ((request = open_inet_socket ()) != -1)
225	WellKnownConnections \|= (1L << request);	230	{
226	}	231	WellKnownConnections \|= (1L << request);
227	else	232	}
228	{	233	else
229	ir_debug( Dmsg(5,"Warning: INET domain not created.\n");)	234	{
230	return 0; /* ºîÀ®¤Ë¼ºÇÔ */	235	ir_debug( Dmsg(5,"Warning: INET domain not created.\n");)
231	}	236	return 0; /* ºîÀ®¤Ë¼ºÇÔ */
232	--	237	}
Line 233 Link Here
233	ir_debug( Dmsg(3,"£É£Î£Å£Ô¥É¥á¥¤¥ó¤Ï¤Ç¤¤¿\n"); )	239	ir_debug( Dmsg(3,"£É£Î£Å£Ô¥É¥á¥¤¥ó¤Ï¤Ç¤¤¿\n"); )
234	--	240	}

Line 49 Link Here

(-)server/misc.c (-5 / +59 lines)
49	#include <sys/types.h>
Line 53 Link Here
		52	#include <pwd.h>
Line 54 Link Here
		54	#include <sys/types.h>
Line 90 Link Here
		91	static char userID=NULL; / canna server's user id */
		92
		93	#ifdef USE_INET_SOCKET
		94	/* flag for using INET Domain Socket */
		95	#ifdef USE_UNIX_SOCKET
		96	/* Not to use INET domain socket, if can use Unix Domain Socket */
		97	int UseInet = 0;
		98	#else
		99	/* if can use Unix Domain Socket, Use INET domain socket */
		100	int UseInet = 1;
		101	#endif
		102	#endif
		103
Line 102 Link Here
102	#define USAGE "Usage: cannaserver [-p num] [-l num] [-d] [-syslog] [dichome]"	116	#define USAGE "Usage: cannaserver [-p num] [-l num] [-u userid] [-syslog] [-inet] [-d] [dichome]"
103	--
Line 120 Link Here
		134	struct passwd *pwent;
Line 140 Link Here
		155	else if( !strcmp( argv[i], "-u")) {
		156	if (++i < argc) {
		157	userID = argv[i];
		158	}
		159	else {
		160	fprintf(stderr, "%s\n", USAGE);
		161	exit(2);
		162	/* NOTREACHED */
		163	}
		164	}
		165	#ifdef USE_INET_SOCKET
		166	else if( !strcmp( argv[i], "-inet")) {
		167	UseInet = 1;
		168	}
		169	#endif
Line 171 Link Here
		201	if (userID != NULL) {
		202	pwent = getpwnam(userID);
		203	if (pwent) {
		204	if(setgid(pwent->pw_gid)) {
		205	FatalError("cannaserver:couldn't set groupid to canna user's group\n");
		206	}
		207	if (initgroups(userID, pwent->pw_gid)) {
		208	FatalError("cannserver: couldn't init supplementary groups\n");
		209	}
		210	if (setuid(pwent->pw_uid)) {
		211	FatalError("cannaserver: couldn't set userid to %s user\n", userID);
		212	}
		213	} else if (userID != NULL) {
		214	FatalError("cannaserver: -u flag specified, but canna not run as root\n");
		215	}
		216	}
		217
Lines 563-564 Link Here
563	if( current )
564	current->next = (ACLPtr)NULL ;
Line 652 Link Here
		697	if (strlen(DDUSER) + strlen(client->username) +
		698	strlen(DDGROUP) + strlen(client->groupname) +
		699	strlen(DDPATH) + 4 >= 256) {
		700	return(-1);
		701	}
		702
Line 658 Link Here
		709	if (strlen(DDUSER) + strlen(client->username) +
		710	strlen(DDPATH) + 2 >= 256) {
		711	return(-1);
		712	}

Line 31 Link Here

(-)server/server.man (-23 / +13 lines)
31	users on the network can access cannaserver(1M). The scope of	31	users on the network can access cannaserver. The scope of
32	--
Line 35 Link Here
35	After starting, cannaserver(1M) immediately forks and enters the	35	After starting, cannaserver immediately forks and enters the
36	--
Line 39 Link Here
39	When starting, cannaserver(1M) creates the lock file	39	When starting, cannaserver creates the lock file
40	--
Lines 41-43 Link Here
41	lock file is deleted automatically at the end of cannaserver(1M) if no	41	lock file is deleted automatically at the end of cannaserver if no
42	trouble occurs. The lock file may exist although cannaserver(1M) is	42	trouble occurs. The lock file may exist although cannaserver is
43	not in operation (because cannaserver(1M) terminates abnormally, for	43	not in operation (because cannaserver terminates abnormally, for
44	--
Line 46 Link Here
46	When starting, cannaserver(1M) examines	46	When starting, cannaserver examines
47	--
Line 59 Link Here
59	Outputs the cannaserver(1M) log to /tmp/canna.log. n (1 to 5)	59	Outputs the cannaserver log to /tmp/canna.log. n (1 to 5)
60	--
Line 62 Link Here
62	Starts cannaserver(1M) in debug mode. It is executed as the	62	Starts cannaserver in debug mode. It is executed as the
63	--
Lines 68-69 Link Here
68	.IP "@(cannaLibDir)/dic/*/dics.dir" 36	68	.IP "@(DicDir)/dics.dir" 36
69	Dictionary directory	69	Dictionary list
70	--
Line 73 Link Here
73	Premount dictionary list	73	Premounted dictionary list
74	--
Line 76 Link Here
76	cannakill(1M), cannastat(1), cannacheck(1)	76	cannakill(1), cannastat(1), cannacheck(1)
77	--

Return to bug 3319

Line 4 Link Here

(-)cmd/catdic/Imakefile (-41 / +42 lines)
		4	/* gentoo: use hard links so that the image can be merged correctly */
		5	LN = ln
		6
Lines 56-75 Link Here
56	$(RM) $(cannaBinDir)/cpdic.exe	59	$(RM) $(DESTDIR)$(cannaBinDir)/cpdic.exe
57	$(RM) $(cannaBinDir)/lsdic.exe	60	$(RM) $(DESTDIR)$(cannaBinDir)/lsdic.exe
58	$(RM) $(cannaBinDir)/mkdic.exe	61	$(RM) $(DESTDIR)$(cannaBinDir)/mkdic.exe
59	$(RM) $(cannaBinDir)/mvdic.exe	62	$(RM) $(DESTDIR)$(cannaBinDir)/mvdic.exe
60	$(RM) $(cannaBinDir)/rmdic.exe	63	$(RM) $(DESTDIR)$(cannaBinDir)/rmdic.exe
61	$(RM) $(cannaBinDir)/syncdic.exe	64	$(RM) $(DESTDIR)$(cannaBinDir)/syncdic.exe
62	$(RM) $(cannaBinDir)/chmoddic.exe	65	$(RM) $(DESTDIR)$(cannaBinDir)/chmoddic.exe
63	$(RM) $(cannaBinDir)/addwords.exe	66	$(RM) $(DESTDIR)$(cannaBinDir)/addwords.exe
64	$(RM) $(cannaBinDir)/delwords.exe	67	$(RM) $(DESTDIR)$(cannaBinDir)/delwords.exe
65	$(RM) $(cannaBinDir)/cannakill.exe	68	$(RM) $(DESTDIR)$(cannaBinDir)/cannakill.exe
66	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/cpdic.exe	69	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cpdic.exe
67	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/lsdic.exe	70	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/lsdic.exe
68	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/mkdic.exe	71	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/mkdic.exe
69	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/mvdic.exe	72	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/mvdic.exe
70	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/rmdic.exe	73	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/rmdic.exe
71	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/syncdic.exe	74	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/syncdic.exe
72	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/chmoddic.exe	75	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/chmoddic.exe
73	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/addwords.exe	76	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/addwords.exe
74	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/delwords.exe	77	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/delwords.exe
75	$(LN) $(cannaBinDir)/catdic.exe $(cannaBinDir)/cannakill.exe	78	$(LN) $(DESTDIR)$(cannaBinDir)/catdic.exe $(DESTDIR)$(cannaBinDir)/cannakill.exe
76	--
Lines 78-96 Link Here
78	$(RM) $(cannaBinDir)/cpdic	81	$(RM) $(DESTDIR)$(cannaBinDir)/cpdic
79	$(RM) $(cannaBinDir)/lsdic	82	$(RM) $(DESTDIR)$(cannaBinDir)/lsdic
80	$(RM) $(cannaBinDir)/mkdic	83	$(RM) $(DESTDIR)$(cannaBinDir)/mkdic
81	$(RM) $(cannaBinDir)/mvdic	84	$(RM) $(DESTDIR)$(cannaBinDir)/mvdic
82	$(RM) $(cannaBinDir)/rmdic	85	$(RM) $(DESTDIR)$(cannaBinDir)/rmdic
83	$(RM) $(cannaBinDir)/syncdic	86	$(RM) $(DESTDIR)$(cannaBinDir)/syncdic
84	$(RM) $(cannaBinDir)/chmoddic	87	$(RM) $(DESTDIR)$(cannaBinDir)/chmoddic
85	$(RM) $(cannaBinDir)/addwords	88	$(RM) $(DESTDIR)$(cannaBinDir)/addwords
86	$(RM) $(cannaBinDir)/delwords	89	$(RM) $(DESTDIR)$(cannaBinDir)/delwords
87	$(RM) $(cannaBinDir)/cannakill	90	$(RM) $(DESTDIR)$(cannaBinDir)/cannakill
88	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cpdic	91	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cpdic
89	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/lsdic	92	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/lsdic
90	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mkdic	93	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mkdic
91	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/mvdic	94	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/mvdic
92	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/rmdic	95	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/rmdic
93	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/syncdic	96	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/syncdic
94	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/addwords	97	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/addwords
95	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/delwords	98	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/delwords
96	$(LN) $(cannaBinDir)/catdic $(cannaBinDir)/cannakill	99	$(LN) $(DESTDIR)$(cannaBinDir)/catdic $(DESTDIR)$(cannaBinDir)/cannakill
97	--