From a52c84f1c299b80d33bcef1f889db567b73c915b Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sun, 21 Aug 2011 23:21:13 +0000
Subject: marvosym 3.10 (21aug11)

git-svn-id: svn://tug.org/texlive/trunk@23630 c570f23f-e606-0410-a88d-b1316a301751
---
 Master/texmf-dist/tex/latex/marvosym/marvosym.sty | 164 +++++++++++++---------
 1 file changed, 96 insertions(+), 68 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/marvosym/marvosym.sty')

diff --git a/Master/texmf-dist/tex/latex/marvosym/marvosym.sty b/Master/texmf-dist/tex/latex/marvosym/marvosym.sty
index 47267c5d704..df32e20827d 100644
--- a/Master/texmf-dist/tex/latex/marvosym/marvosym.sty
+++ b/Master/texmf-dist/tex/latex/marvosym/marvosym.sty
@@ -1,5 +1,5 @@
 \ProvidesPackage{marvosym}
-  [2006/05/11 v2.1 Martin Vogel's Symbols font definitions]
+  [2011/07/20 v2.2 Martin Vogel's Symbols font definitions]
 \newcommand{\mvs}{\fontfamily{mvs}\fontencoding{U}%
 \fontseries{m}\fontshape{n}\selectfont}
 \newcommand{\mvchr}[1]{{\mvs\char#1}}
@@ -8,11 +8,19 @@
 \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\LooseBearing{\mvchr{36}}    \let\Loosebearing\LooseBearing
+\newcommand\FixedBearing{\mvchr{37}}    \let\Fixedbearing\FixedBearing
+\newcommand\LeftTorque{\mvchr{38}}      \let\Lefttorque\LeftTorque
+\newcommand\RightTorque{\mvchr{39}}     \let\Righttorque\RightTorque
+
+\newcommand\MVLeftBracket{\mvchr{40}}
+\newcommand\MVRightBracket{\mvchr{41}}
+\newcommand\MVMultiplication{\mvchr{42}}
+\newcommand\MVPlus{\mvchr{43}}
+\newcommand\MVComma{\mvchr{44}}
+\newcommand\MVMinus{\mvchr{45}}
+\newcommand\MVPeriod{\mvchr{46}}
+\newcommand\MVDivision{\mvchr{47}}
 \newcommand\MVZero{\mvchr{48}}
 \newcommand\MVOne{\mvchr{49}}
 
@@ -24,69 +32,83 @@
 \newcommand\MVSeven{\mvchr{55}}
 \newcommand\MVEight{\mvchr{56}}
 \newcommand\MVNine{\mvchr{57}}
-\newcommand\MVRightarrow{\mvchr{58}}
+\newcommand\MVRightArrow{\mvchr{58}}    \let\MVRightarrow\MVRightArrow
+\newcommand\Conclusion{\mvchr{59}}
 
+\newcommand\LessOrEqual{\mvchr{60}}
 \newcommand\Corresponds{\mvchr{61}}
+\newcommand\LargerOrEqual{\mvchr{62}}
+\newcommand\Equivalence{\mvchr{63}}
 \newcommand\MVAt{\mvchr{64}}
 \newcommand\Pickup{\mvchr{65}}
 \newcommand\Letter{\mvchr{66}}
-\newcommand\CEsign{\mvchr{67}}
-\newcommand\EURdig{\mvchr{68}}
+\newcommand\CESign{\mvchr{67}}          \let\CEsign\CESign
+\newcommand\EurDig{\mvchr{68}}          \let\EURdig\EurDig
 \newcommand\Lightning{\mvchr{69}}
 
-\newcommand\FHBOlogo{\mvchr{70}}
+\newcommand\BOLogo{\mvchr{70}}          \let\FHBOlogo\BOLogo \let\FHBOLOGO\BOLogo \let\FullFHBO\BOLogo % different
+\newcommand\BarOver{\mvchr{71}}
 \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\BOLogoL{\mvchr{77}}
+\newcommand\BOLogoP{\mvchr{78}}
+\newcommand\HollowBox{\mvchr{79}}
+
+\newcommand\ArrowOver{\mvchr{80}}       \let\Vectorarrowhigh\ArrowOver
+\newcommand\LeftScissors{\mvchr{81}}    \let\Rightscissors\LeftScissors
+\newcommand\CuttingLine{\mvchr{82}}     \let\Kutline\CuttingLine
+\newcommand\RightScissors{\mvchr{83}}   \let\Leftscissors\RightScissors
 \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\ClockLogo{\mvchr{85}}       \let\Clocklogo\ClockLogo
+\newcommand\CheckedBox{\mvchr{86}}      \let\Checkedbox\CheckedBox
+\newcommand\AngleSign{\mvchr{87}}       \let\Anglesign\AngleSign
+\newcommand\CrossedBox{\mvchr{88}}      \let\Crossedbox\CrossedBox
+\newcommand\YinYang{\mvchr{89}}         \let\Yingyang\YinYang \let\Yinyang\YinYang \let\YingYang\YinYang
+
+\newcommand\PointingHand{\mvchr{90}}    \let\Pointinghand\PointingHand
+\newcommand\Divides{\mvchr{91}}
+\newcommand\DividesNot{\mvchr{92}}
+\newcommand\Congruent{\mvchr{93}}
+\newcommand\NotCongruent{\mvchr{94}}
+\newcommand\StrikingThrough{\mvchr{95}}
 \newcommand\Explosionsafe{\mvchr{96}}
 \newcommand\Laserbeam{\mvchr{97}}
-\newcommand\Writinghand{\mvchr{98}}
-\newcommand\EURhv{\mvchr{99}}
+\newcommand\WritingHand{\mvchr{98}}     \let\Writinghand\WritingHand
+\newcommand\EurHv{\mvchr{99}}           \let\EURhv\EurHv
 
-\newcommand\EURcr{\mvchr{100}}
-\newcommand\EURtm{\mvchr{101}}
-\newcommand\FHBOLOGO{\mvchr{102}}
+\newcommand\EurCr{\mvchr{100}}          \let\EURcr\EurCr
+\newcommand\EurTm{\mvchr{101}}          \let\EURtm\EurTm
+\newcommand\PeaceDove{\mvchr{102}}
+\newcommand\barOver{\mvchr{103}}
 \newcommand\Biohazard{\mvchr{104}}
 \newcommand\Info{\mvchr{105}}
 \newcommand\Radioactivity{\mvchr{106}}
-\newcommand\Email{\mvchr{107}}
-\newcommand\Force{\mvchr{108}}
+\newcommand\EMail{\mvchr{107}}          \let\Email\EMail
+\newcommand\MVArrowDown{\mvchr{108}}    \let\Force\MVArrowDown
 \newcommand\Mundus{\mvchr{109}}
 
-\newcommand\BSEfree{\mvchr{110}}
+\newcommand\BSEFree{\mvchr{110}}        \let\BSEfree\BSEFree
 \newcommand\Football{\mvchr{111}}
-\newcommand\Vectorarrow{\mvchr{112}}
-\newcommand\Cutright{\mvchr{113}}
-\newcommand\Cutline{\mvchr{114}}
-\newcommand\Cutleft{\mvchr{115}}
+\newcommand\arrowOver{\mvchr{112}}      \let\Vectorarrow\arrowOver
+\newcommand\CutLeft{\mvchr{113}}        \let\Cutright\CutLeft
+\newcommand\CutLine{\mvchr{114}}        \let\Cutline\CutLine
+\newcommand\CutRight{\mvchr{115}}       \let\Cutleft\CutRight
 \newcommand\fax{\mvchr{116}}
 \newcommand\FAX{\mvchr{117}}
-\newcommand\Faxmachine{\mvchr{118}}
+\newcommand\Fax{\mvchr{118}}            \let\Faxmachine\Fax
 \newcommand\Wheelchair{\mvchr{119}}
 
 \newcommand\Gentsroom{\mvchr{120}}
 \newcommand\Ladiesroom{\mvchr{121}}
-\newcommand\Emailct{\mvchr{122}}
+\newcommand\EmailCT{\mvchr{122}}        \let\Emailct\EmailCT
 \newcommand\Neutral{\mvchr{123}}
 \newcommand\Male{\mvchr{124}}
 \newcommand\Hermaphrodite{\mvchr{125}}
 \newcommand\Female{\mvchr{126}}
+% notdef
 \newcommand\HERMAPHRODITE{\mvchr{128}}
 \newcommand\FEMALE{\mvchr{129}}
 
@@ -95,37 +117,37 @@
 \newcommand\FemaleFemale{\mvchr{132}}
 \newcommand\FemaleMale{\mvchr{133}}
 \newcommand\Cross{\mvchr{134}}
-\newcommand\Celtcross{\mvchr{135}}
+\newcommand\CeltCross{\mvchr{135}}      \let\Celtcross\CeltCross
 \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\EstimatedSign{\mvchr{141}}  \let\Ecommerce\EstimatedSign
+% notdef
 \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\OktoSteel{\mvchr{145}}      \let\Octosteel\OktoSteel
+\newcommand\HexaSteel{\mvchr{146}}      \let\Hexasteel\HexaSteel
+\newcommand\SquareSteel{\mvchr{147}}    \let\Squaresteel\SquareSteel
+\newcommand\RectSteel{\mvchr{148}}      \let\Rectsteel\RectSteel
+\newcommand\CircSteel{\mvchr{149}}      \let\Circsteel\CircSteel
+
+\newcommand\FlatSteel{\mvchr{150}}      \let\Flatsteel\FlatSteel
+\newcommand\SquarePipe{\mvchr{151}}     \let\Squarepipe\SquarePipe
+\newcommand\RectPipe{\mvchr{152}}       \let\Rectpipe\RectPipe
+\newcommand\LSteel{\mvchr{153}}         \let\Lsteel\LSteel
+\newcommand\TTSteel{\mvchr{154}}        \let\TTsteel\TTSteel
+\newcommand\CircPipe{\mvchr{155}}       \let\Circpipe\CircPipe
+\newcommand\TSteel{\mvchr{156}}         \let\Tsteel\TSteel
+\newcommand\RoundedLSteel{\mvchr{157}}  \let\RoundedLsteel\RoundedLSteel
+\newcommand\RoundedTTSteel{\mvchr{158}} \let\RoundedTTsteel\RoundedTTSteel
+\newcommand\RoundedTSteel{\mvchr{159}}  \let\RoundedTsteel\RoundedTSteel
+
+% no break space
 \newcommand\Shilling{\mvchr{161}}
-\newcommand\Denarius{\mvchr{162}}
-\newcommand\Deleatur{\Denarius}
+\newcommand\Deleatur{\mvchr{162}}       \let\Denarius\Deleatur
 \newcommand\Pfund{\mvchr{163}}
 \newcommand\EUR{\mvchr{164}}
 \newcommand\Bouquet{\mvchr{165}}
@@ -137,12 +159,13 @@
 \newcommand\CircledA{\mvchr{170}}
 \newcommand\CleaningA{\mvchr{171}}
 \newcommand\CleaningP{\mvchr{172}}
-\newcommand\CleaningPP{\mvchr{173}}
+% soft hyphen
 \newcommand\Bicycle{\mvchr{174}}
-\newcommand\IroningI{\mvchr{175}}
-\newcommand\IroningII{\mvchr{176}}
-\newcommand\IroningIII{\mvchr{177}}
+\newcommand\ironing{\mvchr{175}}        \let\IroningI\ironing
+\newcommand\Ironing{\mvchr{176}}        \let\IroningII\Ironing
+\newcommand\IRONING{\mvchr{177}}        \let\IroningIII\IRONING
 \newcommand\NoIroning{\mvchr{178}}
+\newcommand\MineSign{\mvchr{179}}
 
 \newcommand\RewindToIndex{\mvchr{180}}
 \newcommand\RewindToStart{\mvchr{181}}
@@ -188,8 +211,10 @@
 \newcommand\SpecialForty{\mvchr{218}}
 \newcommand\ShortThirty{\mvchr{219}}
 
-\newcommand\Handwash{\mvchr{220}}
-\newcommand\Dontwash{\mvchr{221}}
+\newcommand\HandWash{\mvchr{220}}       \let\Handwash\HandWash
+\newcommand\NoWash{\mvchr{221}}         \let\Dontwash\NoWash
+\newcommand\Recycling{\mvchr{222}}
+\newcommand\PackingWaste{\mvchr{223}}
 
 \newcommand\Zodiac[1]{\mvchr{\ifcase#1\or224\or225\or226\or227\or228\or229\or230\or231\or232\or233\or234\or235\fi}}
 
@@ -205,11 +230,14 @@
 \newcommand\Capricorn{\mvchr{233}}
 \newcommand\Aquarius{\mvchr{234}}
 \newcommand\Pisces{\mvchr{235}}
+\newcommand\Valve{\mvchr{236}}
+\newcommand\Florin{\mvchr{237}}
+\newcommand\CleaningPP{\mvchr{238}}
 
-\newcommand\Squaredot{\mvchr{247}}
+\newcommand\MultiplicationDot{\mvchr{247}} \let\Squaredot\MultiplicationDot
 
 \newcommand\Bat{\mvchr{253}}
-\newcommand\Womanface{\mvchr{254}}
-\newcommand\MartinVogel{\mvchr{255}}
+\newcommand\WomanFace{\mvchr{254}}      \let\Womanface\WomanFace
+\newcommand\ManFace{\mvchr{255}}        \let\MartinVogel\ManFace
 
 \endinput
-- 
cgit v1.2.3

