Tue Aug 29 07:53:54 2017 UTC ()
update for xkeyboard-config 2.21.
prepare for libdrm data files.


(mrg)
diff -r1.143 -r1.144 src/distrib/sets/lists/xbase/mi
diff -r1.21 -r1.22 src/etc/mtree/NetBSD.dist.Xorg
diff -r1.5 -r1.6 src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile
diff -r1.12 -r1.13 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
cvs diff -r1.143 -r1.144 src/distrib/sets/lists/xbase/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/xbase/mi 2017/02/13 06:11:01 1.143
+++ src/distrib/sets/lists/xbase/mi 2017/08/29 07:53:54 1.144
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.143 2017/02/13 06:11:01 snj Exp $ 1# $NetBSD: mi,v 1.144 2017/08/29 07:53:54 mrg Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./etc/mtree/set.xbase xbase-sys-root 5./etc/mtree/set.xbase xbase-sys-root
6./usr/X11R7 base-x11-root xorg 6./usr/X11R7 base-x11-root xorg
7./usr/X11R7/bin base-x11-root xorg 7./usr/X11R7/bin base-x11-root xorg
8./usr/X11R7/bin/Xmark -unknown- xorg 8./usr/X11R7/bin/Xmark -unknown- xorg
9./usr/X11R7/bin/appres -unknown- xorg 9./usr/X11R7/bin/appres -unknown- xorg
10./usr/X11R7/bin/atobm -unknown- xorg 10./usr/X11R7/bin/atobm -unknown- xorg
11./usr/X11R7/bin/bdftopcf -unknown- xorg 11./usr/X11R7/bin/bdftopcf -unknown- xorg
12./usr/X11R7/bin/bdftruncate -unknown- xorg 12./usr/X11R7/bin/bdftruncate -unknown- xorg
13./usr/X11R7/bin/beforelight -unknown- xorg 13./usr/X11R7/bin/beforelight -unknown- xorg
14./usr/X11R7/bin/bitmap -unknown- xorg 14./usr/X11R7/bin/bitmap -unknown- xorg
@@ -664,26 +664,27 @@ @@ -664,26 +664,27 @@
664./usr/X11R7/lib/X11/xkb/geometry/nokia -unknown- xorg 664./usr/X11R7/lib/X11/xkb/geometry/nokia -unknown- xorg
665./usr/X11R7/lib/X11/xkb/geometry/northgate -unknown- xorg 665./usr/X11R7/lib/X11/xkb/geometry/northgate -unknown- xorg
666./usr/X11R7/lib/X11/xkb/geometry/pc -unknown- xorg 666./usr/X11R7/lib/X11/xkb/geometry/pc -unknown- xorg
667./usr/X11R7/lib/X11/xkb/geometry/sanwa -unknown- xorg 667./usr/X11R7/lib/X11/xkb/geometry/sanwa -unknown- xorg
668./usr/X11R7/lib/X11/xkb/geometry/sgi -unknown- obsolete 668./usr/X11R7/lib/X11/xkb/geometry/sgi -unknown- obsolete
669./usr/X11R7/lib/X11/xkb/geometry/sgi/O2 -unknown- obsolete 669./usr/X11R7/lib/X11/xkb/geometry/sgi/O2 -unknown- obsolete
670./usr/X11R7/lib/X11/xkb/geometry/sgi/indigo -unknown- obsolete 670./usr/X11R7/lib/X11/xkb/geometry/sgi/indigo -unknown- obsolete
671./usr/X11R7/lib/X11/xkb/geometry/sgi/indy -unknown- obsolete 671./usr/X11R7/lib/X11/xkb/geometry/sgi/indy -unknown- obsolete
672./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr base-x11-root xorg 672./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr base-x11-root xorg
673./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/O2 -unknown- xorg 673./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/O2 -unknown- xorg
674./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indigo -unknown- xorg 674./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indigo -unknown- xorg
675./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indy -unknown- xorg 675./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indy -unknown- xorg
676./usr/X11R7/lib/X11/xkb/geometry/sony -unknown- xorg 676./usr/X11R7/lib/X11/xkb/geometry/sony -unknown- xorg
 677./usr/X11R7/lib/X11/xkb/geometry/steelseries -unknown- xorg
677./usr/X11R7/lib/X11/xkb/geometry/sun -unknown- xorg 678./usr/X11R7/lib/X11/xkb/geometry/sun -unknown- xorg
678./usr/X11R7/lib/X11/xkb/geometry/teck -unknown- xorg 679./usr/X11R7/lib/X11/xkb/geometry/teck -unknown- xorg
679./usr/X11R7/lib/X11/xkb/geometry/thinkpad -unknown- xorg 680./usr/X11R7/lib/X11/xkb/geometry/thinkpad -unknown- xorg
680./usr/X11R7/lib/X11/xkb/geometry/typematrix -unknown- xorg 681./usr/X11R7/lib/X11/xkb/geometry/typematrix -unknown- xorg
681./usr/X11R7/lib/X11/xkb/geometry/winbook -unknown- xorg 682./usr/X11R7/lib/X11/xkb/geometry/winbook -unknown- xorg
682./usr/X11R7/lib/X11/xkb/keycodes base-x11-root xorg 683./usr/X11R7/lib/X11/xkb/keycodes base-x11-root xorg
683./usr/X11R7/lib/X11/xkb/keycodes.dir -unknown- obsolete 684./usr/X11R7/lib/X11/xkb/keycodes.dir -unknown- obsolete
684./usr/X11R7/lib/X11/xkb/keycodes/README -unknown- xorg 685./usr/X11R7/lib/X11/xkb/keycodes/README -unknown- xorg
685./usr/X11R7/lib/X11/xkb/keycodes/aliases -unknown- xorg 686./usr/X11R7/lib/X11/xkb/keycodes/aliases -unknown- xorg
686./usr/X11R7/lib/X11/xkb/keycodes/amiga -unknown- xorg 687./usr/X11R7/lib/X11/xkb/keycodes/amiga -unknown- xorg
687./usr/X11R7/lib/X11/xkb/keycodes/ataritt -unknown- xorg 688./usr/X11R7/lib/X11/xkb/keycodes/ataritt -unknown- xorg
688./usr/X11R7/lib/X11/xkb/keycodes/digital -unknown- obsolete 689./usr/X11R7/lib/X11/xkb/keycodes/digital -unknown- obsolete
689./usr/X11R7/lib/X11/xkb/keycodes/digital/lk -unknown- obsolete 690./usr/X11R7/lib/X11/xkb/keycodes/digital/lk -unknown- obsolete
@@ -838,27 +839,27 @@ @@ -838,27 +839,27 @@
838./usr/X11R7/lib/X11/xkb/symbols/am -unknown- xorg 839./usr/X11R7/lib/X11/xkb/symbols/am -unknown- xorg
839./usr/X11R7/lib/X11/xkb/symbols/apl -unknown- xorg 840./usr/X11R7/lib/X11/xkb/symbols/apl -unknown- xorg
840./usr/X11R7/lib/X11/xkb/symbols/apple -unknown- obsolete 841./usr/X11R7/lib/X11/xkb/symbols/apple -unknown- obsolete
841./usr/X11R7/lib/X11/xkb/symbols/ar -unknown- obsolete 842./usr/X11R7/lib/X11/xkb/symbols/ar -unknown- obsolete
842./usr/X11R7/lib/X11/xkb/symbols/ara -unknown- xorg 843./usr/X11R7/lib/X11/xkb/symbols/ara -unknown- xorg
843./usr/X11R7/lib/X11/xkb/symbols/at -unknown- xorg 844./usr/X11R7/lib/X11/xkb/symbols/at -unknown- xorg
844./usr/X11R7/lib/X11/xkb/symbols/au -unknown- xorg 845./usr/X11R7/lib/X11/xkb/symbols/au -unknown- xorg
845./usr/X11R7/lib/X11/xkb/symbols/az -unknown- xorg 846./usr/X11R7/lib/X11/xkb/symbols/az -unknown- xorg
846./usr/X11R7/lib/X11/xkb/symbols/ba -unknown- xorg 847./usr/X11R7/lib/X11/xkb/symbols/ba -unknown- xorg
847./usr/X11R7/lib/X11/xkb/symbols/bd -unknown- xorg 848./usr/X11R7/lib/X11/xkb/symbols/bd -unknown- xorg
848./usr/X11R7/lib/X11/xkb/symbols/be -unknown- xorg 849./usr/X11R7/lib/X11/xkb/symbols/be -unknown- xorg
849./usr/X11R7/lib/X11/xkb/symbols/ben -unknown- obsolete 850./usr/X11R7/lib/X11/xkb/symbols/ben -unknown- obsolete
850./usr/X11R7/lib/X11/xkb/symbols/bg -unknown- xorg 851./usr/X11R7/lib/X11/xkb/symbols/bg -unknown- xorg
851./usr/X11R7/lib/X11/xkb/symbols/bn -unknown- xorg 852./usr/X11R7/lib/X11/xkb/symbols/bn -unknown- obsolete
852./usr/X11R7/lib/X11/xkb/symbols/br -unknown- xorg 853./usr/X11R7/lib/X11/xkb/symbols/br -unknown- xorg
853./usr/X11R7/lib/X11/xkb/symbols/brai -unknown- xorg 854./usr/X11R7/lib/X11/xkb/symbols/brai -unknown- xorg
854./usr/X11R7/lib/X11/xkb/symbols/braille -unknown- obsolete 855./usr/X11R7/lib/X11/xkb/symbols/braille -unknown- obsolete
855./usr/X11R7/lib/X11/xkb/symbols/bs -unknown- obsolete 856./usr/X11R7/lib/X11/xkb/symbols/bs -unknown- obsolete
856./usr/X11R7/lib/X11/xkb/symbols/bt -unknown- xorg 857./usr/X11R7/lib/X11/xkb/symbols/bt -unknown- xorg
857./usr/X11R7/lib/X11/xkb/symbols/bw -unknown- xorg 858./usr/X11R7/lib/X11/xkb/symbols/bw -unknown- xorg
858./usr/X11R7/lib/X11/xkb/symbols/by -unknown- xorg 859./usr/X11R7/lib/X11/xkb/symbols/by -unknown- xorg
859./usr/X11R7/lib/X11/xkb/symbols/ca -unknown- xorg 860./usr/X11R7/lib/X11/xkb/symbols/ca -unknown- xorg
860./usr/X11R7/lib/X11/xkb/symbols/ca_enhanced -unknown- obsolete 861./usr/X11R7/lib/X11/xkb/symbols/ca_enhanced -unknown- obsolete
861./usr/X11R7/lib/X11/xkb/symbols/capslock -unknown- xorg 862./usr/X11R7/lib/X11/xkb/symbols/capslock -unknown- xorg
862./usr/X11R7/lib/X11/xkb/symbols/cd -unknown- xorg 863./usr/X11R7/lib/X11/xkb/symbols/cd -unknown- xorg
863./usr/X11R7/lib/X11/xkb/symbols/ch -unknown- xorg 864./usr/X11R7/lib/X11/xkb/symbols/ch -unknown- xorg
864./usr/X11R7/lib/X11/xkb/symbols/cm -unknown- xorg 865./usr/X11R7/lib/X11/xkb/symbols/cm -unknown- xorg
@@ -1685,26 +1686,27 @@ @@ -1685,26 +1686,27 @@
1685./usr/X11R7/man/man7/XProjectTeam.7 -unknown- .man,xorg 1686./usr/X11R7/man/man7/XProjectTeam.7 -unknown- .man,xorg
1686./usr/X11R7/man/man7/Xsecurity.7 -unknown- .man,xorg 1687./usr/X11R7/man/man7/Xsecurity.7 -unknown- .man,xorg
1687./usr/X11R7/man/man7/xkeyboard-config.7 -unknown- .man,xorg 1688./usr/X11R7/man/man7/xkeyboard-config.7 -unknown- .man,xorg
1688./usr/X11R7/man/whatis.db -unknown- man,xorg,!makemandb 1689./usr/X11R7/man/whatis.db -unknown- man,xorg,!makemandb
1689./usr/X11R7/share base-x11-root xorg 1690./usr/X11R7/share base-x11-root xorg
1690./usr/X11R7/share/aclocal base-x11-root xorg 1691./usr/X11R7/share/aclocal base-x11-root xorg
1691./usr/X11R7/share/examples base-x11-root xorg 1692./usr/X11R7/share/examples base-x11-root xorg
1692./usr/X11R7/share/examples/ssh-askpass base-x11-root xorg 1693./usr/X11R7/share/examples/ssh-askpass base-x11-root xorg
1693./usr/X11R7/share/examples/ssh-askpass/SshAskpass-1337.ad -unknown- xorg 1694./usr/X11R7/share/examples/ssh-askpass/SshAskpass-1337.ad -unknown- xorg
1694./usr/X11R7/share/examples/ssh-askpass/SshAskpass-NeXTish.ad -unknown- xorg 1695./usr/X11R7/share/examples/ssh-askpass/SshAskpass-NeXTish.ad -unknown- xorg
1695./usr/X11R7/share/examples/ssh-askpass/SshAskpass-default.ad -unknown- xorg 1696./usr/X11R7/share/examples/ssh-askpass/SshAskpass-default.ad -unknown- xorg
1696./usr/X11R7/share/examples/ssh-askpass/SshAskpass-green.ad -unknown- xorg 1697./usr/X11R7/share/examples/ssh-askpass/SshAskpass-green.ad -unknown- xorg
1697./usr/X11R7/share/examples/ssh-askpass/SshAskpass-motif.ad -unknown- xorg 1698./usr/X11R7/share/examples/ssh-askpass/SshAskpass-motif.ad -unknown- xorg
 1699./usr/X11R7/share/libdrm base-x11-root xorg
1698./usr/X11R7/share/pciids base-x11-root xorg 1700./usr/X11R7/share/pciids base-x11-root xorg
1699./usr/X11R7/share/xcb base-x11-root xorg 1701./usr/X11R7/share/xcb base-x11-root xorg
1700./usr/libdata/debug/usr/X11R7 base-sys-usr xorg 1702./usr/libdata/debug/usr/X11R7 base-sys-usr xorg
1701./usr/libdata/debug/usr/X11R7/bin base-sys-usr xorg 1703./usr/libdata/debug/usr/X11R7/bin base-sys-usr xorg
1702./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,compatx11dir 1704./usr/libdata/debug/usr/X11R7/lib base-sys-usr xorg,compatx11dir
1703./usr/libdata/debug/usr/X11R7/lib/X11 base-sys-usr xorg 1705./usr/libdata/debug/usr/X11R7/lib/X11 base-sys-usr xorg
1704./usr/libdata/debug/usr/X11R7/lib/X11/locale base-sys-usr xorg 1706./usr/libdata/debug/usr/X11R7/lib/X11/locale base-sys-usr xorg
1705./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib base-sys-usr xorg 1707./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib base-sys-usr xorg
1706./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common base-sys-usr xorg 1708./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common base-sys-usr xorg
1707./usr/libdata/debug/usr/X11R7/lib/modules base-sys-usr xorg 1709./usr/libdata/debug/usr/X11R7/lib/modules base-sys-usr xorg
1708./usr/libdata/debug/usr/X11R7/lib/modules/dri base-sys-usr xorg 1710./usr/libdata/debug/usr/X11R7/lib/modules/dri base-sys-usr xorg
1709./usr/libdata/debug/usr/X11R7/lib/modules/drivers base-sys-usr xorg 1711./usr/libdata/debug/usr/X11R7/lib/modules/drivers base-sys-usr xorg
1710./usr/libdata/debug/usr/X11R7/lib/modules/extensions base-sys-usr xorg 1712./usr/libdata/debug/usr/X11R7/lib/modules/extensions base-sys-usr xorg
cvs diff -r1.21 -r1.22 src/etc/mtree/NetBSD.dist.Xorg (expand / switch to unified diff)

--- src/etc/mtree/NetBSD.dist.Xorg 2017/02/13 04:23:19 1.21
+++ src/etc/mtree/NetBSD.dist.Xorg 2017/08/29 07:53:54 1.22
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: NetBSD.dist.Xorg,v 1.21 2017/02/13 04:23:19 snj Exp $ 1# $NetBSD: NetBSD.dist.Xorg,v 1.22 2017/08/29 07:53:54 mrg Exp $
2./usr/X11R7 2./usr/X11R7
3./usr/X11R7/bin 3./usr/X11R7/bin
4./usr/X11R7/include 4./usr/X11R7/include
5./usr/X11R7/include/DPS 5./usr/X11R7/include/DPS
6./usr/X11R7/include/GL 6./usr/X11R7/include/GL
7./usr/X11R7/include/GL/internal 7./usr/X11R7/include/GL/internal
8./usr/X11R7/include/X11 8./usr/X11R7/include/X11
9./usr/X11R7/include/X11/ICE 9./usr/X11R7/include/X11/ICE
10./usr/X11R7/include/X11/PM 10./usr/X11R7/include/X11/PM
11./usr/X11R7/include/X11/SM 11./usr/X11R7/include/X11/SM
12./usr/X11R7/include/X11/Xaw 12./usr/X11R7/include/X11/Xaw
13./usr/X11R7/include/X11/Xcursor 13./usr/X11R7/include/X11/Xcursor
14./usr/X11R7/include/X11/Xft 14./usr/X11R7/include/X11/Xft
@@ -162,26 +162,27 @@ @@ -162,26 +162,27 @@
162./usr/X11R7/man/html4/x86 162./usr/X11R7/man/html4/x86
163./usr/X11R7/man/html5 163./usr/X11R7/man/html5
164./usr/X11R7/man/html7 164./usr/X11R7/man/html7
165./usr/X11R7/man/man1 165./usr/X11R7/man/man1
166./usr/X11R7/man/man3 166./usr/X11R7/man/man3
167./usr/X11R7/man/man4 167./usr/X11R7/man/man4
168./usr/X11R7/man/man4/x86 168./usr/X11R7/man/man4/x86
169./usr/X11R7/man/man5 169./usr/X11R7/man/man5
170./usr/X11R7/man/man7 170./usr/X11R7/man/man7
171./usr/X11R7/share 171./usr/X11R7/share
172./usr/X11R7/share/aclocal 172./usr/X11R7/share/aclocal
173./usr/X11R7/share/examples 173./usr/X11R7/share/examples
174./usr/X11R7/share/examples/ssh-askpass 174./usr/X11R7/share/examples/ssh-askpass
 175./usr/X11R7/share/libdrm
175./usr/X11R7/share/pciids 176./usr/X11R7/share/pciids
176./usr/X11R7/share/xcb 177./usr/X11R7/share/xcb
177./usr/libdata/debug/usr/X11R7 178./usr/libdata/debug/usr/X11R7
178./usr/libdata/debug/usr/X11R7/bin 179./usr/libdata/debug/usr/X11R7/bin
179./usr/libdata/debug/usr/X11R7/lib 180./usr/libdata/debug/usr/X11R7/lib
180./usr/libdata/debug/usr/X11R7/lib/X11 181./usr/libdata/debug/usr/X11R7/lib/X11
181./usr/libdata/debug/usr/X11R7/lib/X11/locale 182./usr/libdata/debug/usr/X11R7/lib/X11/locale
182./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib 183./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib
183./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common 184./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common
184./usr/libdata/debug/usr/X11R7/lib/modules 185./usr/libdata/debug/usr/X11R7/lib/modules
185./usr/libdata/debug/usr/X11R7/lib/modules/dri 186./usr/libdata/debug/usr/X11R7/lib/modules/dri
186./usr/libdata/debug/usr/X11R7/lib/modules/drivers 187./usr/libdata/debug/usr/X11R7/lib/modules/drivers
187./usr/libdata/debug/usr/X11R7/lib/modules/extensions 188./usr/libdata/debug/usr/X11R7/lib/modules/extensions
cvs diff -r1.5 -r1.6 src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile 2017/02/13 06:11:01 1.5
+++ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile 2017/08/29 07:53:54 1.6
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.5 2017/02/13 06:11:01 snj Exp $ 1# $NetBSD: Makefile,v 1.6 2017/08/29 07:53:54 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5XKBNAME= geometry 5XKBNAME= geometry
6FILES= README amiga ataritt chicony dell everex fujitsu hhk hp \ 6FILES= README amiga ataritt chicony dell everex fujitsu hhk hp \
7 keytronic kinesis macintosh microsoft nec nokia northgate \ 7 keytronic kinesis macintosh microsoft nec nokia northgate \
8 pc sanwa sony sun teck thinkpad typematrix winbook 8 pc sanwa sony steelseries sun teck thinkpad typematrix winbook
9 9
10SUBDIR= digital_vndr sgi_vndr 10SUBDIR= digital_vndr sgi_vndr
11 11
12.include "../Makefile.xkbdata" 12.include "../Makefile.xkbdata"
13 13
14.include <bsd.x11.mk> 14.include <bsd.x11.mk>
15.include <bsd.prog.mk> 15.include <bsd.prog.mk>
16.include <bsd.subdir.mk> 16.include <bsd.subdir.mk>
cvs diff -r1.12 -r1.13 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile (expand / switch to unified diff)

--- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile 2017/02/13 06:11:01 1.12
+++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile 2017/08/29 07:53:54 1.13
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.12 2017/02/13 06:11:01 snj Exp $ 1# $NetBSD: Makefile,v 1.13 2017/08/29 07:53:54 mrg Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5XKBNAME= symbols 5XKBNAME= symbols
6 6
7FILES= af al altwin am apl ara at au az \ 7FILES= af al altwin am apl ara at au az \
8 ba bd be bg bn br brai bt bw by \ 8 ba bd be bg br brai bt bw by \
9 ca capslock cd ch cm cn compose ctrl cz \ 9 ca capslock cd ch cm cn compose ctrl cz \
10 de dk dz \ 10 de dk dz \
11 ee empty epo es et eu eurosign \ 11 ee empty epo es et eu eurosign \
12 fi fo fr \ 12 fi fo fr \
13 gb ge gh gn gr group \ 13 gb ge gh gn gr group \
14 hr hu \ 14 hr hu \
15 id ie il in inet iq ir is it \ 15 id ie il in inet iq ir is it \
16 jp \ 16 jp \
17 ke keypad kg kh kpdl kr kz \ 17 ke keypad kg kh kpdl kr kz \
18 la latam latin level3 level5 lk lt lv \ 18 la latam latin level3 level5 lk lt lv \
19 ma mao md me mk ml mm mn mt mv my \ 19 ma mao md me mk ml mm mn mt mv my \
20 nbsp ng nl no np \ 20 nbsp ng nl no np \
21 olpc \ 21 olpc \