FDclone 2.09 patch [6/10]
しらいです。
file & directory 管理ツール FDclone 2.09 の patch その 6
です。
Submitted-by: shirai@chandra2
Archive-name: FD-2.09.patch/part06
---- Cut Here and feed the following to sh ----
#!/bin/sh
# This is `FD-2.09.shar.06' (part 6 of FD-2.09.patch).
# Do not concatenate these parts, unpack them in order with `/bin/sh'.
# File `FD-2.09.patch' is being continued...
#
echo=echo
touch -am 1231235999 $$.touch >/dev/null 2>&1
if test ! -f 1231235999 && test -f $$.touch; then
shar_touch=touch
else
shar_touch=:
echo
$echo 'WARNING: not restoring timestamps. Consider getting and'
$echo "installing GNU \`touch', distributed in GNU File Utilities..."
echo
fi
rm -f 1231235999 $$.touch
#
if test ! -r _sh00904/seq; then
$echo 'Please unpack part 1 first!'
exit 1
fi
shar_sequence=`cat _sh00904/seq`
if test "$shar_sequence" != 6; then
$echo 'Please unpack part' "$shar_sequence" 'next!'
exit 1
fi
if test ! -f _sh00904/new; then
$echo 'x -' 'STILL SKIPPING' 'FD-2.09.patch'
else
$echo 'x -' 'continuing file' 'FD-2.09.patch'
sed 's/^X//' << 'SHAR_EOF' >> FD-2.09.patch &&
X extern int ptymode;
X extern int ptyinternal;
@@ -1142,6 +1149,8 @@
X VOID initfd(argv)
X char **argv;
X {
+ int i;
+
X #ifndef _NOORIGSHELL
X if (!interactive) /*EMPTY*/;
X else
@@ -1154,7 +1163,7 @@
X Xttyiomode(0);
X }
X #endif /* !MSDOS */
- loadhistory(0);
+ for (i = 0; i < 2; i++) loadhistory(i);
X entryhist(1, origpath, 1);
X }
X #ifndef _NOLOGGING
@@ -1167,6 +1176,7 @@
X int status;
X {
X char cwd[MAXPATHLEN];
+ int i;
X
X #ifndef _NOLOGGING
X endlog(status);
@@ -1175,7 +1185,7 @@
X if (!interactive) /*EMPTY*/;
X else
X #endif
- savehistory(0);
+ for (i = 0; i < 2; i++) savehistory(i);
X
X cwd[0] = '\0';
X if (origpath && _chdir2(origpath) < 0) {
@@ -1188,6 +1198,9 @@
X #ifdef _USEUNICODE
X free(unitblpath);
X #endif
+#ifndef _NOIME
+ free(dicttblpath);
+#endif
X #ifndef _NODOSDRIVE
X dosallclose();
X #endif
@@ -1242,6 +1255,11 @@
X # ifdef _USEUNICODE
X discardunitable();
X # endif
+# ifndef _NOIME
+ ime_freebuf();
+ freeroman(0);
+ discarddicttable();
+# endif
X #endif /* DEBUG */
X if (*cwd) rawchdir(cwd);
X }
@@ -1365,6 +1383,9 @@
X setexecpath(argv[0], envp);
X #ifdef _USEUNICODE
X unitblpath = strdup2(DATADIR);
+#endif
+#ifndef _NOIME
+ dicttblpath = strdup2(DATADIR);
X #endif
X
X #ifdef _NOORIGSHELL
diff -urNP ../FD-2.08f/makefile.b98 ./makefile.b98
--- ../FD-2.08f/makefile.b98 Tue Aug 8 00:00:00 2006
+++ ./makefile.b98 Tue Aug 22 00:00:00 2006
@@ -4,7 +4,7 @@
X
X TITLE = FD-
X VERMAJ = 2
-VERSION = 2.08f
+VERSION = 2.09
X PREFIX =
X CONFDIR =
X BUILD =
@@ -23,6 +23,9 @@
X BLDRC = $(BUILD)$(DEFRC)
X DOSRC = ~FD\\fd2rc
X UNITBL = fd-unicd.tbl
+DICTTBL = fd-dict.tbl
+DICTTXT = fd-dict.txt
+DICTSRC =
X
X SRC = main.c printf.c termio.c term.c pathname.c \
X system.c posixsh.c doscom.c log.c \
@@ -32,6 +35,7 @@
X libc.c file.c apply.c \
X parse.c builtin.c shell.c \
X kanji.c input.c \
+ ime.c roman.c dict.c mkdict.c mktankan.c \
X info.c rockridg.c archive.c tree.c \
X custom.c command.c browse.c \
X kanjicnv.c mkfuncno.c expfunc.c mkmfsed.c
@@ -40,7 +44,7 @@
X wait.h system.h \
X dosdisk.h \
X unixdisk.h unixemu.h \
- termemu.h \
+ termemu.h roman.h hinsi.h \
X func.h functabl.h
X
X DOC = README.eng HISTORY.eng FAQ.eng TECHKNOW.eng \
@@ -95,7 +99,7 @@
X pty.obj termemu.obj frontend.obj backend.obj \
X libc.obj file.obj apply.obj \
X parse.obj builtin.obj shell.obj
-OBJ3 = kanji.obj input.obj \
+OBJ3 = kanji.obj input.obj \
X info.obj rockridg.obj archive.obj tree.obj \
X custom.obj command.obj browse.obj
X SOBJ = ssystem.obj sposixsh.obj sdoscom.obj \
@@ -120,7 +124,7 @@
X # Dependency Rules
X ############################################################
X
-all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X
X $(PROGRAM).exe: $(OBJ1) $(OBJ2) $(OBJ3) $(ARGS)
X $(CC) -ml -e$@ @$(ARGS) $(LDFLAGS)
@@ -210,19 +214,58 @@
X
X
X ############################################################
+# Kanji transfer table generating module
+
+$(DICTTBL): mkdict.exe $(DICTSRC)
+ .\mkdict$(EXE) $@ $(DICTSRC)
+
+mkdict.exe: mkdict.obj troman.obj tkanji.obj
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -e$@ mkdict.obj troman.obj tkanji.obj
+# ren $@ mkdict
+# aout2exe mkdict
+# del mkdict
+
+mktankan.exe: mktankan.obj troman.obj tkanji.obj
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -e$@ mktankan.obj troman.obj tkanji.obj
+# ren $@ mktankan
+# aout2exe mktankan
+# del mktankan
+
+mkdict.obj: mkdict.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o$@ mkdict.c
+
+mktankan.obj: mktankan.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o$@ mktankan.c
+
+troman.obj: roman.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o$@ roman.c
+
+tkanji.obj: kanji.c machine.h config.h printf.h kctype.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o$@ kanji.c
+
+rmdict:
+ -$(RM) $(DICTTBL)
+
+$(DICTTXT): mktankan.exe
+ .\mktankan$(EXE) $@
+
+
+############################################################
X # to install all
X
-install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X $(INSTALL) $(PROGRAM)$(EXE) $(BINDIR)
X $(CHMOD) a+rx $(BINDIR)\$(PROGRAM)$(EXE)
X -$(RM) $(BINDIR)\$(ALIAS)$(EXE)
X $(LN) $(BINDIR)\$(PROGRAM)$(EXE) $(BINDIR)\$(ALIAS)$(EXE)
X $(CHMOD) a+rx $(BINDIR)\$(ALIAS)$(EXE)
+ [ -d $(JMANDIR) ] || mkdir $(JMANDIR)
X $(INSTALL) $(PROGRAM).$(MANSEC) $(JMANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(LN) $(JMANDIR)\$(PROGRAM).$(MANSEC) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(ALIAS).$(MANSEC)
+ [ -d $(MANDIR) ] || mkdir $(MANDIR)
X $(INSTALL) $(MANSRC) $(MANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(MANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(MANDIR)\$(ALIAS).$(MANSEC)
@@ -237,6 +280,11 @@
X $(INSTALL) $(UNITBL) $(BINDIR); \
X $(CHMOD) a+r-x $(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ [ -d $(BINDIR) ] || mkdir $(BINDIR); \
+ $(INSTALL) $(DICTTBL) $(BINDIR); \
+ $(CHMOD) a+r-x $(BINDIR)\$(DICTTBL); \
+ fi
X
X catman: $(MANCAT)
X $(INSTALL) $(MANCAT) $(CATDIR)\$(PROGRAM).$(MANSEC)
@@ -418,7 +466,7 @@
X shar -L50 -apc -n $(TITLE)$(VERSION) -o $(TITLE)$(VERSION).shar \
X -T $(SRCS) -C $(JSRCS)
X
-ipk: $(PROGRAM).exe $(UNITBL)
+ipk: $(PROGRAM).exe $(UNITBL)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(CONFDIR) ] || mkdir -p $(IPKWDIR)\$(CONFDIR)
@@ -487,6 +535,10 @@
X cp -p $(UNITBL) $(IPKWDIR)\$(BINDIR); \
X $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ cp -p $(DICTTBL) $(IPKWDIR)\$(BINDIR); \
+ $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(DICTTBL); \
+ fi
X $(ECHO) "Package: fd" > $(IPKWDIR)\CONTROL\control
X $(ECHO) "Priority: optional" >> $(IPKWDIR)\CONTROL\control
X $(ECHO) "Section: extras" >> $(IPKWDIR)\CONTROL\control
@@ -518,6 +570,8 @@
X -$(RM) expfunc$(EXE)
X -$(RM) mkfuncno$(EXE)
X -$(RM) mkunitbl$(EXE)
+ -$(RM) mkdict$(EXE)
+ -$(RM) mktankan$(EXE)
X -$(RM) fdsh$(EXE)
X -$(RM) fdbsh$(EXE)
X -$(RM) $(PROGRAM)$(EXE)
@@ -527,6 +581,8 @@
X -$(RM) $(PROGRAM).doc
X -$(RM) $(ARGS)
X -$(RM) $(UNITBL)
+ -$(RM) $(DICTTXT)
+ -$(RM)
X # DO NOT DELETE THIS LINE -- make depend depends on it.
X
X main.obj: fd.h
@@ -618,8 +674,8 @@
X frontend.obj: printf.h
X frontend.obj: kctype.h
X frontend.obj: pathname.h term.h funcno.h func.h
-frontend.obj: dosdisk.h kanji.h termemu.h system.h
-frontend.obj: termio.h
+frontend.obj: dosdisk.h kanji.h termemu.h roman.h
+frontend.obj: system.h termio.h
X frontend.obj: wait.h
X backend.obj: fd.h
X backend.obj: machine.h config.h
@@ -669,7 +725,7 @@
X builtin.obj: dosdisk.h funcno.h kanji.h system.h
X builtin.obj: termio.h
X builtin.obj: wait.h
-builtin.obj: termemu.h
+builtin.obj: termemu.h roman.h
X shell.obj: fd.h
X shell.obj: machine.h config.h types.h
X shell.obj: printf.h
@@ -689,6 +745,31 @@
X input.obj: func.h
X input.obj: dosdisk.h kanji.h system.h termio.h
X input.obj: wait.h
+ime.obj: fd.h
+ime.obj: machine.h config.h types.h
+ime.obj: printf.h kctype.h
+ime.obj: pathname.h term.h func.h
+ime.obj: dosdisk.h kanji.h wait.h
+ime.obj: roman.h termemu.h
+roman.obj: machine.h config.h
+roman.obj: printf.h
+roman.obj: kctype.h
+roman.obj: roman.h
+dict.obj: fd.h
+dict.obj: machine.h config.h types.h
+dict.obj: printf.h
+dict.obj: kctype.h
+dict.obj: pathname.h term.h termio.h
+dict.obj: func.h
+dict.obj: dosdisk.h roman.h
+dict.obj: hinsi.h
+mkdict.obj: machine.h config.h
+mkdict.obj: printf.h
+mkdict.obj: kctype.h
+mkdict.obj: roman.h hinsi.h
+mktankan.obj: machine.h config.h
+mktankan.obj: printf.h kctype.h
+mktankan.obj: roman.h
X info.obj: fd.h
X info.obj: machine.h
X info.obj: config.h types.h
diff -urNP ../FD-2.08f/makefile.bpc ./makefile.bpc
--- ../FD-2.08f/makefile.bpc Tue Aug 8 00:00:00 2006
+++ ./makefile.bpc Tue Aug 22 00:00:00 2006
@@ -4,7 +4,7 @@
X
X TITLE = FD-
X VERMAJ = 2
-VERSION = 2.08f
+VERSION = 2.09
X PREFIX =
X CONFDIR =
X BUILD =
@@ -23,6 +23,9 @@
X BLDRC = $(BUILD)$(DEFRC)
X DOSRC = ~FD\\fd2rc
X UNITBL = fd-unicd.tbl
+DICTTBL = fd-dict.tbl
+DICTTXT = fd-dict.txt
+DICTSRC =
X
X SRC = main.c printf.c termio.c term.c pathname.c \
X system.c posixsh.c doscom.c log.c \
@@ -32,6 +35,7 @@
X libc.c file.c apply.c \
X parse.c builtin.c shell.c \
X kanji.c input.c \
+ ime.c roman.c dict.c mkdict.c mktankan.c \
X info.c rockridg.c archive.c tree.c \
X custom.c command.c browse.c \
X kanjicnv.c mkfuncno.c expfunc.c mkmfsed.c
@@ -40,7 +44,7 @@
X wait.h system.h \
X dosdisk.h \
X unixdisk.h unixemu.h \
- termemu.h \
+ termemu.h roman.h hinsi.h \
X func.h functabl.h
X
X DOC = README.eng HISTORY.eng FAQ.eng TECHKNOW.eng \
@@ -95,7 +99,7 @@
X pty.obj termemu.obj frontend.obj backend.obj \
X libc.obj file.obj apply.obj \
X parse.obj builtin.obj shell.obj
-OBJ3 = kanji.obj input.obj \
+OBJ3 = kanji.obj input.obj \
X info.obj rockridg.obj archive.obj tree.obj \
X custom.obj command.obj browse.obj
X SOBJ = ssystem.obj sposixsh.obj sdoscom.obj \
@@ -120,7 +124,7 @@
X # Dependency Rules
X ############################################################
X
-all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X
X $(PROGRAM).exe: $(OBJ1) $(OBJ2) $(OBJ3) $(ARGS)
X $(CC) -ml -e$@ @$(ARGS) $(LDFLAGS)
@@ -210,19 +214,58 @@
X
X
X ############################################################
+# Kanji transfer table generating module
+
+$(DICTTBL): mkdict.exe $(DICTSRC)
+ .\mkdict$(EXE) $@ $(DICTSRC)
+
+mkdict.exe: mkdict.obj troman.obj tkanji.obj
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -e$@ mkdict.obj troman.obj tkanji.obj
+# ren $@ mkdict
+# aout2exe mkdict
+# del mkdict
+
+mktankan.exe: mktankan.obj troman.obj tkanji.obj
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -e$@ mktankan.obj troman.obj tkanji.obj
+# ren $@ mktankan
+# aout2exe mktankan
+# del mktankan
+
+mkdict.obj: mkdict.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o$@ mkdict.c
+
+mktankan.obj: mktankan.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o$@ mktankan.c
+
+troman.obj: roman.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o$@ roman.c
+
+tkanji.obj: kanji.c machine.h config.h printf.h kctype.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o$@ kanji.c
+
+rmdict:
+ -$(RM) $(DICTTBL)
+
+$(DICTTXT): mktankan.exe
+ .\mktankan$(EXE) $@
+
+
+############################################################
X # to install all
X
-install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X $(INSTALL) $(PROGRAM)$(EXE) $(BINDIR)
X $(CHMOD) a+rx $(BINDIR)\$(PROGRAM)$(EXE)
X -$(RM) $(BINDIR)\$(ALIAS)$(EXE)
X $(LN) $(BINDIR)\$(PROGRAM)$(EXE) $(BINDIR)\$(ALIAS)$(EXE)
X $(CHMOD) a+rx $(BINDIR)\$(ALIAS)$(EXE)
+ [ -d $(JMANDIR) ] || mkdir $(JMANDIR)
X $(INSTALL) $(PROGRAM).$(MANSEC) $(JMANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(LN) $(JMANDIR)\$(PROGRAM).$(MANSEC) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(ALIAS).$(MANSEC)
+ [ -d $(MANDIR) ] || mkdir $(MANDIR)
X $(INSTALL) $(MANSRC) $(MANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(MANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(MANDIR)\$(ALIAS).$(MANSEC)
@@ -237,6 +280,11 @@
X $(INSTALL) $(UNITBL) $(BINDIR); \
X $(CHMOD) a+r-x $(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ [ -d $(BINDIR) ] || mkdir $(BINDIR); \
+ $(INSTALL) $(DICTTBL) $(BINDIR); \
+ $(CHMOD) a+r-x $(BINDIR)\$(DICTTBL); \
+ fi
X
X catman: $(MANCAT)
X $(INSTALL) $(MANCAT) $(CATDIR)\$(PROGRAM).$(MANSEC)
@@ -418,7 +466,7 @@
X shar -L50 -apc -n $(TITLE)$(VERSION) -o $(TITLE)$(VERSION).shar \
X -T $(SRCS) -C $(JSRCS)
X
-ipk: $(PROGRAM).exe $(UNITBL)
+ipk: $(PROGRAM).exe $(UNITBL)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(CONFDIR) ] || mkdir -p $(IPKWDIR)\$(CONFDIR)
@@ -487,6 +535,10 @@
X cp -p $(UNITBL) $(IPKWDIR)\$(BINDIR); \
X $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ cp -p $(DICTTBL) $(IPKWDIR)\$(BINDIR); \
+ $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(DICTTBL); \
+ fi
X $(ECHO) "Package: fd" > $(IPKWDIR)\CONTROL\control
X $(ECHO) "Priority: optional" >> $(IPKWDIR)\CONTROL\control
X $(ECHO) "Section: extras" >> $(IPKWDIR)\CONTROL\control
@@ -518,6 +570,8 @@
X -$(RM) expfunc$(EXE)
X -$(RM) mkfuncno$(EXE)
X -$(RM) mkunitbl$(EXE)
+ -$(RM) mkdict$(EXE)
+ -$(RM) mktankan$(EXE)
X -$(RM) fdsh$(EXE)
X -$(RM) fdbsh$(EXE)
X -$(RM) $(PROGRAM)$(EXE)
@@ -527,6 +581,8 @@
X -$(RM) $(PROGRAM).doc
X -$(RM) $(ARGS)
X -$(RM) $(UNITBL)
+ -$(RM) $(DICTTXT)
+ -$(RM)
X # DO NOT DELETE THIS LINE -- make depend depends on it.
X
X main.obj: fd.h
@@ -618,8 +674,8 @@
X frontend.obj: printf.h
X frontend.obj: kctype.h
X frontend.obj: pathname.h term.h funcno.h func.h
-frontend.obj: dosdisk.h kanji.h termemu.h system.h
-frontend.obj: termio.h
+frontend.obj: dosdisk.h kanji.h termemu.h roman.h
+frontend.obj: system.h termio.h
X frontend.obj: wait.h
X backend.obj: fd.h
X backend.obj: machine.h config.h
@@ -669,7 +725,7 @@
X builtin.obj: dosdisk.h funcno.h kanji.h system.h
X builtin.obj: termio.h
X builtin.obj: wait.h
-builtin.obj: termemu.h
+builtin.obj: termemu.h roman.h
X shell.obj: fd.h
X shell.obj: machine.h config.h types.h
X shell.obj: printf.h
@@ -689,6 +745,31 @@
X input.obj: func.h
X input.obj: dosdisk.h kanji.h system.h termio.h
X input.obj: wait.h
+ime.obj: fd.h
+ime.obj: machine.h config.h types.h
+ime.obj: printf.h kctype.h
+ime.obj: pathname.h term.h func.h
+ime.obj: dosdisk.h kanji.h wait.h
+ime.obj: roman.h termemu.h
+roman.obj: machine.h config.h
+roman.obj: printf.h
+roman.obj: kctype.h
+roman.obj: roman.h
+dict.obj: fd.h
+dict.obj: machine.h config.h types.h
+dict.obj: printf.h
+dict.obj: kctype.h
+dict.obj: pathname.h term.h termio.h
+dict.obj: func.h
+dict.obj: dosdisk.h roman.h
+dict.obj: hinsi.h
+mkdict.obj: machine.h config.h
+mkdict.obj: printf.h
+mkdict.obj: kctype.h
+mkdict.obj: roman.h hinsi.h
+mktankan.obj: machine.h config.h
+mktankan.obj: printf.h kctype.h
+mktankan.obj: roman.h
X info.obj: fd.h
X info.obj: machine.h
X info.obj: config.h types.h
diff -urNP ../FD-2.08f/makefile.d98 ./makefile.d98
--- ../FD-2.08f/makefile.d98 Tue Aug 8 00:00:00 2006
+++ ./makefile.d98 Tue Aug 22 00:00:00 2006
@@ -4,7 +4,7 @@
X
X TITLE = FD-
X VERMAJ = 2
-VERSION = 2.08f
+VERSION = 2.09
X PREFIX =
X CONFDIR =
X BUILD =
@@ -23,6 +23,9 @@
X BLDRC = $(BUILD)$(DEFRC)
X DOSRC = ~FD\\fd2rc
X UNITBL = fd-unicd.tbl
+DICTTBL = fd-dict.tbl
+DICTTXT = fd-dict.txt
+DICTSRC =
X
X SRC = main.c printf.c termio.c term.c pathname.c \
X system.c posixsh.c doscom.c log.c \
@@ -32,6 +35,7 @@
X libc.c file.c apply.c \
X parse.c builtin.c shell.c \
X kanji.c input.c \
+ ime.c roman.c dict.c mkdict.c mktankan.c \
X info.c rockridg.c archive.c tree.c \
X custom.c command.c browse.c \
X kanjicnv.c mkfuncno.c expfunc.c mkmfsed.c
@@ -40,7 +44,7 @@
X wait.h system.h \
X dosdisk.h \
X unixdisk.h unixemu.h \
- termemu.h \
+ termemu.h roman.h hinsi.h \
X func.h functabl.h
X
X DOC = README.eng HISTORY.eng FAQ.eng TECHKNOW.eng \
@@ -95,7 +99,7 @@
X pty.o termemu.o frontend.o backend.o \
X libc.o file.o apply.o \
X parse.o builtin.o shell.o
-OBJ3 = kanji.o input.o \
+OBJ3 = kanji.o input.o \
X info.o rockridg.o archive.o tree.o \
X custom.o command.o browse.o
X SOBJ = ssystem.o sposixsh.o sdoscom.o \
@@ -120,7 +124,7 @@
X # Dependency Rules
X ############################################################
X
-all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X
X $(PROGRAM).exe: $(OBJ1) $(OBJ2) $(OBJ3) $(ARGS)
X $(CC) -o $@ @$(ARGS) $(LDFLAGS)
@@ -210,19 +214,58 @@
X
X
X ############################################################
+# Kanji transfer table generating module
+
+$(DICTTBL): mkdict.exe $(DICTSRC)
+ .\mkdict$(EXE) $@ $(DICTSRC)
+
+mkdict.exe: mkdict.o troman.o tkanji.o
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -o $@ mkdict.o troman.o tkanji.o
+# @ren $@ mkdict
+# @aout2exe mkdict
+# @del mkdict
+
+mktankan.exe: mktankan.o troman.o tkanji.o
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -o $@ mktankan.o troman.o tkanji.o
+# @ren $@ mktankan
+# @aout2exe mktankan
+# @del mktankan
+
+mkdict.o: mkdict.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ mkdict.c
+
+mktankan.o: mktankan.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ mktankan.c
+
+troman.o: roman.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ roman.c
+
+tkanji.o: kanji.c machine.h config.h printf.h kctype.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ kanji.c
+
+rmdict:
+ -$(RM) $(DICTTBL)
+
+$(DICTTXT): mktankan.exe
+ .\mktankan$(EXE) $@
+
+
+############################################################
X # to install all
X
-install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X $(INSTALL) $(PROGRAM)$(EXE) $(BINDIR)
X $(CHMOD) a+rx $(BINDIR)\$(PROGRAM)$(EXE)
X -$(RM) $(BINDIR)\$(ALIAS)$(EXE)
X $(LN) $(BINDIR)\$(PROGRAM)$(EXE) $(BINDIR)\$(ALIAS)$(EXE)
X $(CHMOD) a+rx $(BINDIR)\$(ALIAS)$(EXE)
+ [ -d $(JMANDIR) ] || mkdir $(JMANDIR)
X $(INSTALL) $(PROGRAM).$(MANSEC) $(JMANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(LN) $(JMANDIR)\$(PROGRAM).$(MANSEC) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(ALIAS).$(MANSEC)
+ [ -d $(MANDIR) ] || mkdir $(MANDIR)
X $(INSTALL) $(MANSRC) $(MANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(MANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(MANDIR)\$(ALIAS).$(MANSEC)
@@ -237,6 +280,11 @@
X $(INSTALL) $(UNITBL) $(BINDIR); \
X $(CHMOD) a+r-x $(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ [ -d $(BINDIR) ] || mkdir $(BINDIR); \
+ $(INSTALL) $(DICTTBL) $(BINDIR); \
+ $(CHMOD) a+r-x $(BINDIR)\$(DICTTBL); \
+ fi
X
X catman: $(MANCAT)
X $(INSTALL) $(MANCAT) $(CATDIR)\$(PROGRAM).$(MANSEC)
@@ -418,7 +466,7 @@
X shar -L50 -apc -n $(TITLE)$(VERSION) -o $(TITLE)$(VERSION).shar \
X -T $(SRCS) -C $(JSRCS)
X
-ipk: $(PROGRAM).exe $(UNITBL)
+ipk: $(PROGRAM).exe $(UNITBL)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(CONFDIR) ] || mkdir -p $(IPKWDIR)\$(CONFDIR)
@@ -487,6 +535,10 @@
X cp -p $(UNITBL) $(IPKWDIR)\$(BINDIR); \
X $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ cp -p $(DICTTBL) $(IPKWDIR)\$(BINDIR); \
+ $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(DICTTBL); \
+ fi
X $(ECHO) "Package: fd" > $(IPKWDIR)\CONTROL\control
X $(ECHO) "Priority: optional" >> $(IPKWDIR)\CONTROL\control
X $(ECHO) "Section: extras" >> $(IPKWDIR)\CONTROL\control
@@ -518,6 +570,8 @@
X -$(RM) expfunc$(EXE)
X -$(RM) mkfuncno$(EXE)
X -$(RM) mkunitbl$(EXE)
+ -$(RM) mkdict$(EXE)
+ -$(RM) mktankan$(EXE)
X -$(RM) fdsh$(EXE)
X -$(RM) fdbsh$(EXE)
X -$(RM) $(PROGRAM)$(EXE)
@@ -527,6 +581,8 @@
X -$(RM) $(PROGRAM).doc
X -$(RM) $(ARGS)
X -$(RM) $(UNITBL)
+ -$(RM) $(DICTTXT)
+ -$(RM)
X # DO NOT DELETE THIS LINE -- make depend depends on it.
X
X main.o: fd.h
@@ -618,8 +674,8 @@
X frontend.o: printf.h
X frontend.o: kctype.h
X frontend.o: pathname.h term.h funcno.h func.h
-frontend.o: dosdisk.h kanji.h termemu.h system.h
-frontend.o: termio.h
+frontend.o: dosdisk.h kanji.h termemu.h roman.h
+frontend.o: system.h termio.h
X frontend.o: wait.h
X backend.o: fd.h
X backend.o: machine.h config.h
@@ -669,7 +725,7 @@
X builtin.o: dosdisk.h funcno.h kanji.h system.h
X builtin.o: termio.h
X builtin.o: wait.h
-builtin.o: termemu.h
+builtin.o: termemu.h roman.h
X shell.o: fd.h
X shell.o: machine.h config.h types.h
X shell.o: printf.h
@@ -689,6 +745,31 @@
X input.o: func.h
X input.o: dosdisk.h kanji.h system.h termio.h
X input.o: wait.h
+ime.o: fd.h
+ime.o: machine.h config.h types.h
+ime.o: printf.h kctype.h
+ime.o: pathname.h term.h func.h
+ime.o: dosdisk.h kanji.h wait.h
+ime.o: roman.h termemu.h
+roman.o: machine.h config.h
+roman.o: printf.h
+roman.o: kctype.h
+roman.o: roman.h
+dict.o: fd.h
+dict.o: machine.h config.h types.h
+dict.o: printf.h
+dict.o: kctype.h
+dict.o: pathname.h term.h termio.h
+dict.o: func.h
+dict.o: dosdisk.h roman.h
+dict.o: hinsi.h
+mkdict.o: machine.h config.h
+mkdict.o: printf.h
+mkdict.o: kctype.h
+mkdict.o: roman.h hinsi.h
+mktankan.o: machine.h config.h
+mktankan.o: printf.h kctype.h
+mktankan.o: roman.h
X info.o: fd.h
X info.o: machine.h
X info.o: config.h types.h
diff -urNP ../FD-2.08f/makefile.dpc ./makefile.dpc
--- ../FD-2.08f/makefile.dpc Tue Aug 8 00:00:00 2006
+++ ./makefile.dpc Tue Aug 22 00:00:00 2006
@@ -4,7 +4,7 @@
X
X TITLE = FD-
X VERMAJ = 2
-VERSION = 2.08f
+VERSION = 2.09
X PREFIX =
X CONFDIR =
X BUILD =
@@ -23,6 +23,9 @@
X BLDRC = $(BUILD)$(DEFRC)
X DOSRC = ~FD\\fd2rc
X UNITBL = fd-unicd.tbl
+DICTTBL = fd-dict.tbl
+DICTTXT = fd-dict.txt
+DICTSRC =
X
X SRC = main.c printf.c termio.c term.c pathname.c \
X system.c posixsh.c doscom.c log.c \
@@ -32,6 +35,7 @@
X libc.c file.c apply.c \
X parse.c builtin.c shell.c \
X kanji.c input.c \
+ ime.c roman.c dict.c mkdict.c mktankan.c \
X info.c rockridg.c archive.c tree.c \
X custom.c command.c browse.c \
X kanjicnv.c mkfuncno.c expfunc.c mkmfsed.c
@@ -40,7 +44,7 @@
X wait.h system.h \
X dosdisk.h \
X unixdisk.h unixemu.h \
- termemu.h \
+ termemu.h roman.h hinsi.h \
X func.h functabl.h
X
X DOC = README.eng HISTORY.eng FAQ.eng TECHKNOW.eng \
@@ -95,7 +99,7 @@
X pty.o termemu.o frontend.o backend.o \
X libc.o file.o apply.o \
X parse.o builtin.o shell.o
-OBJ3 = kanji.o input.o \
+OBJ3 = kanji.o input.o \
X info.o rockridg.o archive.o tree.o \
X custom.o command.o browse.o
X SOBJ = ssystem.o sposixsh.o sdoscom.o \
@@ -120,7 +124,7 @@
X # Dependency Rules
X ############################################################
X
-all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X
X $(PROGRAM).exe: $(OBJ1) $(OBJ2) $(OBJ3) $(ARGS)
X $(CC) -o $@ @$(ARGS) $(LDFLAGS)
@@ -210,19 +214,58 @@
X
X
X ############################################################
+# Kanji transfer table generating module
+
+$(DICTTBL): mkdict.exe $(DICTSRC)
+ .\mkdict$(EXE) $@ $(DICTSRC)
+
+mkdict.exe: mkdict.o troman.o tkanji.o
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -o $@ mkdict.o troman.o tkanji.o
+# @ren $@ mkdict
+# @aout2exe mkdict
+# @del mkdict
+
+mktankan.exe: mktankan.o troman.o tkanji.o
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -o $@ mktankan.o troman.o tkanji.o
+# @ren $@ mktankan
+# @aout2exe mktankan
+# @del mktankan
+
+mkdict.o: mkdict.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ mkdict.c
+
+mktankan.o: mktankan.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ mktankan.c
+
+troman.o: roman.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ roman.c
+
+tkanji.o: kanji.c machine.h config.h printf.h kctype.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ kanji.c
+
+rmdict:
+ -$(RM) $(DICTTBL)
+
+$(DICTTXT): mktankan.exe
+ .\mktankan$(EXE) $@
+
+
+############################################################
X # to install all
X
-install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X $(INSTALL) $(PROGRAM)$(EXE) $(BINDIR)
X $(CHMOD) a+rx $(BINDIR)\$(PROGRAM)$(EXE)
X -$(RM) $(BINDIR)\$(ALIAS)$(EXE)
X $(LN) $(BINDIR)\$(PROGRAM)$(EXE) $(BINDIR)\$(ALIAS)$(EXE)
X $(CHMOD) a+rx $(BINDIR)\$(ALIAS)$(EXE)
+ [ -d $(JMANDIR) ] || mkdir $(JMANDIR)
X $(INSTALL) $(PROGRAM).$(MANSEC) $(JMANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(LN) $(JMANDIR)\$(PROGRAM).$(MANSEC) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(ALIAS).$(MANSEC)
+ [ -d $(MANDIR) ] || mkdir $(MANDIR)
X $(INSTALL) $(MANSRC) $(MANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(MANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(MANDIR)\$(ALIAS).$(MANSEC)
@@ -237,6 +280,11 @@
X $(INSTALL) $(UNITBL) $(BINDIR); \
X $(CHMOD) a+r-x $(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ [ -d $(BINDIR) ] || mkdir $(BINDIR); \
+ $(INSTALL) $(DICTTBL) $(BINDIR); \
+ $(CHMOD) a+r-x $(BINDIR)\$(DICTTBL); \
+ fi
X
X catman: $(MANCAT)
X $(INSTALL) $(MANCAT) $(CATDIR)\$(PROGRAM).$(MANSEC)
@@ -418,7 +466,7 @@
X shar -L50 -apc -n $(TITLE)$(VERSION) -o $(TITLE)$(VERSION).shar \
X -T $(SRCS) -C $(JSRCS)
X
-ipk: $(PROGRAM).exe $(UNITBL)
+ipk: $(PROGRAM).exe $(UNITBL)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(CONFDIR) ] || mkdir -p $(IPKWDIR)\$(CONFDIR)
@@ -487,6 +535,10 @@
X cp -p $(UNITBL) $(IPKWDIR)\$(BINDIR); \
X $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ cp -p $(DICTTBL) $(IPKWDIR)\$(BINDIR); \
+ $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(DICTTBL); \
+ fi
X $(ECHO) "Package: fd" > $(IPKWDIR)\CONTROL\control
X $(ECHO) "Priority: optional" >> $(IPKWDIR)\CONTROL\control
X $(ECHO) "Section: extras" >> $(IPKWDIR)\CONTROL\control
@@ -518,6 +570,8 @@
X -$(RM) expfunc$(EXE)
X -$(RM) mkfuncno$(EXE)
X -$(RM) mkunitbl$(EXE)
+ -$(RM) mkdict$(EXE)
+ -$(RM) mktankan$(EXE)
X -$(RM) fdsh$(EXE)
X -$(RM) fdbsh$(EXE)
X -$(RM) $(PROGRAM)$(EXE)
@@ -527,6 +581,8 @@
X -$(RM) $(PROGRAM).doc
X -$(RM) $(ARGS)
X -$(RM) $(UNITBL)
+ -$(RM) $(DICTTXT)
+ -$(RM)
X # DO NOT DELETE THIS LINE -- make depend depends on it.
X
X main.o: fd.h
@@ -618,8 +674,8 @@
X frontend.o: printf.h
X frontend.o: kctype.h
X frontend.o: pathname.h term.h funcno.h func.h
-frontend.o: dosdisk.h kanji.h termemu.h system.h
-frontend.o: termio.h
+frontend.o: dosdisk.h kanji.h termemu.h roman.h
+frontend.o: system.h termio.h
X frontend.o: wait.h
X backend.o: fd.h
X backend.o: machine.h config.h
@@ -669,7 +725,7 @@
X builtin.o: dosdisk.h funcno.h kanji.h system.h
X builtin.o: termio.h
X builtin.o: wait.h
-builtin.o: termemu.h
+builtin.o: termemu.h roman.h
X shell.o: fd.h
X shell.o: machine.h config.h types.h
X shell.o: printf.h
@@ -689,6 +745,31 @@
X input.o: func.h
X input.o: dosdisk.h kanji.h system.h termio.h
X input.o: wait.h
+ime.o: fd.h
+ime.o: machine.h config.h types.h
+ime.o: printf.h kctype.h
+ime.o: pathname.h term.h func.h
+ime.o: dosdisk.h kanji.h wait.h
+ime.o: roman.h termemu.h
+roman.o: machine.h config.h
+roman.o: printf.h
+roman.o: kctype.h
+roman.o: roman.h
+dict.o: fd.h
+dict.o: machine.h config.h types.h
+dict.o: printf.h
+dict.o: kctype.h
+dict.o: pathname.h term.h termio.h
+dict.o: func.h
+dict.o: dosdisk.h roman.h
+dict.o: hinsi.h
+mkdict.o: machine.h config.h
+mkdict.o: printf.h
+mkdict.o: kctype.h
+mkdict.o: roman.h hinsi.h
+mktankan.o: machine.h config.h
+mktankan.o: printf.h kctype.h
+mktankan.o: roman.h
X info.o: fd.h
X info.o: machine.h
X info.o: config.h types.h
diff -urNP ../FD-2.08f/makefile.g98 ./makefile.g98
--- ../FD-2.08f/makefile.g98 Tue Aug 8 00:00:00 2006
+++ ./makefile.g98 Tue Aug 22 00:00:00 2006
@@ -4,7 +4,7 @@
X
X TITLE = FD-
X VERMAJ = 2
-VERSION = 2.08f
+VERSION = 2.09
X PREFIX =
X CONFDIR =
X BUILD =
@@ -23,6 +23,9 @@
X BLDRC = $(BUILD)$(DEFRC)
X DOSRC = ~FD\\fd2rc
X UNITBL = fd-unicd.tbl
+DICTTBL = fd-dict.tbl
+DICTTXT = fd-dict.txt
+DICTSRC =
X
X SRC = main.c printf.c termio.c term.c pathname.c \
X system.c posixsh.c doscom.c log.c \
@@ -32,6 +35,7 @@
X libc.c file.c apply.c \
X parse.c builtin.c shell.c \
X kanji.c input.c \
+ ime.c roman.c dict.c mkdict.c mktankan.c \
X info.c rockridg.c archive.c tree.c \
X custom.c command.c browse.c \
X kanjicnv.c mkfuncno.c expfunc.c mkmfsed.c
@@ -40,7 +44,7 @@
X wait.h system.h \
X dosdisk.h \
X unixdisk.h unixemu.h \
- termemu.h \
+ termemu.h roman.h hinsi.h \
X func.h functabl.h
X
X DOC = README.eng HISTORY.eng FAQ.eng TECHKNOW.eng \
@@ -95,7 +99,7 @@
X pty.o termemu.o frontend.o backend.o \
X libc.o file.o apply.o \
X parse.o builtin.o shell.o
-OBJ3 = kanji.o input.o \
+OBJ3 = kanji.o input.o \
X info.o rockridg.o archive.o tree.o \
X custom.o command.o browse.o
X SOBJ = ssystem.o sposixsh.o sdoscom.o \
@@ -120,7 +124,7 @@
X # Dependency Rules
X ############################################################
X
-all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X
X $(PROGRAM).exe: $(OBJ1) $(OBJ2) $(OBJ3) $(ARGS)
X $(CC) -o $@ @$(ARGS) $(LDFLAGS)
@@ -210,19 +214,58 @@
X
X
X ############################################################
+# Kanji transfer table generating module
+
+$(DICTTBL): mkdict.exe $(DICTSRC)
+ .\mkdict$(EXE) $@ $(DICTSRC)
+
+mkdict.exe: mkdict.o troman.o tkanji.o
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -o $@ mkdict.o troman.o tkanji.o
+ @ren $@ mkdict
+ @aout2exe mkdict
+ @del mkdict
+
+mktankan.exe: mktankan.o troman.o tkanji.o
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -o $@ mktankan.o troman.o tkanji.o
+ @ren $@ mktankan
+ @aout2exe mktankan
+ @del mktankan
+
+mkdict.o: mkdict.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ mkdict.c
+
+mktankan.o: mktankan.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ mktankan.c
+
+troman.o: roman.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ roman.c
+
+tkanji.o: kanji.c machine.h config.h printf.h kctype.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ kanji.c
+
+rmdict:
+ -$(RM) $(DICTTBL)
+
+$(DICTTXT): mktankan.exe
+ .\mktankan$(EXE) $@
+
+
+############################################################
X # to install all
X
-install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X $(INSTALL) $(PROGRAM)$(EXE) $(BINDIR)
X $(CHMOD) a+rx $(BINDIR)\$(PROGRAM)$(EXE)
X -$(RM) $(BINDIR)\$(ALIAS)$(EXE)
X $(LN) $(BINDIR)\$(PROGRAM)$(EXE) $(BINDIR)\$(ALIAS)$(EXE)
X $(CHMOD) a+rx $(BINDIR)\$(ALIAS)$(EXE)
+ [ -d $(JMANDIR) ] || mkdir $(JMANDIR)
X $(INSTALL) $(PROGRAM).$(MANSEC) $(JMANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(LN) $(JMANDIR)\$(PROGRAM).$(MANSEC) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(ALIAS).$(MANSEC)
+ [ -d $(MANDIR) ] || mkdir $(MANDIR)
X $(INSTALL) $(MANSRC) $(MANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(MANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(MANDIR)\$(ALIAS).$(MANSEC)
@@ -237,6 +280,11 @@
X $(INSTALL) $(UNITBL) $(BINDIR); \
X $(CHMOD) a+r-x $(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ [ -d $(BINDIR) ] || mkdir $(BINDIR); \
+ $(INSTALL) $(DICTTBL) $(BINDIR); \
+ $(CHMOD) a+r-x $(BINDIR)\$(DICTTBL); \
+ fi
X
X catman: $(MANCAT)
X $(INSTALL) $(MANCAT) $(CATDIR)\$(PROGRAM).$(MANSEC)
@@ -418,7 +466,7 @@
X shar -L50 -apc -n $(TITLE)$(VERSION) -o $(TITLE)$(VERSION).shar \
X -T $(SRCS) -C $(JSRCS)
X
-ipk: $(PROGRAM).exe $(UNITBL)
+ipk: $(PROGRAM).exe $(UNITBL)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(CONFDIR) ] || mkdir -p $(IPKWDIR)\$(CONFDIR)
@@ -487,6 +535,10 @@
X cp -p $(UNITBL) $(IPKWDIR)\$(BINDIR); \
X $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ cp -p $(DICTTBL) $(IPKWDIR)\$(BINDIR); \
+ $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(DICTTBL); \
+ fi
X $(ECHO) "Package: fd" > $(IPKWDIR)\CONTROL\control
X $(ECHO) "Priority: optional" >> $(IPKWDIR)\CONTROL\control
X $(ECHO) "Section: extras" >> $(IPKWDIR)\CONTROL\control
@@ -518,6 +570,8 @@
X -$(RM) expfunc$(EXE)
X -$(RM) mkfuncno$(EXE)
X -$(RM) mkunitbl$(EXE)
+ -$(RM) mkdict$(EXE)
+ -$(RM) mktankan$(EXE)
X -$(RM) fdsh$(EXE)
X -$(RM) fdbsh$(EXE)
X -$(RM) $(PROGRAM)$(EXE)
@@ -527,6 +581,8 @@
X -$(RM) $(PROGRAM).doc
X -$(RM) $(ARGS)
X -$(RM) $(UNITBL)
+ -$(RM) $(DICTTXT)
+ -$(RM)
X # DO NOT DELETE THIS LINE -- make depend depends on it.
X
X main.o: fd.h
@@ -618,8 +674,8 @@
X frontend.o: printf.h
X frontend.o: kctype.h
X frontend.o: pathname.h term.h funcno.h func.h
-frontend.o: dosdisk.h kanji.h termemu.h system.h
-frontend.o: termio.h
+frontend.o: dosdisk.h kanji.h termemu.h roman.h
+frontend.o: system.h termio.h
X frontend.o: wait.h
X backend.o: fd.h
X backend.o: machine.h config.h
@@ -669,7 +725,7 @@
X builtin.o: dosdisk.h funcno.h kanji.h system.h
X builtin.o: termio.h
X builtin.o: wait.h
-builtin.o: termemu.h
+builtin.o: termemu.h roman.h
X shell.o: fd.h
X shell.o: machine.h config.h types.h
X shell.o: printf.h
@@ -689,6 +745,31 @@
X input.o: func.h
X input.o: dosdisk.h kanji.h system.h termio.h
X input.o: wait.h
+ime.o: fd.h
+ime.o: machine.h config.h types.h
+ime.o: printf.h kctype.h
+ime.o: pathname.h term.h func.h
+ime.o: dosdisk.h kanji.h wait.h
+ime.o: roman.h termemu.h
+roman.o: machine.h config.h
+roman.o: printf.h
+roman.o: kctype.h
+roman.o: roman.h
+dict.o: fd.h
+dict.o: machine.h config.h types.h
+dict.o: printf.h
+dict.o: kctype.h
+dict.o: pathname.h term.h termio.h
+dict.o: func.h
+dict.o: dosdisk.h roman.h
+dict.o: hinsi.h
+mkdict.o: machine.h config.h
+mkdict.o: printf.h
+mkdict.o: kctype.h
+mkdict.o: roman.h hinsi.h
+mktankan.o: machine.h config.h
+mktankan.o: printf.h kctype.h
+mktankan.o: roman.h
X info.o: fd.h
X info.o: machine.h
X info.o: config.h types.h
diff -urNP ../FD-2.08f/makefile.gpc ./makefile.gpc
--- ../FD-2.08f/makefile.gpc Tue Aug 8 00:00:00 2006
+++ ./makefile.gpc Tue Aug 22 00:00:00 2006
@@ -4,7 +4,7 @@
X
X TITLE = FD-
X VERMAJ = 2
-VERSION = 2.08f
+VERSION = 2.09
X PREFIX =
X CONFDIR =
X BUILD =
@@ -23,6 +23,9 @@
X BLDRC = $(BUILD)$(DEFRC)
X DOSRC = ~FD\\fd2rc
X UNITBL = fd-unicd.tbl
+DICTTBL = fd-dict.tbl
+DICTTXT = fd-dict.txt
+DICTSRC =
X
X SRC = main.c printf.c termio.c term.c pathname.c \
X system.c posixsh.c doscom.c log.c \
@@ -32,6 +35,7 @@
X libc.c file.c apply.c \
X parse.c builtin.c shell.c \
X kanji.c input.c \
+ ime.c roman.c dict.c mkdict.c mktankan.c \
X info.c rockridg.c archive.c tree.c \
X custom.c command.c browse.c \
X kanjicnv.c mkfuncno.c expfunc.c mkmfsed.c
@@ -40,7 +44,7 @@
X wait.h system.h \
X dosdisk.h \
X unixdisk.h unixemu.h \
- termemu.h \
+ termemu.h roman.h hinsi.h \
X func.h functabl.h
X
X DOC = README.eng HISTORY.eng FAQ.eng TECHKNOW.eng \
@@ -95,7 +99,7 @@
X pty.o termemu.o frontend.o backend.o \
X libc.o file.o apply.o \
X parse.o builtin.o shell.o
-OBJ3 = kanji.o input.o \
+OBJ3 = kanji.o input.o \
X info.o rockridg.o archive.o tree.o \
X custom.o command.o browse.o
X SOBJ = ssystem.o sposixsh.o sdoscom.o \
@@ -120,7 +124,7 @@
X # Dependency Rules
X ############################################################
X
-all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X
X $(PROGRAM).exe: $(OBJ1) $(OBJ2) $(OBJ3) $(ARGS)
X $(CC) -o $@ @$(ARGS) $(LDFLAGS)
@@ -210,19 +214,58 @@
X
X
X ############################################################
+# Kanji transfer table generating module
+
+$(DICTTBL): mkdict.exe $(DICTSRC)
+ .\mkdict$(EXE) $@ $(DICTSRC)
+
+mkdict.exe: mkdict.o troman.o tkanji.o
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -o $@ mkdict.o troman.o tkanji.o
+ @ren $@ mkdict
+ @aout2exe mkdict
+ @del mkdict
+
+mktankan.exe: mktankan.o troman.o tkanji.o
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -o $@ mktankan.o troman.o tkanji.o
+ @ren $@ mktankan
+ @aout2exe mktankan
+ @del mktankan
+
+mkdict.o: mkdict.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ mkdict.c
+
+mktankan.o: mktankan.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ mktankan.c
+
+troman.o: roman.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ roman.c
+
+tkanji.o: kanji.c machine.h config.h printf.h kctype.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ kanji.c
+
+rmdict:
+ -$(RM) $(DICTTBL)
+
+$(DICTTXT): mktankan.exe
+ .\mktankan$(EXE) $@
+
+
+############################################################
X # to install all
X
-install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X $(INSTALL) $(PROGRAM)$(EXE) $(BINDIR)
X $(CHMOD) a+rx $(BINDIR)\$(PROGRAM)$(EXE)
X -$(RM) $(BINDIR)\$(ALIAS)$(EXE)
X $(LN) $(BINDIR)\$(PROGRAM)$(EXE) $(BINDIR)\$(ALIAS)$(EXE)
X $(CHMOD) a+rx $(BINDIR)\$(ALIAS)$(EXE)
+ [ -d $(JMANDIR) ] || mkdir $(JMANDIR)
X $(INSTALL) $(PROGRAM).$(MANSEC) $(JMANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(LN) $(JMANDIR)\$(PROGRAM).$(MANSEC) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(ALIAS).$(MANSEC)
+ [ -d $(MANDIR) ] || mkdir $(MANDIR)
X $(INSTALL) $(MANSRC) $(MANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(MANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(MANDIR)\$(ALIAS).$(MANSEC)
@@ -237,6 +280,11 @@
X $(INSTALL) $(UNITBL) $(BINDIR); \
X $(CHMOD) a+r-x $(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ [ -d $(BINDIR) ] || mkdir $(BINDIR); \
+ $(INSTALL) $(DICTTBL) $(BINDIR); \
+ $(CHMOD) a+r-x $(BINDIR)\$(DICTTBL); \
+ fi
X
X catman: $(MANCAT)
X $(INSTALL) $(MANCAT) $(CATDIR)\$(PROGRAM).$(MANSEC)
@@ -418,7 +466,7 @@
X shar -L50 -apc -n $(TITLE)$(VERSION) -o $(TITLE)$(VERSION).shar \
X -T $(SRCS) -C $(JSRCS)
X
-ipk: $(PROGRAM).exe $(UNITBL)
+ipk: $(PROGRAM).exe $(UNITBL)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(CONFDIR) ] || mkdir -p $(IPKWDIR)\$(CONFDIR)
@@ -487,6 +535,10 @@
X cp -p $(UNITBL) $(IPKWDIR)\$(BINDIR); \
X $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ cp -p $(DICTTBL) $(IPKWDIR)\$(BINDIR); \
+ $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(DICTTBL); \
+ fi
X $(ECHO) "Package: fd" > $(IPKWDIR)\CONTROL\control
X $(ECHO) "Priority: optional" >> $(IPKWDIR)\CONTROL\control
X $(ECHO) "Section: extras" >> $(IPKWDIR)\CONTROL\control
@@ -518,6 +570,8 @@
X -$(RM) expfunc$(EXE)
X -$(RM) mkfuncno$(EXE)
X -$(RM) mkunitbl$(EXE)
+ -$(RM) mkdict$(EXE)
+ -$(RM) mktankan$(EXE)
X -$(RM) fdsh$(EXE)
X -$(RM) fdbsh$(EXE)
X -$(RM) $(PROGRAM)$(EXE)
@@ -527,6 +581,8 @@
X -$(RM) $(PROGRAM).doc
X -$(RM) $(ARGS)
X -$(RM) $(UNITBL)
+ -$(RM) $(DICTTXT)
+ -$(RM)
X # DO NOT DELETE THIS LINE -- make depend depends on it.
X
X main.o: fd.h
@@ -618,8 +674,8 @@
X frontend.o: printf.h
X frontend.o: kctype.h
X frontend.o: pathname.h term.h funcno.h func.h
-frontend.o: dosdisk.h kanji.h termemu.h system.h
-frontend.o: termio.h
+frontend.o: dosdisk.h kanji.h termemu.h roman.h
+frontend.o: system.h termio.h
X frontend.o: wait.h
X backend.o: fd.h
X backend.o: machine.h config.h
@@ -669,7 +725,7 @@
X builtin.o: dosdisk.h funcno.h kanji.h system.h
X builtin.o: termio.h
X builtin.o: wait.h
-builtin.o: termemu.h
+builtin.o: termemu.h roman.h
X shell.o: fd.h
X shell.o: machine.h config.h types.h
X shell.o: printf.h
@@ -689,6 +745,31 @@
X input.o: func.h
X input.o: dosdisk.h kanji.h system.h termio.h
X input.o: wait.h
+ime.o: fd.h
+ime.o: machine.h config.h types.h
+ime.o: printf.h kctype.h
+ime.o: pathname.h term.h func.h
+ime.o: dosdisk.h kanji.h wait.h
+ime.o: roman.h termemu.h
+roman.o: machine.h config.h
+roman.o: printf.h
+roman.o: kctype.h
+roman.o: roman.h
+dict.o: fd.h
+dict.o: machine.h config.h types.h
+dict.o: printf.h
+dict.o: kctype.h
+dict.o: pathname.h term.h termio.h
+dict.o: func.h
+dict.o: dosdisk.h roman.h
+dict.o: hinsi.h
+mkdict.o: machine.h config.h
+mkdict.o: printf.h
+mkdict.o: kctype.h
+mkdict.o: roman.h hinsi.h
+mktankan.o: machine.h config.h
+mktankan.o: printf.h kctype.h
+mktankan.o: roman.h
X info.o: fd.h
X info.o: machine.h
X info.o: config.h types.h
diff -urNP ../FD-2.08f/makefile.l98 ./makefile.l98
--- ../FD-2.08f/makefile.l98 Tue Aug 8 00:00:00 2006
+++ ./makefile.l98 Tue Aug 22 00:00:00 2006
@@ -4,7 +4,7 @@
X
X TITLE = FD-
X VERMAJ = 2
-VERSION = 2.08f
+VERSION = 2.09
X PREFIX =
X CONFDIR =
X BUILD =
@@ -23,6 +23,9 @@
X BLDRC = $(BUILD)$(DEFRC)
X DOSRC = ~FD\\fd2rc
X UNITBL = fd-unicd.tbl
+DICTTBL = fd-dict.tbl
+DICTTXT = fd-dict.txt
+DICTSRC =
X
X SRC = main.c printf.c termio.c term.c pathname.c \
X system.c posixsh.c doscom.c log.c \
@@ -32,6 +35,7 @@
X libc.c file.c apply.c \
X parse.c builtin.c shell.c \
X kanji.c input.c \
+ ime.c roman.c dict.c mkdict.c mktankan.c \
X info.c rockridg.c archive.c tree.c \
X custom.c command.c browse.c \
X kanjicnv.c mkfuncno.c expfunc.c mkmfsed.c
@@ -40,7 +44,7 @@
X wait.h system.h \
X dosdisk.h \
X unixdisk.h unixemu.h \
- termemu.h \
+ termemu.h roman.h hinsi.h \
X func.h functabl.h
X
X DOC = README.eng HISTORY.eng FAQ.eng TECHKNOW.eng \
@@ -95,7 +99,7 @@
X pty.obj termemu.obj frontend.obj backend.obj \
X libc.obj file.obj apply.obj \
X parse.obj builtin.obj shell.obj
-OBJ3 = kanji.obj input.obj \
+OBJ3 = kanji.obj input.obj \
X info.obj rockridg.obj archive.obj tree.obj \
X custom.obj command.obj browse.obj
X SOBJ = ssystem.obj sposixsh.obj sdoscom.obj \
@@ -109,7 +113,7 @@
X CFLAGS = -DPC98=1 -O $(DEBUG)
X HOSTCFLAGS = -DPC98=1 -O
X SLDFLAGS = -lintlib -ltinymain.obj $(ALLOC)
-FDCFLAGS = $(CFLAGS) $(CPPFLAGS) -ml -h -k"-s 3800" -DFD=$(VERMAJ)
+FDCFLAGS = $(CFLAGS) $(CPPFLAGS) -ml -h -k"-s 3000" -DFD=$(VERMAJ)
X SHCFLAGS = $(CFLAGS) $(CPPFLAGS) -mp -h -k"-s 8000" -DFDSH=$(VERMAJ)
X BSHCFLAGS = $(CFLAGS) $(CPPFLAGS) -ms -k"-s 8000" -DFDSH=$(VERMAJ) -DMINIMUMSHELL
X DEFCFLAGS = -DDEFRC=\\\"$(DOSRC)\\\"
@@ -120,10 +124,10 @@
X # Dependency Rules
X ############################################################
X
-all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X
X $(PROGRAM).exe: $(OBJ1) $(OBJ2) $(OBJ3) $(ARGS)
- $(CC) -ml -h -k"-s 3800" -o $@ @$(ARGS) $(LDFLAGS)
+ $(CC) -ml -h -k"-s 3000" -o $@ @$(ARGS) $(LDFLAGS)
X # ren $@ $(PROGRAM)
X # aout2exe $(PROGRAM)
X # del $(PROGRAM)
@@ -210,19 +214,58 @@
X
X
X ############################################################
+# Kanji transfer table generating module
+
+$(DICTTBL): mkdict.exe $(DICTSRC)
+ .\mkdict$(EXE) $@ $(DICTSRC)
+
+mkdict.exe: mkdict.obj troman.obj tkanji.obj
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -o $@ mkdict.obj troman.obj tkanji.obj
+# ren $@ mkdict
+# aout2exe mkdict
+# del mkdict
+
+mktankan.exe: mktankan.obj troman.obj tkanji.obj
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -o $@ mktankan.obj troman.obj tkanji.obj
+# ren $@ mktankan
+# aout2exe mktankan
+# del mktankan
+
+mkdict.obj: mkdict.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ mkdict.c
+
+mktankan.obj: mktankan.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ mktankan.c
+
+troman.obj: roman.c machine.h config.h printf.h kctype.h roman.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ roman.c
+
+tkanji.obj: kanji.c machine.h config.h printf.h kctype.h
+ $(HOSTCC) $(HOSTCFLAGS) $(CPPFLAGS) -c -o $@ kanji.c
+
+rmdict:
+ -$(RM) $(DICTTBL)
+
+$(DICTTXT): mktankan.exe
+ .\mktankan$(EXE) $@
+
+
+############################################################
X # to install all
X
-install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+install: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X $(INSTALL) $(PROGRAM)$(EXE) $(BINDIR)
X $(CHMOD) a+rx $(BINDIR)\$(PROGRAM)$(EXE)
X -$(RM) $(BINDIR)\$(ALIAS)$(EXE)
X $(LN) $(BINDIR)\$(PROGRAM)$(EXE) $(BINDIR)\$(ALIAS)$(EXE)
X $(CHMOD) a+rx $(BINDIR)\$(ALIAS)$(EXE)
+ [ -d $(JMANDIR) ] || mkdir $(JMANDIR)
X $(INSTALL) $(PROGRAM).$(MANSEC) $(JMANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(LN) $(JMANDIR)\$(PROGRAM).$(MANSEC) $(JMANDIR)\$(ALIAS).$(MANSEC)
X $(CHMOD) a+r-x $(JMANDIR)\$(ALIAS).$(MANSEC)
+ [ -d $(MANDIR) ] || mkdir $(MANDIR)
X $(INSTALL) $(MANSRC) $(MANDIR)\$(PROGRAM).$(MANSEC)
X $(CHMOD) a+r-x $(MANDIR)\$(PROGRAM).$(MANSEC)
X -$(RM) $(MANDIR)\$(ALIAS).$(MANSEC)
@@ -237,6 +280,11 @@
X $(INSTALL) $(UNITBL) $(BINDIR); \
X $(CHMOD) a+r-x $(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ [ -d $(BINDIR) ] || mkdir $(BINDIR); \
+ $(INSTALL) $(DICTTBL) $(BINDIR); \
+ $(CHMOD) a+r-x $(BINDIR)\$(DICTTBL); \
+ fi
X
X catman: $(MANCAT)
X $(INSTALL) $(MANCAT) $(CATDIR)\$(PROGRAM).$(MANSEC)
@@ -418,7 +466,7 @@
X shar -L50 -apc -n $(TITLE)$(VERSION) -o $(TITLE)$(VERSION).shar \
X -T $(SRCS) -C $(JSRCS)
X
-ipk: $(PROGRAM).exe $(UNITBL)
+ipk: $(PROGRAM).exe $(UNITBL)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(BINDIR) ] || mkdir -p $(IPKWDIR)\$(BINDIR)
X -[ -d $(IPKWDIR)\$(CONFDIR) ] || mkdir -p $(IPKWDIR)\$(CONFDIR)
@@ -487,6 +535,10 @@
X cp -p $(UNITBL) $(IPKWDIR)\$(BINDIR); \
X $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(UNITBL); \
X fi
+ -if [ -f $(DICTTBL) ]; then \
+ cp -p $(DICTTBL) $(IPKWDIR)\$(BINDIR); \
+ $(CHMOD) a+r-x $(IPKWDIR)\$(BINDIR)\$(DICTTBL); \
+ fi
X $(ECHO) "Package: fd" > $(IPKWDIR)\CONTROL\control
X $(ECHO) "Priority: optional" >> $(IPKWDIR)\CONTROL\control
X $(ECHO) "Section: extras" >> $(IPKWDIR)\CONTROL\control
@@ -518,6 +570,8 @@
X -$(RM) expfunc$(EXE)
X -$(RM) mkfuncno$(EXE)
X -$(RM) mkunitbl$(EXE)
+ -$(RM) mkdict$(EXE)
+ -$(RM) mktankan$(EXE)
X -$(RM) fdsh$(EXE)
X -$(RM) fdbsh$(EXE)
X -$(RM) $(PROGRAM)$(EXE)
@@ -527,6 +581,8 @@
X -$(RM) $(PROGRAM).doc
X -$(RM) $(ARGS)
X -$(RM) $(UNITBL)
+ -$(RM) $(DICTTXT)
+ -$(RM)
X # DO NOT DELETE THIS LINE -- make depend depends on it.
X
X main.obj: fd.h
@@ -618,8 +674,8 @@
X frontend.obj: printf.h
X frontend.obj: kctype.h
X frontend.obj: pathname.h term.h funcno.h func.h
-frontend.obj: dosdisk.h kanji.h termemu.h system.h
-frontend.obj: termio.h
+frontend.obj: dosdisk.h kanji.h termemu.h roman.h
+frontend.obj: system.h termio.h
X frontend.obj: wait.h
X backend.obj: fd.h
X backend.obj: machine.h config.h
@@ -669,7 +725,7 @@
X builtin.obj: dosdisk.h funcno.h kanji.h system.h
X builtin.obj: termio.h
X builtin.obj: wait.h
-builtin.obj: termemu.h
+builtin.obj: termemu.h roman.h
X shell.obj: fd.h
X shell.obj: machine.h config.h types.h
X shell.obj: printf.h
@@ -689,6 +745,31 @@
X input.obj: func.h
X input.obj: dosdisk.h kanji.h system.h termio.h
X input.obj: wait.h
+ime.obj: fd.h
+ime.obj: machine.h config.h types.h
+ime.obj: printf.h kctype.h
+ime.obj: pathname.h term.h func.h
+ime.obj: dosdisk.h kanji.h wait.h
+ime.obj: roman.h termemu.h
+roman.obj: machine.h config.h
+roman.obj: printf.h
+roman.obj: kctype.h
+roman.obj: roman.h
+dict.obj: fd.h
+dict.obj: machine.h config.h types.h
+dict.obj: printf.h
+dict.obj: kctype.h
+dict.obj: pathname.h term.h termio.h
+dict.obj: func.h
+dict.obj: dosdisk.h roman.h
+dict.obj: hinsi.h
+mkdict.obj: machine.h config.h
+mkdict.obj: printf.h
+mkdict.obj: kctype.h
+mkdict.obj: roman.h hinsi.h
+mktankan.obj: machine.h config.h
+mktankan.obj: printf.h kctype.h
+mktankan.obj: roman.h
X info.obj: fd.h
X info.obj: machine.h
X info.obj: config.h types.h
diff -urNP ../FD-2.08f/makefile.lpc ./makefile.lpc
--- ../FD-2.08f/makefile.lpc Tue Aug 8 00:00:00 2006
+++ ./makefile.lpc Tue Aug 22 00:00:00 2006
@@ -4,7 +4,7 @@
X
X TITLE = FD-
X VERMAJ = 2
-VERSION = 2.08f
+VERSION = 2.09
X PREFIX =
X CONFDIR =
X BUILD =
@@ -23,6 +23,9 @@
X BLDRC = $(BUILD)$(DEFRC)
X DOSRC = ~FD\\fd2rc
X UNITBL = fd-unicd.tbl
+DICTTBL = fd-dict.tbl
+DICTTXT = fd-dict.txt
+DICTSRC =
X
X SRC = main.c printf.c termio.c term.c pathname.c \
X system.c posixsh.c doscom.c log.c \
@@ -32,6 +35,7 @@
X libc.c file.c apply.c \
X parse.c builtin.c shell.c \
X kanji.c input.c \
+ ime.c roman.c dict.c mkdict.c mktankan.c \
X info.c rockridg.c archive.c tree.c \
X custom.c command.c browse.c \
X kanjicnv.c mkfuncno.c expfunc.c mkmfsed.c
@@ -40,7 +44,7 @@
X wait.h system.h \
X dosdisk.h \
X unixdisk.h unixemu.h \
- termemu.h \
+ termemu.h roman.h hinsi.h \
X func.h functabl.h
X
X DOC = README.eng HISTORY.eng FAQ.eng TECHKNOW.eng \
@@ -95,7 +99,7 @@
X pty.obj termemu.obj frontend.obj backend.obj \
X libc.obj file.obj apply.obj \
X parse.obj builtin.obj shell.obj
-OBJ3 = kanji.obj input.obj \
+OBJ3 = kanji.obj input.obj \
X info.obj rockridg.obj archive.obj tree.obj \
X custom.obj command.obj browse.obj
X SOBJ = ssystem.obj sposixsh.obj sdoscom.obj \
@@ -109,7 +113,7 @@
X CFLAGS = -DDOSV=1 -O $(DEBUG)
X HOSTCFLAGS = -DDOSV=1 -O
X SLDFLAGS = -lintlib -ltinymain.obj $(ALLOC)
-FDCFLAGS = $(CFLAGS) $(CPPFLAGS) -ml -h -k"-s 3800" -DFD=$(VERMAJ)
+FDCFLAGS = $(CFLAGS) $(CPPFLAGS) -ml -h -k"-s 3000" -DFD=$(VERMAJ)
X SHCFLAGS = $(CFLAGS) $(CPPFLAGS) -mp -h -k"-s 8000" -DFDSH=$(VERMAJ)
X BSHCFLAGS = $(CFLAGS) $(CPPFLAGS) -ms -k"-s 8000" -DFDSH=$(VERMAJ) -DMINIMUMSHELL
X DEFCFLAGS = -DDEFRC=\\\"$(DOSRC)\\\"
@@ -120,10 +124,10 @@
X # Dependency Rules
X ############################################################
X
-all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
+all: $(PROGRAM).exe $(PROGRAM).$(MANSEC) $(UNITBL)
X
X $(PROGRAM).exe: $(OBJ1) $(OBJ2) $(OBJ3) $(ARGS)
- $(CC) -ml -h -k"-s 3800" -o $@ @$(ARGS) $(LDFLAGS)
+ $(CC) -ml -h -k"-s 3000" -o $@ @$(ARGS) $(LDFLAGS)
X # ren $@ $(PROGRAM)
X # aout2exe $(PROGRAM)
X # del $(PROGRAM)
@@ -210,19 +214,58 @@
X
X
X ############################################################
+# Kanji transfer table generating module
+
+$(DICTTBL): mkdict.exe $(DICTSRC)
SHAR_EOF
: || $echo 'restore of' 'FD-2.09.patch' 'failed'
fi
$echo 'End of' 'FD-2.09.patch' 'part' '6'
$echo 'File' 'FD-2.09.patch' 'is continued in part' '7'
echo 7 > _sh00904/seq
exit 0
--
しらい たかし
Fnews-brouse 1.9(20180406) -- by Mizuno, MWE <mwe@ccsf.jp>
GnuPG Key ID = ECC8A735
GnuPG Key fingerprint = 9BE6 B9E9 55A5 A499 CD51 946E 9BDC 7870 ECC8 A735