From owner-svn-src-head@freebsd.org Mon Nov 16 12:58:49 2015 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 71B19A2E91D; Mon, 16 Nov 2015 12:58:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 35C1A125E; Mon, 16 Nov 2015 12:58:49 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tAGCwmPT083307; Mon, 16 Nov 2015 12:58:48 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tAGCwlbf083301; Mon, 16 Nov 2015 12:58:47 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201511161258.tAGCwlbf083301@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 16 Nov 2015 12:58:47 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r290928 - in head: . etc/mtree share/colldef share/ctypedef share/monetdef share/msgdef share/numericdef share/timedef tools/build/mk tools/tools/locale/etc X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Nov 2015 12:58:49 -0000 Author: bapt Date: Mon Nov 16 12:58:47 2015 New Revision: 290928 URL: https://svnweb.freebsd.org/changeset/base/290928 Log: Bring back a couple of ISO8859-15 locales: - af_ZA.ISO8859-15 - en_AU.ISO8859-15 - en_CA.ISO8859-15 - en_NZ.ISO8859-15 - en_US.ISO8859-15 - fr_CA.ISO8859-15 Added: head/share/ctypedef/en_US.ISO8859-1.src - copied unchanged from r290927, head/share/ctypedef/en_GB.ISO8859-15.src head/share/monetdef/en_ZA.ISO8859-15.src - copied unchanged from r290927, head/share/monetdef/en_ZA.ISO8859-1.src head/share/monetdef/fr_CA.ISO8859-15.src - copied unchanged from r290927, head/share/monetdef/fr_CA.ISO8859-1.src head/share/timedef/fr_CA.ISO8859-15.src - copied unchanged from r290927, head/share/timedef/fr_CA.ISO8859-1.src Deleted: head/share/ctypedef/en_GB.ISO8859-15.src head/share/monetdef/en_ZA.ISO8859-1.src head/share/monetdef/fr_CA.ISO8859-1.src head/share/timedef/fr_CA.ISO8859-1.src Modified: head/ObsoleteFiles.inc head/etc/mtree/BSD.usr.dist head/share/colldef/Makefile head/share/ctypedef/Makefile head/share/monetdef/Makefile head/share/msgdef/Makefile head/share/numericdef/Makefile head/share/timedef/Makefile head/tools/build/mk/OptionalObsoleteFiles.inc head/tools/tools/locale/etc/charmaps.xml Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Mon Nov 16 10:20:19 2015 (r290927) +++ head/ObsoleteFiles.inc Mon Nov 16 12:58:47 2015 (r290928) @@ -49,41 +49,6 @@ OLD_FILES+=usr/share/locale/zh_TW.UTF-8/ # 20151107: String collation improvements OLD_FILES+=usr/share/locale/UTF-8/LC_CTYPE OLD_DIRS+=usr/share/locale/UTF-8 -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_NUMERIC -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MESSAGES -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_TIME -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_CTYPE -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_COLLATE -OLD_FILES+=usr/share/locale/en_CA.ISO8859-15/LC_MONETARY -OLD_DIRS+=usr/share/locale/en_CA.ISO8859-15 -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_COLLATE -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_CTYPE -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MESSAGES -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_TIME -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_NUMERIC -OLD_FILES+=usr/share/locale/en_AU.ISO8859-15/LC_MONETARY -OLD_DIRS+=usr/share/locale/en_AU.ISO8859-15 -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_CTYPE -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MESSAGES -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_COLLATE -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_TIME -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_MONETARY -OLD_FILES+=usr/share/locale/en_US.ISO8859-15/LC_NUMERIC -OLD_DIRS+=usr/share/locale/en_US.ISO8859-15 -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MESSAGES -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_COLLATE -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_TIME -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_MONETARY -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_NUMERIC -OLD_FILES+=usr/share/locale/en_NZ.ISO8859-15/LC_CTYPE -OLD_DIRS+=usr/share/locale/en_NZ.ISO8859-15 -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_COLLATE -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MESSAGES -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_CTYPE -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_TIME -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_NUMERIC -OLD_FILES+=usr/share/locale/fr_CA.ISO8859-15/LC_MONETARY -OLD_DIRS+=usr/share/locale/fr_CA.ISO8859-15 OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_COLLATE OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_CTYPE OLD_FILES+=usr/share/locale/kk_KZ.PT154/LC_MESSAGES Modified: head/etc/mtree/BSD.usr.dist ============================================================================== --- head/etc/mtree/BSD.usr.dist Mon Nov 16 10:20:19 2015 (r290927) +++ head/etc/mtree/BSD.usr.dist Mon Nov 16 12:58:47 2015 (r290928) @@ -515,6 +515,8 @@ locale af_ZA.ISO8859-1 .. + af_ZA.ISO8859-15 + .. af_ZA.UTF-8 .. ar_AE.UTF-8 @@ -601,12 +603,16 @@ .. en_AU.ISO8859-1 .. + en_AU.ISO8859-15 + .. en_AU.US-ASCII .. en_AU.UTF-8 .. en_CA.ISO8859-1 .. + en_CA.ISO8859-15 + .. en_CA.US-ASCII .. en_CA.UTF-8 @@ -631,6 +637,8 @@ .. en_NZ.ISO8859-1 .. + en_NZ.ISO8859-15 + .. en_NZ.US-ASCII .. en_NZ.UTF-8 @@ -643,12 +651,16 @@ .. en_US.ISO8859-1 .. + en_US.ISO8859-15 + .. en_US.US-ASCII .. en_US.UTF-8 .. en_ZA.ISO8859-1 .. + en_ZA.ISO8859-15 + .. en_ZA.US-ASCII .. en_ZA.UTF-8 @@ -695,6 +707,8 @@ .. fr_CA.ISO8859-1 .. + fr_CA.ISO8859-15 + .. fr_CA.UTF-8 .. fr_CH.ISO8859-1 Modified: head/share/colldef/Makefile ============================================================================== --- head/share/colldef/Makefile Mon Nov 16 10:20:19 2015 (r290927) +++ head/share/colldef/Makefile Mon Nov 16 12:58:47 2015 (r290928) @@ -47,6 +47,7 @@ LOCALES+= uk_UA.UTF-8 LOCALES+= zh_Hans_CN.UTF-8 LOCALES+= zh_Hant_TW.UTF-8 +SAME+= af_ZA.UTF-8:af_ZA.ISO8859-15 SAME+= af_ZA.UTF-8:af_ZA.ISO8859-1 SAME+= ar_SA.UTF-8:ar_QA.UTF-8 SAME+= ar_SA.UTF-8:ar_MA.UTF-8 @@ -108,6 +109,7 @@ SAME+= en_US.UTF-8:fr_CH.UTF-8 SAME+= en_US.UTF-8:fr_CH.ISO8859-15 SAME+= en_US.UTF-8:fr_CH.ISO8859-1 SAME+= en_US.UTF-8:fr_CA.UTF-8 +SAME+= en_US.UTF-8:fr_CA.ISO8859-15 SAME+= en_US.UTF-8:fr_CA.ISO8859-1 SAME+= en_US.UTF-8:fr_BE.UTF-8 SAME+= en_US.UTF-8:fr_BE.ISO8859-15 @@ -117,14 +119,17 @@ SAME+= en_US.UTF-8:eu_ES.ISO8859-15 SAME+= en_US.UTF-8:eu_ES.ISO8859-1 SAME+= en_US.UTF-8:en_ZA.UTF-8 SAME+= en_US.UTF-8:en_ZA.US-ASCII +SAME+= en_US.UTF-8:en_ZA.ISO8859-15 SAME+= en_US.UTF-8:en_ZA.ISO8859-1 SAME+= en_US.UTF-8:en_US.US-ASCII +SAME+= en_US.UTF-8:en_US.ISO8859-15 SAME+= en_US.UTF-8:en_US.ISO8859-1 SAME+= en_US.UTF-8:en_SG.UTF-8 SAME+= en_US.UTF-8:en_SG.ISO8859-1 SAME+= en_US.UTF-8:en_PH.UTF-8 SAME+= en_US.UTF-8:en_NZ.UTF-8 SAME+= en_US.UTF-8:en_NZ.US-ASCII +SAME+= en_US.UTF-8:en_NZ.ISO8859-15 SAME+= en_US.UTF-8:en_NZ.ISO8859-1 SAME+= en_US.UTF-8:en_IE.UTF-8 SAME+= en_US.UTF-8:en_IE.ISO8859-15 @@ -137,9 +142,11 @@ SAME+= en_US.UTF-8:en_GB.ISO8859-15 SAME+= en_US.UTF-8:en_GB.ISO8859-1 SAME+= en_US.UTF-8:en_CA.UTF-8 SAME+= en_US.UTF-8:en_CA.US-ASCII +SAME+= en_US.UTF-8:en_CA.ISO8859-15 SAME+= en_US.UTF-8:en_CA.ISO8859-1 SAME+= en_US.UTF-8:en_AU.UTF-8 SAME+= en_US.UTF-8:en_AU.US-ASCII +SAME+= en_US.UTF-8:en_AU.ISO8859-15 SAME+= en_US.UTF-8:en_AU.ISO8859-1 SAME+= en_US.UTF-8:de_DE.UTF-8 SAME+= en_US.UTF-8:de_DE.ISO8859-15 Modified: head/share/ctypedef/Makefile ============================================================================== --- head/share/ctypedef/Makefile Mon Nov 16 10:20:19 2015 (r290927) +++ head/share/ctypedef/Makefile Mon Nov 16 12:58:47 2015 (r290928) @@ -16,8 +16,8 @@ LOCALES+= be_BY.CP1131 LOCALES+= ca_IT.ISO8859-1 LOCALES+= ca_IT.ISO8859-15 LOCALES+= el_GR.ISO8859-7 -LOCALES+= en_GB.ISO8859-15 LOCALES+= en_US.ISO8859-1 +LOCALES+= en_US.ISO8859-15 LOCALES+= en_US.US-ASCII LOCALES+= en_US.UTF-8 LOCALES+= hi_IN.ISCII-DEV @@ -152,6 +152,35 @@ SAME+= en_US.ISO8859-1:de_CH.ISO8859-1 SAME+= en_US.ISO8859-1:de_AT.ISO8859-1 SAME+= en_US.ISO8859-1:da_DK.ISO8859-1 SAME+= en_US.ISO8859-1:af_ZA.ISO8859-1 +SAME+= en_US.ISO8859-15:en_GB.ISO8859-15 +SAME+= en_US.ISO8859-15:sv_SE.ISO8859-15 +SAME+= en_US.ISO8859-15:sv_FI.ISO8859-15 +SAME+= en_US.ISO8859-15:pt_PT.ISO8859-15 +SAME+= en_US.ISO8859-15:nn_NO.ISO8859-15 +SAME+= en_US.ISO8859-15:nl_NL.ISO8859-15 +SAME+= en_US.ISO8859-15:nl_BE.ISO8859-15 +SAME+= en_US.ISO8859-15:nb_NO.ISO8859-15 +SAME+= en_US.ISO8859-15:it_IT.ISO8859-15 +SAME+= en_US.ISO8859-15:it_CH.ISO8859-15 +SAME+= en_US.ISO8859-15:is_IS.ISO8859-15 +SAME+= en_US.ISO8859-15:fr_FR.ISO8859-15 +SAME+= en_US.ISO8859-15:fr_CH.ISO8859-15 +SAME+= en_US.ISO8859-15:fr_CA.ISO8859-15 +SAME+= en_US.ISO8859-15:fr_BE.ISO8859-15 +SAME+= en_US.ISO8859-15:fi_FI.ISO8859-15 +SAME+= en_US.ISO8859-15:eu_ES.ISO8859-15 +SAME+= en_US.ISO8859-15:et_EE.ISO8859-15 +SAME+= en_US.ISO8859-15:es_ES.ISO8859-15 +SAME+= en_US.ISO8859-15:en_ZA.ISO8859-15 +SAME+= en_US.ISO8859-15:en_NZ.ISO8859-15 +SAME+= en_US.ISO8859-15:en_IE.ISO8859-15 +SAME+= en_US.ISO8859-15:en_CA.ISO8859-15 +SAME+= en_US.ISO8859-15:en_AU.ISO8859-15 +SAME+= en_US.ISO8859-15:de_DE.ISO8859-15 +SAME+= en_US.ISO8859-15:de_CH.ISO8859-15 +SAME+= en_US.ISO8859-15:de_AT.ISO8859-15 +SAME+= en_US.ISO8859-15:da_DK.ISO8859-15 +SAME+= en_US.ISO8859-15:af_ZA.ISO8859-15 SAME+= ru_RU.CP1251:bg_BG.CP1251 SAME+= ru_RU.CP1251:be_BY.CP1251 SAME+= ru_RU.ISO8859-5:sr_Cyrl_RS.ISO8859-5 @@ -169,28 +198,6 @@ SAME+= sr_Latn_RS.ISO8859-2:pl_PL.ISO88 SAME+= sr_Latn_RS.ISO8859-2:hu_HU.ISO8859-2 SAME+= sr_Latn_RS.ISO8859-2:hr_HR.ISO8859-2 SAME+= sr_Latn_RS.ISO8859-2:cs_CZ.ISO8859-2 -SAME+= en_GB.ISO8859-15:sv_SE.ISO8859-15 -SAME+= en_GB.ISO8859-15:sv_FI.ISO8859-15 -SAME+= en_GB.ISO8859-15:pt_PT.ISO8859-15 -SAME+= en_GB.ISO8859-15:nn_NO.ISO8859-15 -SAME+= en_GB.ISO8859-15:nl_NL.ISO8859-15 -SAME+= en_GB.ISO8859-15:nl_BE.ISO8859-15 -SAME+= en_GB.ISO8859-15:nb_NO.ISO8859-15 -SAME+= en_GB.ISO8859-15:it_IT.ISO8859-15 -SAME+= en_GB.ISO8859-15:it_CH.ISO8859-15 -SAME+= en_GB.ISO8859-15:is_IS.ISO8859-15 -SAME+= en_GB.ISO8859-15:fr_FR.ISO8859-15 -SAME+= en_GB.ISO8859-15:fr_CH.ISO8859-15 -SAME+= en_GB.ISO8859-15:fr_BE.ISO8859-15 -SAME+= en_GB.ISO8859-15:fi_FI.ISO8859-15 -SAME+= en_GB.ISO8859-15:eu_ES.ISO8859-15 -SAME+= en_GB.ISO8859-15:et_EE.ISO8859-15 -SAME+= en_GB.ISO8859-15:es_ES.ISO8859-15 -SAME+= en_GB.ISO8859-15:en_IE.ISO8859-15 -SAME+= en_GB.ISO8859-15:de_DE.ISO8859-15 -SAME+= en_GB.ISO8859-15:de_CH.ISO8859-15 -SAME+= en_GB.ISO8859-15:de_AT.ISO8859-15 -SAME+= en_GB.ISO8859-15:da_DK.ISO8859-15 SAME+= en_US.US-ASCII:en_ZA.US-ASCII SAME+= en_US.US-ASCII:en_NZ.US-ASCII SAME+= en_US.US-ASCII:en_GB.US-ASCII @@ -222,11 +229,11 @@ SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_ SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_CN.GB2312.src SYMPAIRS+= zh_Hans_CN.eucCN.src:zh_Hans_CN.GBK.src SYMPAIRS+= zh_Hant_HK.Big5HKSCS.src:zh_Hant_TW.Big5.src -SYMPAIRS+= en_GB.ISO8859-15.src:en_US.ISO8859-1.src -SYMPAIRS+= en_GB.ISO8859-15.src:en_US.US-ASCII.src -SYMPAIRS+= en_GB.ISO8859-15.src:lv_LV.ISO8859-13.src -SYMPAIRS+= en_GB.ISO8859-15.src:sr_Latn_RS.ISO8859-2.src -SYMPAIRS+= en_GB.ISO8859-15.src:tr_TR.ISO8859-9.src +SYMPAIRS+= en_US.ISO8859-1.src:en_US.ISO8859-15.src +SYMPAIRS+= en_US.ISO8859-1.src:en_US.US-ASCII.src +SYMPAIRS+= en_US.ISO8859-1.src:lv_LV.ISO8859-13.src +SYMPAIRS+= en_US.ISO8859-1.src:sr_Latn_RS.ISO8859-2.src +SYMPAIRS+= en_US.ISO8859-1.src:tr_TR.ISO8859-9.src SYMPAIRS+= ja_JP.eucJP.src:ja_JP.SJIS.src .for PAIR in ${SYMPAIRS} Copied: head/share/ctypedef/en_US.ISO8859-1.src (from r290927, head/share/ctypedef/en_GB.ISO8859-15.src) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/share/ctypedef/en_US.ISO8859-1.src Mon Nov 16 12:58:47 2015 (r290928, copy of r290927, head/share/ctypedef/en_GB.ISO8859-15.src) @@ -0,0 +1,5163 @@ +# Warning: Do not edit. This file is automatically extracted from the +# tools in /usr/src/tools/tools/locale. The data is obtained from the +# CLDR project, obtained from http://cldr.unicode.org/ +# ----------------------------------------------------------------------------- +comment_char * +escape_char / +LC_CTYPE +************* + +upper ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ +

;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + + +lower ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ + ;/ +