--- rail-1.2.6.orig/contrib/SEMI_VERSION
+++ rail-1.2.6/contrib/SEMI_VERSION
@@ -9,230 +9,237 @@
 0.92	--------		--------
 
 ;;-------------------------------------------------------------------------
-;;	Hokuriku Railway	$(BKLN&E4F;(B
-;;	Ishikawa Line		$(B@P@n@~(B
+;;	Hokuriku Railway	$BKLN&E4F;(B
+;;	Ishikawa Line		$B@P@n@~(B
 ;;-------------------------------------------------------------------------
-0.96	Kaga-Ichinomiya		$(B2C2l0l$N5\(B	; $(B!JGr;3Hf$(D5/$(B?@<R!K(B
-0.97	Naka-Tsurugi		$(BCfDaMh(B
-0.112	Tsurugi			$(BDaMh(B		; <=> $(B$8$c$$%P%9(B
-0.115	Hinomiko		$(BF|8f;R(B
-0.115.1	Oyanagi			$(B>.Lx(B
-0.115.2	Inokuchi		$(B0f8}(B
-0.116	D.Dhji			$(BF;K!;{(B
-0.118	Sodani			$(BA>C+(B
-0.118.1	Shijima			$(B;M==K|(B
-0.118.2	Otomaru			$(B254](B
-1.0.0	Nukajtaku-mae		$(B3[=;BpA0(B
-1.0.1	Magae			$(BGOBX(B
-1.0.2	Nonoichi-Kdaimae	$(BLn!9;T9)BgA0(B
-1.1.0	Nonoichi		$(BLn!9;T(B
-1.1.1	Oshino			$(B2!Ln(B
-1.1.2	Shin-Nishikanazawa	$(B?7@>6bBt(B	; <=> JR $(B@>6bBt(B
-1.2.0	Nishiizumi		$(B@>@t(B
-1.2.1	Nomachi			$(BLnD.(B
-
-;;-------------------------------------------------------------------------
-;;	West Japan Railway	$(B@>F|K\N95RE4F;(B	http://www.westjr.co.jp/
-;;	Hokuriku Line		$(BKLN&K\@~(B
-;;-------------------------------------------------------------------------
-1.2.2	Naoetsu			$(BD>9>DE(B		; = JR $(B?.1[K\@~(B
-1.2.3	Tanihama		$(BC+IM(B
-1.2.4	Arimagawa		$(BM-4V@n(B
-1.3.0	Nadachi			$(BL>N)(B
-1.3.1	Tsutsuishi		$(BE{@P(B
-1.3.2	N			$(BG=@8(B
-1.3.3	Uramoto			$(B1:K\(B
-1.3.4	Kajiyashiki		$(B3a20I_(B
-1.4.0	Itoigawa		$(B;e5{@n(B		; = JR $(BBg;e@~(B
-1.4.1	mi			$(B@D3$(B
-1.4.2	Oyashirazu		$(B?FITCN(B
-1.4.3	Ichiburi		$(B;T?6(B
-1.4.4	Ecch-Miyazaki		$(B1[Cf5\:j(B
-1.4.5	Tomari			$(BGq(B
-1.4.6	Nyzen			$(BF~A1(B
-1.5.0	Nishi-Nyzen		$(B@>F~A1(B
-1.5.1	Ikuji			$(B@8CO(B
-1.5.2	Kurobe			$(B9uIt(B
-1.5.3	Uozu			$(B5{DE(B		; <=> $(BIY;3COJ}E4F;(B
-1.5.4	Higashi-Namerikawa	$(BEl3j@n(B
-1.6.0	Namerikawa		$(B3j@n(B		; <=> $(BIY;3COJ}E4F;(B
-1.7.0	Mizuhashi		$(B?e66(B
-1.7.1	Higashi-Toyama		$(BElIY;3(B
-1.8.0	Toyama			$(BIY;3(B		; = JR $(B9b;3K\@~!"IY;39A@~(B
-1.8.1	Kureha			$(B8b1)(B
-1.8.2	Kosugi			$(B>.?y(B
-1.8.3	Ecch-Daimon		$(B1[CfBgLg(B
-1.8.4	Takaoka			$(B9b2,(B		; = JR $(BI98+@~!">kC<@~(B
-1.8.5	Nishi-Takaoka		$(B@>9b2,(B
-1.8.6	Fukuoka			$(BJ!2,(B
-1.9.0	Isurugi			$(B@PF0(B
-1.9.1	Kurikara		$(B6fMx2@Me(B
-1.10.0	Tsubata			$(BDEH((B
-1.10.1	Morimoto		$(B?9K\(B
-1.10.2	Higashi-Kanazawa	$(BEl6bBt(B
-1.11.0	Kanazawa		$(B6bBt(B		; <=> $(BKLN&E4F;(B $(BKLE46bBt(B
-1.12.0	Nishi-Kanazawa		$(B@>6bBt(B		; <=> $(BKLN&E4F;(B $(B?7@>6bBt(B
-1.12.1	[JR] Nonoichi		[JR] $(BLn!9;T(B
-1.13.0	Matt			$(B>>G$(B
-1.13.1	Kaga-Kasama		$(B2C2l3^4V(B
-1.13.2	Mikawa			$(BH~@n(B
-1.13.3	Komaiko			$(B>.Iq;R(B
-1.13.4	Terai			$(B;{0f(B
-1.13.5	Meih			$(BL@Jv(B
-1.13.6	Komatsu			$(B>.>>(B
-1.13.7	Awazu			$(B0@DE(B
-:	:			:
--------	Tsuruga			$(BFX2l(B		; = JR $(B>.IM@~(B
--------	Shin-Hikida		$(B?7I%ED(B
--------	mi-Shiotsu		$(B6a9>1vDE(B	; = JR $(B8P@>@~(B
--------	Yogo			$(BM>8b(B
--------	Kinomoto		$(BLZ%NK\(B
--------	Takatsuki		$(B9b7n(B
--------	Kawake			$(B2OLS(B
--------	Torahime		$(B8WI1(B
--------	Nagahama		$(BD9IM(B
-------- Tamura			$(BEDB<(B
--------	Sakata			$(B:dED(B
-	(Maibara)		($(BJF86(B)		; = JR $(BEl3$F;K\@~(B
+0.96	Kaga-Ichinomiya		$B2C2l0l$N5\(B	; $B!JGr;3Hf$(D5/$B?@<R!K(B
+0.97	Naka-Tsurugi		$BCfDaMh(B
+0.112	Tsurugi			$BDaMh(B		; <=> $B$8$c$$%P%9(B
+0.115	Hinomiko		$BF|8f;R(B
+0.115.1	Oyanagi			$B>.Lx(B
+0.115.2	Inokuchi		$B0f8}(B
+0.116	D.Dhji			$BF;K!;{(B
+0.118	Sodani			$BA>C+(B
+0.118.1	Shijima			$B;M==K|(B
+0.118.2	Otomaru			$B254](B
+1.0.0	Nukajtaku-mae		$B3[=;BpA0(B
+1.0.1	Magae			$BGOBX(B
+1.0.2	Nonoichi-Kdaimae	$BLn!9;T9)BgA0(B
+1.1.0	Nonoichi		$BLn!9;T(B
+1.1.1	Oshino			$B2!Ln(B
+1.1.2	Shin-Nishikanazawa	$B?7@>6bBt(B	; <=> JR $B@>6bBt(B
+1.2.0	Nishiizumi		$B@>@t(B
+1.2.1	Nomachi			$BLnD.(B
+
+;;-------------------------------------------------------------------------
+;;	West Japan Railway	$B@>F|K\N95RE4F;(B	http://www.westjr.co.jp/
+;;	Hokuriku Line		$BKLN&K\@~(B
+;;-------------------------------------------------------------------------
+1.2.2	Naoetsu			$BD>9>DE(B		; = JR $B?.1[K\@~(B
+1.2.3	Tanihama		$BC+IM(B
+1.2.4	Arimagawa		$BM-4V@n(B
+1.3.0	Nadachi			$BL>N)(B
+1.3.1	Tsutsuishi		$BE{@P(B
+1.3.2	N			$BG=@8(B
+1.3.3	Uramoto			$B1:K\(B
+1.3.4	Kajiyashiki		$B3a20I_(B
+1.4.0	Itoigawa		$B;e5{@n(B		; = JR $BBg;e@~(B
+1.4.1	mi			$B@D3$(B
+1.4.2	Oyashirazu		$B?FITCN(B
+1.4.3	Ichiburi		$B;T?6(B
+1.4.4	Ecch-Miyazaki		$B1[Cf5\:j(B
+1.4.5	Tomari			$BGq(B
+1.4.6	Nyzen			$BF~A1(B
+1.5.0	Nishi-Nyzen		$B@>F~A1(B
+1.5.1	Ikuji			$B@8CO(B
+1.5.2	Kurobe			$B9uIt(B
+1.5.3	Uozu			$B5{DE(B		; <=> $BIY;3COJ}E4F;(B
+1.5.4	Higashi-Namerikawa	$BEl3j@n(B
+1.6.0	Namerikawa		$B3j@n(B		; <=> $BIY;3COJ}E4F;(B
+1.7.0	Mizuhashi		$B?e66(B
+1.7.1	Higashi-Toyama		$BElIY;3(B
+1.8.0	Toyama			$BIY;3(B		; = JR $B9b;3K\@~!"IY;39A@~(B
+1.8.1	Kureha			$B8b1)(B
+1.8.2	Kosugi			$B>.?y(B
+1.8.3	Ecch-Daimon		$B1[CfBgLg(B
+1.8.4	Takaoka			$B9b2,(B		; = JR $BI98+@~!">kC<@~(B
+1.8.5	Nishi-Takaoka		$B@>9b2,(B
+1.8.6	Fukuoka			$BJ!2,(B
+1.9.0	Isurugi			$B@PF0(B
+1.9.1	Kurikara		$B6fMx2@Me(B
+1.10.0	Tsubata			$BDEH((B
+1.10.1	Morimoto		$B?9K\(B
+1.10.2	Higashi-Kanazawa	$BEl6bBt(B
+1.11.0	Kanazawa		$B6bBt(B		; <=> $BKLN&E4F;(B $BKLE46bBt(B
+1.12.0	Nishi-Kanazawa		$B@>6bBt(B		; <=> $BKLN&E4F;(B $B?7@>6bBt(B
+1.12.1	[JR] Nonoichi		[JR] $BLn!9;T(B
+1.13.0	Matt			$B>>G$(B
+1.13.1	Kaga-Kasama		$B2C2l3^4V(B
+1.13.2	Mikawa			$BH~@n(B
+1.13.3	Komaiko			$B>.Iq;R(B
+1.13.4	Terai			$B;{0f(B
+1.13.5	Meih			$BL@Jv(B
+1.13.6	Komatsu			$B>.>>(B
+1.13.7	Awazu			$B0@DE(B
+1.14.0	Iburihashi		$BF066(B
+1.14.1	Kaga-Onsen		$B2C2l29@t(B
+1.14.2	Daish$(Het(Bi		$BBg@;;{(B
+1.14.3	Ushinoya		$B5m%NC+(B
+1.14.4	Hosorogi		$B:YO$LZ(B
+1.14.5	Awara-Onsen		$B028629@t(B
+1.14.6	Maruoka			$B4]2,(B
+:	:			:
+-------	Tsuruga			$BFX2l(B		; = JR $B>.IM@~(B
+-------	Shin-Hikida		$B?7I%ED(B
+-------	mi-Shiotsu		$B6a9>1vDE(B	; = JR $B8P@>@~(B
+-------	Yogo			$BM>8b(B
+-------	Kinomoto		$BLZ%NK\(B
+-------	Takatsuki		$B9b7n(B
+-------	Kawake			$B2OLS(B
+-------	Torahime		$B8WI1(B
+-------	Nagahama		$BD9IM(B
+------- Tamura			$BEDB<(B
+-------	Sakata			$B:dED(B
+	(Maibara)		($BJF86(B)		; = JR $BEl3$F;K\@~(B
 
 
 [WEMI version names]
 
 ;;-------------------------------------------------------------------------
-;;	East Japan Railway	$(BElF|K\N95RE4F;(B	http://www.jreast.co.jp/
-;;	Tkaid Line		$(BEl3$F;K\@~(B
+;;	East Japan Railway	$BElF|K\N95RE4F;(B	http://www.jreast.co.jp/
+;;	Tkaid Line		$BEl3$F;K\@~(B
 ;;-------------------------------------------------------------------------
-1.2.0	Tky			$(BEl5~(B
-1.2.1	Shinbashi		$(B?766(B	; = JR $(B;3<j@~!"2#?\2l@~(B
-1.2.2	Shinagawa		$(BIJ@n(B	; = JR $(B;3<j@~!"2#?\2l@~(B
-1.2.3	Kawasaki		$(B@n:j(B	; = JR $(BFnIp@~(B
-1.2.4	Yokohama		$(B2#IM(B	; = JR $(B5~IMElKL@~!&:,4_@~!"2#?\2l@~(B
-1.3.0	Totsuka			$(B8MDM(B	; = JR $(B2#?\2l@~(B
-1.3.1	funa			$(BBgA%(B	; = JR $(B:,4_@~!"2#?\2l@~(B
-1.4.0	Fujisawa		$(BF#Bt(B	; <=> $(B>.ED5^EEE4(B $(B9>%NEg@~!"9>%NEgEEE4(B
-1.4.1	Tsujid			$(BDTF2(B	; $(B!J!VDT!W(B= J90@B-4454:128b$(B!K(B
-1.4.2	Chigasaki		$(B3}%v:j(B	; = JR $(BAjLO@~(B
-1.4.3	Hiratsuka		$(BJ?DM(B
-1.4.4	iso			$(BBg0k(B
-1.4.5	Ninomiya		$(BFs5\(B
-1.4.6	Kzu			$(B9qI\DE(B	; = JR $(B8fEB>l@~(B
-1.5.0	Kamonomiya		$(B3{5\(B
-1.5.1	Odawara			$(B>.ED86(B	; <=> $(B>.ED5^!"H":,EP;3E4F;!"(B
-					;     $(B0KF&H":,E4F;(B
-1.5.2	Hayakawa		$(BAa@n(B
-1.5.3	Nebukawa		$(B:,I\@n(B
-1.5.4	Manazuru		$(B??Da(B
-1.6.0	Yugawara		$(BEr2O86(B
-1.7.0	Atami			$(BG.3$(B	; = JR $(B0KEl@~(B
-;;-------------------------------------------------------------------------
-;;	Central Japan Railway	$(BEl3$N95RE4F;(B
-;;-------------------------------------------------------------------------
-1.7.1	Kan'nami		$(BH!Fn(B
-1.8.0	Mishima			$(B;0Eg(B	; = $(B0KF&H":,E4F;(B
-1.8.1	Numazu			$(B>BDE(B	; = JR $(B8fEB>l@~(B
-1.8.2	Katahama		$(BJRIM(B
-1.8.4	Hara			$(B86(B
-1.8.5	Higashi-Tagonoura	$(BElED;R%N1:(B
-1.8.6	Yoshiwara		$(B5H86(B	; = $(B3YFnE4F;(B
-1.9.0	Fuji			$(BIY;N(B	; = JR $(B?H1d@~(B
-1.9.1	Fujikawa		$(BIY;N@n(B
-1.10.0	Shin-Kambara		$(B?73w86(B
-1.10.1	Kambara			$(B3w86(B
-1.10.2	Yui			$(BM3Hf(B
-1.11.0	Okitsu			$(B6=DE(B
-1.12.0	Shimizu			$(B@6?e(B
-1.12.1	Kusanagi		$(BApFe(B
-1.13.0	Shizuoka		$(B@E2,(B
-1.13.1	Abekawa			$(B0BG\@n(B
-1.13.2	Mochimune		$(BMQ=!(B
-1.13.3	Yaizu			$(B>FDE(B
-1.13.4	Nishi-Yaizu		$(B@>>FDE(B
-1.13.5	Fijieda			$(BF#;^(B
-1.13.6	Rokug			$(BO;9g(B
-1.13.7	Shimada			$(BEgED(B
-------	Kanaya			$(B6bC+(B	; = $(BBg0f@nE4F;(B
-------	Kikugawa		$(B5F@n(B
-------	Kakegawa		$(B3]@n(B	; = $(BE7N5IML>8PE4F;(B
-------	Fukuroi			$(BB^0f(B
-------	Iwata			$(BHXED(B
-------	Toyodach		$(BK-EDD.(B
-------	Tenrygawa		$(BE7N5@n(B
-------	Hamamatsu		$(BIM>>(B	; = $(B1s=#E4F;(B
-------	Takatsuka		$(B9bDM(B
-------	Maisaka			$(BIq:e(B
-------	Bentenjima		$(BJ[E7Eg(B
-------	Araimachi		$(B?75oD.(B
-------	Wasizu			$(BOIDE(B
-------	Shinjohara		$(B?7=j86(B	; = $(BE7N5IML>8PE4F;(B
-------	Futagawa		$(BFs2O(B
-------	Toyohashi		$(BK-66(B	; = JR $(BHSED@~(B
-:	:			:
-------	Kanayama		$(B6b;3(B	; =$(B!J(BJR $(BCf1{K\@~!K(B
-------	Otbashi		$(BHxF,66(B
-------	Nagoya			$(BL>8E20(B	; = JR $(B4X@>K\@~!J!&Cf1{K\@~!K(B
-:	:			:
-------	Gifu			$(B4tIl(B	; = JR $(B9b;3K\@~(B
-:	:			:
-------	Samegai			$(B@C%v0f(B
-;;-------------------------------------------------------------------------
-;;	West Japan Railway	$(B@>F|K\N95RE4F;(B	http://www.westjr.co.jp/
-;;-------------------------------------------------------------------------
-------	Maibara			$(BJF86(B	; = JR $(BKLN&K\@~(B
-:	:			:
-------	Kusatsu			$(BApDE(B	; = JR $(BApDE@~(B
-:	:			:
-------	Yamashina		$(B;32J(B	; = JR $(B8P@>@~(B
-------	Kyto			$(B5~ET(B	; = JR $(BF`NI@~!&;31"K\@~(B
-					; <=> $(B6aE4(B $(B5~ET@~!"5~ET;T8rDL6I(B $(B1(4]@~(B
+1.2.0	Tky			$BEl5~(B
+1.2.1	Shinbashi		$B?766(B	; = JR $B;3<j@~!"2#?\2l@~(B
+1.2.2	Shinagawa		$BIJ@n(B	; = JR $B;3<j@~!"2#?\2l@~(B
+1.2.3	Kawasaki		$B@n:j(B	; = JR $BFnIp@~(B
+1.2.4	Yokohama		$B2#IM(B	; = JR $B5~IMElKL@~!&:,4_@~!"2#?\2l@~(B
+1.3.0	Totsuka			$B8MDM(B	; = JR $B2#?\2l@~(B
+1.3.1	funa			$BBgA%(B	; = JR $B:,4_@~!"2#?\2l@~(B
+1.4.0	Fujisawa		$BF#Bt(B	; <=> $B>.ED5^EEE4(B $B9>%NEg@~!"9>%NEgEEE4(B
+1.4.1	Tsujid			$BDTF2(B	; $B!J!VDT!W(B= J90@B-4454:128b$B!K(B
+1.4.2	Chigasaki		$B3}%v:j(B	; = JR $BAjLO@~(B
+1.4.3	Hiratsuka		$BJ?DM(B
+1.4.4	iso			$BBg0k(B
+1.4.5	Ninomiya		$BFs5\(B
+1.4.6	Kzu			$B9qI\DE(B	; = JR $B8fEB>l@~(B
+1.5.0	Kamonomiya		$B3{5\(B
+1.5.1	Odawara			$B>.ED86(B	; <=> $B>.ED5^!"H":,EP;3E4F;!"(B
+					;     $B0KF&H":,E4F;(B
+1.5.2	Hayakawa		$BAa@n(B
+1.5.3	Nebukawa		$B:,I\@n(B
+1.5.4	Manazuru		$B??Da(B
+1.6.0	Yugawara		$BEr2O86(B
+1.7.0	Atami			$BG.3$(B	; = JR $B0KEl@~(B
+;;-------------------------------------------------------------------------
+;;	Central Japan Railway	$BEl3$N95RE4F;(B
+;;-------------------------------------------------------------------------
+1.7.1	Kan'nami		$BH!Fn(B
+1.8.0	Mishima			$B;0Eg(B	; = $B0KF&H":,E4F;(B
+1.8.1	Numazu			$B>BDE(B	; = JR $B8fEB>l@~(B
+1.8.2	Katahama		$BJRIM(B
+1.8.4	Hara			$B86(B
+1.8.5	Higashi-Tagonoura	$BElED;R%N1:(B
+1.8.6	Yoshiwara		$B5H86(B	; = $B3YFnE4F;(B
+1.9.0	Fuji			$BIY;N(B	; = JR $B?H1d@~(B
+1.9.1	Fujikawa		$BIY;N@n(B
+1.10.0	Shin-Kambara		$B?73w86(B
+1.10.1	Kambara			$B3w86(B
+1.10.2	Yui			$BM3Hf(B
+1.11.0	Okitsu			$B6=DE(B
+1.12.0	Shimizu			$B@6?e(B
+1.12.1	Kusanagi		$BApFe(B
+1.13.0	Shizuoka		$B@E2,(B
+1.13.1	Abekawa			$B0BG\@n(B
+1.13.2	Mochimune		$BMQ=!(B
+1.13.3	Yaizu			$B>FDE(B
+1.13.4	Nishi-Yaizu		$B@>>FDE(B
+1.13.5	Fijieda			$BF#;^(B
+1.13.6	Rokug			$BO;9g(B
+1.13.7	Shimada			$BEgED(B
+1.14.0	Kanaya			$B6bC+(B	; = $BBg0f@nE4F;(B
+------	Kikugawa		$B5F@n(B
+------	Kakegawa		$B3]@n(B	; = $BE7N5IML>8PE4F;(B
+------	Fukuroi			$BB^0f(B
+------	Iwata			$BHXED(B
+------	Toyodach		$BK-EDD.(B
+------	Tenrygawa		$BE7N5@n(B
+------	Hamamatsu		$BIM>>(B	; = $B1s=#E4F;(B
+------	Takatsuka		$B9bDM(B
+------	Maisaka			$BIq:e(B
+------	Bentenjima		$BJ[E7Eg(B
+------	Araimachi		$B?75oD.(B
+------	Wasizu			$BOIDE(B
+------	Shinjohara		$B?7=j86(B	; = $BE7N5IML>8PE4F;(B
+------	Futagawa		$BFs2O(B
+------	Toyohashi		$BK-66(B	; = JR $BHSED@~(B
+:	:			:
+------	Kanayama		$B6b;3(B	; =$B!J(BJR $BCf1{K\@~!K(B
+------	Otbashi		$BHxF,66(B
+------	Nagoya			$BL>8E20(B	; = JR $B4X@>K\@~!J!&Cf1{K\@~!K(B
+:	:			:
+------	Gifu			$B4tIl(B	; = JR $B9b;3K\@~(B
+:	:			:
+------	Samegai			$B@C%v0f(B
+;;-------------------------------------------------------------------------
+;;	West Japan Railway	$B@>F|K\N95RE4F;(B	http://www.westjr.co.jp/
+;;-------------------------------------------------------------------------
+------	Maibara			$BJF86(B	; = JR $BKLN&K\@~(B
+:	:			:
+------	Kusatsu			$BApDE(B	; = JR $BApDE@~(B
+:	:			:
+------	Yamashina		$B;32J(B	; = JR $B8P@>@~(B
+------	Kyto			$B5~ET(B	; = JR $BF`NI@~!&;31"K\@~(B
+					; <=> $B6aE4(B $B5~ET@~!"5~ET;T8rDL6I(B $B1(4]@~(B
 :	:			:
-------	saka			$(BBg:e(B	; = JR $(BBg:e4D>u@~(B <=> JR $(BEl@>@~(B $(BKL?7CO(B
-					;   <=> $(BBg:e;T8rDL6I!":e?@!":e5^(B $(BG_ED(B
+------	saka			$BBg:e(B	; = JR $BBg:e4D>u@~(B <=> JR $BEl@>@~(B $BKL?7CO(B
+					;   <=> $BBg:e;T8rDL6I!":e?@!":e5^(B $BG_ED(B
 :	:			:
-------	Kbe			$(B?@8M(B	; = JR $(B;3M[K\@~(B
+------	Kbe			$B?@8M(B	; = JR $B;3M[K\@~(B
 
 
 [REMI version names]
 
 ;;-------------------------------------------------------------------------
-;;	West Japan Railway	$(B@>F|K\N95RE4F;(B	http://www.westjr.co.jp/
-;;	Himi Line		$(BI98+@~(B
+;;	West Japan Railway	$B@>F|K\N95RE4F;(B	http://www.westjr.co.jp/
+;;	Himi Line		$BI98+@~(B
 ;;-------------------------------------------------------------------------
-1.4.0	Himi			$(BI98+(B
-1.5.0	Shimao			$(BEgHx(B
-1.6.0	Amaharashi		$(B1+@2(B
-1.8.0	Ecch-Kokubu		$(B1[Cf9qJ,(B
-1.8.1	Fushiki			$(BIzLZ(B	; <=> $(B%&%i%8%*%9%C%H%C%/9RO)(B
-1.8.2	Nmachi			$(BG=D.(B
-1.8.3	Ecch-Nakagawa		$(B1[CfCf@n(B
-1.8.4	Takaoka			$(B9b2,(B	; = JR $(BKLN&K\@~!">kC<@~(B
+1.4.0	Himi			$BI98+(B
+1.5.0	Shimao			$BEgHx(B
+1.6.0	Amaharashi		$B1+@2(B
+1.8.0	Ecch-Kokubu		$B1[Cf9qJ,(B
+1.8.1	Fushiki			$BIzLZ(B	; <=> $B%&%i%8%*%9%C%H%C%/9RO)(B
+1.8.2	Nmachi			$BG=D.(B
+1.8.3	Ecch-Nakagawa		$B1[CfCf@n(B
+1.8.4	Takaoka			$B9b2,(B	; = JR $BKLN&K\@~!">kC<@~(B
 
 ;;-------------------------------------------------------------------------
-;;	Hokuetsu Express	$(BKL1[5^9T(B
+;;	Hokuetsu Express	$BKL1[5^9T(B
 ;;		http://www.tiara.or.jp/~tokamaci/hokuhoku/hokuhoku.html
-;;	Hokuhoku Line		$(B$[$/$[$/@~(B
+;;	Hokuhoku Line		$B$[$/$[$/@~(B
 ;;-------------------------------------------------------------------------
-1.13.0	Saigata			$(B:T3c(B	; = JR $(B?.1[K\@~(B
-1.13.1	Kubiki			$(B$/$S$-(B
-1.13.2	ike-Ikoinomori		$(BBgCS$$$3$$$N?9(B
-1.14.0	Uragawara		$(B$&$i$,$o$i(B
-1.14.1	Mushigawasugi		$(BCn@nBg?y(B
--------	Hokuhoku-shima		$(B$[$/$[$/BgEg(B
--------	Matsudai		$(B$^$D$@$$(B
--------	Tkamachi		$(B==F|D.(B
--------	Shinza			$(B$7$s$6(B
--------	Misashima		$(BH~:4Eg(B
--------	Uonumakyry		$(B5{>B5VNM(B
--------	Uonuma-Kyry		$(B5{>B5VNM(B
--------	Muikamachi		$(BO;F|D.(B
+1.13.0	Saigata			$B:T3c(B	; = JR $B?.1[K\@~(B
+1.13.1	Kubiki			$B$/$S$-(B
+1.13.2	ike-Ikoinomori		$BBgCS$$$3$$$N?9(B
+1.14.0	Uragawara		$B$&$i$,$o$i(B
+1.14.1	Mushigawasugi		$BCn@nBg?y(B
+1.14.2	Hokuhoku-shima		$B$[$/$[$/BgEg(B
+1.14.3	Matsudai		$B$^$D$@$$(B
+-------	Tkamachi		$B==F|D.(B
+-------	Shinza			$B$7$s$6(B
+-------	Misashima		$BH~:4Eg(B
+-------	Uonumakyry		$B5{>B5VNM(B
+-------	Uonuma-Kyry		$B5{>B5VNM(B
+-------	Muikamachi		$BO;F|D.(B
 
 
 [etc.]
 
 ;;-------------------------------------------------------------------------
-;;	West Japan Railway	$(B@>F|K\N95RE4F;(B	http://www.westjr.co.jp/
-;;	Kosei Line	 	$(B8P@>@~(B
+;;	West Japan Railway	$B@>F|K\N95RE4F;(B	http://www.westjr.co.jp/
+;;	Kosei Line	 	$B8P@>@~(B
 ;;-------------------------------------------------------------------------
--------	(mi-Shiotsu)		($(B6a9>1vDE(B)	; = JR $(BKLN&K\@~(B
+-------	(mi-Shiotsu)		($B6a9>1vDE(B)	; = JR $BKLN&K\@~(B
 :	:			:
--------	Nishi-tsu		$(B@>BgDE(B
-	(Yamashina)		($(B;32J(B)	; = JR $(BEl3$F;K\@~(B
+-------	Nishi-tsu		$B@>BgDE(B
+	(Yamashina)		($B;32J(B)	; = JR $BEl3$F;K\@~(B
--- rail-1.2.6.orig/rail-table-semi.el
+++ rail-1.2.6/rail-table-semi.el
@@ -7,13 +7,13 @@
     ("Hinomiko"           . "$(BF|8f;R(B")
     ("Oyanagi"            . "$(B>.Lx(B")
     ("Inokuchi"           . "$(B0f8}(B")
-    ("D-Dhji"-A             . "$(BF;K!;{(B")
+    (#("D$(D+W(Bh$(D+W(Bji" 0 1 (charset japanese-jisx0208) 1 6 (charset latin-iso8859-4)) . "$(BF;K!;{(B")
     ("Sodani"             . "$(BA>C+(B")
     ("Shijima"            . "$(B;M==K|(B")
     ("Otomaru"            . "$(B254](B")
-    ("Nukaj-Dtaku-mae"-A     . "$(B3[=;BpA0(B")
+    (#("Nukaj$(D+i(Btaku-mae" 0 5 (charset japanese-jisx0208) 5 14 (charset latin-iso8859-4)) . "$(B3[=;BpA0(B")
     ("Magae"              . "$(BGOBX(B")
-    ("Nonoichi-K-Ddaimae"-A  . "$(BLn!9;T9)BgA0(B")
+    (#("Nonoichi-K$(D+W(Bdaimae" 0 10 (charset japanese-jisx0208) 10 17 (charset latin-iso8859-4)) . "$(BLn!9;T9)BgA0(B")
     ("Nonoichi"           . "$(BLn!9;T(B")
     ("Oshino"             . "$(B2!Ln(B")
     ("Shin-Nishikanazawa" . "$(B?7@>6bBt(B")
@@ -24,17 +24,17 @@
     ("Arimagawa"          . "$(BM-4V@n(B")
     ("Nadachi"            . "$(BL>N)(B")
     ("Tsutsuishi"         . "$(BE{@P(B")
-    ("N-D"-A                 . "$(BG=@8(B")
+    (#("N$(D+W(B" 0 1 (charset japanese-jisx0208) 1 2 (charset latin-iso8859-4)) . "$(BG=@8(B")
     ("Uramoto"            . "$(B1:K\(B")
     ("Kajiyashiki"        . "$(B3a20I_(B")
     ("Itoigawa"           . "$(B;e5{@n(B")
-    ("-Dmi"-A                . "$(B@D3$(B")
+    (#("$(D*W(Bmi" 0 3 (charset latin-iso8859-4)) . "$(B@D3$(B")
     ("Oyashirazu"         . "$(B?FITCN(B")
     ("Ichiburi"           . "$(B;T?6(B")
-    ("Ecch-D-Miyazaki"-A     . "$(B1[Cf5\:j(B")
+    (#("Ecch$(D+i(B-Miyazaki" 0 4 (charset japanese-jisx0208) 4 14 (charset latin-iso8859-4)) . "$(B1[Cf5\:j(B")
     ("Tomari"             . "$(BGq(B")
-    ("Ny-Dzen"-A             . "$(BF~A1(B")
-    ("Nishi-Ny-Dzen"-A       . "$(B@>F~A1(B")
+    (#("Ny$(D+i(Bzen" 0 2 (charset japanese-jisx0208) 2 6 (charset latin-iso8859-4)) . "$(BF~A1(B")
+    (#("Nishi-Ny$(D+i(Bzen" 0 8 (charset japanese-jisx0208) 8 12 (charset latin-iso8859-4)) . "$(B@>F~A1(B")
     ("Ikuji"              . "$(B@8CO(B")
     ("Kurobe"             . "$(B9uIt(B")
     ("Uozu"               . "$(B5{DE(B")
@@ -45,7 +45,7 @@
     ("Toyama"             . "$(BIY;3(B")
     ("Kureha"             . "$(B8b1)(B")
     ("Kosugi"             . "$(B>.?y(B")
-    ("Ecch-D-Daimon"-A       . "$(B1[CfBgLg(B")
+    (#("Ecch$(D+i(B-Daimon" 0 4 (charset japanese-jisx0208) 4 12 (charset latin-iso8859-4)) . "$(B1[CfBgLg(B")
     ("Nishi-Takaoka"      . "$(B@>9b2,(B")
     ("Fukuoka"            . "$(BJ!2,(B")
     ("Isurugi"            . "$(B@PF0(B")
@@ -56,17 +56,24 @@
     ("Kanazawa"           . "$(B6bBt(B")
     ("Nishi-Kanazawa"     . "$(B@>6bBt(B")
     ("[JR] Nonoichi"      . "[JR] $(BLn!9;T(B")
-    ("Matt-D"-A              . "$(B>>G$(B")
+    (#("Matt$(D+W(B" 0 4 (charset japanese-jisx0208) 4 5 (charset latin-iso8859-4)) . "$(B>>G$(B")
     ("Kaga-Kasama"        . "$(B2C2l3^4V(B")
     ("Mikawa"             . "$(BH~@n(B")
     ("Komaiko"            . "$(B>.Iq;R(B")
     ("Terai"              . "$(B;{0f(B")
-    ("Meih-D"-A              . "$(BL@Jv(B")
+    (#("Meih$(D+W(B" 0 4 (charset japanese-jisx0208) 4 5 (charset latin-iso8859-4)) . "$(BL@Jv(B")
     ("Komatsu"            . "$(B>.>>(B")
     ("Awazu"              . "$(B0@DE(B")
+    ("Iburihashi"         . "$(BF066(B")
+    ("Kaga-Onsen"         . "$(B2C2l29@t(B")
+    (#("Daish$(Het(Bi" 0 5 (charset japanese-jisx0208) 5 7 (charset chinese-cns11643-2)) . "$(BBg@;;{(B")
+    ("Ushinoya"           . "$(B5m%NC+(B")
+    ("Hosorogi"           . "$(B:YO$LZ(B")
+    ("Awara-Onsen"        . "$(B028629@t(B")
+    ("Maruoka"            . "$(B4]2,(B")
     ("Tsuruga"            . "$(BFX2l(B")
     ("Shin-Hikida"        . "$(B?7I%ED(B")
-    ("-Dmi-Shiotsu"-A        . "$(B6a9>1vDE(B")
+    (#("$(D*W(Bmi-Shiotsu" 0 11 (charset latin-iso8859-4)) . "$(B6a9>1vDE(B")
     ("Yogo"               . "$(BM>8b(B")
     ("Kinomoto"           . "$(BLZ%NK\(B")
     ("Takatsuki"          . "$(B9b7n(B")
@@ -75,20 +82,20 @@
     ("Nagahama"           . "$(BD9IM(B")
     ("Tamura"             . "$(BEDB<(B")
     ("Sakata"             . "$(B:dED(B")
-    ("T-Dky"-A              . "$(BEl5~(B")
+    (#("T$(D+W(Bky$(D+W(B" 0 1 (charset japanese-jisx0208) 1 5 (charset latin-iso8859-4)) . "$(BEl5~(B")
     ("Shinbashi"          . "$(B?766(B")
     ("Shinagawa"          . "$(BIJ@n(B")
     ("Kawasaki"           . "$(B@n:j(B")
     ("Yokohama"           . "$(B2#IM(B")
     ("Totsuka"            . "$(B8MDM(B")
-    ("-Dfuna"-A              . "$(BBgA%(B")
+    (#("$(D*W(Bfuna" 0 5 (charset latin-iso8859-4)) . "$(BBgA%(B")
     ("Fujisawa"           . "$(BF#Bt(B")
-    ("Tsujid-D"-A            . "$(BDTF2(B")
+    (#("Tsujid$(D+W(B" 0 6 (charset japanese-jisx0208) 6 7 (charset latin-iso8859-4)) . "$(BDTF2(B")
     ("Chigasaki"          . "$(B3}%v:j(B")
     ("Hiratsuka"          . "$(BJ?DM(B")
-    ("-Diso"-A               . "$(BBg0k(B")
+    (#("$(D*W(Biso" 0 4 (charset latin-iso8859-4)) . "$(BBg0k(B")
     ("Ninomiya"           . "$(BFs5\(B")
-    ("K-Dzu"-A               . "$(B9qI\DE(B")
+    (#("K$(D+W(Bzu" 0 1 (charset japanese-jisx0208) 1 4 (charset latin-iso8859-4)) . "$(B9qI\DE(B")
     ("Kamonomiya"         . "$(B3{5\(B")
     ("Odawara"            . "$(B>.ED86(B")
     ("Hayakawa"           . "$(BAa@n(B")
@@ -117,15 +124,15 @@
     ("Yaizu"              . "$(B>FDE(B")
     ("Nishi-Yaizu"        . "$(B@>>FDE(B")
     ("Fijieda"            . "$(BF#;^(B")
-    ("Rokug-D"-A             . "$(BO;9g(B")
+    (#("Rokug$(D+W(B" 0 5 (charset japanese-jisx0208) 5 6 (charset latin-iso8859-4)) . "$(BO;9g(B")
     ("Shimada"            . "$(BEgED(B")
     ("Kanaya"             . "$(B6bC+(B")
     ("Kikugawa"           . "$(B5F@n(B")
     ("Kakegawa"           . "$(B3]@n(B")
     ("Fukuroi"            . "$(BB^0f(B")
     ("Iwata"              . "$(BHXED(B")
-    ("Toyodach-D"-A          . "$(BK-EDD.(B")
-    ("Tenry-Dgawa"-A         . "$(BE7N5@n(B")
+    (#("Toyodach$(D+W(B" 0 8 (charset japanese-jisx0208) 8 9 (charset latin-iso8859-4)) . "$(BK-EDD.(B")
+    (#("Tenry$(D+i(Bgawa" 0 5 (charset japanese-jisx0208) 5 10 (charset latin-iso8859-4)) . "$(BE7N5@n(B")
     ("Hamamatsu"          . "$(BIM>>(B")
     ("Takatsuka"          . "$(B9bDM(B")
     ("Maisaka"            . "$(BIq:e(B")
@@ -136,37 +143,37 @@
     ("Futagawa"           . "$(BFs2O(B")
     ("Toyohashi"          . "$(BK-66(B")
     ("Kanayama"           . "$(B6b;3(B")
-    ("Ot-Dbashi"-A           . "$(BHxF,66(B")
+    (#("Ot$(D+W(Bbashi" 0 2 (charset japanese-jisx0208) 2 8 (charset latin-iso8859-4)) . "$(BHxF,66(B")
     ("Nagoya"             . "$(BL>8E20(B")
     ("Gifu"               . "$(B4tIl(B")
     ("Samegai"            . "$(B@C%v0f(B")
     ("Maibara"            . "$(BJF86(B")
     ("Kusatsu"            . "$(BApDE(B")
     ("Yamashina"          . "$(B;32J(B")
-    ("Ky-Dto"-A              . "$(B5~ET(B")
-    ("-Dsaka"-A              . "$(BBg:e(B")
-    ("K-Dbe"-A               . "$(B?@8M(B")
+    (#("Ky$(D+W(Bto" 0 2 (charset japanese-jisx0208) 2 5 (charset latin-iso8859-4)) . "$(B5~ET(B")
+    (#("$(D*W(Bsaka" 0 5 (charset latin-iso8859-4)) . "$(BBg:e(B")
+    (#("K$(D+W(Bbe" 0 1 (charset japanese-jisx0208) 1 4 (charset latin-iso8859-4)) . "$(B?@8M(B")
     ("Himi"               . "$(BI98+(B")
     ("Shimao"             . "$(BEgHx(B")
     ("Amaharashi"         . "$(B1+@2(B")
-    ("Ecch-D-Kokubu"-A       . "$(B1[Cf9qJ,(B")
+    (#("Ecch$(D+i(B-Kokubu" 0 4 (charset japanese-jisx0208) 4 12 (charset latin-iso8859-4)) . "$(B1[Cf9qJ,(B")
     ("Fushiki"            . "$(BIzLZ(B")
-    ("N-Dmachi"-A            . "$(BG=D.(B")
-    ("Ecch-D-Nakagawa"-A     . "$(B1[CfCf@n(B")
+    (#("N$(D+W(Bmachi" 0 1 (charset japanese-jisx0208) 1 7 (charset latin-iso8859-4)) . "$(BG=D.(B")
+    (#("Ecch$(D+i(B-Nakagawa" 0 4 (charset japanese-jisx0208) 4 14 (charset latin-iso8859-4)) . "$(B1[CfCf@n(B")
     ("Takaoka"            . "$(B9b2,(B")
     ("Saigata"            . "$(B:T3c(B")
     ("Kubiki"             . "$(B$/$S$-(B")
-    ("-Dike-Ikoinomori"-A    . "$(BBgCS$$$3$$$N?9(B")
+    (#("$(D*W(Bike-Ikoinomori" 0 15 (charset latin-iso8859-4)) . "$(BBgCS$$$3$$$N?9(B")
     ("Uragawara"          . "$(B$&$i$,$o$i(B")
-    ("Mushigawa-Dsugi"-A     . "$(BCn@nBg?y(B")
-    ("Hokuhoku--Dshima"-A    . "$(B$[$/$[$/BgEg(B")
+    (#("Mushigawa$(D+W(Bsugi" 0 9 (charset japanese-jisx0208) 9 14 (charset latin-iso8859-4)) . "$(BCn@nBg?y(B")
+    (#("Hokuhoku-$(D*W(Bshima" 0 9 (charset japanese-jisx0208) 9 15 (charset latin-iso8859-4)) . "$(B$[$/$[$/BgEg(B")
     ("Matsudai"           . "$(B$^$D$@$$(B")
-    ("T-Dkamachi"-A          . "$(B==F|D.(B")
+    (#("T$(D+W(Bkamachi" 0 1 (charset japanese-jisx0208) 1 9 (charset latin-iso8859-4)) . "$(B==F|D.(B")
     ("Shinza"             . "$(B$7$s$6(B")
     ("Misashima"          . "$(BH~:4Eg(B")
-    ("Uonumaky-Dry"-A       . "$(B5{>B5VNM(B")
-    ("Uonuma-Ky-Dry"-A      . "$(B5{>B5VNM(B")
+    (#("Uonumaky$(D+i(Bry$(D+W(B" 0 8 (charset japanese-jisx0208) 8 12 (charset latin-iso8859-4)) . "$(B5{>B5VNM(B")
+    (#("Uonuma-Ky$(D+i(Bry$(D+W(B" 0 9 (charset japanese-jisx0208) 9 13 (charset latin-iso8859-4)) . "$(B5{>B5VNM(B")
     ("Muikamachi"         . "$(BO;F|D.(B")
-    ("Nishi--Dtsu"-A         . "$(B@>BgDE(B")))
+    (#("Nishi-$(D*W(Btsu" 0 6 (charset japanese-jisx0208) 6 10 (charset latin-iso8859-4)) . "$(B@>BgDE(B")))
 
 (provide 'rail-table-semi)
