--- rail-1.2.6.orig/contrib/FLIM_VERSION
+++ rail-1.2.6/contrib/FLIM_VERSION
@@ -60,15 +60,15 @@
 ;;				$(B3{El@~(B
 ;;-------------------------------------------------------------------------
 1.14.5	Demachiyanagi		$(B=PD.Lx(B		; <=> $(B1CEE(B
-------	Keihan-Marutamachi	$(B5~:e4]B@D.(B
-------	Sanj-D-A			$(B;0>r(B		; <=> $(B5~ET;T8rDL6I(B $(BEl@>@~(B
+1.14.6	Keihan-Marutamachi	$(B4]B@D.(B
+1.14.7	Sanj-D-A			$(B;0>r(B		; <=> $(B5~ET;T8rDL6I(B $(BEl@>@~(B
 ;;-------------------------------------------------------------------------
 ;;	Keihan Electric Railway	$(B5~:eEE5$E4F;(B	http://www.keihan.co.jp/
 ;;				$(B3{El@~(B
 ;;-------------------------------------------------------------------------
 	(Sanj-D)-A			($(B;0>r(B)
-------	Keihan-Shij-D-A		$(B5~:e;M>r(B
-------	Keihan-Goj-D-A		$(B5~:e8^>r(B
+1.14.8	Keihan-Shij-D-A		$(B;M>r(B
+1.14.9	Keihan-Goj-D-A		$(B8^>r(B
 ------	Shichij-D-A		$(B<7>r(B
 ------	T-Dfukuji-A		$(BElJ!;{(B		; = JR-W $(BF`NI@~(B
 ------	Tobakaid-D-A		$(BD;1)39F;(B
--- rail-1.2.6.orig/rail-table-flim.el
+++ rail-1.2.6/rail-table-flim.el
@@ -1,57 +1,57 @@
 ;; -*- coding: ctext; -*-
 
 (defvar rail-flim-codename-alist
-  '(("T-Dji"               . "$(BEl;{(B")-A
+  '((#("T$(D+W(Bji" 0 1 (charset japanese-jisx0208) 1 4 (charset latin-iso8859-4)) . "$(BEl;{(B")
     ("Kamitobaguchi"      . "$(B>eD;1)8}(B")
     ("Fushimi"            . "$(BIz8+(B")
     ("Kintetsu-Tambabashi" . "$(B6aE4C0GH66(B")
-    ("Momoyama-Gory-Dmae"  . "$(BEm;38fNMA0(B")-A
+    (#("Momoyama-Gory$(D+W(Bmae" 0 13 (charset japanese-jisx0208) 13 17 (charset latin-iso8859-4)) . "$(BEm;38fNMA0(B")
     ("Mukaijima"          . "$(B8~Eg(B")
     ("Ogura"              . "$(B>.AR(B")
     ("Iseda"              . "$(B0K@*ED(B")
-    ("-Dkubo"              . "$(BBg5WJ](B")-A
+    (#("$(D*W(Bkubo" 0 5 (charset latin-iso8859-4)) . "$(BBg5WJ](B")
     ("Kutsukawa"          . "$(B5WDE@n(B")
     ("Terada"             . "$(B;{ED(B")
-    ("Tonosh-D"            . "$(BIYLnAq(B")-A
+    (#("Tonosh$(D+W(B" 0 6 (charset japanese-jisx0208) 6 7 (charset latin-iso8859-4)) . "$(BIYLnAq(B")
     ("Shin-Tanabe"        . "$(B?7EDJU(B")
-    ("K-Ddo"               . "$(B6=8M(B")-A
+    (#("K$(D+W(Bdo" 0 1 (charset japanese-jisx0208) 1 4 (charset latin-iso8859-4)) . "$(B6=8M(B")
     ("Miyamaki"           . "$(B;0;3LZ(B")
     ("Kintetsu-Miyazu"    . "$(B6aE45\DE(B")
     ("Komada"             . "$(B9}ED(B")
-    ("Shin-H-Dsono"        . "$(B?7=K1`(B")-A
+    (#("Shin-H$(D+W(Bsono" 0 6 (charset japanese-jisx0208) 6 11 (charset latin-iso8859-4)) . "$(B?7=K1`(B")
     ("Kizugawadai"        . "$(BLZDE@nBf(B")
     ("Yamadagawa"         . "$(B;3ED@n(B")
     ("Takanohara"         . "$(B9b$N86(B")
-    ("Heij-D"              . "$(BJ?>k(B")-A
+    (#("Heij$(D+W(B" 0 4 (charset japanese-jisx0208) 4 5 (charset latin-iso8859-4)) . "$(BJ?>k(B")
     ("Saidaiji"           . "$(B@>Bg;{(B")
     ("Amagatsuji"         . "$(BFt%vDT(B")
-    ("Nishinoky-D"         . "$(B@>$N5~(B")-A
-    ("Kintetsu-K-Driyama"  . "$(B6aE474;3(B")-A
+    (#("Nishinoky$(D+W(B" 0 9 (charset japanese-jisx0208) 9 10 (charset latin-iso8859-4)) . "$(B@>$N5~(B")
+    (#("Kintetsu-K$(D+W(Briyama" 0 10 (charset japanese-jisx0208) 10 17 (charset latin-iso8859-4)) . "$(B6aE474;3(B")
     ("Tsutsui"            . "$(BE{0f(B")
-    ("Family-K-Denmae"     . "$(B%U%!%_%j!<8x1`A0(B")-A
-    ("Y-Dzaki"             . "$(B7k:j(B")-A
+    (#("Family-K$(D+W(Benmae" 0 8 (charset japanese-jisx0208) 8 14 (charset latin-iso8859-4)) . "$(B%U%!%_%j!<8x1`A0(B")
+    (#("Y$(D+i(Bzaki" 0 1 (charset japanese-jisx0208) 1 6 (charset latin-iso8859-4)) . "$(B7k:j(B")
     ("Iwami"              . "$(B@P8+(B")
     ("Tawaramoto"         . "$(BED86K\(B")
     ("Kasanui"            . "$(B3^K%(B")
     ("Ninokuchi"          . "$(B?7%N8}(B")
     ("Yagi"               . "$(BH,LZ(B")
     ("Yagi-Nishiguchi"    . "$(BH,LZ@>8}(B")
-    ("Unebigory-Dmae"      . "$(B@&K58fNMA0(B")-A
+    (#("Unebigory$(D+W(Bmae" 0 9 (charset japanese-jisx0208) 9 13 (charset latin-iso8859-4)) . "$(B@&K58fNMA0(B")
     ("Kashiharajingu-mae" . "$(B3`86?@5\A0(B")
     ("Demachiyanagi"      . "$(B=PD.Lx(B")
-    ("Keihan-Marutamachi" . "$(B5~:e4]B@D.(B")
-    ("Sanj-D"              . "$(B;0>r(B")-A
-    ("Keihan-Shij-D"       . "$(B5~:e;M>r(B")-A
-    ("Keihan-Goj-D"        . "$(B5~:e8^>r(B")-A
-    ("Shichij-D"           . "$(B<7>r(B")-A
-    ("Tobakaid-D"          . "$(BD;1)39F;(B")-A
+    ("Keihan-Marutamachi" . "$(B4]B@D.(B")
+    (#("Sanj$(D+W(B" 0 4 (charset japanese-jisx0208) 4 5 (charset latin-iso8859-4)) . "$(B;0>r(B")
+    (#("Keihan-Shij$(D+W(B" 0 11 (charset japanese-jisx0208) 11 12 (charset latin-iso8859-4)) . "$(B;M>r(B")
+    (#("Keihan-Goj$(D+W(B" 0 10 (charset japanese-jisx0208) 10 11 (charset latin-iso8859-4)) . "$(B8^>r(B")
+    (#("Shichij$(D+W(B" 0 7 (charset japanese-jisx0208) 7 8 (charset latin-iso8859-4)) . "$(B<7>r(B")
+    (#("Tobakaid$(D+W(B" 0 8 (charset japanese-jisx0208) 8 9 (charset latin-iso8859-4)) . "$(BD;1)39F;(B")
     ("Fushimiinari"       . "$(BIz8+0p2Y(B")
     ("Fukakusa"           . "$(B?<Ap(B")
     ("Fujinomori"         . "$(BF#?9(B")
     ("Sumizome"           . "$(BKO@w(B")
     ("Tambabashi"         . "$(BC0GH66(B")
     ("Fushimimomoyama"    . "$(BIz8+Em;3(B")
-    ("Ch-Dshojima"         . "$(BCf=qEg(B")-A
+    (#("Ch$(D+i(Bshojima" 0 2 (charset japanese-jisx0208) 2 10 (charset latin-iso8859-4)) . "$(BCf=qEg(B")
     ("Yodo"               . "$(BMd(B")
     ("Yawatashi"          . "$(BH,H(;T(B")
     ("Hashimoto"          . "$(B66K\(B")
@@ -59,52 +59,52 @@
     ("Makino"             . "$(BKRLn(B")
     ("Goten-yama"         . "$(B8fEB;3(B")
     ("Hirakatashi"        . "$(BKgJ};T(B")
-    ("Hirakatak-Den"       . "$(BKgJ}8x1`(B")-A
-    ("K-Dzenji"            . "$(B8wA1;{(B")-A
-    ("K-Drien"             . "$(B9aN$1`(B")-A
+    (#("Hirakatak$(D+W(Ben" 0 9 (charset japanese-jisx0208) 9 12 (charset latin-iso8859-4)) . "$(BKgJ}8x1`(B")
+    (#("K$(D+W(Bzenji" 0 1 (charset japanese-jisx0208) 1 7 (charset latin-iso8859-4)) . "$(B8wA1;{(B")
+    (#("K$(D+W(Brien" 0 1 (charset japanese-jisx0208) 1 6 (charset latin-iso8859-4)) . "$(B9aN$1`(B")
     ("Neyagawashi"        . "$(B?220@n;T(B")
     ("Kayashima"          . "$(B3~Eg(B")
-    ("-Dwada"              . "$(BBgOBED(B")-A
+    (#("$(D*W(Bwada" 0 5 (charset latin-iso8859-4)) . "$(BBgOBED(B")
     ("Furukawabashi"      . "$(B8E@n66(B")
     ("Kadomashi"          . "$(BLg??;T(B")
-    ("Nishisans-D"         . "$(B@>;0Aq(B")-A
+    (#("Nishisans$(D+W(B" 0 9 (charset japanese-jisx0208) 9 10 (charset latin-iso8859-4)) . "$(B@>;0Aq(B")
     ("Moriguchishi"       . "$(B<i8};T(B")
     ("Doi"                . "$(BEZ5o(B")
     ("Takii"              . "$(BBl0f(B")
     ("Sembayashi"         . "$(B@iNS(B")
-    ("Morish-Dji"          . "$(B?9>.O)(B")-A
+    (#("Morish$(D+W(Bji" 0 6 (charset japanese-jisx0208) 6 9 (charset latin-iso8859-4)) . "$(B?9>.O)(B")
     ("Sekime"             . "$(B4XL\(B")
     ("Noe"                . "$(BLn9>(B")
-    ("Ky-Dbashi"           . "$(B5~66(B")-A
+    (#("Ky$(D+W(Bbashi" 0 2 (charset japanese-jisx0208) 2 8 (charset latin-iso8859-4)) . "$(B5~66(B")
     ("Temmabashi"         . "$(BE7K~66(B")
     ("Kitahama"           . "$(BKLIM(B")
     ("Yodoyabashi"        . "$(BMd2066(B")
     ("Takeda"             . "$(BC]ED(B")
     ("Kuinabashi"         . "$(B$/$$$J66(B")
-    ("J-Dj"               . "$(B==>r(B")-A
-    ("Kuj-D"               . "$(B6e>r(B")-A
-    ("Ky-Dto"              . "$(B5~ET(B")-A
-    ("Goj-D"               . "$(B8^>r(B")-A
-    ("Shij-D"              . "$(B;M>r(B")-A
+    (#("J$(D+i(Bj$(D+W(B" 0 1 (charset japanese-jisx0208) 1 4 (charset latin-iso8859-4)) . "$(B==>r(B")
+    (#("Kuj$(D+W(B" 0 3 (charset japanese-jisx0208) 3 4 (charset latin-iso8859-4)) . "$(B6e>r(B")
+    (#("Ky$(D+W(Bto" 0 2 (charset japanese-jisx0208) 2 5 (charset latin-iso8859-4)) . "$(B5~ET(B")
+    (#("Goj$(D+W(B" 0 3 (charset japanese-jisx0208) 3 4 (charset latin-iso8859-4)) . "$(B8^>r(B")
+    (#("Shij$(D+W(B" 0 4 (charset japanese-jisx0208) 4 5 (charset latin-iso8859-4)) . "$(B;M>r(B")
     ("Karasuma Oike"      . "$(B1(4]8fCS(B")
     ("Marutamach"         . "$(B4]B@D.(B")
     ("Imadegawa"          . "$(B:#=P@n(B")
     ("Kuramaguchi"        . "$(B0HGO8}(B")
-    ("Kita-Dji"            . "$(BKLBgO)(B")-A
+    (#("Kita$(D+W(Bji" 0 4 (charset japanese-jisx0208) 4 7 (charset latin-iso8859-4)) . "$(BKLBgO)(B")
     ("Kitayama"           . "$(BKL;3(B")
     ("Matugasaki"         . "$(B>>%v:j(B")
     ("Kokusaikaikan"      . "$(B9q:]2q4[(B")
-    ("[JR] Ky-Dto"         . "$(B5~ET(B")-A
-    ("T-Dfukuji"           . "$(BElJ!;{(B")-A
+    (#("[JR] Ky$(D+W(Bto" 0 7 (charset japanese-jisx0208) 7 10 (charset latin-iso8859-4)) . "$(B5~ET(B")
+    (#("T$(D+W(Bfukuji" 0 1 (charset japanese-jisx0208) 1 8 (charset latin-iso8859-4)) . "$(BElJ!;{(B")
     ("Inari"              . "$(B0p2Y(B")
     ("JR Fujinomori "     . "JR $(BF#?9(B")
     ("Momoyama"           . "$(BEm;3(B")
-    ("Rokujiz-D"           . "$(BO;COB"(B")-A
+    (#("Rokujiz$(D+W(B" 0 7 (charset japanese-jisx0208) 7 8 (charset latin-iso8859-4)) . "$(BO;COB"(B")
     ("Kohata"             . "$(BLZH((B")
-    ("-Dbaku"              . "$(B2+]!(B")-A
+    (#("$(D*W(Bbaku" 0 5 (charset latin-iso8859-4)) . "$(B2+]!(B")
     ("Uji"                . "$(B1'<#(B")
     ("Shinden"            . "$(B?7ED(B")
-    ("J-Dy"               . "$(B>kM[(B")-A
+    (#("J$(D+W(By$(D+W(B" 0 1 (charset japanese-jisx0208) 1 4 (charset latin-iso8859-4)) . "$(B>kM[(B")
     ("Nagaike"            . "$(BD9CS(B")
     ("Yamashiro-Aodani"   . "$(B;3>k@DC+(B")
     ("Yamashiro-Taga"     . "$(B;3>kB?2l(B")
@@ -112,17 +112,17 @@
     ("Tanakura"           . "$(BC*AR(B")
     ("Kamikoma"           . "$(B>e9}(B")
     ("Kidu"               . "$(BLZDE(B")
-    ("Shin-H-Dryji"       . "$(B?7K!N4;{(B")-A
+    (#("Shin-H$(D+W(Bry$(D+i(Bji" 0 6 (charset japanese-jisx0208) 6 12 (charset latin-iso8859-4)) . "$(B?7K!N4;{(B")
     ("Ando"               . "$(B0BEH(B")
     ("Nukatabe"           . "$(B3[EDIt(B")
     ("Hirahata"           . "$(BJ?C<(B")
     ("Shin-Terai"         . "$(B?7;{0f(B")
     ("Tameike"            . "$(BN/CS(B")
     ("Kaga-Fukuoka"       . "$(B2C2lJ!2,(B")
-    ("Nakanosh-D"          . "$(BCf%N>1(B")-A
-    ("Gokend-D"            . "$(B8^4VF2(B")-A
+    (#("Nakanosh$(D+W(B" 0 8 (charset japanese-jisx0208) 8 9 (charset latin-iso8859-4)) . "$(BCf%N>1(B")
+    (#("Gokend$(D+W(B" 0 6 (charset japanese-jisx0208) 6 7 (charset latin-iso8859-4)) . "$(B8^4VF2(B")
     ("Terai-Nishiguchi"   . "$(B;{0f@>8}(B")
-    ("Jid-Dsha-Renraku"    . "$(B<+F0<VO"Mm(B")-A
+    (#("Jid$(D+W(Bsha-Renraku" 0 3 (charset japanese-jisx0208) 3 15 (charset latin-iso8859-4)) . "$(B<+F0<VO"Mm(B")
     ("Hon-Terai"          . "$(BK\;{0f(B")
     ("Suenobuushijima"    . "$(BKv?.5mEg(B")
     ("Kaga-Sano"          . "$(B2C2l:4Ln(B")
@@ -140,7 +140,7 @@
     ("Tenguyama"          . "$(BE76i;3(B")
     ("Hon-Tsurugi"        . "$(BK\DaMh(B")
     ("Tsurugi"            . "$(BDaMh(B")
-    ("-Dsaka-Abenobashi"   . "$(BBg:e0$ItLn66(B")-A
+    (#("$(D*W(Bsaka-Abenobashi" 0 16 (charset latin-iso8859-4)) . "$(BBg:e0$ItLn66(B")
     ("Koboreguchi"        . "$(B2OKY8}(B")
     ("Kita-tanabe"        . "$(BKLEDJU(B")
     ("Imagawa"            . "$(B:#@n(B")
@@ -150,24 +150,24 @@
     ("Nunose"             . "$(BI[G&(B")
     ("Takaminosato"       . "$(B9b8+%NN$(B")
     ("Kawachi-Matsubara"  . "$(B2OFb>>86(B")
-    ("Eganosh-D"           . "$(B7C2f%NAq(B")-A
+    (#("Eganosh$(D+W(B" 0 7 (charset japanese-jisx0208) 7 8 (charset latin-iso8859-4)) . "$(B7C2f%NAq(B")
     ("Takawashi"          . "$(B9bOI(B")
     ("Fujiidera"          . "$(BF#0f;{(B")
     ("Hajinosato"         . "$(BEZ;U$NN$(B")
-    ("D-Dmyji"            . "$(BF;L@;{(B")-A
+    (#("D$(D+W(Bmy$(D+W(Bji" 0 1 (charset japanese-jisx0208) 1 7 (charset latin-iso8859-4)) . "$(BF;L@;{(B")
     ("Furuichi"           . "$(B8E;T(B")
     ("Komagatani"         . "$(B6p%vC+(B")
     ("Kaminotaishi"       . "$(B>e%NB@;R(B")
-    ("Nij-Dsan"            . "$(BFs>e;3(B")-A
-    ("Nij-Djinjaguchi"     . "$(BFs>e?@<R8}(B")-A
+    (#("Nij$(D+W(Bsan" 0 3 (charset japanese-jisx0208) 3 7 (charset latin-iso8859-4)) . "$(BFs>e;3(B")
+    (#("Nij$(D+W(Bjinjaguchi" 0 3 (charset japanese-jisx0208) 3 14 (charset latin-iso8859-4)) . "$(BFs>e?@<R8}(B")
     ("Taimadera"          . "$(BEvKc;{(B")
     ("Iwaki"              . "$(BHX>k(B")
     ("Shakudo"            . "$(B<\EZ(B")
     ("Takadashi"          . "$(B9bED;T(B")
     ("Ukiana"             . "$(BIb9&(B")
-    ("B-Dj"               . "$(BK7>k(B")-A
-    ("Kashiharajing-D-Nisiguchi" . "$(B3`86?@5\@>8}(B")-A
-    ("Kashiharajing-Dmae"  . "$(B3`86?@5\A0(B")-A
+    (#("B$(D+W(Bj$(D+W(B" 0 1 (charset japanese-jisx0208) 1 4 (charset latin-iso8859-4)) . "$(BK7>k(B")
+    (#("Kashiharajing$(D+i(B-Nisiguchi" 0 13 (charset japanese-jisx0208) 13 24 (charset latin-iso8859-4)) . "$(B3`86?@5\@>8}(B")
+    (#("Kashiharajing$(D+i(Bmae" 0 13 (charset japanese-jisx0208) 13 17 (charset latin-iso8859-4)) . "$(B3`86?@5\A0(B")
     ("Okadera"            . "$(B2,;{(B")
     ("Asuka"              . "$(BHtD;(B")
     ("Tsubosakayama"      . "$(BTd:e;3(B")
@@ -176,12 +176,12 @@
     ("Yoshinoguchi"       . "$(B5HLn8}(B")
     ("Kusurimizu"         . "$(BLt?e(B")
     ("Fukugami"           . "$(BJ!?@(B")
-    ("-Dada"               . "$(BBg0$B@(B")-A
+    (#("$(D*W(Bada" 0 4 (charset latin-iso8859-4)) . "$(BBg0$B@(B")
     ("Shimoichiguchi"     . "$(B2<;T8}(B")
     ("Koshibe"            . "$(B1[It(B")
     ("Muda"               . "$(BO;ED(B")
     ("Yamato-Kamiichi"    . "$(BBgOB>e;T(B")
-    ("Yoshinojing-D"       . "$(B5HLn?@5\(B")-A
+    (#("Yoshinojing$(D+i(B" 0 11 (charset japanese-jisx0208) 11 12 (charset latin-iso8859-4)) . "$(B5HLn?@5\(B")
     ("Yoshino"            . "$(B5HLn(B")))
 
 (provide 'rail-table-flim)
