diff options
Diffstat (limited to 'Master/texmf-dist/doc/latex/pas-cours/macro-solides.tex')
-rw-r--r-- | Master/texmf-dist/doc/latex/pas-cours/macro-solides.tex | 44 |
1 files changed, 40 insertions, 4 deletions
diff --git a/Master/texmf-dist/doc/latex/pas-cours/macro-solides.tex b/Master/texmf-dist/doc/latex/pas-cours/macro-solides.tex index aa2019d7501..46777951b63 100644 --- a/Master/texmf-dist/doc/latex/pas-cours/macro-solides.tex +++ b/Master/texmf-dist/doc/latex/pas-cours/macro-solides.tex @@ -422,7 +422,8 @@ % coefopaq = coefficient d'opacité, % grandcercle (booléen : si oui, le grand cercle est dessiné), % legende (booléen), -% scale = coefficient d'agrandissement] +% scale = coefficient d'agrandissement, +% greenwich (booléen)] \define@boolkey[PAS] {boule} {border}[true]{} \define@cmdkey [PAS] {boule} {bordercolor}{} @@ -433,7 +434,14 @@ \define@cmdkey [PAS] {boule} {coefopaq}{} \define@boolkey[PAS] {boule} {grandcercle}[true]{} \define@boolkey[PAS] {boule} {legende}[true]{} +\define@boolkey[PAS] {boule} {greenwich}[true]{} +\define@boolkey[PAS] {boule} {greenwichlegende}[true]{} +\define@boolkey[PAS] {boule} {equateurlegende}[true]{} +\define@boolkey[PAS] {boule} {exemplecoord}[true]{} \define@cmdkey [PAS] {boule} {scale}{} +\define@cmdkey [PAS] {boule} {greenwichcolor}{} +\define@cmdkey [PAS] {boule} {exemplecoordcolor}{} +\define@cmdkey [PAS] {boule} {exemplecoordname}{} \presetkeys [PAS] {boule} { border = false, bordercolor = black, @@ -444,6 +452,13 @@ scale = 1, grandcercle = false, legende = false, + greenwich = false, % NEW 2016-08-04 + greenwichcolor = black, % NEW 2016-08-04 + greenwichlegende = false, % NEW 2016-08-04 + equateurlegende = false, % NEW 2016-08-04 + exemplecoord = false, % NEW 2016-08-04 + exemplecoordcolor = green!50!black, % NEW 2016-08-04 + exemplecoordname = A, % NEW 2016-08-04 name = false}{} \newcommand*{\boule}[1][]{\pasBoule[#1]} @@ -453,9 +468,9 @@ \begin{scope}[scale=\cmdPAS@boule@scale] \ifPAS@boule@grandcercle \draw[\cmdPAS@boule@bordercolor,dotted] (2,0) arc (0:180:2cm and .5cm); - \fi + \fi \ifPAS@boule@name - \fill[\cmdPAS@boule@bordercolor] (0,0) circle (0.01cm) node[\cmdPAS@boule@poscentre,scale=\cmdPAS@boule@scale] {\cmdPAS@boule@centre}; + \fill[\cmdPAS@boule@bordercolor] (0,0) circle (0.03cm) node[\cmdPAS@boule@poscentre,scale=\cmdPAS@boule@scale] {\cmdPAS@boule@centre}; \fi \shade[shading=ball, ball color=\cmdPAS@boule@incolor,opacity=\cmdPAS@boule@coefopaq] (0,0) circle (2cm); \ifPAS@boule@grandcercle @@ -464,6 +479,9 @@ \ifPAS@boule@border \draw[\cmdPAS@boule@bordercolor] (0,0) circle (2cm); \fi + \ifPAS@boule@greenwich + \draw[\cmdPAS@boule@greenwichcolor] (0,2) arc (90:270:1cm and 2cm); + \fi \ifPAS@boule@legende \pgfmathparse{2*cos(-60)}\let\x\pgfmathresult \pgfmathparse{.5*sin(-60)}\let\y\pgfmathresult @@ -475,7 +493,25 @@ \pgfmathparse{1.5*cos(38)}\let\x\pgfmathresult \pgfmathparse{1.5*sin(38)}\let\y\pgfmathresult \draw[<-,>=stealth',\cmdPAS@boule@bordercolor!50!black] (\x,\y) to [bend right=30] (3,\y) node[right,\cmdPAS@boule@bordercolor!50!black] {\texttt{un autre grand cercle}}; - + \fi + \ifPAS@boule@greenwichlegende + \draw[<-,>=stealth',\cmdPAS@boule@greenwichcolor] (-0.6,-1.8) to [bend left=30] (-3,-1.9) node[left,\cmdPAS@boule@greenwichcolor] {\texttt{M\'eridien de Greenwich}}; + \fi + \ifPAS@boule@equateurlegende + \draw[<-,>=stealth',\cmdPAS@boule@bordercolor] (1.8,-.3) to [bend right=30] (3,-0.4) node[right,\cmdPAS@boule@bordercolor] {\texttt{\'Equateur}}; + \fi + \ifPAS@boule@exemplecoord + \filldraw[fill=\cmdPAS@boule@exemplecoordcolor!50,draw=\cmdPAS@boule@exemplecoordcolor] (0,0) -- (-155:0.4) arc (-110:-50:0.7 and 0.3) -- (-17:0.4) -- (0,0); + \filldraw[fill=\cmdPAS@boule@exemplecoordcolor!25,draw=\cmdPAS@boule@exemplecoordcolor] (0,0) -- (-17:0.4) arc (-17:50:0.7 and 0.3) -- (50:0.4) -- (0,0); + \node[\cmdPAS@boule@exemplecoordcolor,scale={\cmdPAS@boule@scale*0.6}] at (-102:0.4) {80$^\circ$}; + \node[\cmdPAS@boule@exemplecoordcolor!70,scale={\cmdPAS@boule@scale*0.6}] at (20:0.6) {40$^\circ$}; + \fill[fill=\cmdPAS@boule@exemplecoordcolor] (50:1.6cm) circle (0.05cm) node[right,\cmdPAS@boule@exemplecoordcolor] {\cmdPAS@boule@exemplecoordname}; + \draw[dashed,\cmdPAS@boule@greenwichcolor] (-0.98,-0.43) -- (0,0); + \draw[dashed,\cmdPAS@boule@exemplecoordcolor] (0,0) -- (1.28,-0.38); + \draw[dashed,\cmdPAS@boule@exemplecoordcolor] (0,0) -- (50:1.6cm); + \fill[\cmdPAS@boule@greenwichcolor] (-0.98,-0.43) circle (0.05cm) node[below left,scale=\cmdPAS@boule@scale,color=\cmdPAS@boule@greenwichcolor] {G}; + \draw[\cmdPAS@boule@exemplecoordcolor] (0,2) arc (90:-90:1.3cm and 2cm); + \fill[\cmdPAS@boule@exemplecoordcolor] (1.28,-0.38) circle (0.05cm) node[below right,scale=\cmdPAS@boule@scale,color=\cmdPAS@boule@exemplecoordcolor] {H}; \fi \end{scope} } |