xkbdesc/rules base.lists.part, 1.26, 1.27 base.m_g.part, 1.6, 1.7 base.m_k.part, 1.7, 1.8 base.m_s.part, 1.5, 1.6 base.ml1_s.part, 1.5, 1.6 base.ml_s.part, 1.8, 1.9 base.mlv_s.part, 1.2, 1.3

[Sergey V. Oudaltsov]

Committed by: svu

Update of /cvs/xlibs/xkbdesc/rules
In directory kemper:/tmp/cvs-serv31375/rules

Modified Files:
	base.lists.part base.m_g.part base.m_k.part base.m_s.part 
	base.ml1_s.part base.ml_s.part base.mlv_s.part 
Log Message:
fixing lists, b.fd.o#7817

Index: base.lists.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.lists.part,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- base.lists.part	31 Aug 2006 21:44:13 -0000	1.26
+++ base.lists.part	4 Sep 2006 21:23:22 -0000	1.27
@@ -5,13 +5,18 @@
 //              in ir iku jp kan kh kr la lao lk mk mm mn mv mal ori pk \
 //              ru scc sy syr tel th tj tam ua uz
 
+// PC models
 ! $pcmodels = pc101 pc102 pc104 pc105
 
-! $pcgeometries = abnt2 latitude microsoft jp106 kr106
+// Microsoft models (using MS geometry)
+! $msmodels = microsoft microsoftpro microsoftprousb microsoftprose
+
+// PC geometries - they have special geometry but symbols are mostly pc105
+! $pcgeometries = abnt2 latitude jp106 kr106
 
 ! $macbooks = macbook78 macbook79
 ! $maclaptop = ibook powerbook macbook78 macbook79
-! $mac = macintosh macintosh_old ibook powerbook macbook78 macbook79
+! $macs = macintosh macintosh_old ibook powerbook macbook78 macbook79
 
 ! $macvendorlayouts = ch de dk es fi fr gb is it nl no pt se us
 

Index: base.m_g.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.m_g.part,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- base.m_g.part	31 Aug 2006 21:44:13 -0000	1.6
+++ base.m_g.part	4 Sep 2006 21:23:22 -0000	1.7
@@ -1,6 +1,4 @@
-  microsoftpro	=	microsoft(natural)
-  microsoftprousb =	microsoft(natural)
-  microsoftprose =	microsoft(natural)
+ $msmodels	=	microsoft(natural)
   dell101	=	dell(dell101)
   flexpro	=	keytronic(FlexPro)
   hp6000	=	hp(omnibook)
@@ -12,5 +10,5 @@
   winbook	=	winbook(XP5)
   pc98		=	nec(pc98)
  $macbooks      =       macintosh(%m)
- $mac		=	macintosh(macintosh)
+ $macs		=	macintosh(macintosh)
   *		=       pc(pc104)

Index: base.m_k.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.m_k.part,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- base.m_k.part	31 Aug 2006 21:44:13 -0000	1.7
+++ base.m_k.part	4 Sep 2006 21:23:22 -0000	1.8
@@ -10,5 +10,5 @@
   jp106		=	xfree86(jp106)
   evdev		=	evdev
  $macbooks	=	macintosh(macbook)
- $mac   	=	macintosh
+ $macs   	=	macintosh
   *		=	xfree86

Index: base.m_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.m_s.part,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- base.m_s.part	31 Aug 2006 21:44:13 -0000	1.5
+++ base.m_s.part	4 Sep 2006 21:23:22 -0000	1.6
@@ -1,3 +1,3 @@
   $inetkbds     =       +inet(%m)
   $maclaptop	=	+inet(apple_laptop)
-  $mac	        =	+inet(apple)
+  $macs	        =	+inet(apple)

Index: base.ml1_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.ml1_s.part,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- base.ml1_s.part	11 Jan 2006 22:48:13 -0000	1.5
+++ base.ml1_s.part	4 Sep 2006 21:23:22 -0000	1.6
@@ -5,6 +5,6 @@
   old_macintosh	us			=	macintosh_vndr/us(extended)
   old_macintosh	$macvendorlayouts	=	macintosh_vndr/us(extended)+macintosh_vndr/%l[1]%(v[1])
   old_macintosh	*			=	macintosh_vndr/us(extended)+%l[1]%(v[1])
- $mac		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l[1]%(v[1])
+ $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l[1]%(v[1])
  $pcmodels	*			=	pc(%m)+%l[1]%(v[1])
   *		*			=	pc(pc105)+%l[1]%(v[1])

Index: base.ml_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.ml_s.part,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- base.ml_s.part	31 Aug 2006 21:44:13 -0000	1.8
+++ base.ml_s.part	4 Sep 2006 21:23:22 -0000	1.9
@@ -14,8 +14,8 @@
   old_macintosh	$nonlatin		=	macintosh_vndr/us(extended)+%l%(v):2
   old_macintosh	*			=	macintosh_vndr/us(extended)+%l%(v)
  $macbooks	*			=	pc(pc105)+%l%(v)
- $mac		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
- $mac		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
+ $macs		en_US			=	pc(pc105)+macintosh_vndr/us(extended)
+ $macs		$macvendorlayouts	=	pc(pc105)+macintosh_vndr/%l%(v)
  $pcmodels      intl   			=       us(%mcompose)
   *		intl			=	us(pc104compose)
   *		jp			=	pc(pc102)+jp(latin)+jp:2

Index: base.mlv_s.part
===================================================================
RCS file: /cvs/xlibs/xkbdesc/rules/base.mlv_s.part,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- base.mlv_s.part	11 Jan 2006 22:48:13 -0000	1.2
+++ base.mlv_s.part	4 Sep 2006 21:23:22 -0000	1.3
@@ -1 +1 @@
- $mac		$macvendorlayouts	nodeadkeys	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
+ $macs		$macvendorlayouts	nodeadkeys	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)