xc/nls/Compose/pt_BR.UTF-8XORG-6_8_1_904XORG-6_8-branch

//bugs.freedesktop.org/show_bug.cgi?id=2400) attachment #1762 (https://bugs.freedesktop.org/attachment.cgi?id=1762): Fix build bustage caused by broken patch for brazillian locale support (see Bugzilla #1896). Patch by Kevin E. Martin <kem@freedesktop.org>. Approved in the 2005-01-31 Xorg release-wranglers phone call.

2 files changed, 54 insertions, 54 deletions

diff --git a/nls/pt_BR.UTF-8/Compose.pre b/nls/pt_BR.UTF-8/Compose.pre
index ffe724ae..8804f742 100644
--- a/nls/pt_BR.UTF-8/Compose.pre
+++ b/nls/pt_BR.UTF-8/Compose.pre
@@ -1,11 +1,11 @@
-# UTF-8 (Unicode) compose sequence
-# David.Monniaux@ens.fr
-#
-# Modified for Brazilian Portuguese by Gustavo Noronha Silva <kov@debian.org>
+XCOMM UTF-8 (Unicode) compose sequence
+XCOMM David.Monniaux@ens.fr
+XCOMM
+XCOMM Modified for Brazilian Portuguese by Gustavo Noronha Silva <kov@debian.org>
 
-# Part 1 - Manual definitions
+XCOMM Part 1 - Manual definitions
 
-# Spacing versions of dead accents
+XCOMM Spacing versions of dead accents
 <dead_tilde> <space>			: "~"	asciitilde
 <dead_tilde> <dead_tilde>		: "~"	asciitilde
 <dead_acute> <space>			: "'"	apostrophe
@@ -35,8 +35,8 @@
 <dead_iota> <dead_space>		: "ͺ"	U37a
 <dead_iota> <dead_iota>			: "ͺ"	U37a
 
-# ASCII characters that may be difficult to access
-# on some keyboards.
+XCOMM ASCII characters that may be difficult to access
+XCOMM on some keyboards.
 <Multi_key> <plus> <plus>		: "#"	numbersign
 <Multi_key> <apostrophe> <space>	: "'"	apostrophe
 <Multi_key> <space> <apostrophe>	: "'"	apostrophe
@@ -73,7 +73,7 @@
 <Multi_key> <minus> <space>		: "~"	asciitilde
 <Multi_key> <space> <minus>		: "~"	asciitilde
 
-# Spaces
+XCOMM Spaces
 <Multi_key> <space> <space> : " " nobreakspace # NO-BREAK SPACE
 <Multi_key> <space> <period>: " " U2008 # PUNCTUATION SPACE
 
@@ -108,7 +108,7 @@
 
 <Multi_key> <o> <o> : "°" degree # ^0 already taken
 
-# Quotation marks
+XCOMM Quotation marks
 <Multi_key> <quotedbl> <backslash>	: "〝" U301d # REVERSED DOUBLE PRIME QUOTATION MARK
 <Multi_key> <quotedbl> <slash>		: "〞" U301e # DOUBLE PRIME QUOTATION MARK
 <Multi_key> <less> <less>		: "«" guillemotleft # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
@@ -126,10 +126,10 @@
 <Multi_key> <comma> <quotedbl>          : "„" U201e # DOUBLE LOW-9 QUOTATION MARK
 <Multi_key> <quotedbl> <comma>          : "„" U201e # DOUBLE LOW-9 QUOTATION MARK
 
-# Per xxx
+XCOMM Per xxx
 <Multi_key> <percent> <o>		: "‰" U2030 # PER MILLE SIGN
 
-# Currencies
+XCOMM Currencies
 <Multi_key> <C> <E>			: "₠" U20a0 # EURO-CURRENCY SIGN
 <Multi_key> <C> <slash>			: "₡" U20a1 # COLON SIGN
 <Multi_key> <slash> <C>			: "₡" U20a1 # COLON SIGN
@@ -145,7 +145,7 @@
 <Multi_key> <R> <s>			: "₨" U20a8 # RUPEE SIGN
 <Multi_key> <W> <equal>			: "₩" U20a9 # WON SIGN
 <Multi_key> <equal> <W>			: "₩" U20a9 # WON SIGN
-# "₪" U20aa NEW SHEQEL SIGN
+XCOMM "₪" U20aa NEW SHEQEL SIGN
 <Multi_key> <d> <minus>			: "₫" U20ab # DONG SIGN
 <Multi_key> <C> <equal>			: "€" EuroSign # EURO SIGN
 <Multi_key> <equal> <C>			: "€" EuroSign # EURO SIGN
@@ -157,20 +157,20 @@
 <Multi_key> <Y> <equal>			: "¥" yen
 <Multi_key> <equal><Y>			: "¥" yen
 
-# Long S
+XCOMM Long S
 <Multi_key> <f> <s>	: "ſ" U017f # LONG S
 <Multi_key> <f> <S>	: "ſ" U017f # LONG S
 
-# Dashes
+XCOMM Dashes
 <Multi_key> <minus> <minus> <period> : "–" U2013 # EN DASH
 <Multi_key> <minus> <minus> <minus>  : "—" U2014 # EM DASH
 
-# Musical alterations
+XCOMM Musical alterations
 <Multi_key> <numbersign> <b>		: "♭" U266d # MUSIC FLAT SIGN
 <Multi_key> <numbersign> <f>		: "♮" U266e # MUSIC NATURAL SIGN
 <Multi_key> <numbersign> <numbersign>	: "♯" U266f # MUSIC SHARP SIGN
 
-# Other symbols
+XCOMM Other symbols
 <Multi_key> <s> <o>             : "§" section # SECTION SIGN
 <Multi_key> <o> <s>             : "§" section # SECTION SIGN
 
@@ -179,15 +179,15 @@
 
 <Multi_key> <P> <P>		: "¶" paragraph # PILCROW SIGN (PARAGRAPH SIGN)
 
-# Part 2
+XCOMM Part 2
 
-# Compose map for Korean Hangul(Choseongul) Conjoining Jamos  automatically
-# generated  from UnicodeData-2.0.14.txt at
-#    ftp://ftp.unicode.org/Public/2.0-Update/UnicodeData-2.0.14.txt
-#   by Jungshik Shin <jshin@jshin.net>  2002-10-17
-# There are some conflicts among sequences, but I left them alone.
-#
-# group 1: cluster jamos made of three basic jamos
+XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos  automatically
+XCOMM generated  from UnicodeData-2.0.14.txt at
+XCOMM    ftp://ftp.unicode.org/Public/2.0-Update/UnicodeData-2.0.14.txt
+XCOMM   by Jungshik Shin <jshin@jshin.net>  2002-10-17
+XCOMM There are some conflicts among sequences, but I left them alone.
+XCOMM
+XCOMM group 1: cluster jamos made of three basic jamos
 
   <Multi_key> <U1107> <U1109> <U1100> : "ᄢ"  	U1122	 : ᄇᅠ ᄉᅠ ᄀᅠ  = ᄢᅠ
   <Multi_key> <U1107> <U1109> <U1103> : "ᄣ"  	U1123	 : ᄇᅠ ᄉᅠ ᄃᅠ  = ᄣᅠ
diff --git a/nls/pt_BR.UTF-8/XLC_LOCALE.pre b/nls/pt_BR.UTF-8/XLC_LOCALE.pre
index a640e762..e53dd508 100644
--- a/nls/pt_BR.UTF-8/XLC_LOCALE.pre
+++ b/nls/pt_BR.UTF-8/XLC_LOCALE.pre
@@ -1,18 +1,18 @@
-#  XLocale Database Sample for pt_BR.UTF-8
-#
-#  Based on XLocale Database Sample for en_US.UTF-8
-# 
+XCOMM  XLocale Database Sample for pt_BR.UTF-8
+XCOMM
+XCOMM  Based on XLocale Database Sample for en_US.UTF-8
+XCOMM 
 
-# 
-# 	XLC_FONTSET category
-# 
+XCOMM 
+XCOMM 	XLC_FONTSET category
+XCOMM 
 XLC_FONTSET
 
 on_demand_loading	True
 
 object_name		generic
 
-# 	fs0 class (7 bit ASCII)
+XCOMM 	fs0 class (7 bit ASCII)
 fs0	{
 	charset	{
 		name	ISO8859-1:GL
@@ -22,7 +22,7 @@ fs0	{
 		vertical_rotate	all
 	}
 }
-#	fs1 class (ISO8859 families)
+XCOMM	fs1 class (ISO8859 families)
 fs1	{
 	charset	{
 		name	ISO8859-1:GR
@@ -31,7 +31,7 @@ fs1	{
 		primary	ISO8859-1:GR
 	}
 }
-# 	fs2 class (Kanji)
+XCOMM 	fs2 class (Kanji)
 fs2	{
 	charset	{
 		name	JISX0208.1983-0:GL
@@ -40,7 +40,7 @@ fs2	{
 		primary	JISX0208.1983-0:GL
 	}
 }
-#   fs3 class (Korean Character)
+XCOMM   fs3 class (Korean Character)
 fs3	{
 	charset	{
 		name	KSC5601.1987-0:GL
@@ -49,7 +49,7 @@ fs3	{
 		primary	KSC5601.1987-0:GL
 	}
 }
-#   fs4 class (Chinese Han Character)
+XCOMM   fs4 class (Chinese Han Character)
 fs4	{
 	charset	{
 		name	GB2312.1980-0:GL
@@ -58,7 +58,7 @@ fs4	{
 		primary	GB2312.1980-0:GL
 	}
 }
-#	fs5 class (Half Kana)
+XCOMM	fs5 class (Half Kana)
 fs5	{
 	charset	{
 		name	JISX0201.1976-0:GR
@@ -68,8 +68,8 @@ fs5	{
 		vertical_rotate	all
 	}
 }
-# ISO10646 is last, per Roland Mainz in
-# http://bugs.freedesktop.org/show_bug.cgi?id=1896
+XCOMM ISO10646 is last, per Roland Mainz in
+XCOMM http://bugs.freedesktop.org/show_bug.cgi?id=1896
 fs6	{
 	charset	{
 		name	ISO10646-1
@@ -80,60 +80,60 @@ fs6	{
 }
 END XLC_FONTSET
 
-# 
-# 	XLC_XLOCALE category
-# 
+XCOMM 
+XCOMM 	XLC_XLOCALE category
+XCOMM 
 XLC_XLOCALE
 
 encoding_name		UTF-8
 mb_cur_max		6
 state_depend_encoding	False
 
-#	cs0 class
+XCOMM	cs0 class
 cs0	{
 	side		GL:Default
 	length		1
 	ct_encoding	ISO8859-1:GL
 }
 
-#	cs1 class
+XCOMM	cs1 class
 cs1     {
         side            GR:Default
         length          1
         ct_encoding     ISO8859-1:GR
 }
  
-#	cs2 class
+XCOMM	cs2 class
 cs2	{
 	side		GR
 	length		2
-	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;			JISX0208.1983-1:GL; JISX0208.1983-1:GR
-
+	ct_encoding	JISX0208.1983-0:GL; JISX0208.1983-0:GR;\
+			JISX0208.1983-1:GL; JISX0208.1983-1:GR
 }
 
-#	cs3 class
+XCOMM	cs3 class
 cs3     {
         side            GL
         length          2
-        ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;                        KSC5601.1987-1:GL; KSC5601.1987-1:GR
-
+        ct_encoding     KSC5601.1987-0:GL; KSC5601.1987-0:GR;\
+                        KSC5601.1987-1:GL; KSC5601.1987-1:GR
 }
  
-#	cs4 class
+XCOMM	cs4 class
 cs4     {
         side            GR
         length          2
         ct_encoding     GB2312.1980-0:GL; GB2312.1980-0:GR
 }
  
-#	cs5 class
+XCOMM	cs5 class
 cs5	{
 	side		GR
 	length		1
 	ct_encoding	JISX0201.1976-0:GR
 }
 
-#	cs6 class
+XCOMM	cs6 class
 cs6	{
 	side		none
 	ct_encoding	ISO10646-1