marvosym clean up and update

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

2 files changed, 215 insertions, 212 deletions

diff --git a/Master/texmf-dist/tex/latex/marvosym/marvosym.sty b/Master/texmf-dist/tex/latex/marvosym/marvosym.sty
index 2b675273011..47267c5d704 100644
--- a/Master/texmf-dist/tex/latex/marvosym/marvosym.sty
+++ b/Master/texmf-dist/tex/latex/marvosym/marvosym.sty
@@ -1,215 +1,215 @@
 \ProvidesPackage{marvosym}
-  [2000/05/01 v2.0 Martin Vogel's Symbols font definitions]
-\DeclareFontFamily{OT1}{mvs}{}
-\DeclareFontShape{OT1}{mvs}{m}{n}{<-> fmvr8x}{}
-\def\mvs{\usefont{OT1}{mvs}{m}{n}}
-\def\mvchr{\mvs\char}
-\def\textmvs#1{{\mvs #1}}
-
-\def\Stopsign{{\mvchr33}}
-\def\Beam{{\mvchr34}}
-\def\Bearing{{\mvchr35}}
-\def\Loosebearing{{\mvchr36}}
-\def\Fixedbearing{{\mvchr37}}
-\def\Lefttorque{{\mvchr38}}
-\def\Righttorque{{\mvchr39}}
-
-\def\MVZero{{\mvchr48}}
-\def\MVOne{{\mvchr49}}
-
-\def\MVTwo{{\mvchr50}}
-\def\MVThree{{\mvchr51}}
-\def\MVFour{{\mvchr52}}
-\def\MVFive{{\mvchr53}}
-\def\MVSix{{\mvchr54}}
-\def\MVSeven{{\mvchr55}}
-\def\MVEight{{\mvchr56}}
-\def\MVNine{{\mvchr57}}
-\def\Rightarrow{{\mvchr58}}
-
-\def\Corresponds{{\mvchr61}}
-\def\MVAt{{\mvchr64}}
-\def\Pickup{{\mvchr65}}
-\def\Letter{{\mvchr66}}
-\def\CEsign{{\mvchr67}}
-\def\EURdig{{\mvchr68}}
-\def\Lightning{{\mvchr69}}
-
-\def\FHBOlogo{{\mvchr70}}
-\def\Mobilefone{{\mvchr72}}
-\def\Industry{{\mvchr73}}
-\def\Estatically{{\mvchr74}}
-\def\Coffeecup{{\mvchr75}}
-\def\Lineload{{\mvchr76}}
-
-\def\Vectorarrowhigh{{\mvchr80}}
-\def\Rightscissors{{\mvchr81}}
-\def\Kutline{{\mvchr82}}
-\def\Leftscissors{{\mvchr83}}
-\def\Telefon{{\mvchr84}}
-\def\Clocklogo{{\mvchr85}}
-\def\Checkedbox{{\mvchr86}}
-\def\Anglesign{{\mvchr87}}
-\def\Crossedbox{{\mvchr88}}
-\def\Yinyang{{\mvchr89}}
-\let\Yingyang=\Yinyang
-
-\def\Pointinghand{{\mvchr90}}
-\def\Explosionsafe{{\mvchr96}}
-\def\Laserbeam{{\mvchr97}}
-\def\Writinghand{{\mvchr98}}
-\def\EURhv{{\mvchr99}}
-
-\def\EURcr{{\mvchr100}}
-\def\EURtm{{\mvchr101}}
-\def\FHBOLOGO{{\mvchr102}}
-\def\Biohazard{{\mvchr104}}
-\def\Info{{\mvchr105}}
-\def\Radioactivity{{\mvchr106}}
-\def\Email{{\mvchr107}}
-\def\Force{{\mvchr108}}
-\def\Mundus{{\mvchr109}}
-
-\def\BSEfree{{\mvchr110}}
-\def\Football{{\mvchr111}}
-\def\Vectorarrow{{\mvchr112}}
-\def\Cutright{{\mvchr113}}
-\def\Cutline{{\mvchr114}}
-\def\Cutleft{{\mvchr115}}
-\def\fax{{\mvchr116}}
-\def\FAX{{\mvchr117}}
-\def\Faxmachine{{\mvchr118}}
-\def\Wheelchair{{\mvchr119}}
-
-\def\Gentsroom{{\mvchr120}}
-\def\Ladiesroom{{\mvchr121}}
-\def\Emailct{{\mvchr122}}
-\def\Neutral{{\mvchr123}}
-\def\Male{{\mvchr124}}
-\def\Hermaphrodite{{\mvchr125}}
-\def\Female{{\mvchr126}}
-\def\HERMAPHRODITE{{\mvchr128}}
-\def\FEMALE{{\mvchr129}}
-
-\def\MALE{{\mvchr130}}
-\def\MaleMale{{\mvchr131}}
-\def\FemaleFemale{{\mvchr132}}
-\def\FemaleMale{{\mvchr133}}
-\def\Cross{{\mvchr134}}
-\def\Celtcross{{\mvchr135}}
-\def\Ankh{{\mvchr136}}
-\def\WashCotton{{\mvchr137}}
-\def\WashSynthetics{{\mvchr138}}
-\def\WashWool{{\mvchr139}}
-
-\def\Heart{{\mvchr140}}
-\def\Ecommerce{{\mvchr141}}
-\def\FullFHBO{{\mvchr142}}
-\def\Tumbler{{\mvchr143}}
-\def\NoTumbler{{\mvchr144}}
-\def\Octosteel{{\mvchr145}}
-\def\Hexasteel{{\mvchr146}}
-\def\Squaresteel{{\mvchr147}}
-\def\Rectsteel{{\mvchr148}}
-\def\Circsteel{{\mvchr149}}
-
-\def\Flatsteel{{\mvchr150}}
-\def\Squarepipe{{\mvchr151}}
-\def\Rectpipe{{\mvchr152}}
-\def\Lsteel{{\mvchr153}}
-\def\TTsteel{{\mvchr154}}
-\def\Circpipe{{\mvchr155}}
-\def\Tsteel{{\mvchr156}}
-\def\RoundedTsteel{{\mvchr157}}
-\def\RoundedTTsteel{{\mvchr158}}
-\def\RoundedLsteel{{\mvchr159}}
-
-\def\Shilling{{\mvchr161}}
-\def\Denarius{{\mvchr162}}\let\Deleatur\Denarius
-\def\Pfund{{\mvchr163}}
-\def\EUR{{\mvchr164}}
-\def\Bouquet{{\mvchr165}}
-\def\EyesDollar{{\mvchr166}}
-\def\Frowny{{\mvchr167}}
-\def\NoChemicalCleaning{{\mvchr168}}
-\def\Smiley{{\mvchr169}}
-
-\def\CircledA{{\mvchr170}}
-\def\CleaningA{{\mvchr171}}
-\def\CleaningP{{\mvchr172}}
-\def\CleaningPP{{\mvchr173}}
-\def\Bicycle{{\mvchr174}}
-\def\IroningI{{\mvchr175}}
-\def\IroningII{{\mvchr176}}
-\def\IroningIII{{\mvchr177}}
-\def\NoIroning{{\mvchr178}}
-
-\def\RewindToIndex{{\mvchr180}}
-\def\RewindToStart{{\mvchr181}}
-\def\Rewind{{\mvchr182}}
-\def\Forward{{\mvchr183}}
-\def\ForwardToEnd{{\mvchr184}}
-\def\ForwardToIndex{{\mvchr185}}
-\def\MoveUp{{\mvchr186}}
-\def\MoveDown{{\mvchr187}}
-\def\ToTop{{\mvchr188}}
-\def\ToBottom{{\mvchr189}}
-
-\def\CleaningF{{\mvchr190}}
-\def\CleaningFF{{\mvchr191}}
-\def\Sun{{\mvchr192}}
-\def\Moon{{\mvchr193}}
-\def\Mercury{{\mvchr194}}
-\def\Venus{{\mvchr195}}
-\def\Mars{{\mvchr196}}
-\def\Jupiter{{\mvchr197}}
-\def\Saturn{{\mvchr198}}
-\def\Uranus{{\mvchr199}}
-
-\def\Neptune{{\mvchr200}}
-\def\Pluto{{\mvchr201}}
-\def\Earth{{\mvchr202}}
-\def\Bleech{{\mvchr203}}
-\def\NoBleech{{\mvchr204}}
-\def\ComputerMouse{{\mvchr205}}
-\def\SerialInterface{{\mvchr206}}
-\def\Keyboard{{\mvchr207}}
-\def\SerialPort{{\mvchr208}}
-\def\ParallelPort{{\mvchr209}}
-
-\def\Printer{{\mvchr210}}
-\def\AtNinetyFive{{\mvchr211}}
-\def\ShortNinetyFive{{\mvchr212}}
-\def\AtSixty{{\mvchr213}}
-\def\ShortSixty{{\mvchr214}}
-\def\ShortFifty{{\mvchr215}}
-\def\AtForty{{\mvchr216}}
-\def\ShortForty{{\mvchr217}}
-\def\SpecialForty{{\mvchr218}}
-\def\ShortThirty{{\mvchr219}}
-
-\def\Handwash{{\mvchr220}}
-\def\Dontwash{{\mvchr221}}
-
-\def\Zodiac#1{{\mvchr\ifcase#1\or224\or225\or226\or227\or228\or229\or230\or231\or232\or233\or234\or235\fi}}
-
-\def\Aries{{\mvchr224}}
-\def\Taurus{{\mvchr225}}
-\def\Gemini{{\mvchr226}}
-\def\Cancer{{\mvchr227}}
-\def\Leo{{\mvchr228}}
-\def\Virgo{{\mvchr229}}
-\def\Libra{{\mvchr230}}
-\def\Scorpio{{\mvchr231}}
-\def\Sagittarius{{\mvchr232}}
-\def\Capricorn{{\mvchr233}}
-\def\Aquarius{{\mvchr234}}
-\def\Pisces{{\mvchr235}}
-
-\def\Squaredot{{\mvchr247}}
-
-\def\Bat{{\mvchr253}}
-\def\Womanface{{\mvchr254}}
-\def\MartinVogel{{\mvchr255}}
+  [2006/05/11 v2.1 Martin Vogel's Symbols font definitions]
+\newcommand{\mvs}{\fontfamily{mvs}\fontencoding{U}%
+\fontseries{m}\fontshape{n}\selectfont}
+\newcommand{\mvchr}[1]{{\mvs\char#1}}
+\newcommand{\textmvs}[1]{{\mvs #1}}
+
+\newcommand\Stopsign{\mvchr{33}}
+\newcommand\Beam{\mvchr{34}}
+\newcommand\Bearing{\mvchr{35}}
+\newcommand\Loosebearing{\mvchr{36}}
+\newcommand\Fixedbearing{\mvchr{37}}
+\newcommand\Lefttorque{\mvchr{38}}
+\newcommand\Righttorque{\mvchr{39}}
+
+\newcommand\MVZero{\mvchr{48}}
+\newcommand\MVOne{\mvchr{49}}
+
+\newcommand\MVTwo{\mvchr{50}}
+\newcommand\MVThree{\mvchr{51}}
+\newcommand\MVFour{\mvchr{52}}
+\newcommand\MVFive{\mvchr{53}}
+\newcommand\MVSix{\mvchr{54}}
+\newcommand\MVSeven{\mvchr{55}}
+\newcommand\MVEight{\mvchr{56}}
+\newcommand\MVNine{\mvchr{57}}
+\newcommand\MVRightarrow{\mvchr{58}}
+
+\newcommand\Corresponds{\mvchr{61}}
+\newcommand\MVAt{\mvchr{64}}
+\newcommand\Pickup{\mvchr{65}}
+\newcommand\Letter{\mvchr{66}}
+\newcommand\CEsign{\mvchr{67}}
+\newcommand\EURdig{\mvchr{68}}
+\newcommand\Lightning{\mvchr{69}}
+
+\newcommand\FHBOlogo{\mvchr{70}}
+\newcommand\Mobilefone{\mvchr{72}}
+\newcommand\Industry{\mvchr{73}}
+\newcommand\Estatically{\mvchr{74}}
+\newcommand\Coffeecup{\mvchr{75}}
+\newcommand\Lineload{\mvchr{76}}
+
+\newcommand\Vectorarrowhigh{\mvchr{80}}
+\newcommand\Rightscissors{\mvchr{81}}
+\newcommand\Kutline{\mvchr{82}}
+\newcommand\Leftscissors{\mvchr{83}}
+\newcommand\Telefon{\mvchr{84}}
+\newcommand\Clocklogo{\mvchr{85}}
+\newcommand\Checkedbox{\mvchr{86}}
+\newcommand\Anglesign{\mvchr{87}}
+\newcommand\Crossedbox{\mvchr{88}}
+\newcommand\Yinyang{\mvchr{89}}
+\newcommand\Yingyang{\Yinyang}
+
+\newcommand\Pointinghand{\mvchr{90}}
+\newcommand\Explosionsafe{\mvchr{96}}
+\newcommand\Laserbeam{\mvchr{97}}
+\newcommand\Writinghand{\mvchr{98}}
+\newcommand\EURhv{\mvchr{99}}
+
+\newcommand\EURcr{\mvchr{100}}
+\newcommand\EURtm{\mvchr{101}}
+\newcommand\FHBOLOGO{\mvchr{102}}
+\newcommand\Biohazard{\mvchr{104}}
+\newcommand\Info{\mvchr{105}}
+\newcommand\Radioactivity{\mvchr{106}}
+\newcommand\Email{\mvchr{107}}
+\newcommand\Force{\mvchr{108}}
+\newcommand\Mundus{\mvchr{109}}
+
+\newcommand\BSEfree{\mvchr{110}}
+\newcommand\Football{\mvchr{111}}
+\newcommand\Vectorarrow{\mvchr{112}}
+\newcommand\Cutright{\mvchr{113}}
+\newcommand\Cutline{\mvchr{114}}
+\newcommand\Cutleft{\mvchr{115}}
+\newcommand\fax{\mvchr{116}}
+\newcommand\FAX{\mvchr{117}}
+\newcommand\Faxmachine{\mvchr{118}}
+\newcommand\Wheelchair{\mvchr{119}}
+
+\newcommand\Gentsroom{\mvchr{120}}
+\newcommand\Ladiesroom{\mvchr{121}}
+\newcommand\Emailct{\mvchr{122}}
+\newcommand\Neutral{\mvchr{123}}
+\newcommand\Male{\mvchr{124}}
+\newcommand\Hermaphrodite{\mvchr{125}}
+\newcommand\Female{\mvchr{126}}
+\newcommand\HERMAPHRODITE{\mvchr{128}}
+\newcommand\FEMALE{\mvchr{129}}
+
+\newcommand\MALE{\mvchr{130}}
+\newcommand\MaleMale{\mvchr{131}}
+\newcommand\FemaleFemale{\mvchr{132}}
+\newcommand\FemaleMale{\mvchr{133}}
+\newcommand\Cross{\mvchr{134}}
+\newcommand\Celtcross{\mvchr{135}}
+\newcommand\Ankh{\mvchr{136}}
+\newcommand\WashCotton{\mvchr{137}}
+\newcommand\WashSynthetics{\mvchr{138}}
+\newcommand\WashWool{\mvchr{139}}
+
+\newcommand\Heart{\mvchr{140}}
+\newcommand\Ecommerce{\mvchr{141}}
+\newcommand\FullFHBO{\mvchr{142}}
+\newcommand\Tumbler{\mvchr{143}}
+\newcommand\NoTumbler{\mvchr{144}}
+\newcommand\Octosteel{\mvchr{145}}
+\newcommand\Hexasteel{\mvchr{146}}
+\newcommand\Squaresteel{\mvchr{147}}
+\newcommand\Rectsteel{\mvchr{148}}
+\newcommand\Circsteel{\mvchr{149}}
+
+\newcommand\Flatsteel{\mvchr{150}}
+\newcommand\Squarepipe{\mvchr{151}}
+\newcommand\Rectpipe{\mvchr{152}}
+\newcommand\Lsteel{\mvchr{153}}
+\newcommand\TTsteel{\mvchr{154}}
+\newcommand\Circpipe{\mvchr{155}}
+\newcommand\Tsteel{\mvchr{156}}
+\newcommand\RoundedTsteel{\mvchr{157}}
+\newcommand\RoundedTTsteel{\mvchr{158}}
+\newcommand\RoundedLsteel{\mvchr{159}}
+
+\newcommand\Shilling{\mvchr{161}}
+\newcommand\Denarius{\mvchr{162}}
+\newcommand\Deleatur{\Denarius}
+\newcommand\Pfund{\mvchr{163}}
+\newcommand\EUR{\mvchr{164}}
+\newcommand\Bouquet{\mvchr{165}}
+\newcommand\EyesDollar{\mvchr{166}}
+\newcommand\Frowny{\mvchr{167}}
+\newcommand\NoChemicalCleaning{\mvchr{168}}
+\newcommand\Smiley{\mvchr{169}}
+
+\newcommand\CircledA{\mvchr{170}}
+\newcommand\CleaningA{\mvchr{171}}
+\newcommand\CleaningP{\mvchr{172}}
+\newcommand\CleaningPP{\mvchr{173}}
+\newcommand\Bicycle{\mvchr{174}}
+\newcommand\IroningI{\mvchr{175}}
+\newcommand\IroningII{\mvchr{176}}
+\newcommand\IroningIII{\mvchr{177}}
+\newcommand\NoIroning{\mvchr{178}}
+
+\newcommand\RewindToIndex{\mvchr{180}}
+\newcommand\RewindToStart{\mvchr{181}}
+\newcommand\Rewind{\mvchr{182}}
+\newcommand\Forward{\mvchr{183}}
+\newcommand\ForwardToEnd{\mvchr{184}}
+\newcommand\ForwardToIndex{\mvchr{185}}
+\newcommand\MoveUp{\mvchr{186}}
+\newcommand\MoveDown{\mvchr{187}}
+\newcommand\ToTop{\mvchr{188}}
+\newcommand\ToBottom{\mvchr{189}}
+
+\newcommand\CleaningF{\mvchr{190}}
+\newcommand\CleaningFF{\mvchr{191}}
+\newcommand\Sun{\mvchr{192}}
+\newcommand\Moon{\mvchr{193}}
+\newcommand\Mercury{\mvchr{194}}
+\newcommand\Venus{\mvchr{195}}
+\newcommand\Mars{\mvchr{196}}
+\newcommand\Jupiter{\mvchr{197}}
+\newcommand\Saturn{\mvchr{198}}
+\newcommand\Uranus{\mvchr{199}}
+
+\newcommand\Neptune{\mvchr{200}}
+\newcommand\Pluto{\mvchr{201}}
+\newcommand\Earth{\mvchr{202}}
+\newcommand\Bleech{\mvchr{203}}
+\newcommand\NoBleech{\mvchr{204}}
+\newcommand\ComputerMouse{\mvchr{205}}
+\newcommand\SerialInterface{\mvchr{206}}
+\newcommand\Keyboard{\mvchr{207}}
+\newcommand\SerialPort{\mvchr{208}}
+\newcommand\ParallelPort{\mvchr{209}}
+
+\newcommand\Printer{\mvchr{210}}
+\newcommand\AtNinetyFive{\mvchr{211}}
+\newcommand\ShortNinetyFive{\mvchr{212}}
+\newcommand\AtSixty{\mvchr{213}}
+\newcommand\ShortSixty{\mvchr{214}}
+\newcommand\ShortFifty{\mvchr{215}}
+\newcommand\AtForty{\mvchr{216}}
+\newcommand\ShortForty{\mvchr{217}}
+\newcommand\SpecialForty{\mvchr{218}}
+\newcommand\ShortThirty{\mvchr{219}}
+
+\newcommand\Handwash{\mvchr{220}}
+\newcommand\Dontwash{\mvchr{221}}
+
+\newcommand\Zodiac[1]{\mvchr{\ifcase#1\or224\or225\or226\or227\or228\or229\or230\or231\or232\or233\or234\or235\fi}}
+
+\newcommand\Aries{\mvchr{224}}
+\newcommand\Taurus{\mvchr{225}}
+\newcommand\Gemini{\mvchr{226}}
+\newcommand\Cancer{\mvchr{227}}
+\newcommand\Leo{\mvchr{228}}
+\newcommand\Virgo{\mvchr{229}}
+\newcommand\Libra{\mvchr{230}}
+\newcommand\Scorpio{\mvchr{231}}
+\newcommand\Sagittarius{\mvchr{232}}
+\newcommand\Capricorn{\mvchr{233}}
+\newcommand\Aquarius{\mvchr{234}}
+\newcommand\Pisces{\mvchr{235}}
+
+\newcommand\Squaredot{\mvchr{247}}
+
+\newcommand\Bat{\mvchr{253}}
+\newcommand\Womanface{\mvchr{254}}
+\newcommand\MartinVogel{\mvchr{255}}
 
 \endinput
diff --git a/Master/texmf-dist/tex/latex/marvosym/umvs.fd b/Master/texmf-dist/tex/latex/marvosym/umvs.fd
new file mode 100644
index 00000000000..504f7a99711
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/marvosym/umvs.fd
@@ -0,0 +1,3 @@
+% Font declarations for MarVoSym font
+\DeclareFontFamily{U}{mvs}{}
+\DeclareFontShape{U}{mvs}{m}{n}{<-> umvs}{}