From 7414d794c574611723435a79759fedf9fa30f4ff Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 16 Jan 2018 22:45:03 +0000 Subject: mandi (16jan18) git-svn-id: svn://tug.org/texlive/trunk@46333 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/mandi/mandi.sty | 223 ++++++++++++++++++---------- 1 file changed, 148 insertions(+), 75 deletions(-) (limited to 'Master/texmf-dist/tex/latex/mandi') diff --git a/Master/texmf-dist/tex/latex/mandi/mandi.sty b/Master/texmf-dist/tex/latex/mandi/mandi.sty index e0a8922ae84..2aa2008ba60 100644 --- a/Master/texmf-dist/tex/latex/mandi/mandi.sty +++ b/Master/texmf-dist/tex/latex/mandi/mandi.sty @@ -6,7 +6,7 @@ %% %% mandi.dtx (with options: `package') %% -%% Copyright (C) 2016 by Paul J. Heafner +%% Copyright (C) 2018 by Paul J. Heafner %% --------------------------------------------------------------------------- %% This work may be distributed and/or modified under the conditions of the %% LaTeX Project Public License, either version 1.3 of this license or (at @@ -28,7 +28,7 @@ %% vdemo.py. %% --------------------------------------------------------------------------- %% -\ProvidesPackage{mandi}[2016/06/30 2.6.1 Macros for physics and astronomy] +%%\ProvidesPackage{mandi}[2018/01/15 2.7.1 Macros for physics and astronomy] \NeedsTeXFormat{LaTeX2e}[1999/12/01] \RequirePackage{amsmath} @@ -43,6 +43,7 @@ \RequirePackage{etoolbox} \RequirePackage{filehook} \RequirePackage{extarrows} +\RequirePackage{float} \RequirePackage[T1]{fontenc} \RequirePackage{graphicx} \RequirePackage{epstopdf} @@ -59,7 +60,7 @@ \RequirePackage{xspace} \RequirePackage{ifthen} \RequirePackage{calligra} -\RequirePackage{hyperref} +\RequirePackage[hypertexnames=false]{hyperref} \hypersetup{colorlinks=true,urlcolor=blue} \DeclareMathAlphabet{\mathcalligra}{T1}{calligra}{m}{n} \DeclareFontShape{T1}{calligra}{m}{n}{<->s*[2.2]callig15}{} @@ -78,10 +79,10 @@ line,linecolor,mag,mag2,make_trail,material,norm,normal,objects,opacity,points,pos,% print,print_function,proj,pyramid,radians,radius,rate,retain,ring,rotate,scene,% shaftwidth,shape,sign,size,space,sphere,text,trail_object,trail_type,True,twist,up,% - vector,visual,width,offset,yoffset,GlowScript,VPython,trail_color,trail_radius,% - pps,clear,False,CoffeeScript,graph,gdisplay,canvas,pause,vec,clone,compound,% - vertex,triangle,quad,attach_trail,attach_arrow,textures,bumpmaps,print_options,% - get_library,read_local_file},% + vector,visual,width,offset,yoffset,GlowScript,VPython,vpython,trail_color,% + trail_radius,pps,clear,False,CoffeeScript,graph,gdisplay,canvas,pause,vec,clone,% + compound,vertex,triangle,quad,attach_trail,attach_arrow,textures,bumpmaps,% + print_options,get_library,read_local_file},% captionpos=b,% % position caption frame=shadowbox,% % shadowbox around listing rulesepcolor=\color{vshadowcolor},% % shadow color @@ -121,11 +122,12 @@ \DeclareOption{useradians}{\setboolean{@optuseradians}{true}} \ProcessOptions\relax \newcommand*{\mandiversion}{\ifmmode% - 2.6.1\mbox{ dated }2016/06/30% + 2.7.1\mbox{ dated }2018/01/15% \else% - 2.6.1 dated 2016/06/30% + 2.7.1 dated 2018/01/15% \fi }% +\typeout{ } \typeout{mandi: You're using mandi version \mandiversion.} \@ifpackageloaded{amssymb}{% \csundef{square} @@ -136,7 +138,7 @@ }% \newcommand*{\per}{\ensuremath{/}} \newcommand*{\usk}{\ensuremath{\cdot}} -\newcommand*{\unit}[2]{\ensuremath{{#1}\,{#2}}} +\newcommand*{\unit}[2]{\ensuremath{{#1}\;{#2}}} \newcommand*{\ampere}{\ensuremath{\mathrm{A}}} \newcommand*{\arcminute}{\ensuremath{'}} \newcommand*{\arcsecond}{\ensuremath{''}} @@ -267,6 +269,7 @@ \ifthenelse{\boolean{@optuseradians}} {\typeout{mandi: You'll get radians in ang mom, ang impulse, and torque.}} {\typeout{mandi: You won't get radians in ang mom, ang impulse, and torque.}} +\typeout{ } \ifthenelse{\boolean{@optapproxconsts}} {\newcommand*{\mi@p}[2]{#1}} % approximate value {\newcommand*{\mi@p}[2]{#2}} % precise value @@ -284,11 +287,14 @@ \newcommand*{\dimtemperature}{\ensuremath{\mathrm{\Theta}}} \newcommand*{\dimamount}{\ensuremath{\mathrm{N}}} \newcommand*{\dimluminous}{\ensuremath{\mathrm{J}}} -\newcommand*{\indegrees}[1]{\unit{#1}{\degree}} -\newcommand*{\inFarenheit}[1]{\unit{#1}{\degree\mathrm{F}}} -\newcommand*{\inCelsius}[1]{\unit{#1}{\degree\mathrm{C}}} -\newcommand*{\inarcminutes}[1]{\unit{#1}{\arcminute}} -\newcommand*{\inarcseconds}[1]{\unit{#1}{\arcsecond}} +\newcommand*{\infeet}[1]{\unit{#1}{\mathrm{ft}}} +\newcommand*{\infeetpersecond}[1]{\unit{#1}{\mathrm{ft}\per\s}} +\newcommand*{\infeetpersecondsquared}[1]{\unit{#1}{\mathrm{ft}\per\s\squared}} +\newcommand*{\indegrees}[1]{\unit{#1}{\mkern-\thickmuskip\degree}} +\newcommand*{\inFarenheit}[1]{\unit{#1}{\mkern-\thickmuskip\degree\mathrm{F}}} +\newcommand*{\inCelsius}[1]{\unit{#1}{\mkern-\thickmuskip\degree\mathrm{C}}} +\newcommand*{\inarcminutes}[1]{\unit{#1}{\mkern-\thickmuskip\arcminute}} +\newcommand*{\inarcseconds}[1]{\unit{#1}{\mkern-\thickmuskip\arcsecond}} \newcommand*{\ineV}[1]{\unit{#1}{\electronvolt}} \newcommand*{\ineVocs}[1]{\unit{#1}{\mathrm{eV}\per c^2}} \newcommand*{\ineVoc}[1]{\unit{#1}{\mathrm{eV}\per c}} @@ -349,11 +355,11 @@ \newphysicsquantity{planeangle}% {\m\usk\reciprocal\m}% [\rad]% - [] + [\rad] \newphysicsquantity{solidangle}% {\m\squared\usk\reciprocalsquare\m}% [\sr]% - [] + [\sr] \newphysicsquantity{velocity}% {\m\usk\reciprocal\s}% [\m\usk\reciprocal\s]% @@ -716,6 +722,7 @@ {\newcommand*{\dirvect}[1]{\ensuremath{\widehat{#1}}}}} \newcommand*{\direction}[1]{\ensuremath{\mivector{#1}}} \newcommand*{\vectordirection}{\direction} +\newcommand*{\factorvect}[1]{\magvect{#1}\dirvect{#1}} \newcommand*{\componentalong}[2]{\ensuremath{\mathrm{comp}_{#1}{#2}}} \newcommand*{\expcomponentalong}[2]{\ensuremath{\frac{\vectdotvect{#2}{#1}} {\magof{#1}}}} @@ -815,7 +822,6 @@ \ifthenelse{\boolean{@optromanvectors}} {\newcommand*{\dirvectsub}[2]{\ensuremath{\ssub{\widehat{\mathrm{#1}}}{#2}}}} {\newcommand*{\dirvectsub}[2]{\ensuremath{\ssub{\widehat{#1}}{#2}}}} -\newcommand*{\directionsub}{\dirvectsub} \newcommand*{\dvectsub}[2]{\ensuremath{\mathrm{d}\vectsub{#1}{#2}}} \newcommand*{\Dvectsub}[2]{\ensuremath{\Delta\vectsub{#1}{#2}}} \newcommand*{\compdvectsub}[3]{\ensuremath{\mathrm{d}\compvectsub{#1}{#2}{#3}}} @@ -847,14 +853,18 @@ \compDervectsub{#1}{#2}{x}{#3},% \compDervectsub{#1}{#2}{y}{#3},% \compDervectsub{#1}{#2}{z}{#3}\rv}} -\newcommand*{\vectdotvect}[2]{\ensuremath{{#1}\bullet{#2}}} -\newcommand*{\vectdotsvect}[2]{\ensuremath{\scompsvect{#1}\bullet\scompsvect{#2}}} +\newcommand*{\vectdotvect}[2]{\ensuremath{{#1}\cdot{#2}}} +\newcommand*{\vectDotvect}[2]{\ensuremath{{#1}\bullet{#2}}} +\newcommand*{\vectdotsvect}[2]{\ensuremath{\scompsvect{#1}\cdot\scompsvect{#2}}} +\newcommand*{\vectDotsvect}[2]{\ensuremath{\scompsvect{#1}\bullet\scompsvect{#2}}} \newcommand*{\vectdotevect}[2]{\ensuremath{% \compvect{#1}{x}\compvect{#2}{x}+% \compvect{#1}{y}\compvect{#2}{y}+% \compvect{#1}{z}\compvect{#2}{z}}} -\newcommand*{\vectdotsdvect}[2]{\ensuremath{\scompsvect{#1}\bullet\scompsdvect{#2}}} -\newcommand*{\vectdotsDvect}[2]{\ensuremath{\scompsvect{#1}\bullet\scompsDvect{#2}}} +\newcommand*{\vectdotsdvect}[2]{\ensuremath{\scompsvect{#1}\cdot\scompsdvect{#2}}} +\newcommand*{\vectDotsdvect}[2]{\ensuremath{\scompsvect{#1}\bullet\scompsdvect{#2}}} +\newcommand*{\vectdotsDvect}[2]{\ensuremath{\scompsvect{#1}\cdot\scompsDvect{#2}}} +\newcommand*{\vectDotsDvect}[2]{\ensuremath{\scompsvect{#1}\bullet\scompsDvect{#2}}} \newcommand*{\vectdotedvect}[2]{\ensuremath{% \compvect{#1}{x}\compdvect{#2}{x}+% \compvect{#1}{y}\compdvect{#2}{y}+% @@ -864,14 +874,20 @@ \compvect{#1}{y}\compDvect{#2}{y}+% \compvect{#1}{z}\compDvect{#2}{z}}} \newcommand*{\vectsubdotsvectsub}[4]{\ensuremath{% + \scompsvectsub{#1}{#2}\cdot\scompsvectsub{#3}{#4}}} +\newcommand*{\vectsubDotsvectsub}[4]{\ensuremath{% \scompsvectsub{#1}{#2}\bullet\scompsvectsub{#3}{#4}}} \newcommand*{\vectsubdotevectsub}[4]{\ensuremath{% \compvectsub{#1}{#2}{x}\compvectsub{#3}{#4}{x}+% \compvectsub{#1}{#2}{y}\compvectsub{#3}{#4}{y}+% \compvectsub{#1}{#2}{z}\compvectsub{#3}{#4}{z}}} \newcommand*{\vectsubdotsdvectsub}[4]{\ensuremath{% + \scompsvectsub{#1}{#2}\cdot\scompsdvectsub{#3}{#4}}} +\newcommand*{\vectsubDotsdvectsub}[4]{\ensuremath{% \scompsvectsub{#1}{#2}\bullet\scompsdvectsub{#3}{#4}}} \newcommand*{\vectsubdotsDvectsub}[4]{\ensuremath{% + \scompsvectsub{#1}{#2}\cdot\scompsDvectsub{#3}{#4}}} +\newcommand*{\vectsubDotsDvectsub}[4]{\ensuremath{% \scompsvectsub{#1}{#2}\bullet\scompsDvectsub{#3}{#4}}} \newcommand*{\vectsubdotedvectsub}[4]{\ensuremath{% \compvectsub{#1}{#2}{x}\compdvectsub{#3}{#4}{x}+% @@ -882,8 +898,12 @@ \compvectsub{#1}{#2}{y}\compDvectsub{#3}{#4}{y}+% \compvectsub{#1}{#2}{z}\compDvectsub{#3}{#4}{z}}} \newcommand*{\vectsubdotsdvect}[3]{\ensuremath{% + \scompsvectsub{#1}{#2}\cdot\scompsdvect{#3}}} +\newcommand*{\vectsubDotsdvect}[3]{\ensuremath{% \scompsvectsub{#1}{#2}\bullet\scompsdvect{#3}}} \newcommand*{\vectsubdotsDvect}[3]{\ensuremath{% + \scompsvectsub{#1}{#2}\cdot\scompsDvect{#3}}} +\newcommand*{\vectsubDotsDvect}[3]{\ensuremath{% \scompsvectsub{#1}{#2}\bullet\scompsDvect{#3}}} \newcommand*{\vectsubdotedvect}[3]{\ensuremath{% \compvectsub{#1}{#2}{x}\compdvect{#3}{x}+% @@ -894,8 +914,12 @@ \compvectsub{#1}{#2}{y}\compDvect{#3}{y}+% \compvectsub{#1}{#2}{z}\compDvect{#3}{z}}} \newcommand*{\dervectdotsvect}[3]{\ensuremath{% + \scompsdervect{#1}{#2}\cdot\scompsvect{#3}}} +\newcommand*{\dervectDotsvect}[3]{\ensuremath{% \scompsdervect{#1}{#2}\bullet\scompsvect{#3}}} \newcommand*{\Dervectdotsvect}[3]{\ensuremath{% + \scompsDervect{#1}{#2}\cdot\scompsvect{#3}}} +\newcommand*{\DervectDotsvect}[3]{\ensuremath{% \scompsDervect{#1}{#2}\bullet\scompsvect{#3}}} \newcommand*{\dervectdotevect}[3]{\ensuremath{% \compdervect{#1}{x}{#2}\compvect{#3}{x}+% @@ -906,8 +930,12 @@ \compDervect{#1}{y}{#2}\compvect{#3}{y}+% \compDervect{#1}{z}{#2}\compvect{#3}{z}}} \newcommand*{\vectdotsdervect}[3]{\ensuremath{% + \scompsvect{#1}\cdot\scompsdervect{#2}{#3}}} +\newcommand*{\vectDotsdervect}[3]{\ensuremath{% \scompsvect{#1}\bullet\scompsdervect{#2}{#3}}} \newcommand*{\vectdotsDervect}[3]{\ensuremath{% + \scompsvect{#1}\cdot\scompsDervect{#2}{#3}}} +\newcommand*{\vectDotsDervect}[3]{\ensuremath{% \scompsvect{#1}\bullet\scompsDervect{#2}{#3}}} \newcommand*{\vectdotedervect}[3]{\ensuremath{% \compvect{#1}{x}\compdervect{#2}{x}{#3}+% @@ -918,8 +946,12 @@ \compvect{#1}{y}\compDervect{#2}{y}{#3}+% \compvect{#1}{z}\compDervect{#2}{z}{#3}}} \newcommand*{\dervectdotsdvect}[3]{\ensuremath{% + \scompsdervect{#1}{#2}\cdot\scompsdvect{#3}}} +\newcommand*{\dervectDotsdvect}[3]{\ensuremath{% \scompsdervect{#1}{#2}\bullet\scompsdvect{#3}}} \newcommand*{\DervectdotsDvect}[3]{\ensuremath{% + \scompsDervect{#1}{#2}\cdot\scompsDvect{#3}}} +\newcommand*{\DervectDotsDvect}[3]{\ensuremath{% \scompsDervect{#1}{#2}\bullet\scompsDvect{#3}}} \newcommand*{\dervectdotedvect}[3]{\ensuremath{% \compdervect{#1}{x}{#2}\compdvect{#3}{x}+% @@ -936,8 +968,12 @@ \newcommand*{\rtriplecross}[3]{\ensuremath{{#1}\boldsymbol{\times}% \inparens{{#2}\boldsymbol{\times}{#3}}}} \newcommand*{\ltriplescalar}[3]{\ensuremath{% + {#1}\boldsymbol{\times}{#2}\cdot{#3}}} +\newcommand*{\ltripleScalar}[3]{\ensuremath{% {#1}\boldsymbol{\times}{#2}\bullet{#3}}} \newcommand*{\rtriplescalar}[3]{\ensuremath{% + {#1}\cdot{#2}\boldsymbol{\times}{#3}}} +\newcommand*{\rtripleScalar}[3]{\ensuremath{% {#1}\bullet{#2}\boldsymbol{\times}{#3}}} \newcommand*{\ezero}{\ensuremath{\boldsymbol{e}_0}} \newcommand*{\eone}{\ensuremath{\boldsymbol{e}_1}} @@ -1146,7 +1182,7 @@ \left\lvert{#2}\right\rangle}} \newphysicsconstant{oofpez}% {\ensuremath{\frac{1}{\phantom{_o}4\pi\epsilon_0}}}% - {\mi@p{9}{8.9876}\timestento{9}}% + {\mi@p{9}{8.9875517873681764}\timestento{9}}% {\m\cubed\usk\kg\usk\reciprocalquartic\s\usk\A\reciprocalsquared}% [\m\per\farad]% [\newton\usk\m\squared\per\coulomb\squared] @@ -1158,7 +1194,7 @@ [\N\usk\s\squared\per\C\squared] \newphysicsconstant{vacuumpermittivity}% {\ensuremath{\epsilon_0}}% - {\mi@p{9.0}{8.8542}\timestento{-12}}% + {\mi@p{9.0}{8.854187817}\timestento{-12}}% {\m\reciprocalcubed\usk\reciprocal\kg\usk\s\quarted\usk\A\squared}% [\F\per\m]% [\C\squared\per\N\usk\m\squared] @@ -1176,103 +1212,103 @@ [\T\usk\m\per\A] \newphysicsconstant{boltzmann}% {\ensuremath{k_B}}% - {\mi@p{1.4}{1.3806}\timestento{-23}}% + {\mi@p{1.4}{1.38064852}\timestento{-23}}% {\m\squared\usk\kg\usk\reciprocalsquare\s\usk\reciprocal\K}% [\joule\per\K]% [\J\per\K] \newphysicsconstant{boltzmannineV}% {\ensuremath{k_B}}% - {\mi@p{8.6}{8.6173}\timestento{-5}}% + {\mi@p{8.6}{8.6173303}\timestento{-5}}% {\eV\usk\reciprocal\K}% [\eV\per\K]% [\eV\per\K] \newphysicsconstant{stefanboltzmann}% {\ensuremath{\sigma}}% - {\mi@p{5.7}{5.6704}\timestento{-8}}% + {\mi@p{5.7}{5.670367}\timestento{-8}}% {\kg\usk\s\reciprocalcubed\usk\K\reciprocalquarted}% [\W\per\m\squared\usk\K^4]% [\W\per\m\squared\usk\K\quarted] \newphysicsconstant{planck}% {\ensuremath{h}}% - {\mi@p{6.6}{6.6261}\timestento{-34}}% + {\mi@p{6.6}{6.626070040}\timestento{-34}}% {\m\squared\usk\kg\usk\reciprocal\s}% [\J\usk\s]% [\J\usk\s] \newphysicsconstant{planckineV}% {\ensuremath{h}}% - {\mi@p{4.1}{4.1357}\timestento{-15}}% + {\mi@p{4.1}{4.135667662}\timestento{-15}}% {\eV\usk\s}% [\eV\usk\s]% [\eV\usk\s] \newphysicsconstant{planckbar}% {\ensuremath{\hslash}}% - {\mi@p{1.1}{1.0546}\timestento{-34}}% + {\mi@p{1.1}{1.054571800}\timestento{-34}}% {\m\squared\usk\kg\usk\reciprocal\s}% [\J\usk\s]% [\J\usk\s] \newphysicsconstant{planckbarineV}% {\ensuremath{\hslash}}% - {\mi@p{6.6}{6.5821}\timestento{-16}}% + {\mi@p{6.6}{6.582119514}\timestento{-16}}% {\eV\usk\s}% [\eV\usk\s]% [\eV\usk\s] \newphysicsconstant{planckc}% {\ensuremath{hc}}% - {\mi@p{2.0}{1.9864}\timestento{-25}}% + {\mi@p{2.0}{1.98644568}\timestento{-25}}% {\m\cubed\usk\kg\usk\reciprocalsquare\s}% [\J\usk\m]% [\J\usk\m] \newphysicsconstant{planckcineV}% {\ensuremath{hc}}% - {\mi@p{2.0}{1.9864}\timestento{-25}}% + {\mi@p{1240}{1.23984193}\timestento{3}}% {\eV\usk\text{n}\m}% [\eV\usk\text{n}\m]% [\eV\usk\text{n}\m] \newphysicsconstant{rydberg}% {\ensuremath{\msub{R}{\infty}}}% - {\mi@p{1.1}{1.0974}\timestento{7}}% + {\mi@p{1.1}{1.0973731568508}\timestento{7}}% {\reciprocal\m}% [\reciprocal\m]% [\reciprocal\m] \newphysicsconstant{bohrradius}% {\ensuremath{a_0}}% - {\mi@p{5.3}{5.2918}\timestento{-11}}% + {\mi@p{5.3}{5.2917721067}\timestento{-11}}% {\m}% [\m]% [\m] \newphysicsconstant{finestructure}% {\ensuremath{\alpha}}% - {\mi@p{\frac{1}{137}}{7.2974\timestento{-3}}}% + {\mi@p{\frac{1}{137}}{7.2973525664\timestento{-3}}}% {}% []% [] \newphysicsconstant{avogadro}% {\ensuremath{N_A}}% - {\mi@p{6.0}{6.0221}\timestento{23}}% + {\mi@p{6.0}{6.022140857}\timestento{23}}% {\reciprocal\mol}% [\reciprocal\mol]% [\reciprocal\mol] \newphysicsconstant{universalgrav}% {\ensuremath{G}}% - {\mi@p{6.7}{6.6738}\timestento{-11}}% + {\mi@p{6.7}{6.67408}\timestento{-11}}% {\m\cubed\usk\reciprocal\kg\usk\s\reciprocalsquared}% [\J\usk\m\per\kg\squared]% [\N\usk\m\squared\per\kg\squared] \newphysicsconstant{surfacegravfield}% {\ensuremath{g}}% - {\mi@p{9.8}{9.80}}% + {\mi@p{9.8}{9.807}}% {\m\usk\s\reciprocalsquared}% [\N\per\kg]% [\N\per\kg] \newphysicsconstant{clight}% {\ensuremath{c}}% - {\mi@p{3}{2.9979}\timestento{8}}% + {\mi@p{3}{2.99792458}\timestento{8}}% {\m\usk\reciprocal\s}% [\m\per\s]% [\m\per\s] \newphysicsconstant{clightinfeet}% {\ensuremath{c}}% - {\mi@p{1}{0.9836}}% + {\mi@p{1}{0.983571}}% {\text{ft}\usk\reciprocal{\text{n}\s}}% [\text{ft}\per\text{n}\s]% [\text{ft}\per\mathrm{n}\s] @@ -1284,31 +1320,31 @@ [\m] \newphysicsconstant{Mproton}% {\ensuremath{m_p}}% - {\mi@p{1.7}{1.6726}\timestento{-27}}% + {\mi@p{1.7}{1.672621898}\timestento{-27}}% {\kg}% [\kg]% [\kg] \newphysicsconstant{Mneutron}% {\ensuremath{m_n}}% - {\mi@p{1.7}{1.6749}\timestento{-27}}% + {\mi@p{1.7}{1.674927471}\timestento{-27}}% {\kg}% [\kg]% [\kg] \newphysicsconstant{Mhydrogen}% {\ensuremath{m_H}}% - {\mi@p{1.7}{1.6737}\timestento{-27}}% + {\mi@p{1.7}{1.6737236}\timestento{-27}}% {\kg}% [\kg]% [\kg] \newphysicsconstant{Melectron}% {\ensuremath{m_e}}% - {\mi@p{9.1}{9.1094}\timestento{-31}}% + {\mi@p{9.1}{9.10938356}\timestento{-31}}% {\kg}% [\kg]% [\kg] \newphysicsconstant{echarge}% {\ensuremath{e}}% - {\mi@p{1.6}{1.6022}\timestento{-19}}% + {\mi@p{1.6}{1.6021766208}\timestento{-19}}% {\A\usk\s}% [\C]% [\C] @@ -1338,61 +1374,61 @@ [\C] \newphysicsconstant{MEarth}% {\ensuremath{M_{\text{Earth}}}}% - {\mi@p{6.0}{5.9736}\timestento{24}}% + {\mi@p{6.0}{5.97237}\timestento{24}}% {\kg}% [\kg]% [\kg] \newphysicsconstant{MMoon}% {\ensuremath{M_{\text{Moon}}}}% - {\mi@p{7.3}{7.3459}\timestento{22}}% + {\mi@p{7.3}{7.342}\timestento{22}}% {\kg}% [\kg]% [\kg] \newphysicsconstant{MSun}% {\ensuremath{M_{\text{Sun}}}}% - {\mi@p{2.0}{1.9891}\timestento{30}}% + {\mi@p{2.0}{1.98855}\timestento{30}}% {\kg}% [\kg]% [\kg] \newphysicsconstant{REarth}% {\ensuremath{R_{\text{Earth}}}}% - {\mi@p{6.4}{6.3675}\timestento{6}}% + {\mi@p{6.4}{6.371}\timestento{6}}% {\m}% [\m]% [\m] \newphysicsconstant{RMoon}% {\ensuremath{R_{\text{Moon}}}}% - {\mi@p{1.7}{1.7375}\timestento{6}}% + {\mi@p{1.7}{1.7371}\timestento{6}}% {\m}% [\m]% [\m] \newphysicsconstant{RSun}% {\ensuremath{R_{\text{Sun}}}}% - {\mi@p{7.0}{6.9634}\timestento{8}}% + {\mi@p{7.0}{6.957}\timestento{8}}% {\m}% [\m]% [\m] \newphysicsconstant{ESdist}% {\magvectsub{r}{ES}}% - {\mi@p{1.5}{1.4960}\timestento{11}}% + {\mi@p{1.5}{1.496}\timestento{11}}% {\m}% [\m]% [\m] \newphysicsconstant{SEdist}% {\magvectsub{r}{SE}}% - {\mi@p{1.5}{1.4960}\timestento{11}}% + {\mi@p{1.5}{1.496}\timestento{11}}% {\m}% [\m]% [\m] \newphysicsconstant{EMdist}% {\magvectsub{r}{EM}}% - {\mi@p{3.8}{3.8440}\timestento{8}}% + {\mi@p{3.8}{3.81550}\timestento{8}}% {\m}% [\m]% [\m] \newphysicsconstant{MEdist}% {\magvectsub{r}{ME}}% - {\mi@p{3.8}{3.8440}\timestento{8}}% + {\mi@p{3.8}{3.81550}\timestento{8}}% {\m}% [\m]% [\m] @@ -1501,6 +1537,7 @@ \newcommand*{\sumoverall}[1]{\ensuremath{\displaystyle \sum_{\substack{\text{\tiny{all }}\text{\tiny{{#1}}}}}}} \newcommand*{\dx}[1]{\ensuremath{\,\mathrm{d}{#1}}} +\newcommand*{\dslashx}[1]{\ensuremath{\,\mathchar'26\mkern-12mu \mathrm{d}{#1}}} \newcommandx{\evaluatedfromto}[2][2,usedefault]{\ensuremath{% \Bigg.\Bigg\rvert_{#1}^{#2}}} \newcommand*{\evaluatedat}{\evaluatedfromto} @@ -1603,6 +1640,7 @@ \newcommand*{\scripty}[1]{\ensuremath{\mathcalligra{#1}}} \newcommand*{\Lagr}{\ensuremath{\mathcal{L}}} \newcommandx{\flux}[1][1]{\ensuremath{\ssub{\Phi}{#1}}} +\newcommandx{\circulation}[1][1]{\ensuremath{\ssub{\Gamma}{#1}}} \newcommand*{\absof}[1]{\ensuremath{% \left\lvert{\ifblank{#1}{\:\_\:}{#1}}\right\rvert}} \newcommand*{\inparens}[1]{\ensuremath{% @@ -1631,12 +1669,12 @@ \newcommand*{\hms}[3]{\ensuremath{% {#1}^{\hour}{#2}^{\mathrm{m}}{#3}^{\s}}} \newcommand*{\clockreading}{\hms} -\newcommand*{\latitude}[1]{\unit{#1}{\degree}} -\newcommand*{\latitudeN}[1]{\unit{#1}{\degree\;\mathrm{N}}} -\newcommand*{\latitudeS}[1]{\unit{#1}{\degree\;\mathrm{S}}} -\newcommand*{\longitude}[1]{\unit{#1}{\degree}} -\newcommand*{\longitudeE}[1]{\unit{#1}{\degree\;\mathrm{E}}} -\newcommand*{\longitudeW}[1]{\unit{#1}{\degree\;\mathrm{W}}} +\newcommand*{\latitude}[1]{\unit{#1}{\mkern-\thickmuskip\degree}} +\newcommand*{\latitudeN}[1]{\unit{#1}{\mkern-\thickmuskip\degree\;\mathrm{N}}} +\newcommand*{\latitudeS}[1]{\unit{#1}{\mkern-\thickmuskip\degree\;\mathrm{S}}} +\newcommand*{\longitude}[1]{\unit{#1}{\mkern-\thickmuskip\degree}} +\newcommand*{\longitudeE}[1]{\unit{#1}{\mkern-\thickmuskip\degree\;\mathrm{E}}} +\newcommand*{\longitudeW}[1]{\unit{#1}{\mkern-\thickmuskip\degree\;\mathrm{W}}} \newcommand*{\ssub}[2]{\ensuremath{#1_{\text{#2}}}} \newcommand*{\ssup}[2]{\ensuremath{#1^{\text{#2}}}} \newcommand*{\ssud}[3]{\ensuremath{#1^{\text{#2}}_{\text{#3}}}} @@ -1736,8 +1774,8 @@ \mivector{\_ , \_ , \_}}{#4}}}\times{{\ifblank{#5}{\mivector{\_ , \_ , \_}}{#5}}}}} \newcommand*{\springinteractionplaces}[3]{\ensuremath{\inparens{#1} \inparens{#2}{{\ifblank{#3}{\mivector{\_ , \_ , \_}}{#3}}}}} -\newcommand*{\gravitationalpotentialenergyplaces}[3]{% - -\genericpotentialenergyplaces{\universalgrav}{#1}{#2}{#3}} +\newcommand*{\gravitationalpotentialenergyplaces}[3]{\ensuremath{% + -\genericpotentialenergyplaces{\universalgrav}{#1}{#2}{#3}}} \newcommand*{\electricpotentialenergyplaces}[3]{% \genericpotentialenergyplaces{\oofpez}{#1}{#2}{#3}} \newcommand*{\springpotentialenergyplaces}[2]{\ensuremath{% @@ -2272,6 +2310,21 @@ \end{align*} \end{mdframed} }% +\mdfdefinestyle{mistandardstyle}{% + hidealllines=false,skipbelow=\baselineskip,skipabove=\baselineskip, + leftmargin=40pt,rightmargin=40pt,linewidth=1,roundcorner=10, + nobreak=true, + frametitle={STANDARD}, + frametitlebackgroundcolor=cyan!60,frametitlerule=true,frametitlerulewidth=1, + backgroundcolor=cyan!25, + linecolor=black,fontcolor=black,shadow=true} +\NewEnviron{mistandard}{% + \begin{mdframed}[style=mistandardstyle] + \begin{adjactivityanswer}[cyan!25][cyan!25][black] + \BODY + \end{adjactivityanswer} + \end{mdframed} +}% \mdfdefinestyle{bwinstructornotestyle}{% hidealllines=false,skipbelow=\baselineskip,skipabove=\baselineskip, leftmargin=40pt,rightmargin=40pt,linewidth=1,roundcorner=10, @@ -2326,6 +2379,21 @@ \end{align*} \end{mdframed} }% +\mdfdefinestyle{bwstandardstyle}{% + hidealllines=false,skipbelow=\baselineskip,skipabove=\baselineskip, + leftmargin=40pt,rightmargin=40pt,linewidth=1,roundcorner=10, + nobreak=true, + frametitle={STANDARD}, + frametitlebackgroundcolor=gray!50,frametitlerule=true,frametitlerulewidth=1, + backgroundcolor=gray!20, + linecolor=black,fontcolor=black,shadow=true} +\NewEnviron{bwstandard}{% + \begin{mdframed}[style=bwstandardstyle] + \begin{adjactivityanswer}[gray!20][gray!20][black] + \BODY + \end{adjactivityanswer} + \end{mdframed} +}% \NewEnviron{mysolution}{% \setcounter{equation}{0} \begin{align} @@ -2344,20 +2412,23 @@ \newlist{parts}{enumerate}{2}% \setlist[parts]{label=(\alph*)}}{\newpage} \newcommand{\problempart}{\item}% -\newcommand{\reason}[1]{\parbox{2cm}{#1}} +\newcommand{\reason}[1]{\begin{minipage}{5cm}{#1}\end{minipage}} \newcommand*{\checkpoint}{% \vspace{1cm}\begin{center}% \colorbox{yellow!80}{|--------- CHECKPOINT ---------|}% \end{center}}% -\newcommand*{\image}[2]{% - \begin{figure}[h!] +\newcommandx*{\image}[4][1={scale=1},usedefault]{% + \begin{figure}[H] \begin{center}% - \includegraphics[scale=1]{#1}% - \caption{#2}% - \label{#1}% + \includegraphics[#1]{#2}% \end{center}% + \caption{#3}% + \label{#4}% \end{figure}} \newcommand*{\sneakyone}[1]{\ensuremath{\cancelto{1}{#1}}} +\newcommand*{\parallelto}{\ensuremath{{{\mkern3mu\vphantom{\perp}\vrule depth 0pt + \mkern2mu\vrule depth 0pt\mkern3mu}}}} +\newcommand*{\perpendicularto}{\ensuremath{\perp}} \newcommand*{\qed}{\ensuremath{\text{ Q.E.D.}}} \newcommand*{\chkquantity}[1]{% \begin{center} @@ -2370,11 +2441,13 @@ }% \newcommand*{\chkconstant}[1]{% \begin{center} - \begin{tabular}{C{4cm} C{2cm} C{3cm} C{3cm} C{3cm} C{3cm}} - name & symbol & value & baseunit & drvdunit & tradunit \tabularnewline - \cs{#1} & \csname #1mathsymbol\endcsname & \csname #1value\endcsname & - \csname #1onlybaseunit\endcsname & \csname #1onlydrvdunit\endcsname & - \csname #1onlytradunit\endcsname + \begin{tabular}{C{4cm} C{4cm} C{4cm}} + name & symbol & value \tabularnewline + \cs{#1} & \csname #1mathsymbol\endcsname & \csname #1value\endcsname + \tabularnewline + baseunit & drvdunit & tradunit \tabularnewline + \csname #1onlybaseunit\endcsname & \csname #1onlydrvdunit\endcsname & + \csname #1onlytradunit\endcsname \end{tabular} \end{center} }% -- cgit v1.2.3