fixing lists, b.fd.o#7817

8 files changed, 22 insertions, 12 deletions

diff --git a/ChangeLog b/ChangeLog
index 6d4df44e..5d27742f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-09-04  Sergey Udaltsov
 
+	rules/base.lists.part, rules/base.m_g.part, rules/base.m_k.part,
+	rules/base.m_s.part, rules/base.ml1_s.part, rules/base.ml_s.part,
+	rules/base.mlv_s.part: fixing lists,
+	https://bugs.freedesktop.org/show_bug.cgi?id=7817
+
+2006-09-04  Sergey Udaltsov
+
 	symbols/cd, symbols/gr, symbols/il, symbols/jp, symbols/la,
 	symbols/lk, symbols/ru, symbols/ca: fixing types, on per-group basis,
 	https://bugs.freedesktop.org/show_bug.cgi?id=8121
diff --git a/rules/base.lists.part b/rules/base.lists.part
index b86bc847..5d7f8be3 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -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
 
diff --git a/rules/base.m_g.part b/rules/base.m_g.part
index 5a55f5b0..2e43ed22 100644
--- a/rules/base.m_g.part
+++ b/rules/base.m_g.part
@@ -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)
diff --git a/rules/base.m_k.part b/rules/base.m_k.part
index 63901be1..6d4fd6e1 100644
--- a/rules/base.m_k.part
+++ b/rules/base.m_k.part
@@ -10,5 +10,5 @@
   jp106		=	xfree86(jp106)
   evdev		=	evdev
  $macbooks	=	macintosh(macbook)
- $mac   	=	macintosh
+ $macs   	=	macintosh
   *		=	xfree86
diff --git a/rules/base.m_s.part b/rules/base.m_s.part
index 5d51a14b..a4e797c8 100644
--- a/rules/base.m_s.part
+++ b/rules/base.m_s.part
@@ -1,3 +1,3 @@
   $inetkbds     =       +inet(%m)
   $maclaptop	=	+inet(apple_laptop)
-  $mac	        =	+inet(apple)
+  $macs	        =	+inet(apple)
diff --git a/rules/base.ml1_s.part b/rules/base.ml1_s.part
index 720850ff..89dec13c 100644
--- a/rules/base.ml1_s.part
+++ b/rules/base.ml1_s.part
@@ -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])
diff --git a/rules/base.ml_s.part b/rules/base.ml_s.part
index 5aa7898f..bc002b4a 100644
--- a/rules/base.ml_s.part
+++ b/rules/base.ml_s.part
@@ -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
diff --git a/rules/base.mlv_s.part b/rules/base.mlv_s.part
index 12f8dc62..b2ee2ee2 100644
--- a/rules/base.mlv_s.part
+++ b/rules/base.mlv_s.part
@@ -1 +1 @@
- $mac		$macvendorlayouts	nodeadkeys	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)
+ $macs		$macvendorlayouts	nodeadkeys	=	macintosh_vndr/us(extended)+macintosh_vndr/%l%(v)