svn commit: r197382 - in user/edwin/locale/share: . colldef
Edwin Groothuis
edwin at FreeBSD.org
Mon Sep 21 07:50:58 UTC 2009
Author: edwin
Date: Mon Sep 21 07:50:57 2009
New Revision: 197382
URL: http://svn.freebsd.org/changeset/base/197382
Log:
Complete the migration of share/colldef
Added:
user/edwin/locale/share/colldef/la_LN.ISO8859-13.src
- copied unchanged from r196788, head/share/colldef/la_LN.ISO8859-13.src
user/edwin/locale/share/colldef/sr_Cyrl_RS.ISO8859-5.src
- copied unchanged from r196349, user/edwin/locale/share/colldef/sr_YU.ISO8859-5.src
Deleted:
user/edwin/locale/share/colldef/lt_LT.ISO8859-13.src
user/edwin/locale/share/colldef/sr_YU.ISO8859-5.src
Modified:
user/edwin/locale/share/ (props changed)
user/edwin/locale/share/Makefile
user/edwin/locale/share/Makefile.def.inc
user/edwin/locale/share/colldef/Makefile
user/edwin/locale/share/mfc
Modified: user/edwin/locale/share/Makefile
==============================================================================
--- user/edwin/locale/share/Makefile Mon Sep 21 07:38:50 2009 (r197381)
+++ user/edwin/locale/share/Makefile Mon Sep 21 07:50:57 2009 (r197382)
@@ -5,7 +5,7 @@
# Do not include `info' in the SUBDIR list, it is handled separately.
-SUBDIR= msgdef numericdef timedef monetdef # colldef
+SUBDIR= colldef msgdef numericdef timedef monetdef
_SUBDIR= ${_colldef} \
${_dict} \
Modified: user/edwin/locale/share/Makefile.def.inc
==============================================================================
--- user/edwin/locale/share/Makefile.def.inc Mon Sep 21 07:38:50 2009 (r197381)
+++ user/edwin/locale/share/Makefile.def.inc Mon Sep 21 07:50:57 2009 (r197382)
@@ -11,6 +11,17 @@ CMALIAS_ISCII-DEV= macdevanaga
ICONV= iconv
ICONV_hi_IN.ISCII-DEV= bsdiconv
+# Target selection
+TARGET_LC_MESSAGES= TARGET_CHARACTERMAP
+TARGET_LC_MONETARY= TARGET_CHARACTERMAP
+TARGET_LC_NUMERIC= TARGET_CHARACTERMAP
+TARGET_LC_TIME= TARGET_CHARACTERMAP
+TARGET_LC_COLLATE= TARGET_COLLDEF
+.if !defined(TARGET_${LCTYPE})
+.error unknown LCTYPE (${LCTYPE}) or not set.
+.endif
+TARGET= ${TARGET_${LCTYPE}}
+
#
# Calculated variables
#
@@ -30,8 +41,11 @@ CMS+= ${cm}
. endfor
.endfor
-# All files generated and their locations
+# All files generated and their locations. Default UTF-8 is only for
+# the TARGET_CHARACTERMAP, not for the TARGET_COLLDEF.
+.if ${TARGET} == "TARGET_CHARACTERMAP"
ALLFILES= ${CCLN:S/$/.UTF-8/}
+.endif
.for ccln in ${CCLN}
FILESDIR_${ccln}.UTF-8.out= ${LOCALEDIR}/${ccln}.UTF-8
. for cm in ${CMS_${ccln}}
@@ -253,19 +267,6 @@ _TRANSLATIONAFTER_${cm}+= | awk '{ gsub
.endfor
#
-# Target selection
-#
-TARGET_LC_MESSAGES= TARGET_CHARACTERMAP
-TARGET_LC_MONETARY= TARGET_CHARACTERMAP
-TARGET_LC_NUMERIC= TARGET_CHARACTERMAP
-TARGET_LC_TIME= TARGET_CHARACTERMAP
-TARGET_LC_COLLDEF= TARGET_COLLDEF
-.if !defined(TARGET_${LCTYPE})
-.error unknown LCTYPE (${LCTYPE}) or not set.
-.endif
-TARGET= ${TARGET_${LCTYPE}}
-
-#
# All targets for TARGET_CHARACTERMAP
#
# .unicode -> utf-8.src -> utf-8.out
@@ -322,6 +323,21 @@ ${ccln}.${cms}.out: ${ccln}.${cms}.src
. endfor
.endif
+#
+# All targets for TARGET_COLLDEF
+#
+.if ${TARGET} == "TARGET_COLLDEF"
+. for ccln in ${CCLN}
+. for cm in ${CMS_${ccln}}
+${ccln}.${cm}.out: ${ccln}.${cm}.src
+ colldef -I ${.CURDIR} -o ${.TARGET} ${.ALLSRC}
+. endfor
+. endfor
+.endif
+
+#
+# General targets.
+#
beforeinstall:
.for f in ${FILES:S/.out//}
rm -f ${DESTDIR}/${LOCALEDIR}/${f}/${FILESNAME}
Modified: user/edwin/locale/share/colldef/Makefile
==============================================================================
--- user/edwin/locale/share/colldef/Makefile Mon Sep 21 07:38:50 2009 (r197381)
+++ user/edwin/locale/share/colldef/Makefile Mon Sep 21 07:50:57 2009 (r197382)
@@ -18,7 +18,7 @@ CMS_hi_IN= ISCII-DEV
CMS_hr_HR= ISO8859-2
CMS_hy_AM= ARMSCII-8
CMS_is_IS= ISO8859-1 ISO8859-15
-CMS_kk_KZ= CP154
+CMS_kk_KZ= PT154
CMS_la_LN= ISO8859-1 ISO8859-2 ISO8859-4 ISO8859-13 ISO8859-15 US-ASCII
CMS_lt_LT= ISO8859-4
CMS_no_NO= ISO8859-1 ISO8859-15
@@ -32,28 +32,38 @@ CMS_uk_UA= CP1251 ISO8859-5 KOI8-U
# For these locales, link the following charactermaps to the UTF-8 map.
# (unless the origin charactermap is defined)
-CMSLINK_be_BY= cm
CMSLINK_ca_ES.ISO8859-1= ca_AD.ISO8859-1 ca_FR.ISO8859-1 ca_IT.ISO8859-1
CMSLINK_ca_ES.ISO8859-15= ca_AD.ISO8859-15 ca_FR.ISO8859-15 ca_IT.ISO8859-15
-CMSLINK_ca_CZ.ISO8859-2= sk_SK.ISO8859-2
+CMSLINK_cs_CZ.ISO8859-2= sk_SK.ISO8859-2
CMSLINK_de_DE.ISO8859-1= de_AT.ISO8859-1 de_CH.ISO8859-1
CMSLINK_de_DE.ISO8859-15= de_AT.ISO8859-15 de_CH.ISO8859-15
CMSLINK_is_IS.ISO8859-1= zh_Hant_TW.Big5
CMSLINK_no_NO.ISO8859-1= nb_NO.ISO8859-1 nn_NO.ISO8859-1
CMSLINK_no_NO.ISO8859-15= nb_NO.ISO8859-15 nn_NO.ISO8859-15
CMSLINK_pt_PT.ISO8859-1= pt_BR.ISO8859-1
-CMSLINK_la_LN.ISO8859-1= af_ZA.ISO8859-1/LC_COLLATE da_DK.ISO8859-1/LC_COLLATE en_AU.ISO8859-1/LC_COLLATE en_CA.ISO8859-1/LC_COLLATE en_GB.ISO8859-1/LC_COLLATE en_NZ.ISO8859-1/LC_COLLATE en_US.ISO8859-1/LC_COLLATE eu_ES.ISO8859-1/LC_COLLATE fi_FI.ISO8859-1/LC_COLLATE fr_BE.ISO8859-1/LC_COLLATE fr_CA.ISO8859-1/LC_COLLATE fr_CH.ISO8859-1/LC_COLLATE fr_FR.ISO8859-1/LC_COLLATE it_CH.ISO8859-1/LC_COLLATE it_IT.ISO8859-1/LC_COLLATE nl_BE.ISO8859-1/LC_COLLATE nl_NL.ISO8859-1/LC_COLLATE pt_PT.ISO8859-1/LC_COLLATE
+CMSLINK_la_LN.ISO8859-1= af_ZA.ISO8859-1 da_DK.ISO8859-1 en_AU.ISO8859-1 en_CA.ISO8859-1 en_GB.ISO8859-1 en_NZ.ISO8859-1 en_US.ISO8859-1 eu_ES.ISO8859-1 fi_FI.ISO8859-1 fr_BE.ISO8859-1 fr_CA.ISO8859-1 fr_CH.ISO8859-1 fr_FR.ISO8859-1 it_CH.ISO8859-1 it_IT.ISO8859-1 nl_BE.ISO8859-1 nl_NL.ISO8859-1 pt_BR.ISO8859-1 pt_PT.ISO8859-1
CMSLINK_la_LN.ISO8859-2= hu_HU.ISO8859-2 ro_RO.ISO8859-2 sr_YU.ISO8859-2
CMSLINK_la_LN.ISO8859-13= lt_LT.ISO8859-13 lv_LV.ISO8859-13
-CMSLINK_la_LN.ISO8859-15= af_ZA.ISO8859-15/LC_COLLATE da_DK.ISO8859-15/LC_COLLATE en_AU.ISO8859-15/LC_COLLATE en_CA.ISO8859-15/LC_COLLATE en_GB.ISO8859-15/LC_COLLATE en_NZ.ISO8859-15/LC_COLLATE en_US.ISO8859-15/LC_COLLATE eu_ES.ISO8859-15/LC_COLLATE fi_FI.ISO8859-15/LC_COLLATE fr_BE.ISO8859-15/LC_COLLATE fr_CA.ISO8859-15/LC_COLLATE fr_CH.ISO8859-15/LC_COLLATE fr_FR.ISO8859-15/LC_COLLATE it_CH.ISO8859-15/LC_COLLATE it_IT.ISO8859-15/LC_COLLATE nl_BE.ISO8859-15/LC_COLLATE nl_NL.ISO8859-15/LC_COLLATE pt_PT.ISO8859-15/LC_COLLATE
-CMSLINK_la_LN.US-ASCII= af_ZA.UTF-8/LC_COLLATE am_ET.UTF-8/LC_COLLATE be_BY.UTF-8/LC_COLLATE bg_BG.UTF-8/LC_COLLATE ca_AD.UTF-8/LC_COLLATE ca_ES.UTF-8/LC_COLLATE ca_FR.UTF-8/LC_COLLATE ca_IT.UTF-8/LC_COLLATE cs_CZ.UTF-8/LC_COLLATE da_DK.UTF-8/LC_COLLATE de_AT.UTF-8/LC_COLLATE de_CH.UTF-8/LC_COLLATE de_DE.UTF-8/LC_COLLATE el_GR.UTF-8/LC_COLLATE en_AU.US-ASCII/LC_COLLATE en_AU.UTF-8/LC_COLLATE en_CA.US-ASCII/LC_COLLATE en_CA.UTF-8/LC_COLLATE en_GB.US-ASCII/LC_COLLATE en_GB.UTF-8/LC_COLLATE en_IE.UTF-8/LC_COLLATE en_NZ.US-ASCII/LC_COLLATE en_NZ.UTF-8/LC_COLLATE en_US.US-ASCII/LC_COLLATE en_US.UTF-8/LC_COLLATE es_ES.UTF-8/LC_COLLATE et_EE.UTF-8/LC_COLLATE eu_ES.UTF-8/LC_COLLATE fi_FI.UTF-8/LC_COLLATE fr_BE.UTF-8/LC_COLLATE fr_CA.UTF-8/LC_COLLATE fr_CH.UTF-8/LC_COLLATE fr_FR.UTF-8/LC_COLLATE he_IL.UTF-8/LC_COLLATE hr_HR.UTF-8/LC_COLLATE hu_HU.UTF-8/LC_COLLATE hy_AM.UTF-8/LC_COLLATE is_IS.UTF-8/LC_COLLATE it_CH.UTF-8/LC_COLLATE it_IT.UTF-8/LC_COLLATE ja_JP.SJIS/LC_COLLATE ja_JP.U
TF-8/LC_COLLATE ja_JP.eucJP/LC_COLLATE kk_KZ.UTF-8/LC_COLLATE ko_KR.CP949/LC_COLLATE ko_KR.UTF-8/LC_COLLATE ko_KR.eucKR/LC_COLLATE lt_LT.UTF-8/LC_COLLATE lv_LV.UTF-8/LC_COLLATE mn_MN.UTF-8/LC_COLLATE nb_NO.UTF-8/LC_COLLATE nl_BE.UTF-8/LC_COLLATE nl_NL.UTF-8/LC_COLLATE nn_NO.UTF-8/LC_COLLATE no_NO.UTF-8/LC_COLLATE pl_PL.UTF-8/LC_COLLATE pt_BR.UTF-8/LC_COLLATE pt_PT.UTF-8/LC_COLLATE ro_RO.UTF-8/LC_COLLATE ru_RU.UTF-8/LC_COLLATE sk_SK.UTF-8/LC_COLLATE sl_SI.UTF-8/LC_COLLATE sr_YU.UTF-8/LC_COLLATE sv_SE.UTF-8/LC_COLLATE tr_TR.UTF-8/LC_COLLATE uk_UA.UTF-8/LC_COLLATE zh_CN.GB18030/LC_COLLATE zh_CN.GB2312/LC_COLLATE zh_CN.GBK/LC_COLLATE zh_CN.UTF-8/LC_COLLATE zh_CN.eucCN/LC_COLLATE zh_HK.Big5HKSCS/LC_COLLATE zh_HK.UTF-8/LC_COLLATE zh_TW.UTF-8/LC_COLLATE
+CMSLINK_la_LN.ISO8859-15= af_ZA.ISO8859-15 da_DK.ISO8859-15 en_AU.ISO8859-15 en_CA.ISO8859-15 en_GB.ISO8859-15 en_NZ.ISO8859-15 en_US.ISO8859-15 eu_ES.ISO8859-15 fi_FI.ISO8859-15 fr_BE.ISO8859-15 fr_CA.ISO8859-15 fr_CH.ISO8859-15 fr_FR.ISO8859-15 it_CH.ISO8859-15 it_IT.ISO8859-15 nl_BE.ISO8859-15 nl_NL.ISO8859-15 pt_PT.ISO8859-15
+CMSLINK_la_LN.US-ASCII= af_ZA.UTF-8 am_ET.UTF-8 be_BY.UTF-8 bg_BG.UTF-8 ca_AD.UTF-8 ca_ES.UTF-8 ca_FR.UTF-8 ca_IT.UTF-8 cs_CZ.UTF-8 da_DK.UTF-8 de_AT.UTF-8 de_CH.UTF-8 de_DE.UTF-8 el_GR.UTF-8 en_AU.US-ASCII en_AU.UTF-8 en_CA.US-ASCII en_CA.UTF-8 en_GB.US-ASCII en_GB.UTF-8 en_IE.UTF-8 en_NZ.US-ASCII en_NZ.UTF-8 en_US.US-ASCII en_US.UTF-8 es_ES.UTF-8 et_EE.UTF-8 eu_ES.UTF-8 fi_FI.UTF-8 fr_BE.UTF-8 fr_CA.UTF-8 fr_CH.UTF-8 fr_FR.UTF-8 he_IL.UTF-8 hr_HR.UTF-8 hu_HU.UTF-8 hy_AM.UTF-8 is_IS.UTF-8 it_CH.UTF-8 it_IT.UTF-8 ja_JP.SJIS ja_JP.UTF-8 ja_JP.eucJP kk_KZ.UTF-8 ko_KR.CP949 ko_KR.UTF-8 ko_KR.eucKR lt_LT.UTF-8 lv_LV.UTF-8 mn_MN.UTF-8 nb_NO.UTF-8 nl_BE.UTF-8 nl_NL.UTF-8 nn_NO.UTF-8 no_NO.UTF-8 pl_PL.UTF-8 pt_BR.UTF-8 pt_PT.UTF-8 ro_RO.UTF-8 ru_RU.UTF-8 sk_SK.UTF-8 sl_SI.UTF-8 sr_YU.UTF-8 sv_SE.UTF-8 tr_TR.UTF-8 uk_UA.UTF-8 zh_Hans_CN.GB18030 zh_Hans_CN.GB2312 zh_Hans_CN.GBK zh_Hans_CN.UTF-8 zh_Hans_CN.eucCN zh_Hant_HK.Big5HKSCS zh_Hant_HK.UTF-8 zh_Hant_TW.UTF-8
# For these locales, also create symlinks to the main locale.
#CCLNLINK_ccln= ccnln
# None!
# For these locales, create symlinks to the main locale for historical reasons.
-#LEGLINK_ccln= ccln
+# The ones for zh_XX are linked to la_LN because there are no
+# zh_Hanx_XX CCLN entries.
+LEGLINK_sr_Cyrl_RS.ISO8859-5= sr_YU.ISO8859-5
+LEGLINK_sr_Latn_RS= sr_YU
+LEGLINK_ja_JP= jp_JP
+#EGLINK_zh_Hant_TW= zh_TW
+LEGLINK_la_LN.US-ASCII+= zh_TW.UTF-8
+LEGLINK_is_IS.ISO8859-1+= zh_TW.Big5
+#EGLINK_zh_Hant_HK= zh_HK
+LEGLINK_la_LN.US-ASCII+= zh_HK.UTF-8 zh_HK.Big5HKSCS
+#EGLINK_zh_Hans_CN= zh_CN
+LEGLINK_la_LN.US-ASCII+= zh_CN.eucCN zh_CN.UTF-8 zh_CN.GBK zh_CN.GB2312 zh_CN.GB18030
#
# In theory there are no parts after here which should be touched when adding
@@ -61,7 +71,7 @@ CMSLINK_la_LN.US-ASCII= af_ZA.UTF-8/LC_
#
# Required variables
-LCTYPE= LC_COLLDEF
+LCTYPE= LC_COLLATE
LOCALEDIR= /usr/share/locale
# For testing only
@@ -74,116 +84,5 @@ SHAREGRP= edwin
# All variables
#
-#LOCALES= bg_BG.CP1251 \
-# be_BY.CP1131 \
-# be_BY.CP1251 \
-# be_BY.ISO8859-5 \
-# ca_ES.ISO8859-1 \
-# ca_ES.ISO8859-15 \
-# cs_CZ.ISO8859-2 \
-# de_DE.ISO8859-1 \
-# de_DE.ISO8859-15 \
-# el_GR.ISO8859-7 \
-# es_ES.ISO8859-1 \
-# es_ES.ISO8859-15 \
-# et_EE.ISO8859-15 \
-# hi_IN.ISCII-DEV \
-# hr_HR.ISO8859-2 \
-# hy_AM.ARMSCII-8 \
-# is_IS.ISO8859-1 \
-# is_IS.ISO8859-15 \
-# kk_KZ.PT154 \
-# la_LN.ISO8859-1 \
-# la_LN.ISO8859-15 \
-# la_LN.ISO8859-2 \
-# la_LN.ISO8859-4 \
-# la_LN.US-ASCII \
-# no_NO.ISO8859-1 \
-# no_NO.ISO8859-15 \
-# lt_LT.ISO8859-4 \
-# lt_LT.ISO8859-13 \
-# pl_PL.ISO8859-2 \
-# ru_RU.CP1251 \
-# ru_RU.CP866 \
-# ru_RU.ISO8859-5 \
-# ru_RU.KOI8-R \
-# sl_SI.ISO8859-2 \
-# sr_YU.ISO8859-5 \
-# sv_SE.ISO8859-1 \
-# sv_SE.ISO8859-15 \
-# tr_TR.ISO8859-9 \
-# uk_UA.CP1251 \
-# uk_UA.ISO8859-5 \
-# uk_UA.KOI8-U
-#
-#LOCALEDIR= /usr/share/locale
-#
-#.SUFFIXES: .src .out
-#
-#.src.out:
-# colldef -I ${.CURDIR} -o ${.TARGET} ${.IMPSRC}
-#
-#FILES= ${LOCALES:S/$/.out/}
-#FILESNAME= LC_COLLATE
-#
-#.for locale in ${LOCALES}
-#FILESDIR_${locale}.out= ${LOCALEDIR}/${locale}
-#.if exists(${.CURDIR}/map.${locale:E})
-#${locale}.out: map.${locale:E}
-#.endif
-#.endfor
-#
-#CLEANFILES= ${FILES}
-#
-#ENCODINGS= Big5 Big5HKSCS CP949 eucCN eucJP eucKR GB18030 GB2312 GBK \
-# ISO8859-1 ISO8859-2 ISO8859-15 SJIS US-ASCII UTF-8
-#
-#ISO8859-1_Big5= is_IS:zh_TW
-#ISO8859-1_ISO8859-1= ${ISO8859-15_ISO8859-15} pt_PT:pt_BR
-#
-#LATIN1LINKS= af_ZA da_DK en_AU en_CA en_GB en_NZ en_US eu_ES fi_FI \
-# fr_BE fr_CA fr_CH fr_FR it_CH it_IT nl_BE nl_NL pt_PT
-#ISO8859-15_ISO8859-15= \
-# ca_ES:ca_AD ca_ES:ca_FR ca_ES:ca_IT \
-# de_DE:de_AT de_DE:de_CH \
-# no_NO:nb_NO no_NO:nn_NO \
-# ${LATIN1LINKS:C/^/la_LN:/}
-#
-#LATIN2LINKS= hu_HU ro_RO sr_YU
-#ISO8859-2_ISO8859-2= ${LATIN2LINKS:C/^/la_LN:/} cs_CZ:sk_SK
-#
-#US-ASCII_Big5HKSCS= la_LN:zh_HK
-#US-ASCII_CP949= la_LN:ko_KR
-#US-ASCII_eucCN= la_LN:zh_CN
-#US-ASCII_eucJP= la_LN:ja_JP
-#US-ASCII_eucKR= la_LN:ko_KR
-#US-ASCII_GB18030= la_LN:zh_CN
-#US-ASCII_GB2312= la_LN:zh_CN
-#US-ASCII_GBK= la_LN:zh_CN
-#US-ASCII_SJIS= la_LN:ja_JP
-#
-#ASCIILINKS= en_AU en_CA en_GB en_NZ en_US
-#US-ASCII_US-ASCII= ${ASCIILINKS:C/^/la_LN:/}
-#
-#UTF8LINKS= af_ZA am_ET be_BY bg_BG ca_AD ca_ES ca_FR ca_IT cs_CZ \
-# da_DK de_AT de_CH de_DE \
-# el_GR en_AU en_CA en_GB en_IE en_NZ en_US es_ES et_EE eu_ES \
-# fi_FI fr_BE fr_CA fr_CH fr_FR he_IL hr_HR hu_HU hy_AM \
-# is_IS it_CH it_IT ja_JP kk_KZ ko_KR lt_LT mn_MN \
-# nb_NO nl_BE nl_NL nn_NO no_NO pl_PL pt_BR pt_PT \
-# ro_RO ru_RU sk_SK sl_SI sr_YU sv_SE tr_TR uk_UA zh_CN zh_HK \
-# zh_TW
-#US-ASCII_UTF-8= ${UTF8LINKS:C/^/la_LN:/}
-#
-#SYMLINKS=
-#.for enc1 in ${ENCODINGS}
-#.for enc2 in ${ENCODINGS}
-#.for lang_terr in ${${enc1}_${enc2}}
-#SYMLINKS+= ../${lang_terr:C/:.*$//}.${enc1}/${FILESNAME} \
-# ${LOCALEDIR}/${lang_terr:C/^.*://}.${enc2}
-#.endfor
-#.endfor
-#.endfor
-
.include "../Makefile.def.inc"
.include <bsd.prog.mk>
Copied: user/edwin/locale/share/colldef/la_LN.ISO8859-13.src (from r196788, head/share/colldef/la_LN.ISO8859-13.src)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/edwin/locale/share/colldef/la_LN.ISO8859-13.src Mon Sep 21 07:50:57 2009 (r197382, copy of r196788, head/share/colldef/la_LN.ISO8859-13.src)
@@ -0,0 +1,37 @@
+# Latin-7 / Baltic Rim (backward compatible with ASCII)
+#
+# $FreeBSD$
+#
+charmap map.ISO8859-13
+order \
+# controls
+ <NU>;...;<US>;<PA>;...;<AC>;\
+#
+ <NS>;<SP>;!;\";<"">;<Nb>;\
+ <Cu>;<DO>;<Ct>;<Pd>;\
+ %;&;';\(;\);*;+;<-:>;<*X>;<.M>;\,;<,,>;<``>;<-->;<+->;-;.;<'.>;/;\
+# digits
+ 0;...;9;\
+#
+ :;\;;\<;=;>;<<<>;</>/>>;?;<NO>;<SE>;<At>;\
+# capital
+ (A,<AA>,<A:>,<A;>,<A->,<AE>);\
+ B;(C,<C<>,<C'>);D;(E,<E'>,<E;>,<E->,<E.>);\
+ F;(G,<G,>);H;(I,<I;>,<I->);Y;\
+ J;(K,<K,>);(L,<L,>,<L//>);M;(N,<N'>,<N,>);(O,<O'>,<O:>,<O?>,<O//>,<O->);\
+ P;Q;(R,<R,>);(S,<S'>,<S<>);T;\
+ (U,<U:>,<U;>,<U->);\
+ V;W;X;(Z,<Z'>,<Z.>,<Z<>);\
+#
+ [;\\;];^;_;`;\
+# small
+ (a,<aa>,<a:>,<a;>,<a->,<ae>);\
+ b;(c,<c<>,<c'>);d;(e,<e'>,<e;>,<e->,<e.>);\
+ f;(g,<g,>);h;(i,<i;>,<i->);y;\
+ j;(k,<k,>);(l,<l,>,<l//>);m;(n,<n'>,<n,>);(o,<o'>,<o:>,<o?>,<o//>,<o->);\
+ p;q;(r,<r,>);(s,<s'>,<s<>,<ss>);t;\
+ (u,<u:>,<u;>,<u->);\
+ v;w;x;(z,<z'>,<z.>,<z<>);\
+#
+ \{;|;<BB>;\};~;<DG>;<DT>;<Co>;<Rg>;<My>;<PI>;<1S>;<2S>;<3S>;\
+ <14>;<12>;<34>
Copied: user/edwin/locale/share/colldef/sr_Cyrl_RS.ISO8859-5.src (from r196349, user/edwin/locale/share/colldef/sr_YU.ISO8859-5.src)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/edwin/locale/share/colldef/sr_Cyrl_RS.ISO8859-5.src Mon Sep 21 07:50:57 2009 (r197382, copy of r196349, user/edwin/locale/share/colldef/sr_YU.ISO8859-5.src)
@@ -0,0 +1,38 @@
+# Serbian part of ISO8859-5 (backward compatible with ASCII)
+#
+# $FreeBSD$
+#
+charmap map.ISO8859-5
+order \
+# controls
+ <NU>;...;<US>;\
+#
+ <NS>;<SP>;!;\";<Nb>;<DO>;\
+ %;&;';\(;\);*;+;\,;-;.;/;\
+# digits
+ 0;...;9;\
+#
+ :;\;;\<;=;>;?;<At>;\
+# capital
+ A;...;Z;\
+ <A=>;<B=>;<V=>;<G=>;<D=>;<D%>;<E=>;<Z%>;<Z=>;\
+ <I=>;<J%>;<K=>;<L=>;<LJ>;<M=>;<N=>;<NJ>;<O=>;\
+ <P=>;<R=>;<S=>;<T=>;<Ts>;<U=>;<F=>;<H=>;<C=>;\
+ <C%>;<DZ>;<S%>;\
+#
+ [;\\;];^;_;`;\
+# small
+ a;...;z;\
+ <a=>;<b=>;<v=>;<g=>;<d=>;<d%>;<e=>;<z%>;<z=>;\
+ <i=>;<j%>;<k=>;<l=>;<lj>;<m=>;<n=>;<nj>;<o=>;\
+ <p=>;<r=>;<s=>;<t=>;<ts>;<u=>;<f=>;<h=>;<c=>;\
+ <c%>;<dz>;<s%>;\
+#
+ \{;\|;\};\~;<DT>;<PA>;<HO>;<BH>;<NH>;<IN>;<NL>;\
+ <SA>;<ES>;<HS>;<HJ>;<VS>;<PD>;<PU>;<RI>;<S2>;<S3>;\
+ <DC>;<P1>;<P2>;<TS>;<CC>;<MW>;<SG>;<EG>;<SS>;<GC>;\
+ <SC>;<CI>;<ST>;<OC>;<PM>;<AC>;<IO>;<G%>;<IE>;<DS>;\
+ <II>;<YI>;<KJ>;<-->;<V%>;<J=>;<Sc>;<=">;<Y=>;<%">;\
+ <JE>;<JU>;<JA>;<j=>;<sc>;<='>;<y=>;<%'>;<je>;<ju>;\
+ <ja>;<N0>;<io>;<g%>;<ie>;<ds>;<ii>;<yi>;<kj>;<SE>;\
+ <v%>
Modified: user/edwin/locale/share/mfc
==============================================================================
--- user/edwin/locale/share/mfc Mon Sep 21 07:38:50 2009 (r197381)
+++ user/edwin/locale/share/mfc Mon Sep 21 07:50:57 2009 (r197382)
@@ -1,3 +1,12 @@
+MERGED
+r196788 | ache | 2009-09-04 02:53:11 +1000 (Fri, 04 Sep 2009) | 2 lines
+Changed paths:
+ M /head/share/colldef/Makefile
+ A /head/share/colldef/la_LN.ISO8859-13.src (from /head/share/colldef/lt_LT.ISO8859-13.src:196787)
+ D /head/share/colldef/lt_LT.ISO8859-13.src
+
+Add lv_LV, move lt_LT to common part
+
------------------------------------------------------------------------
MERGED
r196814 | ache | 2009-09-04 16:26:40 +1000 (Fri, 04 Sep 2009) | 5 lines
More information about the svn-src-user
mailing list