ConTeXt hotfixes:

* remove three old and forgotten files that remained in tree by accident
* fix name of antykwa poltawskiego map file
* rename reference to marvosym fmvr8x->umvs and remove copy of the old tfm file


git-svn-id: svn://tug.org/texlive/trunk@23189 c570f23f-e606-0410-a88d-b1316a301751

7 files changed, 4 insertions, 152 deletions

diff --git a/Master/texmf-dist/fonts/tfm/hoekwater/context/fmvr8x.tfm b/Master/texmf-dist/fonts/tfm/hoekwater/context/fmvr8x.tfm
deleted file mode 100644
index ce8172f1c8b..00000000000
--- a/Master/texmf-dist/fonts/tfm/hoekwater/context/fmvr8x.tfm
+++ /dev/null
diff --git a/Master/texmf-dist/tex/context/base/data-kps.lua b/Master/texmf-dist/tex/context/base/data-kps.lua
deleted file mode 100644
index 09d50240947..00000000000
--- a/Master/texmf-dist/tex/context/base/data-kps.lua
+++ /dev/null
@@ -1,101 +0,0 @@
-if not modules then modules = { } end modules ['luat-kps'] = {
-    version   = 1.001,
-    comment   = "companion to luatools.lua",
-    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
-    copyright = "PRAGMA ADE / ConTeXt Development Team",
-    license   = "see context related readme files"
-}
-
---[[ldx--
-<p>This file is used when we want the input handlers to behave like
-<type>kpsewhich</type>. What to do with the following:</p>
-
-<typing>
-{$SELFAUTOLOC,$SELFAUTODIR,$SELFAUTOPARENT}{,{/share,}/texmf{-local,}/web2c}
-$SELFAUTOLOC    : /usr/tex/bin/platform
-$SELFAUTODIR    : /usr/tex/bin
-$SELFAUTOPARENT : /usr/tex
-</typing>
-
-<p>How about just forgetting about them?</p>
---ldx]]--
-
-local suffixes = resolvers.suffixes
-local formats  = resolvers.formats
-
-suffixes['gf']                       = { '<resolution>gf' }
-suffixes['pk']                       = { '<resolution>pk' }
-suffixes['base']                     = { 'base' }
-suffixes['bib']                      = { 'bib' }
-suffixes['bst']                      = { 'bst' }
-suffixes['cnf']                      = { 'cnf' }
-suffixes['mem']                      = { 'mem' }
-suffixes['mf']                       = { 'mf' }
-suffixes['mfpool']                   = { 'pool' }
-suffixes['mft']                      = { 'mft' }
-suffixes['mppool']                   = { 'pool' }
-suffixes['graphic/figure']           = { 'eps', 'epsi' }
-suffixes['texpool']                  = { 'pool' }
-suffixes['PostScript header']        = { 'pro' }
-suffixes['ist']                      = { 'ist' }
-suffixes['web']                      = { 'web', 'ch' }
-suffixes['cweb']                     = { 'w', 'web', 'ch' }
-suffixes['cmap files']               = { 'cmap' }
-suffixes['lig files']                = { 'lig' }
-suffixes['bitmap font']              = { }
-suffixes['MetaPost support']         = { }
-suffixes['TeX system documentation'] = { }
-suffixes['TeX system sources']       = { }
-suffixes['dvips config']             = { }
-suffixes['type42 fonts']             = { }
-suffixes['web2c files']              = { }
-suffixes['other text files']         = { }
-suffixes['other binary files']       = { }
-suffixes['opentype fonts']           = { 'otf' }
-
-suffixes['fmt']                      = { 'fmt' }
-suffixes['texmfscripts']             = { 'rb','lua','py','pl' }
-
-suffixes['pdftex config']            = { }
-suffixes['Troff fonts']              = { }
-
-suffixes['ls-R']                     = { }
-
---[[ldx--
-<p>If you wondered abou tsome of the previous mappings, how about
-the next bunch:</p>
---ldx]]--
-
-formats['bib']                      = ''
-formats['bst']                      = ''
-formats['mft']                      = ''
-formats['ist']                      = ''
-formats['web']                      = ''
-formats['cweb']                     = ''
-formats['MetaPost support']         = ''
-formats['TeX system documentation'] = ''
-formats['TeX system sources']       = ''
-formats['Troff fonts']              = ''
-formats['dvips config']             = ''
-formats['graphic/figure']           = ''
-formats['ls-R']                     = ''
-formats['other text files']         = ''
-formats['other binary files']       = ''
-
-formats['gf']                       = ''
-formats['pk']                       = ''
-formats['base']                     = 'MFBASES'
-formats['cnf']                      = ''
-formats['mem']                      = 'MPMEMS'
-formats['mf']                       = 'MFINPUTS'
-formats['mfpool']                   = 'MFPOOL'
-formats['mppool']                   = 'MPPOOL'
-formats['texpool']                  = 'TEXPOOL'
-formats['PostScript header']        = 'TEXPSHEADERS'
-formats['cmap files']               = 'CMAPFONTS'
-formats['type42 fonts']             = 'T42FONTS'
-formats['web2c files']              = 'WEB2C'
-formats['pdftex config']            = 'PDFTEXCONFIG'
-formats['texmfscripts']             = 'TEXMFSCRIPTS'
-formats['bitmap font']              = ''
-formats['lig files']                = 'LIGFONTS'
diff --git a/Master/texmf-dist/tex/context/base/symb-mvs.mkii b/Master/texmf-dist/tex/context/base/symb-mvs.mkii
index 1dd3da0a00c..5f1d3962b36 100644
--- a/Master/texmf-dist/tex/context/base/symb-mvs.mkii
+++ b/Master/texmf-dist/tex/context/base/symb-mvs.mkii
@@ -43,7 +43,7 @@
 
 \loadmapfile[original-base.map] % \loadmapfile[original-vogel-symbol]
 
-\definefontsynonym [MartinVogel] [fmvr8x]
+\definefontsynonym [MartinVogel] [umvs]
 
 \def\MartinVogelSymbol#1{\getglyph{MartinVogel}{\char#1}}
 
diff --git a/Master/texmf-dist/tex/context/base/trac-lmx.mkiv b/Master/texmf-dist/tex/context/base/trac-lmx.mkiv
deleted file mode 100644
index a47d2b8bbee..00000000000
--- a/Master/texmf-dist/tex/context/base/trac-lmx.mkiv
+++ /dev/null
@@ -1,16 +0,0 @@
-%D \module
-%D   [       file=trac-lmx,
-%D        version=2005.09.02,
-%D          title=\CONTEXT\ Tracing Macros,
-%D       subtitle=LMX,
-%D         author=Hans Hagen,
-%D           date=\currentdate,
-%D      copyright=PRAGMA]
-%C
-%C This module is part of the \CONTEXT\ macro||package and is
-%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
-%C details.
-
-\writestatus{loading}{ConTeXt Tracing Macros / LMX}
-
-\registerctxluafile{trac-lmx}{1.001}
diff --git a/Master/texmf-dist/tex/context/base/type-one.mkii b/Master/texmf-dist/tex/context/base/type-one.mkii
index f1e94fd7934..55c108c69c3 100644
--- a/Master/texmf-dist/tex/context/base/type-one.mkii
+++ b/Master/texmf-dist/tex/context/base/type-one.mkii
@@ -1483,7 +1483,7 @@
         \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsBold]              [\typescriptthree-antpb6-sc]   [encoding=\typescriptthree]
         \definefontsynonym [AntykwaPoltawskiego-Expanded-CapsBoldItalic]        [\typescriptthree-antpbi6-sc]  [encoding=\typescriptthree]
 
-        \loadmapfile[poltawski-\typescriptthree.map]
+        \loadmapfile[ap-\typescriptthree.map]
     \stoptypescript
 
     \starttypescript [serif] [antykwa-poltawskiego] [name]
@@ -1911,7 +1911,7 @@
     \starttypescript
         \definefontsynonym [ZapfDingbats]          [uzdr]
         \definefontsynonym [RalfSmithFormalScript] [rsfs10]
-        \definefontsynonym [MartinVogel]           [fmvr8x]
+        \definefontsynonym [MartinVogel]           [umvs]
     \stoptypescript
 
 \stoptypescriptcollection
diff --git a/Master/texmf-dist/tex/context/base/type-otf.mkii b/Master/texmf-dist/tex/context/base/type-otf.mkii
index 0a43061f717..9c49853efa8 100644
--- a/Master/texmf-dist/tex/context/base/type-otf.mkii
+++ b/Master/texmf-dist/tex/context/base/type-otf.mkii
@@ -1698,7 +1698,7 @@
     \starttypescript
         \definefontsynonym [ZapfDingbats]          [uzdr]
         \definefontsynonym [RalfSmithFormalScript] [rsfs10]
-        \definefontsynonym [MartinVogel]           [fmvr8x]
+        \definefontsynonym [MartinVogel]           [umvs]
     \stoptypescript
 
 \stoptypescriptcollection
diff --git a/Master/texmf-dist/tex/context/test/x-cals-test.cdx b/Master/texmf-dist/tex/context/test/x-cals-test.cdx
deleted file mode 100644
index ce90883fa8d..00000000000
--- a/Master/texmf-dist/tex/context/test/x-cals-test.cdx
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" standalone="yes"?>
-
-<directives>
-
-    <!--
-        <directive attribute='id' value="100" setup="cdx:100"/>
-        <directive attribute='id' value="101" setup="cdx:101"/>
-    -->
-
-    <!--
-        <directive element="cals:table" attribute='cdx' value="colors"   setup="cdx:cals:table:colors"/>
-        <directive element="cals:table" attribute='cdx' value="vertical" setup="cdx:cals:table:vertical"/>
-        <directive element="cals:table" attribute='cdx' value="noframe"  setup="cdx:cals:table:noframe"/>
-    -->
-
-    <!--
-        <directive element="cals:table" attribute='cdx' value="*" setup="cdx:cals:table:*"/>
-        <directive element="cals:table" attribute='cdx' value="*" before="cdx:cals:table:before:*"/>
-        <directive element="cals:table" attribute='cdx' value="*" after="cdx:cals:table:after:*"/>
-    -->
-
-    <directive
-        element="cals:table"
-        attribute='cdx'
-        value="*"
-        setup="cdx:cals:table:*"
-        before="cdx:cals:table:before:*"
-        after="cdx:cals:table:after:*"
-    />
-
-</directives>