Index: share/cats.dgc
===================================================================
--- share/cats.dgc	(revision 5f4d9c3b32eea7b6643a751aa75bdb05b7d41576)
+++ share/cats.dgc	(revision e7de6cc88c605c4f810cbc852e843294b4b0e8ac)
@@ -1,243 +1,132 @@
-ADJ/DcNpCaGp
-ADJ/DcNpCd
-ADJ/DcNpCgl
-ADJ/DcNpCi
-ADJ/DcNpCnavGaifn
-ADJ/DcNpCnvGp
-ADJ/DcNsCaGi
-ADJ/DcNsCaGpa
-ADJ/DcNsCaiGf
-ADJ/DcNsCavGf
-ADJ/DcNsCdGpain
-ADJ/DcNsCgdlGf
-ADJ/DcNsCgGpain
-ADJ/DcNsCilGpain
-ADJ/DcNsCnavGn
-ADJ/DcNsCnvGpai
-ADJ/DpNpCaGp
-ADJ/DpNpCd
-ADJ/DpNpCgl
-ADJ/DpNpCi
-ADJ/DpNpCnavGaifn
-ADJ/DpNpCnvGp
-ADJ/DpNsCaGi
-ADJ/DpNsCaGpa
-ADJ/DpNsCaiGf
-ADJ/DpNsCavGf
-ADJ/DpNsCdGpain
-ADJ/DpNsCgdlGf
-ADJ/DpNsCgGpain
-ADJ/DpNsCilGpain
-ADJ/DpNsCnavGn
-ADJ/DpNsCnvGpai
-ADJ/DsNpCaGp
-ADJ/DsNpCd
-ADJ/DsNpCgl
-ADJ/DsNpCi
-ADJ/DsNpCnavGaifn
-ADJ/DsNpCnvGp
-ADJ/DsNsCaGi
-ADJ/DsNsCaGpa
-ADJ/DsNsCaiGf
-ADJ/DsNsCavGf
-ADJ/DsNsCdGpain
-ADJ/DsNsCgdlGf
-ADJ/DsNsCgGpain
-ADJ/DsNsCilGpain
-ADJ/DsNsCnavGn
-ADJ/DsNsCnvGpai
-ADJNUM/NpCaGp
-ADJNUM/NpCd
-ADJNUM/NpCgl
-ADJNUM/NpCi
-ADJNUM/NpCnavGaifn
-ADJNUM/NpCnvGp
-ADJNUM/NsCaGi
-ADJNUM/NsCaGpa
-ADJNUM/NsCaiGf
-ADJNUM/NsCavGf
-ADJNUM/NsCdGpain
-ADJNUM/NsCgdlGf
-ADJNUM/NsCgGpain
-ADJNUM/NsCilGpain
-ADJNUM/NsCnavGn
-ADJNUM/NsCnvGpai
-ADJPAP/NpCaGp
-ADJPAP/NpCd
-ADJPAP/NpCgl
-ADJPAP/NpCi
-ADJPAP/NpCnavGaifn
-ADJPAP/NpCnvGp
-ADJPAP/NsCaGi
-ADJPAP/NsCaGpa
-ADJPAP/NsCaiGf
-ADJPAP/NsCavGf
-ADJPAP/NsCdGpain
-ADJPAP/NsCgdlGf
-ADJPAP/NsCgGpain
-ADJPAP/NsCilGpain
-ADJPAP/NsCnavGn
-ADJPAP/NsCnvGpai
-ADJPP/NpCaGp
-ADJPP/NpCd
-ADJPP/NpCgl
-ADJPP/NpCi
-ADJPP/NpCnavGaifn
-ADJPP/NpCnvGp
-ADJPP/NsCaGi
-ADJPP/NsCaGpa
-ADJPP/NsCaiGf
-ADJPP/NsCavGf
-ADJPP/NsCdGpain
-ADJPP/NsCgdlGf
-ADJPP/NsCgGpain
-ADJPP/NsCilGpain
-ADJPP/NsCnavGn
-ADJPP/NsCnvGpai
-ADJPRO/NpCaGp
-ADJPRO/NpCd
-ADJPRO/NpCgl
-ADJPRO/NpCi
-ADJPRO/NpCnavGaifn
-ADJPRO/NpCnvGp
-ADJPRO/NsCaGi
-ADJPRO/NsCaGpa
-ADJPRO/NsCaiGf
-ADJPRO/NsCavGf
-ADJPRO/NsCdGpain
-ADJPRO/NsCgdlGf
-ADJPRO/NsCgGpain
-ADJPRO/NsCilGpain
-ADJPRO/NsCnavGn
-ADJPRO/NsCnvGpai
-ADJPRO/ZdNpCaGp
-ADJPRO/ZdNpCd
-ADJPRO/ZdNpCgl
-ADJPRO/ZdNpCi
-ADJPRO/ZdNpCnavGaifn
-ADJPRO/ZdNpCnvGp
-ADJPRO/ZdNsCaGi
-ADJPRO/ZdNsCaGpa
-ADJPRO/ZdNsCaiGf
-ADJPRO/ZdNsCavGf
-ADJPRO/ZdNsCdGpain
-ADJPRO/ZdNsCgdlGf
-ADJPRO/ZdNsCgGpain
-ADJPRO/ZdNsCilGpain
-ADJPRO/ZdNsCnavGn
-ADJPRO/ZdNsCnvGpai
-ADJPRO/ZgNpCaGp
-ADJPRO/ZgNpCd
-ADJPRO/ZgNpCgl
-ADJPRO/ZgNpCi
-ADJPRO/ZgNpCnavGaifn
-ADJPRO/ZgNpCnvGp
-ADJPRO/ZgNsCaGi
-ADJPRO/ZgNsCaGpa
-ADJPRO/ZgNsCaiGf
-ADJPRO/ZgNsCavGf
-ADJPRO/ZgNsCdGpain
-ADJPRO/ZgNsCgdlGf
-ADJPRO/ZgNsCgGpain
-ADJPRO/ZgNsCilGpain
-ADJPRO/ZgNsCnavGn
-ADJPRO/ZgNsCnvGpai
-ADJPRO/ZiNpCaGp
-ADJPRO/ZiNpCd
-ADJPRO/ZiNpCgl
-ADJPRO/ZiNpCi
-ADJPRO/ZiNpCnavGaifn
-ADJPRO/ZiNpCnvGp
-ADJPRO/ZiNsCaGi
-ADJPRO/ZiNsCaGpa
-ADJPRO/ZiNsCaiGf
-ADJPRO/ZiNsCavGf
-ADJPRO/ZiNsCdGpain
-ADJPRO/ZiNsCgdlGf
-ADJPRO/ZiNsCgGpain
-ADJPRO/ZiNsCilGpain
-ADJPRO/ZiNsCnavGn
-ADJPRO/ZiNsCnvGpai
-ADJPRO/ZnNpCaGp
-ADJPRO/ZnNpCd
-ADJPRO/ZnNpCgl
-ADJPRO/ZnNpCi
-ADJPRO/ZnNpCnavGaifn
-ADJPRO/ZnNpCnvGp
-ADJPRO/ZnNsCaGi
-ADJPRO/ZnNsCaGpa
-ADJPRO/ZnNsCaiGf
-ADJPRO/ZnNsCavGf
-ADJPRO/ZnNsCdGpain
-ADJPRO/ZnNsCgdlGf
-ADJPRO/ZnNsCgGpain
-ADJPRO/ZnNsCilGpain
-ADJPRO/ZnNsCnavGn
-ADJPRO/ZnNsCnvGpai
-ADJPRO/ZqNpCaGp
-ADJPRO/ZqNpCd
-ADJPRO/ZqNpCgl
-ADJPRO/ZqNpCi
-ADJPRO/ZqNpCnavGaifn
-ADJPRO/ZqNpCnvGp
-ADJPRO/ZqNsCaGi
-ADJPRO/ZqNsCaGpa
-ADJPRO/ZqNsCaiGf
-ADJPRO/ZqNsCavGf
-ADJPRO/ZqNsCdGpain
-ADJPRO/ZqNsCgdlGf
-ADJPRO/ZqNsCgGpain
-ADJPRO/ZqNsCilGpain
-ADJPRO/ZqNsCnavGn
-ADJPRO/ZqNsCnvGpai
-ADJPRO/ZqrNpCaGp
-ADJPRO/ZqrNpCd
-ADJPRO/ZqrNpCgl
-ADJPRO/ZqrNpCi
-ADJPRO/ZqrNpCnavGaifn
-ADJPRO/ZqrNpCnvGp
-ADJPRO/ZqrNsCaGi
-ADJPRO/ZqrNsCaGpa
-ADJPRO/ZqrNsCaiGf
-ADJPRO/ZqrNsCavGf
-ADJPRO/ZqrNsCdGpain
-ADJPRO/ZqrNsCgdlGf
-ADJPRO/ZqrNsCgGpain
-ADJPRO/ZqrNsCilGpain
-ADJPRO/ZqrNsCnavGn
-ADJPRO/ZqrNsCnvGpai
-ADJPRO/ZsNpCaGp
-ADJPRO/ZsNpCd
-ADJPRO/ZsNpCgl
-ADJPRO/ZsNpCi
-ADJPRO/ZsNpCnavGaifn
-ADJPRO/ZsNpCnvGp
-ADJPRO/ZsNsCaGi
-ADJPRO/ZsNsCaGpa
-ADJPRO/ZsNsCaiGf
-ADJPRO/ZsNsCavGf
-ADJPRO/ZsNsCdGpain
-ADJPRO/ZsNsCgdlGf
-ADJPRO/ZsNsCgGpain
-ADJPRO/ZsNsCilGpain
-ADJPRO/ZsNsCnavGn
-ADJPRO/ZsNsCnvGpai
-ADJPRP/NpCaGp
-ADJPRP/NpCd
-ADJPRP/NpCgl
-ADJPRP/NpCi
-ADJPRP/NpCnavGaifn
-ADJPRP/NpCnvGp
-ADJPRP/NsCaGi
-ADJPRP/NsCaGpa
-ADJPRP/NsCaiGf
-ADJPRP/NsCavGf
-ADJPRP/NsCdGpain
-ADJPRP/NsCgdlGf
-ADJPRP/NsCgGpain
-ADJPRP/NsCilGpain
-ADJPRP/NsCnavGn
-ADJPRP/NsCnvGpai
+ADJ/CaDcGapNs
+ADJ/CaDcGiNs
+ADJ/CaDcGpNp
+ADJ/CaDpGapNs
+ADJ/CaDpGiNs
+ADJ/CaDpGpNp
+ADJ/CaDsGapNs
+ADJ/CaDsGiNs
+ADJ/CaDsGpNp
+ADJ/CaiDcGfNs
+ADJ/CaiDpGfNs
+ADJ/CaiDsGfNs
+ADJ/CanvDcGafinNp
+ADJ/CanvDcGnNs
+ADJ/CanvDpGafinNp
+ADJ/CanvDpGfNs
+ADJ/CanvDpGnNs
+ADJ/CanvDsGafinNp
+ADJ/CanvDsGnNs
+ADJ/CavDcGfNs
+ADJ/CavDsGfNs
+ADJ/CdDcGainpNs
+ADJ/CdDcNp
+ADJ/CdDpGainpNs
+ADJ/CdDpNp
+ADJ/CdDsGainpNs
+ADJ/CdDsNp
+ADJ/CdglDcGfNs
+ADJ/CdglDpGfNs
+ADJ/CdglDsGfNs
+ADJ/CgDcGainpNs
+ADJ/CgDpGainpNs
+ADJ/CgDsGainpNs
+ADJ/CglDcNp
+ADJ/CglDpNp
+ADJ/CglDsNp
+ADJ/CiDcNp
+ADJ/CiDpNp
+ADJ/CiDsNp
+ADJ/CilDcGainpNs
+ADJ/CilDpGainpNs
+ADJ/CilDsGainpNs
+ADJ/CnvDcGaipNs
+ADJ/CnvDcGpNp
+ADJ/CnvDpGaipNs
+ADJ/CnvDpGpNp
+ADJ/CnvDsGaipNs
+ADJ/CnvDsGpNp
+ADJNUM/CaGapNs
+ADJNUM/CaGiNs
+ADJNUM/CaGpNp
+ADJNUM/CaiGfNs
+ADJNUM/CanvGafinNp
+ADJNUM/CanvGnNs
+ADJNUM/CdGainpNs
+ADJNUM/CdglGfNs
+ADJNUM/CdNp
+ADJNUM/CgGainpNs
+ADJNUM/CglNp
+ADJNUM/CilGainpNs
+ADJNUM/CiNp
+ADJNUM/CnvGaipNs
+ADJNUM/CnvGfNs
+ADJNUM/CnvGpNp
+ADJPAP/CaGapNs
+ADJPAP/CaGiNs
+ADJPAP/CaGpNp
+ADJPAP/CaiGfNs
+ADJPAP/CanvGafinNp
+ADJPAP/CanvGnNs
+ADJPAP/CdGainpNs
+ADJPAP/CdglGfNs
+ADJPAP/CdNp
+ADJPAP/CgGainpNs
+ADJPAP/CglNp
+ADJPAP/CilGainpNs
+ADJPAP/CiNp
+ADJPAP/CnvGaipNs
+ADJPAP/CnvGfNs
+ADJPAP/CnvGpNp
+ADJPP/CaGapNs
+ADJPP/CaGiNs
+ADJPP/CaGpNp
+ADJPP/CaiGfNs
+ADJPP/CanvGafinNp
+ADJPP/CanvGnNs
+ADJPP/CdGainpNs
+ADJPP/CdglGfNs
+ADJPP/CdNp
+ADJPP/CgGainpNs
+ADJPP/CglNp
+ADJPP/CilGainpNs
+ADJPP/CiNp
+ADJPP/CnvGaipNs
+ADJPP/CnvGfNs
+ADJPP/CnvGpNp
+ADJPRO/CaGapNs
+ADJPRO/CaGiNs
+ADJPRO/CaGpNp
+ADJPRO/CaiGfNs
+ADJPRO/CanvGafinNp
+ADJPRO/CanvGnNs
+ADJPRO/CdGainpNs
+ADJPRO/CdglGfNs
+ADJPRO/CdNp
+ADJPRO/CgGainpNs
+ADJPRO/CglNp
+ADJPRO/CilGainpNs
+ADJPRO/CiNp
+ADJPRO/CnvGaipNs
+ADJPRO/CnvGfNs
+ADJPRO/CnvGpNp
+ADJPRP/CaGapNs
+ADJPRP/CaGiNs
+ADJPRP/CaGpNp
+ADJPRP/CaiGfNs
+ADJPRP/CanvGafinNp
+ADJPRP/CanvGnNs
+ADJPRP/CdGainpNs
+ADJPRP/CdglGfNs
+ADJPRP/CdNp
+ADJPRP/CgGainpNs
+ADJPRP/CglNp
+ADJPRP/CilGainpNs
+ADJPRP/CiNp
+ADJPRP/CnvGaipNs
+ADJPRP/CnvGfNs
+ADJPRP/CnvGpNp
 ADVANP
+ADVANP/C
 ADV/Dc
 ADV/Dp
@@ -245,254 +134,196 @@
 ADVNUM
 ADVPRO
-ADVPRO/Zd
-ADVPRO/Zi
-ADVPRO/Zn
-ADVPRO/Zq
-ADVPRO/Zqr
-ADVPRO/Zr
+ADVPRO/C
 ADVPRP
+ADVPRP/C
 APP
+BYC/GafinMcNpP1Vp
+BYC/GafinMcNpP2Vp
+BYC/GafinMcNpP3Vp
+BYC/GafinMdNpP1TaVp
+BYC/GafinMdNpP2TaVp
+BYC/GafinMdNpP3TaVp
+BYC/GaipMcNsP1Vp
+BYC/GaipMcNsP2Vp
+BYC/GaipMcNsP3Vp
+BYC/GaipMdNsP1TaVp
+BYC/GaipMdNsP2TaVp
+BYC/GaipMdNsP3TaVp
+BYC/GfMcNsP1Vp
+BYC/GfMcNsP2Vp
+BYC/GfMcNsP3Vp
+BYC/GfMdNsP1TaVp
+BYC/GfMdNsP2TaVp
+BYC/GfMdNsP3TaVp
+BYC/GnMcNsP3Vp
+BYC/GnMdNsP3TaVp
+BYC/GpMcNpP1Vp
+BYC/GpMcNpP2Vp
+BYC/GpMcNpP3Vp
+BYC/GpMdNpP1TaVp
+BYC/GpMdNpP2TaVp
+BYC/GpMdNpP3TaVp
+BYC/MdNpP1TfrVp
+BYC/MdNpP2TfrVp
+BYC/MdNpP3TfrVp
+BYC/MdNsP1TfrVp
+BYC/MdNsP2TfrVp
+BYC/MdNsP3TfrVp
+BYC/MiNpP1Vp
+BYC/MiNpP2Vp
+BYC/MiNsP2Vp
 BYC/Vb
-BYC/VpMcNpP1Gaifn
-BYC/VpMcNpP1Gp
-BYC/VpMcNpP2Gaifn
-BYC/VpMcNpP2Gp
-BYC/VpMcNpP3Gaifn
-BYC/VpMcNpP3Gp
-BYC/VpMcNsP1Gf
-BYC/VpMcNsP1Gpai
-BYC/VpMcNsP2Gf
-BYC/VpMcNsP2Gpai
-BYC/VpMcNsP3Gf
-BYC/VpMcNsP3Gn
-BYC/VpMcNsP3Gpai
-BYC/VpMdTaNpP1Gaifn
-BYC/VpMdTaNpP1Gp
-BYC/VpMdTaNpP2Gaifn
-BYC/VpMdTaNpP2Gp
-BYC/VpMdTaNpP3Gaifn
-BYC/VpMdTaNpP3Gp
-BYC/VpMdTaNsP1Gf
-BYC/VpMdTaNsP1Gpai
-BYC/VpMdTaNsP2Gf
-BYC/VpMdTaNsP2Gpai
-BYC/VpMdTaNsP3Gf
-BYC/VpMdTaNsP3Gn
-BYC/VpMdTaNsP3Gpai
-BYC/VpMdTrfNpP1
-BYC/VpMdTrfNpP2
-BYC/VpMdTrfNpP3
-BYC/VpMdTrfNsP1
-BYC/VpMdTrfNsP2
-BYC/VpMdTrfNsP3
-BYC/VpMiNpP1
-BYC/VpMiNpP2
-BYC/VpMiNsP2
 CONJ
 EXCL
-N/GaNpCa
-N/GaNpCd
-N/GaNpCg
-N/GaNpCi
-N/GaNpCl
-N/GaNpCn
-N/GaNpCv
-N/GaNsCa
-N/GaNsCd
-N/GaNsCg
-N/GaNsCi
-N/GaNsCl
-N/GaNsCn
-N/GaNsCv
-N/GfNpCa
-N/GfNpCd
-N/GfNpCg
-N/GfNpCi
-N/GfNpCl
-N/GfNpCn
-N/GfNpCv
-N/GfNsCa
-N/GfNsCd
-N/GfNsCg
-N/GfNsCi
-N/GfNsCl
-N/GfNsCn
-N/GfNsCv
-N/GiNpCa
-N/GiNpCd
-N/GiNpCg
-N/GiNpCi
-N/GiNpCl
-N/GiNpCn
-N/GiNpCv
-N/GiNsCa
-N/GiNsCd
-N/GiNsCg
-N/GiNsCi
-N/GiNsCl
-N/GiNsCn
-N/GiNsCv
-N/GnNpCa
-N/GnNpCd
-N/GnNpCg
-N/GnNpCi
-N/GnNpCl
-N/GnNpCn
-N/GnNpCv
-N/GnNsCa
-N/GnNsCd
-N/GnNsCg
-N/GnNsCi
-N/GnNsCl
-N/GnNsCn
-N/GnNsCv
-N/G?NpCa
-N/G*NpCa
-N/G?NpCd
-N/G*NpCd
-N/G?NpCg
-N/G*NpCg
-N/G?NpCi
-N/G*NpCi
-N/G?NpCl
-N/G*NpCl
-N/G?NpCn
-N/G*NpCn
-N/G?NpCv
-N/G*NpCv
-N/G?NsCa
-N/G?NsCd
-N/G?NsCg
-N/G?NsCi
-N/G?NsCl
-N/G?NsCn
-N/G?NsCv
-N/GpNpCa
-N/GpNpCd
-N/GpNpCg
-N/GpNpCi
-N/GpNpCl
-N/GpNpCn
-N/GpNpCv
-N/GpNsCa
-N/GpNsCd
-N/GpNsCg
-N/GpNsCi
-N/GpNsCl
-N/GpNsCn
-N/GpNsCv
-NPRO/ZdGnNsCa
-NPRO/ZdGnNsCd
-NPRO/ZdGnNsCg
-NPRO/ZdGnNsCi
-NPRO/ZdGnNsCl
-NPRO/ZdGnNsCn
-NPRO/ZgGnNsCa
-NPRO/ZgGnNsCd
-NPRO/ZgGnNsCg
-NPRO/ZgGnNsCi
-NPRO/ZgGnNsCl
-NPRO/ZgGnNsCn
-NPRO/ZgGpNpCa
-NPRO/ZgGpNpCd
-NPRO/ZgGpNpCg
-NPRO/ZgGpNpCi
-NPRO/ZgGpNpCl
-NPRO/ZgGpNpCn
-NPRO/ZiGnNsCa
-NPRO/ZiGnNsCd
-NPRO/ZiGnNsCg
-NPRO/ZiGnNsCi
-NPRO/ZiGnNsCl
-NPRO/ZiGnNsCn
-NPRO/ZiGpNsCa
-NPRO/ZiGpNsCd
-NPRO/ZiGpNsCg
-NPRO/ZiGpNsCi
-NPRO/ZiGpNsCl
-NPRO/ZiGpNsCn
-NPRO/ZnGnNsCa
-NPRO/ZnGnNsCd
-NPRO/ZnGnNsCg
-NPRO/ZnGnNsCi
-NPRO/ZnGnNsCl
-NPRO/ZnGnNsCn
-NPRO/ZnGpNsCa
-NPRO/ZnGpNsCd
-NPRO/ZnGpNsCg
-NPRO/ZnGpNsCi
-NPRO/ZnGpNsCl
-NPRO/ZnGpNsCn
-NPRO/ZpGaifnNpCa
-NPRO/ZpGaifnNpCd
-NPRO/ZpGaifnNpCg
-NPRO/ZpGaifnNpCi
-NPRO/ZpGaifnNpCl
-NPRO/ZpGaifnNpCn
-NPRO/ZpGfNsCa
-NPRO/ZpGfNsCd
-NPRO/ZpGfNsCg
-NPRO/ZpGfNsCi
-NPRO/ZpGfNsCl
-NPRO/ZpGfNsCn
-NPRO/ZpGnNsCa
-NPRO/ZpGnNsCd
-NPRO/ZpGnNsCg
-NPRO/ZpGnNsCi
-NPRO/ZpGnNsCl
-NPRO/ZpGnNsCn
-NPRO/ZpG*NpCa
-NPRO/ZpG*NpCd
-NPRO/ZpG*NpCg
-NPRO/ZpG*NpCi
-NPRO/ZpG*NpCl
-NPRO/ZpG*NpCn
-NPRO/ZpG*NsCa
-NPRO/ZpG*NsCd
-NPRO/ZpG*NsCg
-NPRO/ZpG*NsCi
-NPRO/ZpG*NsCl
-NPRO/ZpG*NsCn
-NPRO/ZpGpaiNsCa
-NPRO/ZpGpaiNsCd
-NPRO/ZpGpaiNsCg
-NPRO/ZpGpaiNsCi
-NPRO/ZpGpaiNsCl
-NPRO/ZpGpaiNsCn
-NPRO/ZpGpNpCa
-NPRO/ZpGpNpCd
-NPRO/ZpGpNpCg
-NPRO/ZpGpNpCi
-NPRO/ZpGpNpCl
-NPRO/ZpGpNpCn
-NPRO/ZqGnNsCa
-NPRO/ZqGnNsCd
-NPRO/ZqGnNsCg
-NPRO/ZqGnNsCi
-NPRO/ZqGnNsCl
-NPRO/ZqGnNsCn
-NPRO/ZqGpNsCa
-NPRO/ZqGpNsCd
-NPRO/ZqGpNsCg
-NPRO/ZqGpNsCi
-NPRO/ZqGpNsCl
-NPRO/ZqGpNsCn
-NPRO/ZqrGnNsCa
-NPRO/ZqrGnNsCd
-NPRO/ZqrGnNsCg
-NPRO/ZqrGnNsCi
-NPRO/ZqrGnNsCl
-NPRO/ZqrGnNsCn
-NPRO/ZqrGpNsCa
-NPRO/ZqrGpNsCd
-NPRO/ZqrGpNsCg
-NPRO/ZqrGpNsCi
-NPRO/ZqrGpNsCl
-NPRO/ZqrGpNsCn
-NPRO/ZxG*N*Ca
-NPRO/ZxG*N*Cd
-NPRO/ZxG*N*Cg
-NPRO/ZxG*N*Ci
-NPRO/ZxG*N*Cl
+N/Ca
+N/CaGaNp
+N/CaGaNs
+N/CaGfNp
+N/CaGfNs
+N/CaGiNp
+N/CaGiNs
+N/CaGnNp
+N/CaGnNs
+N/CaG?Np
+N/CaG?Ns
+N/CaGpNp
+N/CaGpNs
+N/CaNp
+N/Cd
+N/CdGaNp
+N/CdGaNs
+N/CdGfNp
+N/CdGfNs
+N/CdGiNp
+N/CdGiNs
+N/CdGnNp
+N/CdGnNs
+N/CdG?Np
+N/CdG?Ns
+N/CdGpNp
+N/CdGpNs
+N/CdNp
+N/Cg
+N/CgGaNp
+N/CgGaNs
+N/CgGfNp
+N/CgGfNs
+N/CgGiNp
+N/CgGiNs
+N/CgGnNp
+N/CgGnNs
+N/CgG?Np
+N/CgG?Ns
+N/CgGpNp
+N/CgGpNs
+N/CgNp
+N/Ci
+N/CiGaNp
+N/CiGaNs
+N/CiGfNp
+N/CiGfNs
+N/CiGiNp
+N/CiGiNs
+N/CiGnNp
+N/CiGnNs
+N/CiG?Np
+N/CiG?Ns
+N/CiGpNp
+N/CiGpNs
+N/CiNp
+N/Cl
+N/ClGaNp
+N/ClGaNs
+N/ClGfNp
+N/ClGfNs
+N/ClGiNp
+N/ClGiNs
+N/ClGnNp
+N/ClGnNs
+N/ClG?Np
+N/ClG?Ns
+N/ClGpNp
+N/ClGpNs
+N/ClNp
+N/Cn
+N/CnGaNp
+N/CnGaNs
+N/CnGfNp
+N/CnGfNs
+N/CnGiNp
+N/CnGiNs
+N/CnGnNp
+N/CnGnNs
+N/CnG?Np
+N/CnG?Ns
+N/CnGpNp
+N/CnGpNs
+N/CnNp
+N/CvGaNp
+N/CvGaNs
+N/CvGfNp
+N/CvGfNs
+N/CvGiNp
+N/CvGiNs
+N/CvGnNp
+N/CvGnNs
+N/CvG?Np
+N/CvG?Ns
+N/CvGpNp
+N/CvGpNs
+N/CvNp
+NPRO/Ca
+NPRO/CaGafinNp
+NPRO/CaGaipNs
+NPRO/CaGfNs
+NPRO/CaGnNs
+NPRO/CaGpNp
+NPRO/CaGpNs
+NPRO/CaNp
+NPRO/CaNs
+NPRO/Cd
+NPRO/CdGafinNp
+NPRO/CdGaipNs
+NPRO/CdGfNs
+NPRO/CdGnNs
+NPRO/CdGpNp
+NPRO/CdGpNs
+NPRO/CdNp
+NPRO/CdNs
+NPRO/Cg
+NPRO/CgGafinNp
+NPRO/CgGaipNs
+NPRO/CgGfNs
+NPRO/CgGnNs
+NPRO/CgGpNp
+NPRO/CgGpNs
+NPRO/CgNp
+NPRO/CgNs
+NPRO/Ci
+NPRO/CiGafinNp
+NPRO/CiGaipNs
+NPRO/CiGfNs
+NPRO/CiGnNs
+NPRO/CiGpNp
+NPRO/CiGpNs
+NPRO/CiNp
+NPRO/CiNs
+NPRO/Cl
+NPRO/ClGafinNp
+NPRO/ClGaipNs
+NPRO/ClGfNs
+NPRO/ClGnNs
+NPRO/ClGpNp
+NPRO/ClGpNs
+NPRO/ClNp
+NPRO/ClNs
+NPRO/CnGafinNp
+NPRO/CnGaipNs
+NPRO/CnGfNs
+NPRO/CnGnNs
+NPRO/CnGpNp
+NPRO/CnGpNs
+NPRO/CnNp
+NPRO/CnNs
 NUMCOL/Ca
 NUMCOL/Cd
@@ -502,5 +333,5 @@
 NUMCOL/Cn
 NUMCRD/Ca
-NUMCRD/CaGaifn
+NUMCRD/CaGafin
 NUMCRD/CaGain
 NUMCRD/CaGf
@@ -509,57 +340,35 @@
 NUMCRD/Cg
 NUMCRD/Ci
+NUMCRD/CiGainp
 NUMCRD/CiGf
-NUMCRD/CiGpain
 NUMCRD/Cl
 NUMCRD/Cn
-NUMCRD/CnGaifn
+NUMCRD/CnGafin
 NUMCRD/CnGain
 NUMCRD/CnGf
 NUMCRD/CnGp
-NUMCRD/ZiCaGaifn
-NUMCRD/ZiCaGain
-NUMCRD/ZiCaGf
-NUMCRD/ZiCaGp
-NUMCRD/ZiCd
-NUMCRD/ZiCg
-NUMCRD/ZiCi
-NUMCRD/ZiCiGf
-NUMCRD/ZiCiGpain
-NUMCRD/ZiCl
-NUMCRD/ZiCnGaifn
-NUMCRD/ZiCnGain
-NUMCRD/ZiCnGf
-NUMCRD/ZiCnGp
-NUMCRD/ZqiCaGaifn
-NUMCRD/ZqiCaGp
-NUMCRD/ZqiCd
-NUMCRD/ZqiCg
-NUMCRD/ZqiCi
-NUMCRD/ZqiCl
-NUMCRD/ZqiCnGaifn
-NUMCRD/ZqiCnGp
-NUMORD/NpCaGp
-NUMORD/NpCd
-NUMORD/NpCgl
-NUMORD/NpCi
-NUMORD/NpCnavGaifn
-NUMORD/NpCnvGp
-NUMORD/NsCaGi
-NUMORD/NsCaGpa
-NUMORD/NsCaiGf
-NUMORD/NsCavGf
-NUMORD/NsCdGpain
-NUMORD/NsCgdlGf
-NUMORD/NsCgGpain
-NUMORD/NsCilGpain
-NUMORD/NsCnavGn
-NUMORD/NsCnvGpai
+NUMORD/CaGapNs
+NUMORD/CaGiNs
+NUMORD/CaGpNp
+NUMORD/CaiGfNs
+NUMORD/CanvGafinNp
+NUMORD/CanvGnNs
+NUMORD/CdGainpNs
+NUMORD/CdglGfNs
+NUMORD/CdNp
+NUMORD/CgGainpNs
+NUMORD/CglNp
+NUMORD/CilGainpNs
+NUMORD/CiNp
+NUMORD/CnvGaipNs
+NUMORD/CnvGfNs
+NUMORD/CnvGpNp
 NUMPAR
 NUMPAR/Dc
 NUMPAR/Dp
 NUMPAR/Ds
+NUMPAR/GainpNs
+NUMPAR/GfNs
 NUMPAR/Ns
-NUMPAR/NsGf
-NUMPAR/NsGpain
 NV/Ca
 NV/Cd
@@ -572,125 +381,124 @@
 PART
 P/Ca
+P/Cag
+P/Cagi
 P/Cai
 P/Cal
 P/Cd
+P/Cdg
 P/Cg
-P/Cga
-P/Cgai
-P/Cgd
 P/Cgi
-P/Ci
 P/Cl
-PPRO/Zp
+PPRO/C
+V/AiGafinMcNpP1Vp
+V/AiGafinMcNpP2Vp
+V/AiGafinMcNpP3Vp
+V/AiGafinMdNpP1TaVp
+V/AiGafinMdNpP2TaVp
+V/AiGafinMdNpP3TaVp
+V/AiGaipMcNsP1Vp
+V/AiGaipMcNsP2Vp
+V/AiGaipMcNsP3Vp
+V/AiGaipMdNsP1TaVp
+V/AiGaipMdNsP2TaVp
+V/AiGaipMdNsP3TaVp
+V/AiGfMcNsP1Vp
+V/AiGfMcNsP2Vp
+V/AiGfMcNsP3Vp
+V/AiGfMdNsP1TaVp
+V/AiGfMdNsP2TaVp
+V/AiGfMdNsP3TaVp
+V/AiGnMcNsP3Vp
+V/AiGnMdNsP3TaVp
+V/AiGpMcNpP1Vp
+V/AiGpMcNpP2Vp
+V/AiGpMcNpP3Vp
+V/AiGpMdNpP1TaVp
+V/AiGpMdNpP2TaVp
+V/AiGpMdNpP3TaVp
+V/AiMdNpP1TfrVp
+V/AiMdNpP2TfrVp
+V/AiMdNpP3TfrVp
+V/AiMdNsP1TfrVp
+V/AiMdNsP2TfrVp
+V/AiMdNsP3TfrVp
+V/AiMiNpP1Vp
+V/AiMiNpP2Vp
+V/AiMiNsP2Vp
+V/AiTaVi
 V/AiVb
-V/AiViTa
-V/AiVpMcNpP1Gaifn
-V/AiVpMcNpP1Gp
-V/AiVpMcNpP2Gaifn
-V/AiVpMcNpP2Gp
-V/AiVpMcNpP3Gaifn
-V/AiVpMcNpP3Gp
-V/AiVpMcNsP1Gf
-V/AiVpMcNsP1Gpai
-V/AiVpMcNsP2Gf
-V/AiVpMcNsP2Gpai
-V/AiVpMcNsP3Gf
-V/AiVpMcNsP3Gn
-V/AiVpMcNsP3Gpai
-V/AiVpMdTaNpP1Gaifn
-V/AiVpMdTaNpP1Gp
-V/AiVpMdTaNpP2Gaifn
-V/AiVpMdTaNpP2Gp
-V/AiVpMdTaNpP3Gaifn
-V/AiVpMdTaNpP3Gp
-V/AiVpMdTaNsP1Gf
-V/AiVpMdTaNsP1Gpai
-V/AiVpMdTaNsP2Gf
-V/AiVpMdTaNsP2Gpai
-V/AiVpMdTaNsP3Gf
-V/AiVpMdTaNsP3Gn
-V/AiVpMdTaNsP3Gpai
-V/AiVpMdTrfNpP1
-V/AiVpMdTrfNpP2
-V/AiVpMdTrfNpP3
-V/AiVpMdTrfNsP1
-V/AiVpMdTrfNsP2
-V/AiVpMdTrfNsP3
-V/AiVpMiNpP1
-V/AiVpMiNpP2
-V/AiVpMiNsP2
+V/ApGafinMcNpP1Vp
+V/ApGafinMcNpP2Vp
+V/ApGafinMcNpP3Vp
+V/ApGafinMdNpP1TaVp
+V/ApGafinMdNpP2TaVp
+V/ApGafinMdNpP3TaVp
+V/ApGaipMcNsP1Vp
+V/ApGaipMcNsP2Vp
+V/ApGaipMcNsP3Vp
+V/ApGaipMdNsP1TaVp
+V/ApGaipMdNsP2TaVp
+V/ApGaipMdNsP3TaVp
+V/ApGfMcNsP1Vp
+V/ApGfMcNsP2Vp
+V/ApGfMcNsP3Vp
+V/ApGfMdNsP1TaVp
+V/ApGfMdNsP2TaVp
+V/ApGfMdNsP3TaVp
+V/ApGnMcNsP3Vp
+V/ApGnMdNsP3TaVp
+V/ApGpMcNpP1Vp
+V/ApGpMcNpP2Vp
+V/ApGpMcNpP3Vp
+V/ApGpMdNpP1TaVp
+V/ApGpMdNpP2TaVp
+V/ApGpMdNpP3TaVp
+V/ApMdNpP1TfrVp
+V/ApMdNpP2TfrVp
+V/ApMdNpP3TfrVp
+V/ApMdNsP1TfrVp
+V/ApMdNsP2TfrVp
+V/ApMdNsP3TfrVp
+V/ApMiNpP1Vp
+V/ApMiNpP2Vp
+V/ApMiNsP2Vp
+V/ApTaVi
 V/ApVb
-V/ApViTa
-V/ApVpMcNpP1Gaifn
-V/ApVpMcNpP1Gp
-V/ApVpMcNpP2Gaifn
-V/ApVpMcNpP2Gp
-V/ApVpMcNpP3Gaifn
-V/ApVpMcNpP3Gp
-V/ApVpMcNsP1Gf
-V/ApVpMcNsP1Gpai
-V/ApVpMcNsP2Gf
-V/ApVpMcNsP2Gpai
-V/ApVpMcNsP3Gf
-V/ApVpMcNsP3Gn
-V/ApVpMcNsP3Gpai
-V/ApVpMdTaNpP1Gaifn
-V/ApVpMdTaNpP1Gp
-V/ApVpMdTaNpP2Gaifn
-V/ApVpMdTaNpP2Gp
-V/ApVpMdTaNpP3Gaifn
-V/ApVpMdTaNpP3Gp
-V/ApVpMdTaNsP1Gf
-V/ApVpMdTaNsP1Gpai
-V/ApVpMdTaNsP2Gf
-V/ApVpMdTaNsP2Gpai
-V/ApVpMdTaNsP3Gf
-V/ApVpMdTaNsP3Gn
-V/ApVpMdTaNsP3Gpai
-V/ApVpMdTrfNpP1
-V/ApVpMdTrfNpP2
-V/ApVpMdTrfNpP3
-V/ApVpMdTrfNsP1
-V/ApVpMdTrfNsP2
-V/ApVpMdTrfNsP3
-V/ApVpMiNpP1
-V/ApVpMiNpP2
-V/ApVpMiNsP2
+V/GafinMcNpP1Vp
+V/GafinMcNpP2Vp
+V/GafinMcNpP3Vp
+V/GafinMdNpP1TaVp
+V/GafinMdNpP2TaVp
+V/GafinMdNpP3TaVp
+V/GaipMcNsP1Vp
+V/GaipMcNsP2Vp
+V/GaipMcNsP3Vp
+V/GaipMdNsP1TaVp
+V/GaipMdNsP2TaVp
+V/GaipMdNsP3TaVp
+V/GfMcNsP1Vp
+V/GfMcNsP2Vp
+V/GfMcNsP3Vp
+V/GfMdNsP1TaVp
+V/GfMdNsP2TaVp
+V/GfMdNsP3TaVp
+V/GiMdNpP1TfrVp
+V/GiMdNpP2TfrVp
+V/GiMdNpP3TfrVp
+V/GiMdNsP1TfrVp
+V/GiMdNsP2TfrVp
+V/GiMdNsP3TfrVp
+V/GiMiNpP1Vp
+V/GiMiNpP2Vp
+V/GiMiNsP2Vp
+V/GiTaVi
 V/GiVb
-V/GiViTa
-V/GiVpMcNpP1Gaifn
-V/GiVpMcNpP1Gp
-V/GiVpMcNpP2Gaifn
-V/GiVpMcNpP2Gp
-V/GiVpMcNpP3Gaifn
-V/GiVpMcNpP3Gp
-V/GiVpMcNsP1Gf
-V/GiVpMcNsP1Gpai
-V/GiVpMcNsP2Gf
-V/GiVpMcNsP2Gpai
-V/GiVpMcNsP3Gf
-V/GiVpMcNsP3Gn
-V/GiVpMcNsP3Gpai
-V/GiVpMdTaNpP1Gaifn
-V/GiVpMdTaNpP1Gp
-V/GiVpMdTaNpP2Gaifn
-V/GiVpMdTaNpP2Gp
-V/GiVpMdTaNpP3Gaifn
-V/GiVpMdTaNpP3Gp
-V/GiVpMdTaNsP1Gf
-V/GiVpMdTaNsP1Gpai
-V/GiVpMdTaNsP2Gf
-V/GiVpMdTaNsP2Gpai
-V/GiVpMdTaNsP3Gf
-V/GiVpMdTaNsP3Gn
-V/GiVpMdTaNsP3Gpai
-V/GiVpMdTrfNpP1
-V/GiVpMdTrfNpP2
-V/GiVpMdTrfNpP3
-V/GiVpMdTrfNsP1
-V/GiVpMdTrfNsP2
-V/GiVpMdTrfNsP3
-V/GiVpMiNpP1
-V/GiVpMiNpP2
-V/GiVpMiNsP2
+V/GnMcNsP3Vp
+V/GnMdNsP3TaVp
+V/GpMcNpP1Vp
+V/GpMcNpP2Vp
+V/GpMcNpP3Vp
+V/GpMdNpP1TaVp
+V/GpMdNpP2TaVp
+V/GpMdNpP3TaVp
 VNI
