diff options
Diffstat (limited to 'graphics/pgf/contrib')
20 files changed, 2006 insertions, 326 deletions
diff --git a/graphics/pgf/contrib/circuitikz/doc/changelog.tex b/graphics/pgf/contrib/circuitikz/doc/changelog.tex index a0c556df40..0586f67004 100644 --- a/graphics/pgf/contrib/circuitikz/doc/changelog.tex +++ b/graphics/pgf/contrib/circuitikz/doc/changelog.tex @@ -5,6 +5,34 @@ full list of changes. \begin{itemize} \item + Version 1.6.5 (2023-10-29) + + This version features an important overhaul of the \texttt{muxdemux} + configurable component/shape, making it much more flexible and + powerful, by adding configurable labels and negation and clock symbols + to the pins. Also, a couple of minor fixes/workarounds. + + \begin{itemize} + \tightlist + \item + Added optional and configurable inner, outer and border labels to + the \texttt{muxdemux} shapes + \item + Added optional clock wedge and negation signs to the pins of + \texttt{muxdemux} shapes + \item + Added the possibility to add a background drawing to + \texttt{muxdemux} shapes + \item + Fixed a + \href{https://github.com/circuitikz/circuitikz/issues/748}{bug} with + \texttt{straightvoltages} and \texttt{open} + \item + Added an (ugly) workaround for a + \href{https://github.com/circuitikz/circuitikz/issues/747}{voltage + shift mismatch} for sources + \end{itemize} +\item Version 1.6.4 (2023-10-10) A bit of enhancement and fixes for the European-style logic ports, @@ -253,7 +281,7 @@ full list of changes. B. Cameron, user \texttt{@cameroncb1} on GitHub) \item Added Shockley diode (suggested by - {[}@dauph{]}(https://tex.stackexchange.com/questions/646039/creating-a-shockley-diode-in-circuitikz)) + \href{https://tex.stackexchange.com/questions/646039/creating-a-shockley-diode-in-circuitikz}{@dauph}) \end{itemize} \item Version 1.5.2 (2022-05-08) @@ -1431,7 +1459,7 @@ A detailed list of changes can be seen below. \item Fixed varcap symbol at small scalings \item - New packet-option "straightvoltages, to draw straight(no curved) + New packet-option ``straightvoltages, to draw straight(no curved) voltage arrows \item New option ``invert'' to revert the node direction at paths diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf Binary files differindex e7bc7af850..42c752e23b 100644 --- a/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf +++ b/graphics/pgf/contrib/circuitikz/doc/circuitikz-context.pdf diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf Binary files differindex 5eef804aa8..8583d870a7 100644 --- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf +++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.pdf diff --git a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex index 1982bca452..32a8a8c532 100644 --- a/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex +++ b/graphics/pgf/contrib/circuitikz/doc/circuitikzmanual.tex @@ -7281,11 +7281,133 @@ The code that implemented the printing of the numbers (which in \texttt{muxdemux \foreach \myp in {1,...,\NB} \node[above, font=\tiny] at (\myn.bbpin \myp){\myp}; \foreach \myp in {1,...,\NT} \node[below, font=\tiny] at (\myn.btpin \myp){\myp}; } +\end{circuitikz} \end{lstlisting} -\subsubsection{Adding wedge or circular inversion markers}\label{sec:wedge-inversion} +\subsubsection{Adding labels to the pins}\label{sec:muxdemux-labels} + +In \texttt{muxdemux}es, there is no automatic labelling of pins with numbers as in chips; there is no simple standard enumeration possible. But since \texttt{v1.6.5} it is possible to associate a name to the pins that will be printed with the shape; that names are called \emph{pin labels}. +Pin labels are counter-rotated by default if the shape is rotated, as in chip pin numbers~(see \ref{sec:chip-rotation}), but you can avoid it with the key \texttt{rotated numbers} (the default is \texttt{straight numbers}). +Additionally, you can set also \emph{border labels} on the four borders (more or less, see later); that are normally not counter-rotated \emph{unless} the result would be upside-down (or if you use \texttt{straight numbers}, of course), and clock and negation symbols. + +All of these labels and symbols are added by specifying them in a \texttt{muxdemux label=\{\dots\}} clause. Notice that the key specified there are not checked for validity; if you misspell any of that, it will be simply ignored. + +\paragraph{Inner pin labels} will be printed in the inside of the shape, with the font specified in the \verb|\ctikzset| key \texttt{muxdemux/inner label font} (default is \verb|\tiny| in \LaTeX, other engine can have it different --- better set it in case of doubt) and with a padding setting with the keys \texttt{muxdemux/inner label xsep} and \texttt{muxdemux/inner label ysep} (respectively for horizontal and vertical shifts; default for both \texttt{2pt}). You can also use the key \texttt{muxdemux/inner label sep} to set both at the same time. + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} +\tikzset{myICwl/.style={muxdemux, + muxdemux def={Lh=4, Rh=4, w=4, + NR=1, NL=2, NB=2, NT=2,}, + muxdemux label={L1=left1, L2=left2, + R1=r1, B2=b2, T1=t1, T2=t2}, + } +} +\draw (0, 0) node[myICwl]{chip} ++(3,0) + node[myICwl, rotate=-90]{chip}; +\draw (0, -3) node[myICwl]{chip} ++(3,0) + node[myICwl, rotate=-90, + rotated numbers]{chip}; +\end{circuitikz} +\end{LTXexample} + +As you can see, the syntax is to add a \texttt{muxdemux label} to the specification; the labels are set using one of the letter \texttt{L}, \texttt{R}, \texttt{B}, and \texttt{T} for respectively left, right, bottom and top labels. You can define all the labels, none (which will give the default behavior of no-labels as it was before \texttt{v1.6.5}), or any number you wish. +If you want some specific label rotated in a different way, you have to do it manually, as shown in the following example. + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} +\tikzset{mux 4by2 wl/.style={muxdemux, + muxdemux def={Lh=6, NL=6, Rh=3, NB=2, w=3, NT=1}, + draw only left pins={2-5}, + muxdemux label={B1=$A_1$, B2=$A_0$, R1=OUT, + L2=$D_{00}$, L3=$D_{01}$, L4=$D_{10}$, L5=$D_{11}$, + T1=\rotatebox{90}{\texttt{Enable}}}, + circuitikz/muxdemux/inner label ysep=4pt}} +\node [mux 4by2 wl]{}; +\end{circuitikz} +\end{LTXexample} -Although you can add ``negation balls'' as seen for, for example, flip-flops (see section~\ref{sec:flip-flop-cust}), sometimes the European-style notation (also accepted by the IEEE standard) with the small wedge is preferred. The \texttt{wedgeinv} shape will nicely do. It'll scale with the \texttt{muxdemuxes} class, and the length and height can be changed with the keys \texttt{wedge inversion mark/width} (default \texttt{0.2}) and \texttt{height} (default \texttt{0.1}), with the same units that are used for the \texttt{external pins width} and similar keys. +\paragraph{Outer pin labels} will be printed on the outside of the pin position --- in the case of left and right pins, either above (``up'', identified by \texttt{LU} and \texttt{RU} labels), or below (``down'', \texttt{LD} and \texttt{RD} labels); in the case of top and bottom pin, either at the left (\texttt{TL} and \texttt{BL}) or at the right (\texttt{TR} and \texttt{BR}). The font is specified in the key \texttt{muxdemux/outer label font} (default \verb|\tiny|) and the padding with the corresponding \texttt{muxdemux/outer label xsep} and \texttt{muxdemux/outer label ysep} (default for both \texttt{2pt}), or \texttt{muxdemux/outer label sep} to set both at the same time. + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} +\ctikzset{muxdemux/outer label + font={\tiny\ttfamily\color{blue}}} +\tikzset{myICwl/.style={muxdemux, + muxdemux def={Lh=4, Rh=4, w=4, + NR=1, NL=2, NB=2, NT=2,}, + muxdemux label={L1=left1, L2=left2, + R1=r1, B2=b2, T1=t1, T2=t2, + LU1=lu1, LU2=lu2, LD1=ld1, LD2=ld2, + BR1=br1, BL1=bl1, BR2=br2, BL2=bl2, + RU1=ru1, RD1=rd1,TR2=tr2, TL2=tl2, + TR1=tr1, TL1=tl1},} +} +\draw (0, 0) node[myICwl]{chip} ++(3,0) + node[myICwl, rotate=-90]{chip}; +\draw (0, -3) node[myICwl]{chip} ++(3,0) + node[myICwl, rotate=-90, + rotated numbers]{chip}; +\end{circuitikz} +\end{LTXexample} + +\paragraph{Border labels} are drawn \emph{before} the other labels along the external border (to be exact: in north, south, east, and west position) of the component. +You set them with the key \texttt{N}, \texttt{S}, \texttt{W}, and \texttt{E} for the outer position, and \texttt{Ni}, \texttt{Si}, \texttt{Wi}, and \texttt{Ei} for the inner ones. +The font is specified in the key \texttt{muxdemux/border label font} (default \verb|\tiny|) and the padding with the corresponding \texttt{muxdemux/border label xsep} and \texttt{muxdemux/border label ysep} (default for both \texttt{2pt}), or \texttt{muxdemux/border label sep} to set both at the same time. +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} +\ctikzset{muxdemux/outer label + font={\tiny\ttfamily\color{blue}}} +\tikzset{myICwl/.style={muxdemux, + muxdemux def={Lh=4, Rh=4, w=4, + NR=1, NL=2, NB=0, NT=0,}, + muxdemux label={L1=inA, L2=inB, + R1=OUT, RU1=3, LU1=1, LU2=2, + N=mychip},} +} +\draw (0, 0) node[myICwl]{} ++(3,0) + node[myICwl, rotate=180]{}; +\draw (0, -3) node[myICwl, + muxdemux label={N=another}]{}; +\end{circuitikz} +\end{LTXexample} + +As you can see, you can locally change any label in a specific instance. + +\paragraph{Clock and negation symbols} are not exactly labels, but they can be added with the same mechanism. There are four symbols available: +\begin{description} + \item [clock wedge:] activated by the key \texttt{c} followed by the position (for example, \texttt{cL2} will set the clock wedge on the second left pin); its size can be changed with the key \texttt{muxdemux/clock wedge size} (default \texttt{0.2}, relative to \texttt{muxdemux/base len}); + \item [not ball:] activated by the key \texttt{n} followed by the position (for example, \texttt{cR1} will set the negation circle on the first right pin); the type and shape of the ball will depend on the logic port negation in use (basically it will use a \texttt{circleinv} shape unless you are using european ports with the small \texttt{ocirc} negation symbol); + \item [wedge in:] a wedge negation \emph{entering} the component (with the point on the border), activated by the key \texttt{wi} followed by the position; + \item [wedge out:] a wedge negation \emph{exiting} the component (with the base on the border), activated by the key \texttt{wo} followed by the position. +\end{description} +The value of the key should be \texttt{0} or \texttt{1} for clocks and not circles; zero means ``do not draw'' and is used to override a previously specified element. In the case of wedge-style not, the \texttt{-1} value flips the side of the triangle (see the following example). + +\begin{LTXexample}[varwidth=true] +\begin{circuitikz} \ctikzset{muxdemux/outer label + font={\tiny\ttfamily\color{blue}}} +\ctikzset{logic ports=ieee, multipoles/external pins width=0.3} +\tikzset{myICwl/.style={muxdemux, + muxdemux def={Lh=4, Rh=4, w=4, NR=2, NL=2, NB=1, NT=0,}, + muxdemux label={L1=inA, L2=inB, R1=OUT, RU1=3, LU1=1, LU2=2, + N=example, nL1=1, woR1=1, woR2=-1, wiB1=1, cL2=1},} +} +\draw (0, 0) node[myICwl]{}; +\draw (0, -3) node[myICwl, + muxdemux label={N=another, LU1={1\strut}, + RU1={3\strut}, cL2=0}](A){}; +\draw[red, <-] (A-nL1.-135) -- ++(-135:0.3); +\end{circuitikz} +\end{LTXexample} + +As you can see, the label position is not affected (with the exception of the clock wedge, that displaces the inner label), so you have to manually take care of not having overruns; you can change the \texttt{xsep} or \texttt{ysep} or, as shown in the example, modify the heigh and depth of the affected labels. + +You have also to take care of the effect shown for the flip-flops in section~\ref{sec:flip-flop-cust}, to avoid overrun the not circles when connecting wires. The ``not'' elements are named after the instance as \texttt{\textsl{<nodename>}-\textsl{<activating key>}} to give access to the border (show also in the example, although in bit of forced way\dots look at the red arrow). + +\subsubsection{Manually adding wedges or circular inversion markers}\label{sec:wedge-inversion} + +If the standard ``internal'' negation symbols are not sufficiently configurable for your application, you can add them manually. +To add the wedge symbol, the \texttt{wedgeinv} shape will nicely do. It'll scale with the \texttt{muxdemuxes} class, and the length and height can be changed with the keys \texttt{wedge inversion mark/width} (default \texttt{0.2}) and \texttt{height} (default \texttt{0.1}), with the same units that are used for the \texttt{external pins width} and similar keys. Similarly, there is also a \texttt{circleinv} shape, which is basically the same as the \texttt{notcirc} (see~\ref{sec:ieeestdports}) one, but that scales with the \texttt{muxdemuxes} class and that has the default anchor at its left, similarly to \texttt{wedgeinv}. This one will be filled if the class says so, contrary to the wedge-like shapes that are always open. @@ -7310,6 +7432,52 @@ Similarly, there is also a \texttt{circleinv} shape, which is basically the same \end{tikzpicture} \end{LTXexample} +\subsubsection{Adding a background drawing to the muxdemux} + +In a similar way to the oscilloscope waveform, you can add a drawing to the \texttt{muxdemux} component, provided you use basic-level \texttt{pgf} commands. You have to define a \texttt{.code} key named \texttt{bgpicture} in the \texttt{muxdemux def} definitions, as in the following example. The coordinate system is changed so that the horizontal axis of the shape is mapped between \SI{-1}{\cm} and \SI{+1}{\cm} and the origin at the center; the vertical extent will then depend on the form factor of the \texttt{muxdemux}: for example, the vertical coordinate of the top left border will be $\SI{1}{\cm}\cdot{\mathtt{Lh}/\mathtt{w}}$. + +\begin{LTXexample}[varwidth=true, basicstyle=\scriptsize\ttfamily, keepspaces=true] +\begin{circuitikz} +\ctikzset{muxdemux/outer label font={\tiny\ttfamily\color{blue}}} +\tikzset{myICwl/.style={muxdemux, + muxdemux def={Lh=4, Rh=4, w=3, NR=1, NL=2, NB=0, NT=0, + bgpicture/.code={% + \pgfsetcolor{gray!50}\pgfsetlinewidth{1mm} + \pgfpathmoveto{\pgfpoint{-1cm}{1cm*4/3}} \pgfpathlineto{\pgfpointorigin} + \pgfpathmoveto{\pgfpoint{-1cm}{-1cm*4/3}}\pgfpathlineto{\pgfpointorigin} + \pgfpathmoveto{\pgfpoint{1cm}{0cm}} \pgfpathlineto{\pgfpointorigin} + \pgfpathcircle{\pgfpointorigin}{0.5cm} + \pgfusepath{draw} + }, + }, + muxdemux label={RU1=3, LU1=1, LU2=2, N=flux, Ni=converter},} +} +\draw (0, 0) node[myICwl]{}{}; +\end{circuitikz} +\end{LTXexample} + +You can even embed images: + +\begin{LTXexample}[varwidth=true, basicstyle=\scriptsize\ttfamily] +\begin{circuitikz} +\ctikzset{muxdemux/outer label font={\tiny\ttfamily\color{blue}}} +\tikzset{myICwl/.style={muxdemux, + muxdemux def={Lh=4, Rh=4, w=3, NR=1, NL=2, NB=0, NT=0, + bgpicture/.code={% + \pgfdeclareimage[width=1.5cm]{myimg}{example-image-a} + \pgftext{\pgfuseimage{myimg}} + }, + }, + muxdemux label={RU1=3, LU1=1, LU2=2, N=embedding, Ni=images},} +} +\draw (0, 0) node[myICwl]{}{}; +\end{circuitikz} +\end{LTXexample} + + +For more complex things, consider using a normal macro that draws on the background layer and that use the geographical coordinates of the node to locate it. + + \subsubsection{Mux-Demux special usage} You can use these shapes to draw a lot of symbols that are unavailable; using a bit of \LaTeX{} command trickery you can use them quite naturally too\dots. Examples with personalized amplifier shapes are listed in section~\ref{sec:muxdemux-amplis}. @@ -7331,21 +7499,19 @@ As an additional example, this was used before the introduction of the \texttt{d \end{circuitikz} \end{LTXexample} -Finally, you can play with them to create chips that have generic numbers of pins on the four sides, as in the following example (asked on \href{https://tex.stackexchange.com/q/596320/38080}{TeX.Stackexchange}): +Finally, you can play with them to create chips that have generic numbers of pins on the four sides, as in the following example (asked on \href{https://tex.stackexchange.com/q/596320/38080}{TeX.Stackexchange}; notice however that this example has been made \emph{before} the option for labels existed; it could be quite streamlined now, as shown later): -\begin{LTXexample}[varwidth=true] -\begin{tikzpicture}[scale=0.8, transform shape] +\begin{LTXexample}[varwidth=true, basicstyle=\scriptsize\ttfamily] +\begin{tikzpicture}[scale=0.7, transform shape] \tikzset{ic555/.style={muxdemux, - muxdemux def={Lh=10, NL=5, Rh=10, NR=5, - NB=2, w=6, NT=2, square pins=1}, + muxdemux def={Lh=10, NL=5, Rh=10, NR=5, NB=2, w=6, NT=2, + square pins=1}, no input leads, external pins width=0.4, circuitikz/muxdemuxes/fill=blue!10} } - \node [ic555, font=\small\ttfamily,align=center](A) - at (0,0) {555\\Astable}; + \node [ic555, font=\small\ttfamily,align=center](A) at (0,0) {555\\Astable}; % left pins - \foreach \rawpin/\npin/\label in - {2/7/Discharge, 4/2/Trigger, 5/6/Threshold} { + \foreach \rawpin/\npin/\label in {2/7/Discharge, 4/2/Trigger, 5/6/Threshold}{ \draw (A.lpin \rawpin) -- (A.blpin \rawpin) node[midway, blue, font=\small, above]{\npin} node[right, font=\small]{\label}; @@ -7360,12 +7526,32 @@ Finally, you can play with them to create chips that have generic numbers of pin \draw (A.bpin \rawpin) -- (A.bbpin \rawpin) node[midway, blue, font=\small, left]{\npin}; } - % finally, left + % finally, right \draw (A.rpin 3) -- (A.brpin 3) node[midway, blue, font=\small, above]{3}; \end{tikzpicture} \end{LTXexample} +In a version of \Circuitikz{} better or equal to \texttt{v1.6.5}, you can do this: + +\begin{LTXexample}[varwidth=true, basicstyle=\scriptsize\ttfamily] +\begin{tikzpicture}[scale=0.7, transform shape] +\ctikzset{muxdemux/inner label font=\small} +\ctikzset{muxdemux/outer label font={\small\color{blue}}} + \tikzset{ic555/.style={muxdemux, + muxdemux def={Lh=10, NL=5, Rh=10, NR=1, NB=2, w=6, NT=2}, + muxdemux label={L2=Discharge, L4=Trigger, L5=Threshold, + T1=VCC, B2=GND, + LU2=7, LU4=2, LU5=6, TL1=8, TL2=4, RU1=3, BL1=5, BL2=1}, + external pins width=0.4, + draw only left pins={2,4,5}, + circuitikz/muxdemuxes/fill=blue!10} + } + \node [ic555, font=\small\ttfamily,align=center](A) + at (0,0) {555\\Astable}; +\end{tikzpicture} +\end{LTXexample} + \subsection{Chips (integrated circuits)}\label{sec:chips} @@ -7471,7 +7657,7 @@ with the \texttt{bpin \textit{n}} anchors for the suppressed pins. \end{circuitikz} \end{LTXexample} -\subsubsection{Chips anchors} +\subsubsection{Chip anchors} Chips have anchors on pins and global anchors for the main shape. The pin anchors to be used to connect wires to the chip are called \texttt{pin 1}, \texttt{pin 2} , \dots, with just one space between \texttt{pin} and the number. @@ -7506,7 +7692,7 @@ Additionally, you have geometrical anchors on the chip ``box'', see the followin \end{circuitikz} \end{quote} -\subsubsection{Chips rotation} +\subsubsection{Chip rotation}\label{sec:chip-rotation} You can rotate chips, and normally the pin numbers are kept straight (option \texttt{straight numbers}, which is the default), but you can rotate them if you like with \texttt{rotated numbers}. Notice that the main label has to be (counter-) rotated manually in this case. @@ -8478,6 +8664,25 @@ Negative values do work as expected: \end{circuitikz} \end{LTXexample} +Unfortunately\footnote{see \href{https://github.com/circuitikz/circuitikz/issues/747}{this bug report}.} the amount of shift given by \texttt{voltage shift} is not always the same between sources and passive bipoles, especially if the sizes of the component is very different from the default. Although this qualifies as a bug, and should be fixed in a more comprehensive way, a workaround is available with the key \texttt{voltage shift sources adjust} (default: \texttt{\ctikzvalof{voltage shift sources adjust}}). A smaller value is better for smaller components, as you can see in the example below. + +\begin{LTXexample}[varwidth=true, basicstyle=\small\ttfamily] +\newcommand{\example}[2][]{\draw[#1] (#2) + to [V_=$U$] ++(0, -1) (#2) ++(2,0) + to [R,v=$U_R$] ++(0,-1); + } +\ctikzset{resistors/scale=0.55,inductors/scale=0.55, + capacitors/scale=0.6,sources/scale=.8} +\begin{circuitikz}[circuitikz/voltage=straight, + voltage dir=EF] + \example{0,4} + \ctikzset{voltage shift=2} + \example[color=red]{0,2} + \ctikzset{voltage shift sources adjust=0.2} + \example[color=blue]{0,0} +\end{circuitikz} +\end{LTXexample} + You can fine-tune the position of the \texttt{+} and \texttt{-} symbols and the label in independent way using \texttt{voltage/shift} (default \texttt{0.0} for the former and \texttt{voltage/american label distance} (the distance of the label from the lines of the symbols, default \texttt{1.4}) for the latter. \begin{LTXexample}[varwidth=true] diff --git a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty index 464ad23f13..5ca3373737 100644 --- a/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty +++ b/graphics/pgf/contrib/circuitikz/tex/circuitikz.sty @@ -16,8 +16,8 @@ \providecommand\DeclareRelease[3]{} \providecommand\DeclareCurrentRelease[2]{} -\def\pgfcircversion{1.6.4} -\def\pgfcircversiondate{2023/10/10} +\def\pgfcircversion{1.6.5} +\def\pgfcircversiondate{2023/10/29} \DeclareRelease{0.4}{2012/12/20}{circuitikz-0.4-body.tex} \DeclareRelease{v0.4}{2012/12/20}{circuitikz-0.4-body.tex} diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex index 35038c59f0..094e0de4c0 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcirc.defines.tex @@ -509,8 +509,9 @@ \long\def\pgf@circ@font@tenbm{\normal\bold}% \long\def\pgf@circ@font@twelve{\tfa} % \fi\fi\fi - - +% noop +\def\pgfcirc@nop#1{#1}% no operation, just strip {} +% % % Thanks to Phelype Oleinik https://tex.stackexchange.com/a/520806/38080 % diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex index f48aaac10e..dd4a94c716 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircmultipoles.tex @@ -1144,7 +1144,7 @@ \ctikzset{multipoles/flipflop/pin spacing/.initial=0.6} \ctikzset{multipoles/flipflop/clock wedge size/.initial=0.2} -%% muxdemuxes keys +%% muxdemuxes internal keys \ctikzset{multipoles/muxdemux/base len/.initial=0.4} \ctikzset{multipoles/muxdemux/Lh/.initial=8.0} @@ -1158,6 +1158,41 @@ \ctikzset{multipoles/muxdemux/NB/.initial=3} \ctikzset{multipoles/muxdemux/NT/.initial=0} \ctikzset{multipoles/muxdemux/square pins/.initial=0}% +\ctikzset{multipoles/muxdemux/bgpicture/.code={}}% + +% Thanks to @marmot +% this should automatically create a key in this subfamily +\pgfkeys{\circuitikzbasekey/multipoles/muxdemux/label/.is family, + \circuitikzbasekey/multipoles/muxdemux/label, + .unknown/.code = { + \pgfkeyssetvalue{\pgfkeyscurrentpath/\pgfkeyscurrentname}{#1} + } +} +\tikzset{muxdemux def/.code=\pgfqkeys{\circuitikzbasekey/multipoles/muxdemux}{#1}} +\tikzset{muxdemux label/.code=\pgfqkeys{\circuitikzbasekey/multipoles/muxdemux/label}{#1}} +% external (class-like) muxdemux settings for labels +\ctikzset{muxdemux/inner label font/.initial=\pgf@circ@font@tiny} +\ctikzset{muxdemux/outer label font/.initial=\pgf@circ@font@tiny} +\ctikzset{muxdemux/border label font/.initial=\pgf@circ@font@tiny} +\ctikzset{muxdemux/inner label xsep/.initial=2pt} +\ctikzset{muxdemux/inner label ysep/.initial=2pt} +\ctikzset{muxdemux/outer label xsep/.initial=2pt} +\ctikzset{muxdemux/outer label ysep/.initial=2pt} +\ctikzset{muxdemux/border label xsep/.initial=2pt} +\ctikzset{muxdemux/border label ysep/.initial=2pt} +\ctikzset{muxdemux/inner label sep/.code={% + \ctikzset{muxdemux/inner label xsep=#1}% + \ctikzset{muxdemux/inner label ysep=#1}% +}} +\ctikzset{muxdemux/outer label sep/.code={% + \ctikzset{muxdemux/outer label xsep=#1}% + \ctikzset{muxdemux/outer label ysep=#1}% +}} +\ctikzset{muxdemux/border label sep/.code={% + \ctikzset{muxdemux/border label xsep=#1}% + \ctikzset{muxdemux/border label ysep=#1}% +}} +\ctikzset{muxdemux/clock wedge size/.initial=0.2} %>>> %% Node shapes definitions for flip flops%<<< @@ -1644,8 +1679,8 @@ % % MUX-DEMUXES % -% Thanks to @marmot -\tikzset{muxdemux def/.code=\pgfqkeys{\circuitikzbasekey/multipoles/muxdemux}{#1}} +% predefined muxdemux shapes (see manual) +% \tikzset{demux/.style={muxdemux, muxdemux def={Lh=4, Rh=8, NL=1, NB=3, NR=8}}} \tikzset{one bit adder/.style={muxdemux, muxdemux def={Lh=4, NL=2, Rh=2, NR=1, NB=1, w=1.5, @@ -1653,9 +1688,7 @@ \tikzset{ALU/.style={muxdemux, muxdemux def={Lh=5, NL=2, Rh=2, NR=1, NB=2, NT=1, w=2, inset w=1, inset Lh=2, inset Rh=0, square pins=1}}} - %generic mux-demux shape - % helper macros to set the anchors inside a loop (to expand the current count) % left \pgfutil@protected\def\pgf@circ@make@muxdemux@L@anchor#1% @@ -1705,8 +1738,92 @@ \expandafter\gdef\csname pgf@anchor@muxdemux@btpin #1\endcsname {\pgf@circ@muxdemux@T@anchor{#1}{0}}% } - - +%% put some label somewhere +\def\pgf@circ@muxdemux@label@xy#1#2#3#4#5#6#7{% + % #1: which label: L,R,T,B or the outer ones with U/D/R/L + % #2: rotation + % #3: scale pad x + % #4: scale pad y + % #5: text position + % #6: operation on label text + % #7: type: inner, outer, border + % uses external variables \pgf@circ@count@a unless it's zero, in which case omit it + \ifnum\pgf@circ@count@a=0 + \edef\@@thislabel{\circuitikzbasekey/multipoles/muxdemux/label/#1} + \else + \edef\@@thislabel{\circuitikzbasekey/multipoles/muxdemux/label/#1\the\pgf@circ@count@a} + \fi + \pgfkeysifdefined{\@@thislabel}{% + \pgfscope + \pgftransformrotate{#2} + \pgfmathsetlength\pgf@circ@res@zero{\pgfkeysvalueof{\circuitikzbasekey/muxdemux/#7 label xsep}} + \pgfmathsetlength\pgf@circ@res@other{\pgfkeysvalueof{\circuitikzbasekey/muxdemux/#7 label ysep}} + %%% temp is added when we have wedges; it's a bit of a hack but it works if #3,#4 are -1,0,+1 + \pgftransformxshift{(#3)*(\pgf@circ@res@zero+\pgf@circ@res@temp)} + \pgftransformyshift{(#4)*(\pgf@circ@res@other+\pgf@circ@res@temp)} + % Ok, now we have the point in the correct position, we add the label + \pgftext[#5]{\pgfkeysvalueof{\circuitikzbasekey/muxdemux/#7 label font}% + \expandafter\csname#6\endcsname{\pgfkeysvalueof{\@@thislabel}}} + \endpgfscope + }{} +} +%% put a clock wedge here +\def\pgf@circ@muxdemux@clockwedge#1#2{% + % #1: which label: cL,cR,cT,cB + % #2: rotation + % uses external variables \pgf@circ@count@a + \edef\@@thislabel{\circuitikzbasekey/multipoles/muxdemux/label/#1\the\pgf@circ@count@a} + \pgfkeysifdefined{\@@thislabel}{% + \edef\value{\pgfkeysvalueof{\@@thislabel}} + \ifnum\value=0 + \pgf@circ@res@temp=0pt + \else\pgfscope + \pgftransformrotate{#2} + \pgfpathmoveto{\pgfpoint{+0pt}{-\clockwedge}} + \pgfpathlineto{\pgfpoint{\clockwedge}{+0pt}} + \pgfpathlineto{\pgfpoint{+0pt}{\clockwedge}} + \pgfusepath{draw} + \endpgfscope + \pgf@circ@res@temp=\clockwedge + \fi + }{} +} +%% put a negation here +\def\pgf@circ@muxdemux@not@ball#1#2{% + % #1: which label: nL,nR,nT,nB + % #2: anchor + % uses external variables \pgf@circ@count@a + \edef\@@thislabel{\circuitikzbasekey/multipoles/muxdemux/label/#1\the\pgf@circ@count@a} + \pgfkeysifdefined{\@@thislabel}{% + \edef\value{\pgfkeysvalueof{\@@thislabel}} + \ifnum\value=0 + \else + \pgfnode{\@@notcirc}{#2}{}{\thisshape-#1\the\pgf@circ@count@a}{\pgfusepath{stroke}} + \fi + }{} +} +%% put a negation wedge here +\def\pgf@circ@muxdemux@not@wedge#1#2#3#4#5{% + % #1: which label: wi/wp with L,R,T,B + % #2: anchor + % #3: xscale + % #4: yscale + % #5: rotation + % uses external variables \pgf@circ@count@a + \edef\@@thislabel{\circuitikzbasekey/multipoles/muxdemux/label/#1\the\pgf@circ@count@a} + \pgfkeysifdefined{\@@thislabel}{% + \edef\value{\pgfkeysvalueof{\@@thislabel}} + \ifnum\value=0 + \else\pgfscope + \pgftransformrotate{#5} + \pgftransformxscale{#3} + \pgftransformyscale{#4} + \pgftransformyscale{\value}% to flip + \pgfnode{wedgeinv}{#2}{}{\thisshape-#1\the\pgf@circ@count@a}{\pgfusepath{stroke}} + \endpgfscope\fi + }{} +} +% \pgfdeclareshape{muxdemux}{ \savedmacro{\ctikzclass}{\edef\ctikzclass{muxdemuxes}} \saveddimen{\scaledRlen}{\pgfmathsetlength{\pgf@x}{\ctikzvalof{\ctikzclass/scale}\pgf@circ@Rlen}} @@ -1849,6 +1966,18 @@ \pgf@circ@res@step = \pgf@x \pgf@circ@res@temp = \pgf@y % + % draw the (user-selectable) background + % + \pgfscope + \pgfmathsetmacro{\@@scalex}{\pgf@circ@res@right/1cm} + % It's better not to change the scale in an asymmetric way + % \pgfmathsetmacro{\@@scaley}{\pgf@circ@res@up/1cm} + \pgftransformxscale{\@@scalex} + \pgftransformyscale{\@@scalex} + \pgf@circ@setlinewidth{multipoles}{\pgfstartlinewidth} + \pgfkeys{\circuitikzbasekey/multipoles/muxdemux/bgpicture} + \endpgfscope + % % external block % \pgfscope% (for the line width) @@ -1866,7 +1995,7 @@ \pgfpathlineto{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@temp}} \fi \pgfpathclose - \pgf@circ@draworfill + \pgf@circ@draworfill \endpgfscope % now we have to draw the pins, if needed \ifdim\extshift>0pt\ifpgfcirc@draw@input@leads\pgfscope % let's avoid too much indent @@ -1995,6 +2124,281 @@ % end drawing pins; stroke them \pgfusepath{stroke} \endpgfscope\fi\fi + %%%% Labels. Added by Romano 14/10/2023. + % manage labels. This is independent from the drawing of pins; redo the loops. Surely + % there is a better way; but it's complex to factor out code. Let's go the KISS way. + \ifpgf@circuit@chip@straightnumbers + \pgfgettransformentries\a\b\temp\temp\temp\temp + \pgfmathsetmacro{\rot}{-atan2(\b,\a)} + \pgfmathtruncatemacro{\quadrant}{mod(4+int(360+(\rot+45)/90),4)} + \else + \pgfmathsetmacro{\rot}{0} + \pgfmathsetmacro{\quadrant}{0} + \fi + % clockwedge size + \pgfmathsetlength{\pgf@circ@res@temp}{\ctikzvalof{muxdemux/clock wedge size}*\ctikzvalof{multipoles/muxdemux/base len}*\scaledRlen} + \edef\clockwedge{\the\pgf@circ@res@temp} + % select which negation ball to use + \ifpgf@circuit@ieeelogicport + \def\@@notcirc{circleinv} + \else + \ifpgf@circ@european@port@circle@ieee + \def\@@notcirc{circleinv} + \else + \def\@@notcirc{ocirc} + \fi + \fi + %% border labels + \pgf@circ@res@temp=0pt + \pgf@circ@count@a=0 + % go to north + \topleft\pgf@circ@res@left=\pgf@x \pgf@circ@res@up=\pgf@y + \pgfscope + \pgftransformshift{\pgfpoint{0pt}{\pgf@circ@res@up}} + \ifnum\quadrant=2 + \pgf@circ@muxdemux@label@xy{N}{180}{0}{-1}{top}{pgfcirc@nop}{border}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@muxdemux@label@xy{Ni}{180}{0}{1}{bottom}{pgfcirc@nop}{border}% + \else + \pgf@circ@muxdemux@label@xy{N}{0}{0}{1}{bottom}{pgfcirc@nop}{border}% + \pgf@circ@muxdemux@label@xy{Ni}{0}{0}{-1}{top}{pgfcirc@nop}{border}% + \fi + \endpgfscope + % go south! + \pgfscope + \pgftransformshift{\pgfpoint{0pt}{-\pgf@circ@res@up}} + \ifnum\quadrant=2 + \pgf@circ@muxdemux@label@xy{S}{180}{0}{1}{bottom}{pgfcirc@nop}{border}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@muxdemux@label@xy{Si}{180}{0}{-1}{top}{pgfcirc@nop}{border}% + \else + \pgf@circ@muxdemux@label@xy{S}{0}{0}{-1}{top}{pgfcirc@nop}{border}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@muxdemux@label@xy{Si}{0}{0}{1}{bottom}{pgfcirc@nop}{border}% + \fi + \endpgfscope + % go west! + \pgfscope + \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{0pt}} + \ifnum\quadrant=3 + \pgf@circ@muxdemux@label@xy{W}{-90}{0}{-1}{top}{pgfcirc@nop}{border}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@muxdemux@label@xy{Wi}{-90}{0}{1}{bottom}{pgfcirc@nop}{border}% + \else + \pgf@circ@muxdemux@label@xy{W}{90}{0}{1}{bottom}{pgfcirc@nop}{border}% + \pgf@circ@muxdemux@label@xy{Wi}{90}{0}{-1}{top}{pgfcirc@nop}{border}% + \fi + \endpgfscope + % go east! + \pgfscope + \pgftransformshift{\pgfpoint{-\pgf@circ@res@left}{0pt}} + \ifnum\quadrant=3 + \pgf@circ@muxdemux@label@xy{E}{-90}{0}{1}{bottom}{pgfcirc@nop}{border}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@muxdemux@label@xy{Ei}{-90}{0}{-1}{top}{pgfcirc@nop}{border}% + \else + \pgf@circ@muxdemux@label@xy{E}{90}{0}{-1}{top}{pgfcirc@nop}{border}% + \pgf@circ@muxdemux@label@xy{Ei}{90}{0}{1}{bottom}{pgfcirc@nop}{border}% + \fi + \endpgfscope + % start exploring all the pins. We repeat the steps to position the coordinate on every pin. + % left pins + \ifnum\NL>0\relax + \pgf@circ@count@a=\NL\relax + \pgf@circ@count@b=\NL \divide\pgf@circ@count@b by 2 % see https://tex.stackexchange.com/questions/146523/why-does-numexpr-integer-division-round-rather-than-truncate + \topleft\pgf@circ@res@left=\pgf@x \pgf@circ@res@up=\pgf@y + \insetnortheast\pgf@circ@res@right=\pgf@x \pgf@circ@res@down=\pgf@y + \ifdim\pgf@circ@res@down>0pt % check if we have an inset + % we have to check oddity + \ifodd\NL + \ifnum\NL=1 + % only centerpin, step should not be used, but anyway... + \pgfmathsetlength{\pgf@circ@res@step}{2*(\pgf@circ@res@up-\pgf@circ@res@down)/(\NL)} + \else + \pgfmathsetlength{\pgf@circ@res@step}{2*(\pgf@circ@res@up-\pgf@circ@res@down)/(\NL-1)} + \fi + \else + \pgfmathsetlength{\pgf@circ@res@step}{2*(\pgf@circ@res@up-\pgf@circ@res@down)/\NL} + \fi + \else % no inset + \pgfmathsetlength{\pgf@circ@res@step}{2*\pgf@circ@res@up/\NL} + \fi + \pgfmathloop% + \ifnum\pgf@circ@count@a>0 + \pgfscope + \ifdim\pgf@circ@res@down>0pt % check if we have an inset + \ifnum\pgf@circ@count@a>\pgf@circ@count@b\relax + % for lower pins we have to shift them down + \ifodd\NL + % odd number of pins + \ifnum\pgf@circ@count@a=\numexpr\the\pgf@circ@count@b+1\relax + % centerpin! + \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{0pt}} + \else + \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(0.5-\pgf@circ@count@a+1)*\pgf@circ@res@step-2*\pgf@circ@res@down}} + \fi + \else + % even numer of pins: just go down + \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(0.5-\pgf@circ@count@a)*\pgf@circ@res@step-2*\pgf@circ@res@down}} + \fi + \else + % nothing need for #1<=NL/2 + \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(0.5-\pgf@circ@count@a)*\pgf@circ@res@step}} + \fi + \else + % no inset + \pgftransformshift{\pgfpoint{\pgf@circ@res@left}{\pgf@circ@res@up+(0.5-\pgf@circ@count@a)*\pgf@circ@res@step}} + \fi + % put the not ball/wedges if needed + \pgf@circ@muxdemux@not@ball{nL}{east} + \pgf@circ@muxdemux@not@wedge{wiL}{east}{1}{1}{0} + \pgf@circ@muxdemux@not@wedge{woL}{west}{-1}{1}{0} + % \fi + \pgf@circ@muxdemux@clockwedge{cL}{0} + %% put the labels + \ifcase\quadrant % rotation 0; left label are at the left + \pgf@circ@muxdemux@label@xy{L}{0}{1}{0}{left}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{LU}{0}{-1}{1}{bottom}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{LD}{0}{-1}{-1}{top}{llap}{outer}% + \or %rotation -90; left labels are at the top + \pgf@circ@muxdemux@label@xy{L}{90}{0}{-1}{top}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{LU}{90}{-1}{1}{bottom}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{LD}{90}{1}{1}{bottom}{rlap}{outer}% + \or %rotation 180; left labels are at the right + \pgf@circ@muxdemux@label@xy{L}{180}{-1}{0}{right}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{LU}{180}{1}{1}{bottom}{rlap}{outer}% + \pgf@circ@muxdemux@label@xy{LD}{180}{1}{-1}{top}{rlap}{outer}% + \or %rotation +90; left labels are at the bottom + \pgf@circ@muxdemux@label@xy{L}{-90}{0}{1}{bottom}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{LU}{-90}{-1}{-1}{top}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{LD}{-90}{1}{-1}{top}{rlap}{outer}% + \fi + \endpgfscope + \advance\pgf@circ@count@a by -1\relax% + \repeatpgfmathloop + \fi + %% right pins + \ifnum\NR>0\pgf@circ@count@a=\NR\relax + \pgfmathloop% + \topright\pgf@circ@res@right=\pgf@x \pgf@circ@res@up=\pgf@y + \pgfmathsetlength{\pgf@circ@res@step}{2*\pgf@circ@res@up/\NR} + \ifnum\pgf@circ@count@a>0 + \pgfscope + \pgftransformshift{\pgfpoint{\pgf@circ@res@right}{\pgf@circ@res@up+(0.5-\pgf@circ@count@a)*\pgf@circ@res@step}} + % put the not ball/wedge if needed + \pgf@circ@muxdemux@not@ball{nR}{west} + \pgf@circ@muxdemux@not@wedge{wiR}{east}{-1}{1}{0} + \pgf@circ@muxdemux@not@wedge{woR}{west}{1}{1}{0} + % put the clock wedge if needed + \pgf@circ@muxdemux@clockwedge{cR}{180} + \ifcase\quadrant % rotation 0; right label are at the right + \pgf@circ@muxdemux@label@xy{R}{0}{-1}{0}{right}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{RU}{0}{1}{1}{bottom}{rlap}{outer}% + \pgf@circ@muxdemux@label@xy{RD}{0}{1}{-1}{top}{rlap}{outer}% + \or %rotation -90; right labels are at the bottom + \pgf@circ@muxdemux@label@xy{R}{90}{0}{1}{bottom}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{RU}{90}{-1}{-1}{top}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{RD}{90}{1}{-1}{top}{rlap}{outer}% + \or %rotation 180; right labels are at the left + \pgf@circ@muxdemux@label@xy{R}{180}{1}{0}{left}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{RU}{180}{-1}{1}{bottom}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{RD}{180}{-1}{-1}{top}{llap}{outer}% + \or %rotation +90; right labels are at the top + \pgf@circ@muxdemux@label@xy{R}{-90}{0}{-1}{top}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{RU}{-90}{-1}{1}{bottom}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{RD}{-90}{1}{1}{bottom}{rlap}{outer}% + \fi + \endpgfscope + \advance\pgf@circ@count@a by -1\relax% + \repeatpgfmathloop + \fi + %% bottom pins + \ifnum\NB>0\pgf@circ@count@a=\NB\relax %%% + \pgfmathloop% + \topleft\pgf@circ@res@left=\pgf@x \pgf@circ@res@up=\pgf@y + \topright\pgf@circ@res@right=\pgf@x \pgf@circ@res@down=\pgf@y + \pgfmathsetlength{\pgf@circ@res@step}{2*\pgf@circ@res@right/\NB} + \pgfmathsetlength{\pgf@circ@res@other}{(\pgf@circ@res@down-\pgf@circ@res@up)/(\pgf@circ@res@right-\pgf@circ@res@left)*\pgf@circ@res@step} + \ifnum\pgf@circ@count@a>0 + \pgfscope + \pgftransformshift{\pgfpoint{\pgf@circ@res@left+(\pgf@circ@count@a-0.5)*\pgf@circ@res@step} + {-\pgf@circ@res@down+(\NB-\pgf@circ@count@a+0.5)*\pgf@circ@res@other}} + % put the not ball/wedge if needed + \pgf@circ@muxdemux@not@ball{nB}{north} + \pgf@circ@muxdemux@not@wedge{wiB}{east}{1}{1}{90} + \pgf@circ@muxdemux@not@wedge{woB}{west}{-1}{1}{90} + % put the clock wedge if needed + \pgf@circ@muxdemux@clockwedge{cB}{90} + \ifcase\quadrant % rotation 0; bottom label are at the bottom + \pgf@circ@muxdemux@label@xy{B}{0}{0}{1}{bottom}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{BL}{0}{-1}{-1}{top}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{BR}{0}{1}{-1}{top}{rlap}{outer}% + \or %rotation -90; bottom labels are at the left + \pgf@circ@muxdemux@label@xy{B}{90}{1}{0}{left}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{BL}{90}{-1}{1}{bottom}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{BR}{90}{-1}{-1}{top}{llap}{outer}% + \or %rotation 180; bottom labels are at the top + \pgf@circ@muxdemux@label@xy{B}{180}{0}{-1}{top}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{BL}{180}{-1}{1}{bottom}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{BR}{180}{1}{1}{bottom}{rlap}{outer}% + \or %rotation +90; bottom labels are at the right + \pgf@circ@muxdemux@label@xy{B}{-90}{-1}{0}{right}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{BL}{-90}{1}{1}{bottom}{rlap}{outer}% + \pgf@circ@muxdemux@label@xy{BR}{-90}{1}{-1}{top}{rlap}{outer}% + \fi + \endpgfscope + \advance\pgf@circ@count@a by -1\relax% + \repeatpgfmathloop + \fi + %% top pins + \ifnum\NT>0\pgf@circ@count@a=\NT\relax + \pgfmathloop% + \topleft\pgf@circ@res@left=\pgf@x \pgf@circ@res@up=\pgf@y + \topright\pgf@circ@res@right=\pgf@x \pgf@circ@res@down=\pgf@y + \pgfmathsetlength{\pgf@circ@res@step}{2*\pgf@circ@res@right/\NT} + \pgfmathsetlength{\pgf@circ@res@other}{(\pgf@circ@res@down-\pgf@circ@res@up)/(\pgf@circ@res@right-\pgf@circ@res@left)*\pgf@circ@res@step} + \ifnum\pgf@circ@count@a>0 + \pgfscope + \pgftransformshift{\pgfpoint{\pgf@circ@res@left+(\pgf@circ@count@a-0.5)*\pgf@circ@res@step} + {\pgf@circ@res@down-(\NT-\pgf@circ@count@a+0.5)*\pgf@circ@res@other}} + % put the not ball/wedge if needed + \pgf@circ@muxdemux@not@ball{nT}{south} + \pgf@circ@muxdemux@not@wedge{wiT}{east}{1}{-1}{-90} + \pgf@circ@muxdemux@not@wedge{woT}{west}{-1}{-1}{-90} + % put the clock wedge if needed + \pgf@circ@muxdemux@clockwedge{cT}{-90} + \ifcase\quadrant % rotation 0; top label are at the top + \pgf@circ@muxdemux@label@xy{T}{0}{0}{-1}{top}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{TL}{0}{-1}{1}{bottom}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{TR}{0}{1}{1}{bottom}{rlap}{outer}% + \or %rotation -90; top labels are at the right + \pgf@circ@muxdemux@label@xy{T}{90}{-1}{0}{right}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{TL}{90}{1}{1}{bottom}{rlap}{outer}% + \pgf@circ@muxdemux@label@xy{TR}{90}{1}{-1}{top}{rlap}{outer}% + \or %rotation 180; top labels are at the bottom + \pgf@circ@muxdemux@label@xy{T}{180}{0}{1}{bottom}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{TL}{180}{-1}{-1}{top}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{TR}{180}{1}{-1}{top}{rlap}{outer}% + \or %rotation +90; top labels are at the left + \pgf@circ@muxdemux@label@xy{T}{-90}{1}{0}{left}{pgfcirc@nop}{inner}% type, rot, pad x, pad y, text pos, op, type + \pgf@circ@res@temp=0pt + \pgf@circ@muxdemux@label@xy{TL}{-90}{-1}{1}{bottom}{llap}{outer}% + \pgf@circ@muxdemux@label@xy{TR}{-90}{-1}{-1}{top}{llap}{outer}% + \fi + \endpgfscope + \advance\pgf@circ@count@a by -1\relax% + \repeatpgfmathloop + \fi } % let's start adding anchors \pgfutil@g@addto@macro\pgf@sh@s@muxdemux{% diff --git a/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex b/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex index 819da5a110..6634531c2c 100644 --- a/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex +++ b/graphics/pgf/contrib/circuitikz/tex/pgfcircvoltage.tex @@ -191,6 +191,13 @@ \def\pgf@circ@bipole@voltage@label@anchor{center} \pgfmathsetlength{\absvshift}{\absvshift+sign(\absvshift)*height{"Q"}} % with the current font. \fi + % apply the same shift to open "straight" voltage as raised + \ifpgf@circuit@bipole@voltage@straight + \ifx\@@kind\@@open + \def\pgf@circ@bipole@voltage@label@anchor{center} + \pgfmathsetlength{\absvshift}{\absvshift+sign(\absvshift)*height{"Q"}} % with the current font. + \fi + \fi } % %\pgf@circ@Rlen/\ctikzvalof{current arrow scale} is equal to the length of the currarrow %absolute move, minimum space is length of arrowhead @@ -359,6 +366,8 @@ % %>>> %% Output routine for voltage sources%<<< +% (ugly) workaround for https://github.com/circuitikz/circuitikz/issues/747 +\ctikzset{voltage shift sources adjust/.initial=0.5} % coefficient added "by feel". Sorry. \def\pgf@circ@drawvoltagegenerator{ % the following is affected indirectly by voltage/shift, you can move the arrow with voltage/bump a. % it's not perfect, but I can't find the way to do it correctly... @@ -382,7 +391,7 @@ { \edef\addvshift{0} } - \pgfmathsetmacro{\bumpaplus}{\bumpa + 0.5*\shiftv} % coefficient added "by feel". Sorry. + \pgfmathsetmacro{\bumpaplus}{\bumpa + \ctikzvalof{voltage shift sources adjust}*\shiftv} } \ifpgf@circuit@bipole@voltage@below coordinate (pgfcirc@Vfrom0) at ($(\ctikzvalof{bipole/name}.center) ! \bumpaplus ! (\ctikzvalof{bipole/name}.-120)$) diff --git a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex index e76a91d957..8cc8b39131 100644 --- a/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex +++ b/graphics/pgf/contrib/circuitikz/tex/t-circuitikz.tex @@ -16,8 +16,8 @@ \startmodule[circuitikz] \usemodule[tikz] -\def\pgfcircversion{1.6.4} -\def\pgfcircversiondate{2023/10/10} +\def\pgfcircversion{1.6.5} +\def\pgfcircversiondate{2023/10/29} \writestatus{loading}{\pgfcircversiondate{} The CircuiTikz circuit drawing package version \pgfcircversion} diff --git a/graphics/pgf/contrib/pgfornament-han/README.md b/graphics/pgf/contrib/pgfornament-han/README.md index 33084e0a93..893666ec52 100644 --- a/graphics/pgf/contrib/pgfornament-han/README.md +++ b/graphics/pgf/contrib/pgfornament-han/README.md @@ -1,4 +1,4 @@ -# pgfornament-han 2023/04/23 +# pgfornament-han 2023/10/29 A pgfornament library for Chinese traditional motifs and patterns. 以 pgfornament 宏包的机制，实现绘制汉风图纹。在此基础上设计了三款beamer主题：「萧山」(XiaoShan)、「神马浮云」(Heavenly Clouds)、「天青」(TianQing)。 diff --git a/graphics/pgf/contrib/pgfornament-han/beamerthemeHeavenlyClouds.sty b/graphics/pgf/contrib/pgfornament-han/beamerthemeHeavenlyClouds.sty index ca6d49bafc..00bc63cd78 100644 --- a/graphics/pgf/contrib/pgfornament-han/beamerthemeHeavenlyClouds.sty +++ b/graphics/pgf/contrib/pgfornament-han/beamerthemeHeavenlyClouds.sty @@ -1,4 +1,4 @@ -% beamerthemeHeavenlyClouds.sty v1.1 2019/07/24 +% beamerthemeHeavenlyClouds.sty v1.1.1 2023/10/29 % by LianTze Lim (liantze@gmail.com) \ProvidesPackage{beamerthemeHeavenlyClouds} @@ -94,12 +94,16 @@ \fill[headline.fg] (\clouds@progressinheadfoot,1.25em) circle (2pt); }% } -\newbox{\clouds@shenma} -\savebox{\clouds@shenma}{% - \usebeamercolor[fg]{headline}% - \tikzset{pgfornamentstyle/.style={line width=0pt}}% - \pgfornamenthan[width=2.5em]{78}% + +\AddToHook{begindocument/before}{% + \newbox{\clouds@shenma} + \savebox{\clouds@shenma}{% + \usebeamercolor[fg]{headline}% + \tikzset{pgfornamentstyle/.style={line width=0pt}}% + \pgfornamenthan[width=2.5em]{78}% + } } + \newcommand{\shenmaprogressmarker}{% \renewcommand{\clouds@progressmarker}{% \clip (-1.3em,4em) rectangle (\paperwidth,0pt); diff --git a/graphics/pgf/contrib/pgfornament-han/beamerthemeTianQing.sty b/graphics/pgf/contrib/pgfornament-han/beamerthemeTianQing.sty index df339a7512..7d4bdfea49 100644 --- a/graphics/pgf/contrib/pgfornament-han/beamerthemeTianQing.sty +++ b/graphics/pgf/contrib/pgfornament-han/beamerthemeTianQing.sty @@ -1,4 +1,4 @@ -% beamerthemeXiaoshan.sty v1.0 2023/04/23 +% beamerthemeXiaoshan.sty v1.01 2023/10/29 % by LianTze Lim (liantze@gmail.com) \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{beamerthemeTianQing} @@ -25,7 +25,9 @@ \setbeamertemplate{navigation symbols}{} \setbeamertemplate{frametitle continuation}[from second] \setbeamercolor{structure}{fg=正青} -\setbeamercolor{palette secondary}{fg=天青色} +\setbeamercolor{section page deco}{fg=天青色} +\setbeamercolor{top deco}{fg=蓝灰色} +\setbeamercolor{deco outline}{fg=墨灰} \setbeamercolor{normal text}{bg=精白} \setbeamerfont{frametitle}{family=\romankai\kaishu,size=\LARGE} @@ -39,20 +41,27 @@ \setbeamercolor{block title}{fg=宝蓝} \setbeamercolor{mini frame}{bg=天青色} -\newsavebox{\bulletboxone} -\savebox{\bulletboxone}{\usebeamercolor[fg]{structure}\tikz\node[line width=0pt,inner sep=0pt,outer sep=0pt]{\pgfornamenthan[height=1ex]{43}};} +\AddToHook{begindocument/before}{% + \newsavebox{\bulletboxone} + \savebox{\bulletboxone}{\usebeamercolor[fg]{structure}\tikz\node[line width=0pt,inner sep=0pt,outer sep=0pt]{\pgfornamenthan[height=1ex]{43}};} -\newsavebox{\bulletboxtwo} -\savebox{\bulletboxtwo}{\usebeamercolor[fg]{structure}\tikz\node[line width=0pt,inner sep=0pt,outer sep=0pt]{\pgfornamenthan[height=1ex]{41}};} + \newsavebox{\bulletboxtwo} + \savebox{\bulletboxtwo}{\usebeamercolor[fg]{structure}\tikz\node[line width=0pt,inner sep=0pt,outer sep=0pt]{\pgfornamenthan[height=1ex]{41}};} -\newsavebox{\bulletboxthree} -\savebox{\bulletboxthree}{\usebeamercolor[fg]{structure}\tikz\node[line width=0pt,inner sep=0pt,outer sep=0pt]{\pgfornamenthan[height=1ex]{33}};} + \newsavebox{\bulletboxthree} + \savebox{\bulletboxthree}{\usebeamercolor[fg]{structure}\tikz\node[line width=0pt,inner sep=0pt,outer sep=0pt]{\pgfornamenthan[height=1ex]{33}};} -\newsavebox{\topcornermotif} -\savebox{\topcornermotif}{\tikzset{pgfornamentstyle/.style={rotate=30,draw=墨灰,color=蓝灰色,opacity=.2,inner sep=0pt,ultra thick}}\pgfornamenthan[width=.5\paperheight]{64}} + \newsavebox{\topcornermotif} + \savebox{\topcornermotif}{% + \usebeamercolor{deco outline}% + \usebeamercolor{top deco}% + \tikzset{pgfornamentstyle/.style={rotate=30,color=top deco.fg,draw=deco outline.fg,opacity=.2,inner sep=0pt,ultra thick}}\pgfornamenthan[width=.5\paperheight]{64}} -\newsavebox{\bottomcornermotif} -\savebox{\bottomcornermotif}{\tikzset{pgfornamentstyle/.style={draw=墨灰,color=正青,opacity=.9,inner sep=0pt,very thick}}\pgfornamenthan[width=.2\paperheight,symmetry=v]{74}} + \newsavebox{\bottomcornermotif} + \savebox{\bottomcornermotif}{% + \usebeamercolor{structure}% + \tikzset{pgfornamentstyle/.style={color=structure.fg,opacity=.9,inner sep=0pt,very thick}}\pgfornamenthan[width=.2\paperheight,symmetry=v]{74}}% +} \setbeamertemplate{itemize item}{\raisebox{.08\ccwd}{\usebox{\bulletboxone}}} \setbeamertemplate{itemize subitem}{\raisebox{.08\ccwd}{\usebox{\bulletboxtwo}}} @@ -147,7 +156,8 @@ } \AtBeginSection{\begingroup - \setbeamercolor{normal text}{bg=palette secondary.fg!20} + \usebeamercolor{section page deco} + \setbeamercolor{normal text}{bg=section page deco.fg!20} \setbeamertemplate{background}{} \begin{frame}\zhnumsetup{style=Financial}\sectionpage\end{frame} \endgroup @@ -156,32 +166,32 @@ \setbeamercolor{section page}{fg=structure} \setbeamertemplate{section page}{\centering \begin{textblock*}{\paperwidth}[0.5,0](0.5\paperwidth,-0.15\paperheight) - \tikzset{pgfornamentstyle/.style={opacity=.5,inner sep=0pt,outer sep=0pt,very thick,draw=palette secondary.fg!70!structure.fg}} - \usebeamercolor{palette secondary} - \pgfornamenthan[width=1.3\paperheight,color=palette secondary.fg]{53} + \tikzset{pgfornamentstyle/.style={opacity=.5,inner sep=0pt,outer sep=0pt,very thick,draw=section page deco.fg!70!structure.fg}} + \usebeamercolor{section page deco} + \pgfornamenthan[width=1.3\paperheight,color=section page deco.fg]{53} \end{textblock*} \begin{tikzpicture} - \usebeamercolor{palette secondary} + \usebeamercolor{section page deco} \foreach \i in {45, 90, ..., 360} - \node[inner sep=5.5bp,rotate=-\i,anchor=north west]{\pgfornamenthan[width=1.2\ccwd,color=palette secondary.fg!70!structure.fg]{77}}; + \node[inner sep=5.5bp,rotate=-\i,anchor=north west]{\pgfornamenthan[width=1.2\ccwd,color=section page deco.fg!70!structure.fg]{77}}; \node[font=\usebeamerfont{section name},structure.fg]{\thesection}; \end{tikzpicture}\par \parbox{\paperheight}{\centering\usebeamerfont{section title}\insertsection}\par\bigskip - \pgfornamenthan[color=palette secondary.fg!70!structure.fg,width=.5\paperheight,symmetry=h]{60}\par + \pgfornamenthan[color=section page deco.fg!70!structure.fg,width=.5\paperheight,symmetry=h]{60}\par } \preto\maketitle{\begingroup - \setbeamercolor{normal text}{bg=天青色!20} + \setbeamercolor{normal text}{bg=section page deco.fg!20} \addtobeamertemplate{background}{\vadjust{% \begin{textblock*}{\paperwidth}(\paperwidth-.36\paperheight,\paperheight-.36\paperheight) - \tikzset{pgfornamentstyle/.style={opacity=.25,inner sep=0pt,outer sep=0pt,very thick,draw=palette secondary.fg!70!structure.fg}} - \usebeamercolor{palette secondary} - \pgfornamenthan[width=.35\paperheight,color=palette secondary.fg,symmetry=v]{74} + \tikzset{pgfornamentstyle/.style={opacity=.25,inner sep=0pt,outer sep=0pt,very thick,draw=section page deco.fg!70!structure.fg}} + \usebeamercolor{section page deco} + \pgfornamenthan[width=.35\paperheight,color=section page deco.fg,symmetry=v]{74} \end{textblock*} \begin{textblock*}{\paperwidth}(\paperwidth-.55\paperheight,0.5\paperheight) - \tikzset{pgfornamentstyle/.style={opacity=.5,inner sep=0pt,outer sep=0pt,very thick,draw=palette secondary.fg!70!structure.fg}} - \usebeamercolor{palette secondary} - \pgfornamenthan[width=\paperheight,color=palette secondary.fg]{49} + \tikzset{pgfornamentstyle/.style={opacity=.5,inner sep=0pt,outer sep=0pt,very thick,draw=section page deco.fg!70!structure.fg}} + \usebeamercolor{section page deco} + \pgfornamenthan[width=\paperheight,color=section page deco.fg]{49} \end{textblock*} }}{} } diff --git a/graphics/pgf/contrib/pgfornament-han/cncolours.sty b/graphics/pgf/contrib/pgfornament-han/cncolours.sty index c0e66e8cab..bf9fa7ba8c 100644 --- a/graphics/pgf/contrib/pgfornament-han/cncolours.sty +++ b/graphics/pgf/contrib/pgfornament-han/cncolours.sty @@ -1,261 +1,162 @@ -% Extracted from http://ylbook.com/cms/web/chuantongsecai/chuantongsecai.htm -% by LianTze Lim (liantze@gmail.com), 27 December 2015 +% Extracted from http://ylbook.com/cms/web/chuantongsecai/chuantongsecai.htm and http://zhongguose.com +% by LianTze Lim (liantze@gmail.com),27 December 2015 % v1.1 Updated 7 May 2018: 端憲 @heangfat 新增三正色並加傳統字色名 -\ProvidesPackage{cncolours}[2018/07/05 v1.1 Chinese colour names] +% v2.0 Updated 11 July 2023: 加入 http://zhongguose.com 参看: 色谱 中科院科技情报编委会名词室.科学出版社,1957. +\ProvidesPackage{cncolours}[2023/07/11 v2.0 Chinese colour names] \RequirePackage{xcolor} -\definecolor{粉红}{RGB}{255,179,167} -\definecolor{粉紅}{RGB}{255,179,167} -\definecolor{妃色}{RGB}{237,87,54} -\definecolor{品红}{RGB}{240,0,86} -\definecolor{品紅}{RGB}{240,0,86} -\definecolor{桃红}{RGB}{244,121,131} -\definecolor{桃紅}{RGB}{244,121,131} -\definecolor{海棠红}{RGB}{219,90,107} -\definecolor{海棠紅}{RGB}{219,90,107} -\definecolor{石榴红}{RGB}{242,12,0} -\definecolor{石榴紅}{RGB}{242,12,0} -\definecolor{樱桃色}{RGB}{201,55,86} -\definecolor{櫻桃色}{RGB}{201,55,86} -\definecolor{银红}{RGB}{240,86,84} -\definecolor{銀紅}{RGB}{240,86,84} -\definecolor{大红}{RGB}{255,33,33} -\definecolor{大紅}{RGB}{255,33,33} -\definecolor{绛紫}{RGB}{140,67,86} -\definecolor{絳紫}{RGB}{140,67,86} -\definecolor{绯红}{RGB}{200,60,35} -\definecolor{緋紅}{RGB}{200,60,35} -\definecolor{胭脂}{RGB}{157,41,51} -\definecolor{朱红}{RGB}{255,76,0} -\definecolor{朱紅}{RGB}{255,76,0} -\definecolor{丹}{RGB}{255,78,32} -\definecolor{彤}{RGB}{243,83,54} -\definecolor{茜色}{RGB}{203,58,86} -\definecolor{火红}{RGB}{255,45,81} -\definecolor{火紅}{RGB}{255,45,81} -\definecolor{赫赤}{RGB}{201,31,55} -\definecolor{嫣红}{RGB}{239,122,130} -\definecolor{嫣紅}{RGB}{239,122,130} -\definecolor{洋红}{RGB}{255,0,151} -\definecolor{洋紅}{RGB}{255,0,151} -\definecolor{炎}{RGB}{255,51,0} -\definecolor{赤}{RGB}{195,39,43} -\definecolor{绾}{RGB}{169,129,117} -\definecolor{綰}{RGB}{169,129,117} -\definecolor{枣红}{RGB}{195,33,54} -\definecolor{棗紅}{RGB}{195,33,54} -\definecolor{檀}{RGB}{179,109,97} -\definecolor{殷红}{RGB}{190,0,47} -\definecolor{殷紅}{RGB}{190,0,47} -\definecolor{酡红}{RGB}{220,48,35} -\definecolor{酡紅}{RGB}{220,48,35} -\definecolor{酡颜}{RGB}{249,144,111} -\definecolor{酡顏}{RGB}{249,144,111} -\definecolor{鹅黄}{RGB}{255,241,67} -\definecolor{鵝黃}{RGB}{255,241,67} -\definecolor{鸭黄}{RGB}{250,255,114} -\definecolor{鴨黃}{RGB}{250,255,114} -\definecolor{樱草色}{RGB}{234,255,86} -\definecolor{櫻草色}{RGB}{234,255,86} -\definecolor{杏黄}{RGB}{255,166,49} -\definecolor{杏黃}{RGB}{255,166,49} -\definecolor{杏红}{RGB}{255,140,49} -\definecolor{杏紅}{RGB}{255,140,49} -\definecolor{橘黄}{RGB}{255,137,54} -\definecolor{橘黃}{RGB}{255,137,54} -\definecolor{橙黄}{RGB}{255,164,0} -\definecolor{橙黃}{RGB}{255,164,0} -\definecolor{橘红}{RGB}{255,117,0} -\definecolor{橘紅}{RGB}{255,117,0} -\definecolor{姜黄}{RGB}{255,199,115} +\newif\if@loadcas +\newif\if@cmykcolors +\newif\if@overwritecolors +\DeclareOption{cas-rgb}{\@loadcastrue\@cmykcolorsfalse\@overwritecolorsfalse} +\DeclareOption{cas-rgb*}{\@loadcastrue\@cmykcolorsfalse\@overwritecolorstrue} +\DeclareOption{cas-cmyk}{\@loadcastrue\@cmykcolorstrue\@overwritecolorsfalse} +\DeclareOption{cas-cmyk*}{\@loadcastrue\@cmykcolorstrue\@overwritecolorstrue} +\ExecuteOptions{} +\ProcessOptions\relax + +% 默认：http://ylbook.com/cms/web/chuantongsecai/chuantongsecai.htm +\definecolorset{RGB}{}{}{% +粉红,255,179,167;妃色,237,87,54;品红,240,0,86;桃红,244,121,131;海棠红,219,90,107;石榴红,242,12,0;樱桃色,201,55,86;银红,240,86,84;大红,255,33,33;绛紫,140,67,86;绯红,200,60,35;胭脂,157,41,51;朱红,255,76,0;丹,255,78,32;彤,243,83,54;茜色,203,58,86;火红,255,45,81;赫赤,201,31,55;嫣红,239,122,130;洋红,255,0,151;炎,255,51,0;赤,195,39,43;绾,169,129,117;枣红,195,33,54;檀,179,109,97;殷红,190,0,47;酡红,220,48,35;酡颜,249,144,111;鹅黄,255,241,67;鸭黄,250,255,114;樱草色,234,255,86;杏黄,255,166,49;杏红,255,140,49;橘黄,255,137,54;橙黄,255,164,0;橘红,255,117,0;姜黄,255,199,115;% % 姜黃、薑黃是兩種植物。未審此指何種，闕之. -\definecolor{缃色}{RGB}{240,194,57} -\definecolor{緗色}{RGB}{240,194,57} -\definecolor{橙色}{RGB}{250,140,53} -\definecolor{茶色}{RGB}{179,92,68} -\definecolor{驼色}{RGB}{168,132,98} -\definecolor{駝色}{RGB}{168,132,98} -\definecolor{昏黄}{RGB}{200,155,64} -\definecolor{昏黃}{RGB}{200,155,64} -\definecolor{栗色}{RGB}{96,40,30} -\definecolor{棕色}{RGB}{178,93,37} -\definecolor{椶色}{RGB}{178,93,37} -\definecolor{棕绿}{RGB}{130,113,0} -\definecolor{椶綠}{RGB}{130,113,0} -\definecolor{棕黑}{RGB}{124,75,0} -\definecolor{椶黑}{RGB}{124,75,0} -\definecolor{棕红}{RGB}{155,68,0} -\definecolor{椶紅}{RGB}{155,68,0} -\definecolor{棕黄}{RGB}{174,112,0} -\definecolor{椶黃}{RGB}{174,112,0} -\definecolor{赭色}{RGB}{149,85,57} -\definecolor{琥珀}{RGB}{202,105,36} -\definecolor{褐色}{RGB}{110,81,30} -\definecolor{枯黄}{RGB}{211,177,125} -\definecolor{枯黃}{RGB}{211,177,125} -\definecolor{黄栌}{RGB}{226,156,69} -\definecolor{黃櫨}{RGB}{226,156,69} -\definecolor{秋色}{RGB}{137,108,57} -\definecolor{秋香色}{RGB}{217,182,17} -\definecolor{嫩绿}{RGB}{189,221,34} -\definecolor{嫩綠}{RGB}{189,221,34} -\definecolor{柳黄}{RGB}{201,221,34} -\definecolor{柳黃}{RGB}{201,221,34} -\definecolor{柳绿}{RGB}{175,221,34} -\definecolor{柳綠}{RGB}{175,221,34} -\definecolor{竹青}{RGB}{120,146,98} -\definecolor{葱黄}{RGB}{163,217,0} -\definecolor{蔥黃}{RGB}{163,217,0} -\definecolor{葱绿}{RGB}{158,217,0} -\definecolor{蔥綠}{RGB}{158,217,0} -\definecolor{葱青}{RGB}{14,184,58} -\definecolor{蔥青}{RGB}{14,184,58} -\definecolor{青葱}{RGB}{10,163,68} -\definecolor{青蔥}{RGB}{10,163,68} -\definecolor{油绿}{RGB}{0,188,18} -\definecolor{油綠}{RGB}{0,188,18} -\definecolor{绿沉}{RGB}{12,137,24} -\definecolor{綠沉}{RGB}{12,137,24} -\definecolor{碧色}{RGB}{27,209,165} -\definecolor{碧绿}{RGB}{42,221,156} -\definecolor{碧綠}{RGB}{42,221,156} -\definecolor{青碧}{RGB}{72,192,163} -\definecolor{翡翠色}{RGB}{61,225,173} -\definecolor{草绿}{RGB}{64,222,90} -\definecolor{草綠}{RGB}{64,222,90} -\definecolor{青色}{RGB}{0,224,158} -\definecolor{青翠}{RGB}{0,224,121} -\definecolor{青白}{RGB}{192,235,215} -\definecolor{鸭卵青}{RGB}{224,238,232} -\definecolor{鴨卵青}{RGB}{224,238,232} -\definecolor{蟹壳青}{RGB}{187,205,197} -\definecolor{蟹殼青}{RGB}{187,205,197} -\definecolor{鸦青}{RGB}{66,76,80} -\definecolor{鴉青}{RGB}{66,76,80} -\definecolor{绿色}{RGB}{0,229,0} -\definecolor{綠色}{RGB}{0,229,0} -\definecolor{豆绿}{RGB}{158,208,72} -\definecolor{豆綠}{RGB}{158,208,72} -\definecolor{豆青}{RGB}{150,206,84} -\definecolor{石青}{RGB}{123,207,166} -\definecolor{玉色}{RGB}{46,223,163} -\definecolor{缥}{RGB}{127,236,173} -\definecolor{縹}{RGB}{127,236,173} -\definecolor{艾绿}{RGB}{164,226,198} -\definecolor{艾綠}{RGB}{164,226,198} -\definecolor{松柏绿}{RGB}{33,166,117} -\definecolor{松柏綠}{RGB}{33,166,117} -\definecolor{松花绿}{RGB}{5,119,72} -\definecolor{松花綠}{RGB}{5,119,72} -\definecolor{松花色}{RGB}{5,119,72} -\definecolor{蓝}{RGB}{68,206,246} -\definecolor{藍}{RGB}{68,206,246} -\definecolor{靛青}{RGB}{23,124,176} -\definecolor{靛蓝}{RGB}{6,82,121} -\definecolor{靛藍}{RGB}{6,82,121} -\definecolor{碧蓝}{RGB}{62,237,231} -\definecolor{碧藍}{RGB}{62,237,231} -\definecolor{蔚蓝}{RGB}{112,243,255} -\definecolor{蔚藍}{RGB}{112,243,255} -\definecolor{宝蓝}{RGB}{75,92,196} -\definecolor{寶藍}{RGB}{75,92,196} -\definecolor{蓝灰色}{RGB}{161,175,201} -\definecolor{藍灰色}{RGB}{161,175,201} -\definecolor{藏青}{RGB}{46,78,126} -\definecolor{藏蓝}{RGB}{59,46,126} -\definecolor{藏藍}{RGB}{59,46,126} -\definecolor{黛}{RGB}{74,66,102} -\definecolor{黱}{RGB}{74,66,102} -\definecolor{黛绿}{RGB}{66,102,102} -\definecolor{黛綠}{RGB}{66,102,102} -\definecolor{黛蓝}{RGB}{66,80,102} -\definecolor{黛藍}{RGB}{66,80,102} -\definecolor{黛紫}{RGB}{87,66,102} -\definecolor{紫色}{RGB}{141,75,187} -\definecolor{紫酱}{RGB}{129,84,99} -\definecolor{紫醬}{RGB}{129,84,99} -\definecolor{酱紫}{RGB}{129,84,118} -\definecolor{醬紫}{RGB}{129,84,118} -\definecolor{紫檀}{RGB}{76,34,27} -\definecolor{绀青}{RGB}{0,51,113} -\definecolor{紺青}{RGB}{0,51,113} -\definecolor{紫棠}{RGB}{86,0,79} -\definecolor{青莲}{RGB}{128,29,174} -\definecolor{青蓮}{RGB}{128,29,174} -\definecolor{群青}{RGB}{76,141,174} -\definecolor{雪青}{RGB}{176,164,227} -\definecolor{丁香色}{RGB}{204,164,227} -\definecolor{藕色}{RGB}{237,209,216} -\definecolor{藕荷色}{RGB}{228,198,208} -\definecolor{苍色}{RGB}{117,135,138} -\definecolor{蒼色}{RGB}{117,135,138} -\definecolor{苍黄}{RGB}{81,154,115} -\definecolor{蒼黃}{RGB}{81,154,115} -\definecolor{苍青}{RGB}{162,155,124} -\definecolor{蒼青}{RGB}{162,155,124} -\definecolor{苍黑}{RGB}{115,151,171} -\definecolor{蒼黑}{RGB}{115,151,171} -\definecolor{苍白}{RGB}{209,217,224} -\definecolor{蒼白}{RGB}{209,217,224} -\definecolor{水色}{RGB}{136,173,166} -\definecolor{水红}{RGB}{243,211,231} -\definecolor{水紅}{RGB}{243,211,231} -\definecolor{水绿}{RGB}{212,242,231} -\definecolor{水綠}{RGB}{212,242,231} -\definecolor{水蓝}{RGB}{210,240,244} -\definecolor{水藍}{RGB}{210,240,244} -\definecolor{淡青}{RGB}{211,224,243} -\definecolor{湖蓝}{RGB}{48,223,243} -\definecolor{湖藍}{RGB}{48,223,243} -\definecolor{湖绿}{RGB}{37,248,203} -\definecolor{湖綠}{RGB}{37,248,203} -\definecolor{精白}{RGB}{255,255,255} -\definecolor{象牙白}{RGB}{255,251,240} -\definecolor{雪白}{RGB}{240,252,255} -\definecolor{月白}{RGB}{214,236,240} -\definecolor{缟}{RGB}{242,236,222} -\definecolor{縞}{RGB}{242,236,222} -\definecolor{素}{RGB}{224,240,233} -\definecolor{荼白}{RGB}{243,249,241} -\definecolor{霜色}{RGB}{233,241,246} -\definecolor{花白}{RGB}{194,204,208} -\definecolor{鱼肚白}{RGB}{252,239,232} -\definecolor{魚肚白}{RGB}{252,239,232} -\definecolor{莹白}{RGB}{227,239,253} -\definecolor{瑩白}{RGB}{227,239,253} -\definecolor{灰色}{RGB}{128,128,128} -\definecolor{牙色}{RGB}{238,222,176} -\definecolor{铅白}{RGB}{240,240,244} -\definecolor{鉛白}{RGB}{240,240,244} -\definecolor{玄色}{RGB}{98,42,29} -\definecolor{玄青}{RGB}{61,59,79} -\definecolor{乌色}{RGB}{114,94,130} -\definecolor{烏色}{RGB}{114,94,130} -\definecolor{乌黑}{RGB}{57,47,65} -\definecolor{烏黑}{RGB}{57,47,65} -\definecolor{漆黑}{RGB}{22,24,35} -\definecolor{墨色}{RGB}{80,97,109} -\definecolor{墨灰}{RGB}{117,138,153} -\definecolor{黑色}{RGB}{0,0,0} -\definecolor{缁色}{RGB}{73,49,49} -\definecolor{緇色}{RGB}{73,49,49} -\definecolor{煤黑}{RGB}{49,37,32} -\definecolor{黧}{RGB}{93,81,60} -\definecolor{黎}{RGB}{117,102,77} -\definecolor{黝}{RGB}{107,104,130} -\definecolor{黝黑}{RGB}{102,87,87} -\definecolor{黯}{RGB}{65,85,93} -\definecolor{赤金}{RGB}{242,190,69} -\definecolor{金色}{RGB}{234,205,118} -\definecolor{银白}{RGB}{233,231,239} -\definecolor{銀白}{RGB}{233,231,239} -\definecolor{铜绿}{RGB}{84,150,136} -\definecolor{銅綠}{RGB}{84,150,136} -\definecolor{乌金}{RGB}{167,142,68} -\definecolor{烏金}{RGB}{167,142,68} -\definecolor{老银}{RGB}{186,202,198} -\definecolor{老銀}{RGB}{186,202,198} +缃色,240,194,57;橙色,250,140,53;茶色,179,92,68;驼色,168,132,98;昏黄,200,155,64;栗色,96,40,30;棕色,178,93,37;棕绿,130,113,0;棕黑,124,75,0;棕红,155,68,0;棕黄,174,112,0;赭色,149,85,57;琥珀,202,105,36;褐色,110,81,30;枯黄,211,177,125;黄栌,226,156,69;秋色,137,108,57;秋香色,217,182,17;嫩绿,189,221,34;柳黄,201,221,34;柳绿,175,221,34;竹青,120,146,98;葱黄,163,217,0;葱绿,158,217,0;葱青,14,184,58;青葱,10,163,68;油绿,0,188,18;绿沉,12,137,24;碧色,27,209,165;碧绿,42,221,156;青碧,72,192,163;翡翠色,61,225,173;草绿,64,222,90;青色,0,224,158;青翠,0,224,121;青白,192,235,215;鸭卵青,224,238,232;蟹壳青,187,205,197;鸦青,66,76,80;绿色,0,229,0;豆绿,158,208,72;豆青,150,206,84;石青,123,207,166;玉色,46,223,163;缥,127,236,173;艾绿,164,226,198;松柏绿,33,166,117;松花绿,5,119,72;松花色,5,119,72;蓝,68,206,246;靛青,23,124,176;靛蓝,6,82,121;碧蓝,62,237,231;蔚蓝,112,243,255;宝蓝,75,92,196;蓝灰色,161,175,201;藏青,46,78,126;藏蓝,59,46,126;黛,74,66,102;黱,74,66,102;黛绿,66,102,102;黛蓝,66,80,102;黛紫,87,66,102;紫色,141,75,187;紫酱,129,84,99;酱紫,129,84,118;紫檀,76,34,27;绀青,0,51,113;紫棠,86,0,79;青莲,128,29,174;群青,76,141,174;雪青,176,164,227;丁香色,204,164,227;藕色,237,209,216;藕荷色,228,198,208;苍色,117,135,138;苍黄,81,154,115;苍青,162,155,124;苍黑,115,151,171;苍白,209,217,224;水色,136,173,166;水红,243,211,231;水绿,212,242,231;水蓝,210,240,244;淡青,211,224,243;湖蓝,48,223,243;湖绿,37,248,203;精白,255,255,255;象牙白,255,251,240;雪白,240,252,255;月白,214,236,240;缟,242,236,222;素,224,240,233;荼白,243,249,241;霜色,233,241,246;花白,194,204,208;鱼肚白,252,239,232;莹白,227,239,253;灰色,128,128,128;牙色,238,222,176;铅白,240,240,244;玄色,98,42,29;玄青,61,59,79;乌色,114,94,130;乌黑,57,47,65;漆黑,22,24,35;墨色,80,97,109;墨灰,117,138,153;黑色,0,0,0;缁色,73,49,49;煤黑,49,37,32;黧,93,81,60;黎,117,102,77;黝,107,104,130;黝黑,102,87,87;黯,65,85,93;赤金,242,190,69;金色,234,205,118;银白,233,231,239;铜绿,84,150,136;乌金,167,142,68;老银,186,202,198;% % 以下增補，出處肖世孟《先秦色彩研究》: -\definecolor{正青}{RGB}{16.27, 51.37, 147.9}%{Hsb}{224, 89, 58} -\definecolor{正赤}{RGB}{153, 22.95, 33.79}%{Hsb}{335, 85, 60} -\definecolor{正黄}{RGB}{221.85, 149.45, 24.4}%{Hsb}{38, 89, 87} -\definecolor{正黃}{RGB}{221.85, 149.45, 24.4}%{Hsb}{38, 89, 87} +正青,16.27,51.37,147.9;正赤,153,22.95,33.79;正黄,221.85,149.45,24.4% +} +\colorlet{粉紅}{粉红} +\colorlet{品紅}{品红} +\colorlet{桃紅}{桃红} +\colorlet{海棠紅}{海棠红} +\colorlet{石榴紅}{石榴红} +\colorlet{櫻桃色}{樱桃色} +\colorlet{銀紅}{银红} +\colorlet{大紅}{大红} +\colorlet{絳紫}{绛紫} +\colorlet{緋紅}{绯红} +\colorlet{朱紅}{朱红} +\colorlet{火紅}{火红} +\colorlet{嫣紅}{嫣红} +\colorlet{洋紅}{洋红} +\colorlet{綰}{绾} +\colorlet{棗紅}{枣红} +\colorlet{殷紅}{殷红} +\colorlet{酡紅}{酡红} +\colorlet{酡顏}{酡颜} +\colorlet{鵝黃}{鹅黄} +\colorlet{鴨黃}{鸭黄} +\colorlet{櫻草色}{樱草色} +\colorlet{杏黃}{杏黄} +\colorlet{杏紅}{杏红} +\colorlet{橘黃}{橘黄} +\colorlet{橙黃}{橙黄} +\colorlet{橘紅}{橘红} +\colorlet{緗色}{缃色} +\colorlet{駝色}{驼色} +\colorlet{昏黃}{昏黄} +\colorlet{椶色}{棕色} +\colorlet{椶綠}{棕绿} +\colorlet{椶黑}{棕黑} +\colorlet{椶紅}{棕红} +\colorlet{椶黃}{棕黄} +\colorlet{枯黃}{枯黄} +\colorlet{黃櫨}{黄栌} +\colorlet{嫩綠}{嫩绿} +\colorlet{柳黃}{柳黄} +\colorlet{柳綠}{柳绿} +\colorlet{蔥黃}{葱黄} +\colorlet{蔥綠}{葱绿} +\colorlet{蔥青}{葱青} +\colorlet{青蔥}{青葱} +\colorlet{油綠}{油绿} +\colorlet{綠沉}{绿沉} +\colorlet{碧綠}{碧绿} +\colorlet{草綠}{草绿} +\colorlet{鴨卵青}{鸭卵青} +\colorlet{蟹殼青}{蟹壳青} +\colorlet{鴉青}{鸦青} +\colorlet{綠色}{绿色} +\colorlet{豆綠}{豆绿} +\colorlet{縹}{缥} +\colorlet{艾綠}{艾绿} +\colorlet{松柏綠}{松柏绿} +\colorlet{松花綠}{松花绿} +\colorlet{藍}{蓝} +\colorlet{靛藍}{靛蓝} +\colorlet{碧藍}{碧蓝} +\colorlet{蔚藍}{蔚蓝} +\colorlet{寶藍}{宝蓝} +\colorlet{藍灰色}{蓝灰色} +\colorlet{藏藍}{藏蓝} +\colorlet{黛綠}{黛绿} +\colorlet{黛藍}{黛蓝} +\colorlet{紫醬}{紫酱} +\colorlet{醬紫}{酱紫} +\colorlet{紺青}{绀青} +\colorlet{青蓮}{青莲} +\colorlet{蒼色}{苍色} +\colorlet{蒼黃}{苍黄} +\colorlet{蒼青}{苍青} +\colorlet{蒼黑}{苍黑} +\colorlet{蒼白}{苍白} +\colorlet{水紅}{水红} +\colorlet{水綠}{水绿} +\colorlet{水藍}{水蓝} +\colorlet{湖藍}{湖蓝} +\colorlet{湖綠}{湖绿} +\colorlet{縞}{缟} +\colorlet{魚肚白}{鱼肚白} +\colorlet{瑩白}{莹白} +\colorlet{鉛白}{铅白} +\colorlet{烏色}{乌色} +\colorlet{烏黑}{乌黑} +\colorlet{緇色}{缁色} +\colorlet{銀白}{银白} +\colorlet{銅綠}{铜绿} +\colorlet{烏金}{乌金} +\colorlet{老銀}{老银} +\colorlet{正黃}{正黄} + + +% 中科院色谱RGB +\def\cas@rgb@colors{% +乳白,249,244,220;杏仁黄,249,236,195;茉莉黄,248,223,114;麦秆黄,248,223,112;油菜花黄,251,218,65;佛手黄,254,215,26;篾黄,247,222,152;葵扇黄,248,216,106;柠檬黄,252,211,55;金瓜黄,252,210,23;藤黄,254,209,16;酪黄,246,222,173;香水玫瑰黄,247,218,148;淡密黄,249,211,103;大豆黄,251,205,49;素馨黄,252,203,22;向日葵黄,254,204,17;雅梨黄,251,200,47;黄连黄,252,197,21;金盏黄,252,195,7;蛋壳黄,248,195,135;肉色,247,193,115;鹅掌黄,251,185,41;鸡蛋黄,251,182,18;鼬黄,252,183,10;榴萼黄,249,166,51;淡橘橙,251,164,20;枇杷黄,252,161,6;橙皮黄,252,161,4;北瓜黄,252,140,35;杏黄,250,142,22;雄黄,255,153,0;万寿菊黄,251,139,5;菊蕾白,233,221,182;秋葵黄,238,208,69;硫华黄,242,206,43;柚黄,241,202,23;芒果黄,221,200,113;蒿黄,223,194,67;姜黄,226,192,39;香蕉黄,228,191,17;草黄,210,180,44;新禾绿,210,177,22;月灰,183,174,143;淡灰绿,173,158,85;草灰绿,142,128,75;苔绿,136,115,34;碧螺春绿,134,112,24;燕羽灰,104,94,72;蟹壳灰,105,94,69;潭水绿,100,88,34;橄榄绿,94,83,20;蚌肉白,249,241,219;豆汁黄,248,232,193;淡茧黄,249,215,112;乳鸭黄,255,201,12;荔肉白,242,230,206;象牙黄,240,214,149;炒米黄,244,206,105;鹦鹉冠黄,246,196,48;木瓜黄,249,193,22;浅烙黄,249,189,16;莲子白,229,211,170;谷黄,232,176,4;栀子黄,235,177,13;芥黄,217,164,14;银鼠灰,181,170,144;尘灰,182,164,118;枯绿,183,141,18;鲛青,135,114,62;粽叶绿,135,104,24;灰绿,138,105,19;鹤灰,74,64,53;淡松烟,77,64,48;暗海水绿,88,71,23;棕榈绿,91,73,19;米色,249,223,205;淡肉色,248,224,176;麦芽糖黄,249,210,125;琥珀黄,254,186,7;甘草黄,243,191,76;初熟杏黄,248,188,49;浅驼色,226,193,124;沙石黄,229,183,81;虎皮黄,234,173,26;土黄,214,160,29;百灵鸟灰,180,169,146;山鸡黄,183,139,38;龟背黄,130,107,72;苍黄,128,99,50;莱阳梨黄,129,95,37;蜴蜊绿,131,94,29;松鼠灰,79,64,50;橄榄灰,80,62,42;蟹壳绿,81,60,32;古铜绿,83,60,27;焦茶绿,85,59,24;粉白,251,242,227;落英淡粉,249,232,208;瓜瓤粉,249,203,139;蜜黄,251,185,87;金叶黄,255,166,15;金莺黄,244,168,58;鹿角棕,227,189,141;凋叶棕,231,162,63;玳瑁黄,218,164,90;软木黄,222,158,68;风帆黄,220,145,35;桂皮淡棕,192,147,81;猴毛灰,151,132,108;山鸡褐,152,101,36;驼色,102,70,42;茶褐,93,61,33;古铜褐,92,55,25;荷花白,251,236,222;玫瑰粉,248,179,127;橘橙,249,125,28;美人焦橙,250,126,35;润红,247,205,188;淡桃红,246,206,193;海螺橙,240,148,93;桃红,240,173,160;颊红,238,170,156;淡罂粟红,238,160,140;晨曦红,234,137,88;蟹壳红,242,118,53;金莲花橙,248,107,29;草莓红,239,111,72;龙睛鱼红,239,99,43;蜻蜓红,241,68,29;大红,240,75,34;柿红,242,72,27;榴花红,243,71,24;银朱,244,62,6;朱红,237,81,38;鲑鱼红,240,156,90;金黄,242,123,31;鹿皮褐,217,145,86;醉瓜肉,219,133,64;麂棕,222,118,34;淡银灰,193,178,163;淡赭,190,126,74;槟榔综,193,101,26;银灰,145,128,114;海鸥灰,154,136,120;淡咖啡,148,88,51;岩石棕,150,77,34;芒果棕,149,68,22;石板灰,98,73,65;珠母灰,100,72,61;丁香棕,113,54,29;咖啡,117,49,23;筍皮棕,115,46,18;燕颔红,252,99,21;玉粉红,232,180,154;金驼,228,104,40;铁棕,216,89,22;蛛网灰,183,160,145;淡可可棕,183,81,29;中红灰,139,97,77;淡土黄,140,75,49;淡豆沙,135,61,36;椰壳棕,136,58,30;淡铁灰,91,66,58;中灰驼,96,61,48;淡栗棕,103,52,36;可可棕,101,43,28;柞叶棕,105,42,27;野蔷薇红,251,153,104;菠萝红,252,121,48;藕荷,237,195,174;陶瓷红,225,103,35;晓灰,212,196,183;余烬红,207,117,67;火砖红,205,98,39;火泥棕,170,106,76;绀红,166,82,44;橡树棕,119,61,49;海报灰,72,51,50;玫瑰灰,175,46,43;火山棕,72,37,34;豆沙,72,30,28;淡米粉,251,238,226;初桃粉红,246,220,206;介壳淡粉红,247,207,186;淡藏花红,246,173,143;瓜瓤红,246,140,96;芙蓉红,249,114,61;莓酱红,250,93,25;法螺红,238,128,85;落霞红,207,72,19;淡玫瑰灰,184,148,133;蟹蝥红,177,75,40;火岩棕,134,48,32;赭石,134,38,23;暗驼棕,89,38,32;酱棕,90,31,27;栗棕,92,30,25;洋水仙红,244,199,186;谷鞘红,241,118,102;苹果红,241,86,66;铁水红,245,57,28;桂红,242,90,71;极光红,243,59,31;粉红,242,185,178;舌红,241,151,144;曲红,240,90,70;红汞红,242,62,35;淡绯,242,202,201;无花果红,239,175,173;榴子红,241,144,140;胭脂红,240,63,36;合欢红,240,161,168;春梅红,241,147,156;香叶红,240,124,130;珊瑚红,240,74,58;萝卜红,241,60,34;淡茜红,231,124,142;艳红,237,90,101;淡菽红,237,72,69;鱼鳃红,237,59,47;樱桃红,237,51,33;淡蕊香红,238,72,102;石竹红,238,72,99;草茉莉红,239,71,93;茶花红,238,63,77;枸枢红,237,51,51;秋海棠红,236,43,36;丽春红,235,38,26;夕阳红,222,42,24;鹤顶红,212,37,23;鹅血石红,171,55,47;覆盆子红,172,31,24;貂紫,93,49,49;暗玉紫,92,34,35;栗紫,90,25,27;葡萄酱紫,90,18,22;牡丹粉红,238,162,164;山茶红,237,85,106;海棠红,240,55,82;玉红,192,72,81;高粱红,192,44,56;满江红,167,83,90;枣红,124,24,35;葡萄紫,76,31,36;酱紫,77,16,24;淡曙红,238,39,70;唐菖蒲红,222,28,49;鹅冠红,209,26,45;莓红,196,90,101;枫叶红,194,31,48;苋菜红,166,27,41;烟红,137,78,84;暗紫苑红,130,32,43;殷红,130,17,31;猪肝紫,84,30,36;金鱼紫,80,10,22;草珠红,248,235,230;淡绛红,236,118,150;品红,239,52,115;凤仙花红,234,114,147;粉团花红,236,155,173;夹竹桃红,235,80,126;榲桲红,237,47,106;姜红,238,184,195;莲瓣红,234,81,127;水红,241,196,205;报春红,236,138,164;月季红,206,87,109;豇豆红,237,157,178;霞光红,239,130,160;松叶牡丹红,235,60,112;喜蛋红,236,44,100;鼠鼻红,227,180,184;尖晶玉红,204,22,58;山黎豆红,194,124,136;锦葵红,191,53,83;鼠背灰,115,87,92;甘蔗紫,98,22,36;石竹紫,99,7,28;苍蝇灰,54,40,43;卵石紫,48,22,28;李紫,43,18,22;茄皮紫,45,12,19;吊钟花红,206,94,138;兔眼红,236,78,138;紫荆红,238,44,121;菜头紫,149,28,72;鹞冠紫,98,29,52;葡萄酒红,98,16,46;磨石紫,56,33,41;檀紫,56,25,36;火鹅紫,51,20,30;墨紫,49,15,27;晶红,238,166,183;扁豆花红,239,73,139;白芨红,222,120,151;嫩菱红,222,63,124;菠根红,209,60,116;酢酱草红,197,112,139;洋葱紫,168,69,107;海象紫,75,30,47;绀紫,70,22,41;古铜紫,68,14,37;石蕊红,240,201,207;芍药耕红,235,160,179;藏花红,236,45,122;初荷红,225,108,150;马鞭草紫,237,227,231;丁香淡紫,233,215,223;丹紫红,210,86,140;玫瑰红,210,53,125;淡牵牛紫,209,194,211;凤信紫,200,173,196;萝兰紫,192,142,175;玫瑰紫,186,47,123;藤萝紫,128,118,163;槿紫,128,109,158;蕈紫,129,92,148;桔梗紫,129,60,133;魏紫,126,22,113;芝兰紫,233,204,211;菱锰红,210,118,163;龙须红,204,85,149;蓟粉红,230,210,213;电气石红,195,86,145;樱草紫,192,111,152;芦穗灰,189,174,173;隐红灰,181,152,161;苋菜紫,155,30,100;芦灰,133,109,114;暮云灰,79,56,62;斑鸠灰,72,41,54;淡藤萝紫,242,231,229;淡青紫,224,200,209;青蛤壳紫,188,132,168;豆蔻紫,173,101,152;扁豆紫,163,92,143;芥花紫,152,54,128;青莲,139,38,113;芓紫,137,66,118;葛巾紫,126,32,101;牵牛紫,104,23,82;紫灰,93,63,81;龙睛鱼紫,78,42,64;荸荠紫,65,28,53;古鼎灰,54,41,47;乌梅紫,30,19,29;深牵牛紫,28,13,26;银白,241,240,237;芡食白,226,225,228;远山紫,204,204,214;淡蓝紫,167,168,189;山梗紫,97,100,159;螺甸紫,116,117,155;玛瑙灰,207,204,201;野菊紫,82,82,136;满天星紫,46,49,124;锌灰,122,115,116;野葡萄紫,48,47,75;剑锋紫,62,56,65;龙葵紫,50,47,59;暗龙胆紫,34,32,46;晶石紫,31,32,64;暗蓝紫,19,17,36;景泰蓝,39,117,182;尼罗蓝,36,116,181;远天蓝,208,223,230;星蓝,147,181,207;羽扇豆蓝,97,154,195;花青,35,118,183;睛蓝,86,152,195;虹蓝,33,119,184;湖水蓝,176,213,223;秋波蓝,138,188,209;涧石蓝,102,169,201;潮蓝,41,131,187;群青,23,114,180;霁青,99,187,208;碧青,92,179,204;宝石蓝,36,134,185;天蓝,22,119,179;柏林蓝,18,107,174;海青,34,162,195;钴蓝,26,148,188;鸢尾蓝,21,139,184;牵牛花蓝,17,119,176;飞燕草蓝,15,89,164;品蓝,43,115,175;银鱼白,205,209,211;安安蓝,49,112,167;鱼尾灰,94,97,109;鲸鱼灰,71,81,100;海参灰,255,254,250;沙鱼灰,53,51,60;钢蓝,15,20,35;云水蓝,186,204,217;晴山蓝,143,178,201;靛青,22,97,171;大理石灰,196,203,207;海涛蓝,21,85,154;蝶翅蓝,78,124,161;海军蓝,52,108,156;水牛灰,47,47,53;牛角灰,45,46,54;燕颔蓝,19,24,36;云峰白,216,227,231;井天蓝,195,215,223;云山蓝,47,144,185;釉蓝,23,129,181;鸥蓝,199,210,212;搪磁蓝,17,101,154;月影白,192,196,195;星灰,178,187,190;淡蓝灰,94,121,135;鷃蓝,20,74,116;嫩灰,116,120,122;战舰灰,73,92,105;瓦罐灰,71,72,76;青灰,43,51,62;鸽蓝,28,41,56;钢青,20,35,52;暗蓝,16,31,48;月白,238,247,242;海天蓝,198,230,232;清水蓝,147,213,220;瀑布蓝,81,196,211;蔚蓝,41,183,203;孔雀蓝,14,176,201;甸子蓝,16,174,194;石绿,87,195,194;竹篁绿,185,222,201;粉绿,131,203,172;美蝶绿,18,170,156;毛绿,102,193,140;蔻梢绿,93,190,138;麦苗绿,85,187,138;蛙绿,69,183,135;铜绿,43,174,133;竹绿,27,167,132;蓝绿,18,161,130;穹灰,196,215,214;翠蓝,30,158,179;胆矾蓝,15,149,176;樫鸟蓝,20,145,168;闪蓝,124,171,177;冰山蓝,164,172,167;虾壳青,134,157,157;晚波蓝,100,142,147;蜻蜓蓝,59,129,140;玉鈫蓝,18,110,130;垩灰,115,124,123;夏云灰,97,113,114;苍蓝,19,72,87;黄昏灰,71,75,76;灰蓝,33,55,61;深灰蓝,19,44,51;玉簪绿,164,202,182;青矾绿,44,150,120;草原远绿,154,190,175;梧枝绿,105,167,148;浪花绿,146,179,165;海王绿,36,128,103;亚丁绿,66,134,117;镍灰,159,163,154;明灰,138,152,142;淡绿灰,112,136,125;飞泉绿,73,117,104;狼烟灰,93,101,95;绿灰,49,74,67;苍绿,34,62,54;深海绿,26,59,50;长石灰,54,52,51;苷蓝绿,31,38,35;莽丛绿,20,30,27;淡翠绿,198,223,200;明绿,158,204,171;田园绿,104,184,142;翠绿,32,161,98;淡绿,97,172,133;葱绿,64,160,112;孔雀绿,34,148,83;艾绿,202,211,195;蟾绿,60,149,102;宫殿绿,32,137,77;松霜绿,131,167,141;蛋白石绿,87,149,114;薄荷绿,32,127,76;瓦松绿,110,139,116;荷叶绿,26,104,64;田螺绿,94,102,91;白屈菜绿,72,91,77;河豚灰,57,55,51;蒽油绿,55,56,52;槲寄生绿,43,49,44;云杉绿,21,35,27;嫩菊绿,240,245,229;艾背绿,223,236,213;嘉陵水绿,173,213,162;玉髓绿,65,179,73;鲜绿,67,178,68;宝石绿,65,174,60;海沬绿,226,231,191;姚黄,208,222,170;橄榄石绿,178,207,135;水绿,140,194,105;芦苇绿,183,208,122;槐花黄绿,210,217,122;苹果绿,186,207,101;芽绿,150,194,78;蝶黄,226,216,73;橄榄黄绿,190,201,54;鹦鹉绿,91,174,35;油绿,37,61,36;象牙白,255,254,248;汉白玉,248,244,237;雪白,255,254,249;鱼肚白,247,244,237;珍珠灰,228,223,215;浅灰,218,212,203;铅灰,187,181,172;中灰,187,181,172;瓦灰,134,126,118;夜灰,132,124,116;雁灰,128,118,110;深灰,129,119,110% +} + +% 中科院色谱cmyk +\def\cas@cmyk@colors{% +乳白,0.04,0.05,0.18,0;杏仁黄,0.03,0.08,0.3,0;茉莉黄,0.04,0.13,0.67,0;麦秆黄,0.05,0.14,0.68,0.01;油菜花黄,0.02,0.16,0.84,0;佛手黄,0.01,0.18,0.94,0;篾黄,0.03,0.16,0.5,0;葵扇黄,0.03,0.17,0.69,0;柠檬黄,0,0.2,0.87,0;金瓜黄,0,0.2,0.95,0;藤黄,0,0.21,0.94,0;酪黄,0.02,0.16,0.39,0;香水玫瑰黄,0.01,0.17,0.5,0;淡密黄,0.01,0.21,0.7,0;大豆黄,0,0.23,0.88,0;素馨黄,0,0.24,0.94,0;向日葵黄,0,0.24,0.94,0;雅梨黄,0,0.27,0.88,0;黄连黄,0,0.28,0.94,0;金盏黄,0,0.29,0.95,0;蛋壳黄,0,0.32,0.52,0;肉色,0,0.32,0.52,0;鹅掌黄,0,0.35,0.89,0;鸡蛋黄,0,0.36,0.93,0;鼬黄,0,0.35,0.94,0;榴萼黄,0,0.44,0.84,0;淡橘橙,0,0.45,0.92,0;枇杷黄,0,0.47,0.92,0;橙皮黄,0,0.47,0.92,0;北瓜黄,0,0.56,0.87,0;杏黄,0,0.54,0.92,0;雄黄,0,0.51,0.91,0;万寿菊黄,0,0.56,0.91,0;菊蕾白,0.1,0.13,0.35,0.01;秋葵黄,0.08,0.19,0.84,0.01;硫华黄,0.06,0.2,0.92,0.01;柚黄,0.06,0.22,0.92,0;芒果黄,0.15,0.2,0.66,0.02;蒿黄,0.14,0.22,0.85,0.02;姜黄,0.12,0.24,0.95,0.02;香蕉黄,0.11,0.25,0.99,0.01;草黄,0.17,0.27,0.94,0.04;新禾绿,0.17,0.29,1,0.04;月灰,0.28,0.26,0.45,0.07;淡灰绿,0.3,0.3,0.7,0.12;草灰绿,0.38,0.38,0.76,0.24;苔绿,0.36,0.42,1,0.29;碧螺春绿,0.36,0.42,1,0.3;燕羽灰,0.47,0.47,0.65,0.42;蟹壳灰,0.46,0.47,0.69,0.42;潭水绿,0.48,0.48,1,0.45;橄榄绿,0.5,0.5,0.1,0.48;蚌肉白,0.02,0.06,0.18,0;豆汁黄,0.03,0.1,0.31,0;淡茧黄,0.01,0.19,0.66,0;乳鸭黄,0,0.26,0.94,0;荔肉白,0.05,0.11,0.22,0;象牙黄,0.05,0.19,0.5,0;炒米黄,0.03,0.23,0.69,0;鹦鹉冠黄,0.01,0.28,0.89,0;木瓜黄,0,0.3,0.95,0;浅烙黄,0,0.32,0.95,0;莲子白,0.11,0.18,0.39,0.01;谷黄,0.05,0.35,0.99,0;栀子黄,0.03,0.36,0.99,0;芥黄,0.11,0.39,1,0.02;银鼠灰,0.28,0.27,0.43,0.08;尘灰,0.26,0.31,0.57,0.1;枯绿,0.21,0.43,1,0.11;鲛青,0.35,0.44,0.8,0.3;粽叶绿,0.32,0.5,1,0.31;灰绿,0.31,0.51,1,0.3;鹤灰,0.52,0.56,0.64,0.62;淡松烟,0.48,0.58,0.7,0.62;暗海水绿,0.45,0.56,1,0.56;棕榈绿,0.45,0.55,1,0.54;米色,0.01,0.11,0.24,0;淡肉色,0.01,0.15,0.38,0;麦芽糖黄,0,0.23,0.59,0;琥珀黄,0,0.34,0.93,0;甘草黄,0.01,0.31,0.79,0;初熟杏黄,0,0.33,0.83,0;浅驼色,0.1,0.27,0.59,0.01;沙石黄,0.07,0.32,0.78,0.01;虎皮黄,0.03,0.38,0.97,0;土黄,0.12,0.41,0.98,0.02;百灵鸟灰,0.28,0.28,0.41,0.09;山鸡黄,0.21,0.44,0.97,0.11;龟背黄,0.35,0.47,0.71,0.33;苍黄,0.34,0.52,0.85,0.35;莱阳梨黄,0.32,0.56,0.96,0.34;蜴蜊绿,0.31,0.57,1,0.33;松鼠灰,0.46,0.59,0.68,0.61;橄榄灰,0.44,0.61,0.76,0.62;蟹壳绿,0.43,0.63,0.88,0.61;古铜绿,0.42,0.64,0.94,0.6;焦茶绿,0.41,0.66,0.94,0.6;粉白,0.01,0.07,0.13,0;落英淡粉,0.01,0.12,0.22,0;瓜瓤粉,0,0.27,0.51,0;蜜黄,0,0.36,0.72,0;金叶黄,0,0.44,0.91,0;金莺黄,0,0.43,0.82,0;鹿角棕,0.08,0.31,0.5,0.01;凋叶棕,0.02,0.44,0.83,0;玳瑁黄,0.1,0.41,0.72,0.01;软木黄,0.07,0.45,0.82,0.01;风帆黄,0.06,0.51,0.95,0.01;桂皮淡棕,0.19,0.44,0.75,0.07;猴毛灰,0.32,0.4,0.53,0.22;山鸡褐,0.27,0.6,0.97,0.21;驼色,0.37,0.65,0.84,0.49;茶褐,0.38,0.69,0.9,0.54;古铜褐,0.37,0.74,0.96,0.55;荷花白,0,0.1,0.14,0;玫瑰粉,0,0.4,0.52,0;橘橙,0,0.62,0.88,0;美人焦橙,0,0.62,0.85,0;润红,0,0.28,0.25,0;淡桃红,0,0.28,0.22,0;海螺橙,0,0.53,0.65,0;桃红,0,0.44,0.32,0;颊红,0,0.45,0.34,0;淡罂粟红,0,0.49,0.41,0;晨曦红,0,0.58,0.67,0;蟹壳红,0,0.65,0.8,0;金莲花橙,0,0.69,0.86,0;草莓红,0,0.69,0.7,0;龙睛鱼红,0,0.72,0.82,0;蜻蜓红,0,0.81,0.84,0;大红,0,0.8,0.83,0;柿红,0,0.8,0.85,0;榴花红,0,0.8,0.85,0;银朱,0,0.83,0.87,0;朱红,0,0.78,0.83,0;鲑鱼红,0,0.5,0.68,0;金黄,0.05,0.69,0.87,0;鹿皮褐,0.07,0.52,0.71,0.01;醉瓜肉,0.04,0.57,0.82,0.01;麂棕,0,0.64,0.93,0;淡银灰,0.22,0.28,0.34,0.06;淡赭,0.18,0.57,0.76,0.06;槟榔综,0.14,0.69,1,0.04;银灰,0.34,0.42,0.46,0.23;海鸥灰,0.42,0.4,0.46,0.2;淡咖啡,0.27,0.69,0.85,0.22;岩石棕,0.26,0.76,0.97,0.2;芒果棕,0.25,0.8,1,0.2;石板灰,0.39,0.6,0.58,0.51;珠母灰,0.38,0.63,0.63,0.5;丁香棕,0.32,0.83,0.96,0.41;咖啡,0.3,0.87,1,0.38;筍皮棕,0.3,0.89,1,0.39;燕颔红,0,0.72,0.86,0;玉粉红,0.03,0.38,0.39,0;金驼,0,0.7,0.87,0;铁棕,0,0.76,0.97,0;蛛网灰,0.23,0.35,0.38,0.1;淡可可棕,0.16,0.77,1,0.06;中红灰,0.31,0.63,0.66,0.31;淡土黄,0.28,0.76,0.82,0.26;淡豆沙,0.28,0.83,0.92,0.28;椰壳棕,0.27,0.85,0.98,0.27;淡铁灰,0.4,0.64,0.61,0.56;中灰驼,0.37,0.72,0.72,0.52;淡栗棕,0.34,0.82,0.85,0.47;可可棕,0.33,0.89,0.92,0.48;柞叶棕,0.32,0.9,0.95,0.45;野蔷薇红,0,0.53,0.59,0;菠萝红,0,0.65,0.79,0;藕荷,0.02,0.31,0.31,0;陶瓷红,0,0.7,0.91,0;晓灰,0.16,0.23,0.27,0.02;余烬红,0.09,0.64,0.78,0.01;火砖红,0.08,0.72,0.93,0.01;火泥棕,0.22,0.64,0.71,0.12;绀红,0.2,0.76,0.92,0.09;橡树棕,0.31,0.79,0.77,0.37;海报灰,0.45,0.68,0.57,0.66;玫瑰灰,0.41,0.76,0.64,0.65;火山棕,0.41,0.84,0.71,0.67;豆沙,0.4,0.92,0.78,0.66;淡米粉,0,0.09,0.12,0;初桃粉红,0,0.19,0.19,0;介壳淡粉红,0,0.27,0.27,0;淡藏花红,0,0.43,0.43,0;瓜瓤红,0,0.58,0.61,0;芙蓉红,0,0.67,0.74,0;莓酱红,0,0.74,0.85,0;法螺红,0,0.62,0.66,0;落霞红,0.04,0.82,0.99,0;淡玫瑰灰,0.21,0.43,0.43,0.09;蟹蝥红,0.18,0.8,0.92,0.07;火岩棕,0.27,0.91,0.95,0.28;赭石,0.27,0.96,1,0.27;暗驼棕,0.36,0.9,0.82,0.56;酱棕,0.35,0.96,0.88,0.55;栗棕,0.34,0.98,0.91,0.53;洋水仙红,0,0.31,0.24,0;谷鞘红,0,0.67,0.55,0;苹果红,0,0.77,0.69,0;铁水红,0,0.84,0.82,0;桂红,0,0.76,0.67,0;极光红,0,0.84,0.82,0;粉红,0,0.38,0.25,0;舌红,0,0.53,0.36,0;曲红,0,0.76,0.68,0;红汞红,0,0.83,0.81,0;淡绯,0,0.29,0.16,0;无花果红,0,0.43,0.24,0;榴子红,0,0.57,0.36,0;胭脂红,0,0.83,0.81,0;合欢红,0,0.5,0.23,0;春梅红,0,0.56,0.27,0;香叶红,0,0.65,0.38,0;珊瑚红,0,0.8,0.72,0;萝卜红,0,0.84,0.82,0;淡茜红,0,0.65,0.29,0;艳红,0,0.77,0.49,0;淡菽红,0,0.81,0.66,0;鱼鳃红,0,0.84,0.76,0;樱桃红,0,0.86,0.82,0;淡蕊香红,0,0.82,0.44,0;石竹红,0,0.82,0.46,0;草茉莉红,0,0.82,0.5,0;茶花红,0,0.84,0.6,0;枸枢红,0,0.86,0.74,0;秋海棠红,0,0.88,0.81,0;丽春红,0,0.89,0.84,0;夕阳红,0,0.9,0.9,0;鹤顶红,0,0.92,0.95,0;鹅血石红,0.19,0.89,0.85,0.09;覆盆子红,0.17,0.98,1,0.08;貂紫,0.36,0.81,0.64,0.54;暗玉紫,0.35,0.94,0.77,0.53;栗紫,0.35,1,0.85,0.54;葡萄酱紫,0.35,1,0.8,0.54;牡丹粉红,0,0.49,0.27,0;山茶红,0,0.78,0.44,0;海棠红,0,0.86,0.55,0;玉红,0.13,0.83,0.62,0.03;高粱红,0.11,0.93,0.77,0.02;满江红,0.22,0.76,0.54,0.12;枣红,0.28,1,0.86,0.33;葡萄紫,0.39,0.92,0.67,0.64;酱紫,0.39,1,0.79,0.63;淡曙红,0,0.89,0.62,0;唐菖蒲红,0,0.93,0.76,0;鹅冠红,0.01,0.95,0.82,0;莓红,0.13,0.76,0.5,0.02;枫叶红,0.1,0.96,0.82,0.02;苋菜红,0.19,0.99,0.86,0.11;烟红,0.29,0.73,0.51,0.28;暗紫苑红,0.27,0.98,0.79,0.3;殷红,0.27,1,0.9,0.29;猪肝紫,0.36,0.95,0.71,0.59;金鱼紫,0.38,1,0.81,0.61;草珠红,0.01,0.11,0.09,0;淡绛红,0,0.68,0.21,0;品红,0,0.86,0.3,0;凤仙花红,0,0.69,0.22,0;粉团花红,0,0.52,0.18,0;夹竹桃红,0,0.8,0.28,0;榲桲红,0,0.88,0.36,0;姜红,0,0.39,0.14,0;莲瓣红,0,0.8,0.27,0;水红,0,0.33,0.11,0;报春红,0,0.6,0.18,0;月季红,0.08,0.78,0.35,0.01;豇豆红,0,0.52,0.15,0;霞光红,0,0.63,0.18,0;松叶牡丹红,0,0.85,0.33,0;喜蛋红,0,0.88,0.4,0;鼠鼻红,0.05,0.38,0.2,0;尖晶玉红,0.05,0.96,0.73,0.01;山黎豆红,0.16,0.61,0.34,0.04;锦葵红,0.13,0.9,0.56,0.03;鼠背灰,0.41,0.64,0.44,0.36;甘蔗紫,0.33,1,0.75,0.49;石竹紫,0.32,1,0.84,0.49;苍蝇灰,0.57,0.72,0.54,0.74;卵石紫,0.52,0.88,0.58,0.81;李紫,0.56,0.88,0.62,0.84;茄皮紫,0.58,0.9,0.63,0.83;吊钟花红,0,0.76,0.16,0;兔眼红,0,0.81,0.18,0;紫荆红,0,0.87,0.24,0;菜头紫,0.24,0.99,0.52,0.19;鹞冠紫,0.34,0.97,0.54,0.5;葡萄酒红,0.33,1,0.58,0.6;磨石紫,0.53,0.81,0.5,0.74;檀紫,0.48,0.9,0.5,0.76;火鹅紫,0.5,0.91,0.54,0.79;墨紫,0.53,0.92,0.55,0.81;晶红,0,0.48,0.15,0;扁豆花红,0,0.82,0.16,0;白芨红,0.02,0.66,0.22,0;嫩菱红,0,0.85,0.24,0;菠根红,0.05,0.87,0.3,0.01;酢酱草红,0.15,0.68,0.28,0.02;洋葱紫,0.22,0.83,0.34,0.11;海象紫,0.4,0.92,0.47,0.64;绀紫,0.41,0.97,0.49,0.68;古铜紫,0.42,0.99,0.51,0.69;石蕊红,0,0.3,0.12,0;芍药耕红,0,0.5,0.16,0;藏花红,0,0.88,0.23,0;初荷红,0,0.71,0.18,0;马鞭草紫,0.06,0.13,0.07,0;丁香淡紫,0.07,0.2,0.08,0;丹紫红,0.07,0.79,0.18,0;玫瑰红,0.04,0.89,0.21,0;淡牵牛紫,0.19,0.27,0.09,0;凤信紫,0.21,0.37,0.12,0;萝兰紫,0.23,0.53,0.14,0.01;玫瑰紫,0.18,0.91,0.18,0.02;藤萝紫,0.58,0.56,0.17,0.02;槿紫,0.57,0.62,0.16,0.02;蕈紫,0.56,0.72,0.15,0.01;桔梗紫,0.54,0.89,0.12,0.01;魏紫,0.52,1,0.17,0.07;芝兰紫,0.03,0.26,0.1,0;菱锰红,0.1,0.67,0.12,0;龙须红,0.11,0.97,0.1,0;蓟粉红,0.08,0.22,0.12,0;电气石红,0.16,0.79,0.14,0.01;樱草紫,0.19,0.68,0.18,0.01;芦穗灰,0.25,0.31,0.26,0.05;隐红灰,0.26,0.43,0.26,0.06;苋菜紫,0.27,0.97,0.27,0.14;芦灰,0.39,0.53,0.38,0.25;暮云灰,0.49,0.71,0.49,0.58;斑鸠灰,0.49,0.82,0.46,0.63;淡藤萝紫,0.04,0.11,0.09,0;淡青紫,0.1,0.27,0.11,0;青蛤壳紫,0.24,0.58,0.15,0.01;豆蔻紫,0.31,0.71,0.15,0.01;扁豆紫,0.35,0.75,0.18,0.02;芥花紫,0.39,0.91,0.15,0.03;青莲,0.43,0.97,0.19,0.08;芓紫,0.44,0.85,0.24,0.1;葛巾紫,0.45,0.99,0.24,0.16;牵牛紫,0.49,1,0.29,0.32;紫灰,0.53,0.75,0.41,0.41;龙睛鱼紫,0.55,0.87,0.41,0.52;荸荠紫,0.58,0.96,0.4,0.61;古鼎灰,0.63,0.74,0.52,0.7;乌梅紫,0.81,0.87,0.54,0.84;深牵牛紫,0.83,0.87,0.55,0.86;银白,0.07,0.05,0.07,0;芡食白,0.13,0.1,0.09,0;远山紫,0.23,0.18,0.12,0.01;淡蓝紫,0.39,0.31,0.17,0.02;山梗紫,0.74,0.64,0.14,0.01;螺甸紫,0.63,0.53,0.22,0.05;玛瑙灰,0.21,0.17,0.19,0.01;野菊紫,0.8,0.73,0.21,0.06;满天星紫,1,0.93,0.21,0.05;锌灰,0.48,0.45,0.4,0.26;野葡萄紫,0.91,0.84,0.4,0.43;剑锋紫,0.7,0.69,0.49,0.56;龙葵紫,0.79,0.74,0.49,0.6;暗龙胆紫,0.9,0.84,0.5,0.69;晶石紫,0.98,0.93,0.48,0.73;暗蓝紫,1,0.94,0.52,0.77;景泰蓝,0.95,0.46,0.1,0.01;尼罗蓝,0.96,0.47,0.11,0.01;远天蓝,0.25,0.06,0.1,0;星蓝,0.53,0.19,0.15,0.01;羽扇豆蓝,0.74,0.27,0.16,0.02;花青,0.95,0.45,0.1,0.01;睛蓝,0.78,0.27,0.17,0.02;虹蓝,0.99,0.44,0.1,0.01;湖水蓝,0.43,0.04,0.16,0;秋波蓝,0.59,0.12,0.19,0;涧石蓝,0.73,0.17,0.2,0.01;潮蓝,0.93,0.36,0.15,0.02;群青,0.99,0.48,0.11,0.01;霁青,0.74,0.02,0.24,0;碧青,0.77,0.07,0.24,0;宝石蓝,0.94,0.32,0.17,0.03;天蓝,0.98,0.43,0.14,0.02;柏林蓝,1,0.52,0.11,0.01;海青,0.92,0.1,0.25,0.01;钴蓝,0.94,0.16,0.23,0.03;鸢尾蓝,0.95,0.25,0.2,0.04;牵牛花蓝,0.98,0.42,0.16,0.03;飞燕草蓝,1,0.65,0.11,0.01;品蓝,0.95,0.47,0.14,0.02;银鱼白,0.24,0.14,0.16,0.01;安安蓝,0.93,0.49,0.17,0.03;鱼尾灰,0.64,0.52,0.39,0.28;鲸鱼灰,0.78,0.6,0.4,0.31;海参灰,0.69,0.64,0.52,0.59;沙鱼灰,0.76,0.7,0.51,0.6;钢蓝,1,0.89,0.54,0.79;云水蓝,0.35,0.13,0.13,0;晴山蓝,0.55,0.2,0.18,0.01;靛青,1,0.6,0.08,0.01;大理石灰,0.29,0.16,0.17,0.01;海涛蓝,1,0.67,0.16,0.03;蝶翅蓝,0.81,0.41,0.24,0.08;海军蓝,0.93,0.5,0.21,0.06;水牛灰,0.77,0.68,0.54,0.66;牛角灰,0.8,0.7,0.53,0.65;燕颔蓝,1,0.86,0.54,0.78;云峰白,0.21,0.06,0.1,0;井天蓝,0.32,0.08,0.13,0;云山蓝,0.91,0.24,0.22,0.04;釉蓝,0.96,0.34,0.18,0.04;鸥蓝,0.28,0.12,0.17,0;搪磁蓝,1,0.53,0.21,0.06;月影白,0.29,0.18,0.21,0.02;星灰,0.36,0.2,0.23,0.02;淡蓝灰,0.7,0.38,0.36,0.18;鷃蓝,1,0.68,0.32,0.2;嫩灰,0.55,0.4,0.4,0.23;战舰灰,0.77,0.5,0.41,0.31;瓦罐灰,0.67,0.57,0.49,0.49;青灰,0.87,0.69,0.51,0.58;鸽蓝,1,0.77,0.5,0.62;钢青,1,0.82,0.51,0.64;暗蓝,1,0.84,0.51,0.68;月白,0.11,0,0.08,0;海天蓝,0.33,0,0.14,0;清水蓝,0.57,0,0.22,0;瀑布蓝,0.79,0,0.27,0;蔚蓝,0.89,0,0.29,0;孔雀蓝,0.92,0,0.28,0;甸子蓝,0.93,0,0.31,0;石绿,0.78,0.36,0,0;竹篁绿,0.4,0,0.3,0;粉绿,0.64,0,0.46,0;美蝶绿,0.95,0,0.52,0;毛绿,0.75,0,0.61,0;蔻梢绿,0.78,0,0.62,0;麦苗绿,0.81,0,0.62,0;蛙绿,0.86,0,0.63,0;铜绿,0.92,0,0.64,0;竹绿,0.96,0,0.64,0;蓝绿,0.98,0.02,0.64,0;穹灰,0.32,0.07,0.18,0;翠蓝,0.94,0.11,0.33,0.01;胆矾蓝,0.96,0.16,0.31,0.03;樫鸟蓝,0.96,0.18,0.34,0.04;闪蓝,0.64,0.18,0.32,0.02;冰山蓝,0.4,0.24,0.32,0.06;虾壳青,0.56,0.26,0.36,0.07;晚波蓝,0.71,0.28,0.39,0.1;蜻蜓蓝,0.89,0.27,0.41,0.13;玉鈫蓝,0.99,0.33,0.38,0.21;垩灰,0.57,0.37,0.42,0.21;夏云灰,0.65,0.4,0.44,0.26;苍蓝,1,0.52,0.46,0.43;黄昏灰,0.67,0.53,0.51,0.5;灰蓝,0.94,0.58,0.54,0.6;深灰蓝,1,0.64,0.56,0.68;玉簪绿,0.49,0.05,0.37,0;青矾绿,0.96,0.12,0.66,0.02;草原远绿,0.52,0.11,0.37,0;梧枝绿,0.74,0.14,0.51,0.01;浪花绿,0.55,0.16,0.4,0.01;海王绿,0.99,0.23,0.7,0.1;亚丁绿,0.88,0.24,0.61,0.09;镍灰,0.4,0.27,0.36,0.08;明灰,0.52,0.28,0.42,0.1;淡绿灰,0.63,0.31,0.5,0.14;飞泉绿,0.82,0.32,0.6,0.2;狼烟灰,0.62,0.43,0.52,0.34;绿灰,0.85,0.44,0.64,0.52;苍绿,0.93,0.46,0.7,0.61;深海绿,0.98,0.46,0.73,0.63;长石灰,0.67,0.6,0.57,0.68;苷蓝绿,0.82,0.6,0.65,0.8;莽丛绿,0.9,0.62,0.67,0.86;淡翠绿,0.33,0.01,0.29,0;明绿,0.53,0.01,0.44,0;田园绿,0.75,0,0.59,0;翠绿,0.98,0,0.82,0;淡绿,0.78,0.06,0.62,0;葱绿,0.9,0.07,0.73,0;孔雀绿,0.99,0.1,0.91,0.02;艾绿,0.27,0.11,0.27,0.01;蟾绿,0.92,0.14,0.76,0.02;宫殿绿,1,0.17,0.92,0.05;松霜绿,0.61,0.19,0.52,0.03;蛋白石绿,0.81,0.19,0.67,0.04;薄荷绿,1,0.22,0.9,0.1;瓦松绿,0.66,0.29,0.58,0.12;荷叶绿,1,0.31,0.91,0.25;田螺绿,0.62,0.42,0.56,0.34;白屈菜绿,0.74,0.42,0.65,0.4;河豚灰,0.64,0.57,0.6,0.67;蒽油绿,0.68,0.56,0.6,0.66;槲寄生绿,0.76,0.56,0.75,0.72;云杉绿,0.91,0.6,0.76,0.83;嫩菊绿,0.09,0.01,0.14,0;艾背绿,0.2,0.01,0.23,0;嘉陵水绿,0.47,0,0.49,0;玉髓绿,0.89,0,0.96,0;鲜绿,0.88,0,0.99,0;宝石绿,0.9,0,1,0;海沬绿,0.18,0.04,0.33,0;姚黄,0.28,0.04,0.44,0;橄榄石绿,0.44,0.03,0.61,0;水绿,0.62,0,0.76,0;芦苇绿,0.42,0.03,0.67,0;槐花黄绿,0.28,0.06,0.66,0;苹果绿,0.41,0.04,0.76,0;芽绿,0.58,0.01,0.88,0;蝶黄,0.19,0.09,0.84,0.01;橄榄黄绿,0.38,0.08,0.94,0.01;鹦鹉绿,0.81,0,1,0;油绿,0.84,0.64,0.94,0.45;象牙白,0,0.01,0.04,0;汉白玉,0.03,0.05,0.08,0;雪白,0,0.01,0.03,0;鱼肚白,0.04,0.04,0.08,0;珍珠灰,0.12,0.12,0.16,0;浅灰,0.16,0.15,0.2,0.01;铅灰,0.28,0.05,0.3,0.05;中灰,0.28,0.25,0.3,0.05;瓦灰,0.42,0.4,0.43,0.23;夜灰,0.43,0.4,0.44,0.42;雁灰,0.42,0.42,0.45,0.27;深灰,0.42,0.42,0.46,0.27 +} + +\RequirePackage{suffix} +\newcommand\loadCASrgbcolors{% + \typeout{Defining CAS RGB cncolours...}% + \providecolorset{RGB}{}{}{\cas@rgb@colors}% +} +\WithSuffix\newcommand\loadCASrgbcolors*{% + \typeout{Defining CAS RGB cncolours, overwriting colours if previously defined...}% + \definecolorset{RGB}{}{}{\cas@rgb@colors}% +} + +\newcommand\loadCAScmykcolors{% + \typeout{Defining CAS cmyk cncolours...} + \providecolorset{cmyk}{}{}{\cas@cmyk@colors}% +} +\WithSuffix\newcommand\loadCAScmykcolors*{% + \typeout{Defining CAS cmyk cncolours, overwriting colours if previously defined...}% + \definecolorset{cmyk}{}{}{\cas@cmyk@colors}% +} + +\if@loadcas + \if@cmykcolors + \if@overwritecolors + \loadCAScmykcolors* + \else + \loadCAScmykcolors + \fi + \else + \if@overwritecolors + \loadCASrgbcolors* + \else + \loadCASrgbcolors + \fi + \fi +\fi
\ No newline at end of file diff --git a/graphics/pgf/contrib/pgfornament-han/heavenlyclouds-sample.pdf b/graphics/pgf/contrib/pgfornament-han/heavenlyclouds-sample.pdf Binary files differindex c22eb5a439..e8a3837826 100644 --- a/graphics/pgf/contrib/pgfornament-han/heavenlyclouds-sample.pdf +++ b/graphics/pgf/contrib/pgfornament-han/heavenlyclouds-sample.pdf diff --git a/graphics/pgf/contrib/pgfornament-han/heavenlyclouds-sample.tex b/graphics/pgf/contrib/pgfornament-han/heavenlyclouds-sample.tex index 6fa634ead9..d39932feaa 100644 --- a/graphics/pgf/contrib/pgfornament-han/heavenlyclouds-sample.tex +++ b/graphics/pgf/contrib/pgfornament-han/heavenlyclouds-sample.tex @@ -16,6 +16,13 @@ % \alttitlecircle %% 试试取消注释，有惊喜 % \simpleprogressmarker %% 神马太过引人注目的话，可以用简单圆点取代。 +% \setbeamercolor{structure}{fg=绀青} +% \setbeamercolor{headline}{fg=群青} +% \setbeamercolor{page number in head/foot}{fg=藏青} +% \setbeamercolor{normal text}{bg=淡青} +% \setbeamercolor{alerted text}{fg=正黄} +% \setbeamercolor{example text}{fg=绿沉} + \begin{document} \begin{frame}[noframenumbering] diff --git a/graphics/pgf/contrib/pgfornament-han/pgfornament-han-doc.pdf b/graphics/pgf/contrib/pgfornament-han/pgfornament-han-doc.pdf Binary files differnew file mode 100644 index 0000000000..e2abf948f9 --- /dev/null +++ b/graphics/pgf/contrib/pgfornament-han/pgfornament-han-doc.pdf diff --git a/graphics/pgf/contrib/pgfornament-han/pgfornament-han_manual.tex b/graphics/pgf/contrib/pgfornament-han/pgfornament-han-doc.tex index 67f66195e1..a5c6be5f1c 100644 --- a/graphics/pgf/contrib/pgfornament-han/pgfornament-han_manual.tex +++ b/graphics/pgf/contrib/pgfornament-han/pgfornament-han-doc.tex @@ -17,11 +17,10 @@ \usepackage{geometry} \geometry{hmargin=1in,vmargin=0.8in,headheight=10pt} - +\usepackage{enumitem} \usepackage{tcolorbox} \tcbuselibrary{skins,raster} - %%%%%% 这段代码可以忽视，只是 --shell-escape 时调用 minted 不然就用 listings \ifnum\shellescape=1 \tcbuselibrary{minted} @@ -104,7 +103,7 @@ \title{汉风图纹 \texttt{pgfornament-han}} \author{林莲枝、张晨南} -\date{2023/04/23\\\url{https://github.com/liantze/pgfornament-han}} +\date{2023/10/29\\\url{https://github.com/liantze/pgfornament-han}} \begin{document} @@ -523,9 +522,23 @@ \begingroup -这是我比较早以前做的一个宏包了，色卡取自 \url{http://ylbook.com/cms/web/chuantongsecai/chuantongsecai.htm}。 +这是我比较早以前做的一个宏包了，最初的色卡取自 \url{http://ylbook.com/cms/web/chuantongsecai/chuantongsecai.htm}，只有RGB色值。 + + \textbf{(2018年5月)} 感谢网友\href{https://github.com/heangfat}{\emph{端憲}}，加入了三正色，以及提供繁体中文的颜色名称。 + +\medskip + +\textbf{（2023年7月）\texttt{cncolours.sty}迎来了2.0更新！}加入了\url{https://www.zhongguose.com}的色卡。这个网站参考的资料是：色谱 中科院科技情报编委会名词室。科学出版社，1957。 + +载入\texttt{cncolours}宏包时有以下宏包选项： +\begin{itemize}[noitemsep] + \item 默认（无选项）：只定义前面两页(ylbook)的颜色。 + \item \texttt{cas-rgb}：载入zhongguose的RGB颜色值。\emph{若有和ylbook重名的颜色，保留ylbook的颜色值。} + \item \texttt{cas-rgb*}：同上，\emph{但若有和ylbook重名的颜色，会以zhongguose.com的颜色值覆盖之前的定义。} + \item \texttt{cas-cmyk}：载入zhongguose的CMYK颜色值。\emph{若有和ylbook重名的颜色，保留ylbook的颜色值。} + \item \texttt{cas-cmyk*}：同上，\emph{但若有和ylbook重名的颜色，会以zhongguose.com的颜色值覆盖之前的定义。} +\end{itemize} -感谢网友\href{https://github.com/heangfat}{\emph{端憲}}，加入了三正色，以及提供繁体中文的颜色名称。 \bigskip @@ -869,6 +882,1074 @@ \showcolour{正黃} \end{RaggedRight} +\clearpage +\CJKfontspec{Noto Serif CJK SC} +\textbf{\texttt{cas-rgb*} 加载的色值：} +\loadCASrgbcolors* + +\begin{RaggedRight} +\showcolour{乳白} +\showcolour{杏仁黄} +\showcolour{茉莉黄} +\showcolour{麦秆黄} +\showcolour{油菜花黄} +\showcolour{佛手黄} +\showcolour{篾黄} +\showcolour{葵扇黄} +\showcolour{柠檬黄} +\showcolour{金瓜黄} +\showcolour{藤黄} +\showcolour{酪黄} +\showcolour{香水玫瑰黄} +\showcolour{淡密黄} +\showcolour{大豆黄} +\showcolour{素馨黄} +\showcolour{向日葵黄} +\showcolour{雅梨黄} +\showcolour{黄连黄} +\showcolour{金盏黄} +\showcolour{蛋壳黄} +\showcolour{肉色} +\showcolour{鹅掌黄} +\showcolour{鸡蛋黄} +\showcolour{鼬黄} +\showcolour{榴萼黄} +\showcolour{淡橘橙} +\showcolour{枇杷黄} +\showcolour{橙皮黄} +\showcolour{北瓜黄} +\showcolour{杏黄} +\showcolour{雄黄} +\showcolour{万寿菊黄} +\showcolour{菊蕾白} +\showcolour{秋葵黄} +\showcolour{硫华黄} +\showcolour{柚黄} +\showcolour{芒果黄} +\showcolour{蒿黄} +\showcolour{姜黄} +\showcolour{香蕉黄} +\showcolour{草黄} +\showcolour{新禾绿} +\showcolour{月灰} +\showcolour{淡灰绿} +\showcolour{草灰绿} +\showcolour{苔绿} +\showcolour{碧螺春绿} +\showcolour{燕羽灰} +\showcolour{蟹壳灰} +\showcolour{潭水绿} +\showcolour{橄榄绿} +\showcolour{蚌肉白} +\showcolour{豆汁黄} +\showcolour{淡茧黄} +\showcolour{乳鸭黄} +\showcolour{荔肉白} +\showcolour{象牙黄} +\showcolour{炒米黄} +\showcolour{鹦鹉冠黄} +\showcolour{木瓜黄} +\showcolour{浅烙黄} +\showcolour{莲子白} +\showcolour{谷黄} +\showcolour{栀子黄} +\showcolour{芥黄} +\showcolour{银鼠灰} +\showcolour{尘灰} +\showcolour{枯绿} +\showcolour{鲛青} +\showcolour{粽叶绿} +\showcolour{灰绿} +\showcolour{鹤灰} +\showcolour{淡松烟} +\showcolour{暗海水绿} +\showcolour{棕榈绿} +\showcolour{米色} +\showcolour{淡肉色} +\showcolour{麦芽糖黄} +\showcolour{琥珀黄} +\showcolour{甘草黄} +\showcolour{初熟杏黄} +\showcolour{浅驼色} +\showcolour{沙石黄} +\showcolour{虎皮黄} +\showcolour{土黄} +\showcolour{百灵鸟灰} +\showcolour{山鸡黄} +\showcolour{龟背黄} +\showcolour{苍黄} +\showcolour{莱阳梨黄} +\showcolour{蜴蜊绿} +\showcolour{松鼠灰} +\showcolour{橄榄灰} +\showcolour{蟹壳绿} +\showcolour{古铜绿} +\showcolour{焦茶绿} +\showcolour{粉白} +\showcolour{落英淡粉} +\showcolour{瓜瓤粉} +\showcolour{蜜黄} +\showcolour{金叶黄} +\showcolour{金莺黄} +\showcolour{鹿角棕} +\showcolour{凋叶棕} +\showcolour{玳瑁黄} +\showcolour{软木黄} +\showcolour{风帆黄} +\showcolour{桂皮淡棕} +\showcolour{猴毛灰} +\showcolour{山鸡褐} +\showcolour{驼色} +\showcolour{茶褐} +\showcolour{古铜褐} +\showcolour{荷花白} +\showcolour{玫瑰粉} +\showcolour{橘橙} +\showcolour{美人焦橙} +\showcolour{润红} +\showcolour{淡桃红} +\showcolour{海螺橙} +\showcolour{桃红} +\showcolour{颊红} +\showcolour{淡罂粟红} +\showcolour{晨曦红} +\showcolour{蟹壳红} +\showcolour{金莲花橙} +\showcolour{草莓红} +\showcolour{龙睛鱼红} +\showcolour{蜻蜓红} +\showcolour{大红} +\showcolour{柿红} +\showcolour{榴花红} +\showcolour{银朱} +\showcolour{朱红} +\showcolour{鲑鱼红} +\showcolour{金黄} +\showcolour{鹿皮褐} +\showcolour{醉瓜肉} +\showcolour{麂棕} +\showcolour{淡银灰} +\showcolour{淡赭} +\showcolour{槟榔综} +\showcolour{银灰} +\showcolour{海鸥灰} +\showcolour{淡咖啡} +\showcolour{岩石棕} +\showcolour{芒果棕} +\showcolour{石板灰} +\showcolour{珠母灰} +\showcolour{丁香棕} +\showcolour{咖啡} +\showcolour{筍皮棕} +\showcolour{燕颔红} +\showcolour{玉粉红} +\showcolour{金驼} +\showcolour{铁棕} +\showcolour{蛛网灰} +\showcolour{淡可可棕} +\showcolour{中红灰} +\showcolour{淡土黄} +\showcolour{淡豆沙} +\showcolour{椰壳棕} +\showcolour{淡铁灰} +\showcolour{中灰驼} +\showcolour{淡栗棕} +\showcolour{可可棕} +\showcolour{柞叶棕} +\showcolour{野蔷薇红} +\showcolour{菠萝红} +\showcolour{藕荷} +\showcolour{陶瓷红} +\showcolour{晓灰} +\showcolour{余烬红} +\showcolour{火砖红} +\showcolour{火泥棕} +\showcolour{绀红} +\showcolour{橡树棕} +\showcolour{海报灰} +\showcolour{玫瑰灰} +\showcolour{火山棕} +\showcolour{豆沙} +\showcolour{淡米粉} +\showcolour{初桃粉红} +\showcolour{介壳淡粉红} +\showcolour{淡藏花红} +\showcolour{瓜瓤红} +\showcolour{芙蓉红} +\showcolour{莓酱红} +\showcolour{法螺红} +\showcolour{落霞红} +\showcolour{淡玫瑰灰} +\showcolour{蟹蝥红} +\showcolour{火岩棕} +\showcolour{赭石} +\showcolour{暗驼棕} +\showcolour{酱棕} +\showcolour{栗棕} +\showcolour{洋水仙红} +\showcolour{谷鞘红} +\showcolour{苹果红} +\showcolour{铁水红} +\showcolour{桂红} +\showcolour{极光红} +\showcolour{粉红} +\showcolour{舌红} +\showcolour{曲红} +\showcolour{红汞红} +\showcolour{淡绯} +\showcolour{无花果红} +\showcolour{榴子红} +\showcolour{胭脂红} +\showcolour{合欢红} +\showcolour{春梅红} +\showcolour{香叶红} +\showcolour{珊瑚红} +\showcolour{萝卜红} +\showcolour{淡茜红} +\showcolour{艳红} +\showcolour{淡菽红} +\showcolour{鱼鳃红} +\showcolour{樱桃红} +\showcolour{淡蕊香红} +\showcolour{石竹红} +\showcolour{草茉莉红} +\showcolour{茶花红} +\showcolour{枸枢红} +\showcolour{秋海棠红} +\showcolour{丽春红} +\showcolour{夕阳红} +\showcolour{鹤顶红} +\showcolour{鹅血石红} +\showcolour{覆盆子红} +\showcolour{貂紫} +\showcolour{暗玉紫} +\showcolour{栗紫} +\showcolour{葡萄酱紫} +\showcolour{牡丹粉红} +\showcolour{山茶红} +\showcolour{海棠红} +\showcolour{玉红} +\showcolour{高粱红} +\showcolour{满江红} +\showcolour{枣红} +\showcolour{葡萄紫} +\showcolour{酱紫} +\showcolour{淡曙红} +\showcolour{唐菖蒲红} +\showcolour{鹅冠红} +\showcolour{莓红} +\showcolour{枫叶红} +\showcolour{苋菜红} +\showcolour{烟红} +\showcolour{暗紫苑红} +\showcolour{殷红} +\showcolour{猪肝紫} +\showcolour{金鱼紫} +\showcolour{草珠红} +\showcolour{淡绛红} +\showcolour{品红} +\showcolour{凤仙花红} +\showcolour{粉团花红} +\showcolour{夹竹桃红} +\showcolour{榲桲红} +\showcolour{姜红} +\showcolour{莲瓣红} +\showcolour{水红} +\showcolour{报春红} +\showcolour{月季红} +\showcolour{豇豆红} +\showcolour{霞光红} +\showcolour{松叶牡丹红} +\showcolour{喜蛋红} +\showcolour{鼠鼻红} +\showcolour{尖晶玉红} +\showcolour{山黎豆红} +\showcolour{锦葵红} +\showcolour{鼠背灰} +\showcolour{甘蔗紫} +\showcolour{石竹紫} +\showcolour{苍蝇灰} +\showcolour{卵石紫} +\showcolour{李紫} +\showcolour{茄皮紫} +\showcolour{吊钟花红} +\showcolour{兔眼红} +\showcolour{紫荆红} +\showcolour{菜头紫} +\showcolour{鹞冠紫} +\showcolour{葡萄酒红} +\showcolour{磨石紫} +\showcolour{檀紫} +\showcolour{火鹅紫} +\showcolour{墨紫} +\showcolour{晶红} +\showcolour{扁豆花红} +\showcolour{白芨红} +\showcolour{嫩菱红} +\showcolour{菠根红} +\showcolour{酢酱草红} +\showcolour{洋葱紫} +\showcolour{海象紫} +\showcolour{绀紫} +\showcolour{古铜紫} +\showcolour{石蕊红} +\showcolour{芍药耕红} +\showcolour{藏花红} +\showcolour{初荷红} +\showcolour{马鞭草紫} +\showcolour{丁香淡紫} +\showcolour{丹紫红} +\showcolour{玫瑰红} +\showcolour{淡牵牛紫} +\showcolour{凤信紫} +\showcolour{萝兰紫} +\showcolour{玫瑰紫} +\showcolour{藤萝紫} +\showcolour{槿紫} +\showcolour{蕈紫} +\showcolour{桔梗紫} +\showcolour{魏紫} +\showcolour{芝兰紫} +\showcolour{菱锰红} +\showcolour{龙须红} +\showcolour{蓟粉红} +\showcolour{电气石红} +\showcolour{樱草紫} +\showcolour{芦穗灰} +\showcolour{隐红灰} +\showcolour{苋菜紫} +\showcolour{芦灰} +\showcolour{暮云灰} +\showcolour{斑鸠灰} +\showcolour{淡藤萝紫} +\showcolour{淡青紫} +\showcolour{青蛤壳紫} +\showcolour{豆蔻紫} +\showcolour{扁豆紫} +\showcolour{芥花紫} +\showcolour{青莲} +\showcolour{芓紫} +\showcolour{葛巾紫} +\showcolour{牵牛紫} +\showcolour{紫灰} +\showcolour{龙睛鱼紫} +\showcolour{荸荠紫} +\showcolour{古鼎灰} +\showcolour{乌梅紫} +\showcolour{深牵牛紫} +\showcolour{银白} +\showcolour{芡食白} +\showcolour{远山紫} +\showcolour{淡蓝紫} +\showcolour{山梗紫} +\showcolour{螺甸紫} +\showcolour{玛瑙灰} +\showcolour{野菊紫} +\showcolour{满天星紫} +\showcolour{锌灰} +\showcolour{野葡萄紫} +\showcolour{剑锋紫} +\showcolour{龙葵紫} +\showcolour{暗龙胆紫} +\showcolour{晶石紫} +\showcolour{暗蓝紫} +\showcolour{景泰蓝} +\showcolour{尼罗蓝} +\showcolour{远天蓝} +\showcolour{星蓝} +\showcolour{羽扇豆蓝} +\showcolour{花青} +\showcolour{睛蓝} +\showcolour{虹蓝} +\showcolour{湖水蓝} +\showcolour{秋波蓝} +\showcolour{涧石蓝} +\showcolour{潮蓝} +\showcolour{群青} +\showcolour{霁青} +\showcolour{碧青} +\showcolour{宝石蓝} +\showcolour{天蓝} +\showcolour{柏林蓝} +\showcolour{海青} +\showcolour{钴蓝} +\showcolour{鸢尾蓝} +\showcolour{牵牛花蓝} +\showcolour{飞燕草蓝} +\showcolour{品蓝} +\showcolour{银鱼白} +\showcolour{安安蓝} +\showcolour{鱼尾灰} +\showcolour{鲸鱼灰} +\showcolour{海参灰} +\showcolour{沙鱼灰} +\showcolour{钢蓝} +\showcolour{云水蓝} +\showcolour{晴山蓝} +\showcolour{靛青} +\showcolour{大理石灰} +\showcolour{海涛蓝} +\showcolour{蝶翅蓝} +\showcolour{海军蓝} +\showcolour{水牛灰} +\showcolour{牛角灰} +\showcolour{燕颔蓝} +\showcolour{云峰白} +\showcolour{井天蓝} +\showcolour{云山蓝} +\showcolour{釉蓝} +\showcolour{鸥蓝} +\showcolour{搪磁蓝} +\showcolour{月影白} +\showcolour{星灰} +\showcolour{淡蓝灰} +\showcolour{鷃蓝} +\showcolour{嫩灰} +\showcolour{战舰灰} +\showcolour{瓦罐灰} +\showcolour{青灰} +\showcolour{鸽蓝} +\showcolour{钢青} +\showcolour{暗蓝} +\showcolour{月白} +\showcolour{海天蓝} +\showcolour{清水蓝} +\showcolour{瀑布蓝} +\showcolour{蔚蓝} +\showcolour{孔雀蓝} +\showcolour{甸子蓝} +\showcolour{石绿} +\showcolour{竹篁绿} +\showcolour{粉绿} +\showcolour{美蝶绿} +\showcolour{毛绿} +\showcolour{蔻梢绿} +\showcolour{麦苗绿} +\showcolour{蛙绿} +\showcolour{铜绿} +\showcolour{竹绿} +\showcolour{蓝绿} +\showcolour{穹灰} +\showcolour{翠蓝} +\showcolour{胆矾蓝} +\showcolour{樫鸟蓝} +\showcolour{闪蓝} +\showcolour{冰山蓝} +\showcolour{虾壳青} +\showcolour{晚波蓝} +\showcolour{蜻蜓蓝} +\showcolour{玉鈫蓝} +\showcolour{垩灰} +\showcolour{夏云灰} +\showcolour{苍蓝} +\showcolour{黄昏灰} +\showcolour{灰蓝} +\showcolour{深灰蓝} +\showcolour{玉簪绿} +\showcolour{青矾绿} +\showcolour{草原远绿} +\showcolour{梧枝绿} +\showcolour{浪花绿} +\showcolour{海王绿} +\showcolour{亚丁绿} +\showcolour{镍灰} +\showcolour{明灰} +\showcolour{淡绿灰} +\showcolour{飞泉绿} +\showcolour{狼烟灰} +\showcolour{绿灰} +\showcolour{苍绿} +\showcolour{深海绿} +\showcolour{长石灰} +\showcolour{苷蓝绿} +\showcolour{莽丛绿} +\showcolour{淡翠绿} +\showcolour{明绿} +\showcolour{田园绿} +\showcolour{翠绿} +\showcolour{淡绿} +\showcolour{葱绿} +\showcolour{孔雀绿} +\showcolour{艾绿} +\showcolour{蟾绿} +\showcolour{宫殿绿} +\showcolour{松霜绿} +\showcolour{蛋白石绿} +\showcolour{薄荷绿} +\showcolour{瓦松绿} +\showcolour{荷叶绿} +\showcolour{田螺绿} +\showcolour{白屈菜绿} +\showcolour{河豚灰} +\showcolour{蒽油绿} +\showcolour{槲寄生绿} +\showcolour{云杉绿} +\showcolour{嫩菊绿} +\showcolour{艾背绿} +\showcolour{嘉陵水绿} +\showcolour{玉髓绿} +\showcolour{鲜绿} +\showcolour{宝石绿} +\showcolour{海沬绿} +\showcolour{姚黄} +\showcolour{橄榄石绿} +\showcolour{水绿} +\showcolour{芦苇绿} +\showcolour{槐花黄绿} +\showcolour{苹果绿} +\showcolour{芽绿} +\showcolour{蝶黄} +\showcolour{橄榄黄绿} +\showcolour{鹦鹉绿} +\showcolour{油绿} +\showcolour{象牙白} +\showcolour{汉白玉} +\showcolour{雪白} +\showcolour{鱼肚白} +\showcolour{珍珠灰} +\showcolour{浅灰} +\showcolour{铅灰} +\showcolour{中灰} +\showcolour{瓦灰} +\showcolour{夜灰} +\showcolour{雁灰} +\showcolour{深灰} +\end{RaggedRight} + +\bigskip\bigskip + +\textbf{\texttt{cas-cmyk*} 加载的色值：} +\loadCAScmykcolors* + +\begin{RaggedRight} +\showcolour{乳白} +\showcolour{杏仁黄} +\showcolour{茉莉黄} +\showcolour{麦秆黄} +\showcolour{油菜花黄} +\showcolour{佛手黄} +\showcolour{篾黄} +\showcolour{葵扇黄} +\showcolour{柠檬黄} +\showcolour{金瓜黄} +\showcolour{藤黄} +\showcolour{酪黄} +\showcolour{香水玫瑰黄} +\showcolour{淡密黄} +\showcolour{大豆黄} +\showcolour{素馨黄} +\showcolour{向日葵黄} +\showcolour{雅梨黄} +\showcolour{黄连黄} +\showcolour{金盏黄} +\showcolour{蛋壳黄} +\showcolour{肉色} +\showcolour{鹅掌黄} +\showcolour{鸡蛋黄} +\showcolour{鼬黄} +\showcolour{榴萼黄} +\showcolour{淡橘橙} +\showcolour{枇杷黄} +\showcolour{橙皮黄} +\showcolour{北瓜黄} +\showcolour{杏黄} +\showcolour{雄黄} +\showcolour{万寿菊黄} +\showcolour{菊蕾白} +\showcolour{秋葵黄} +\showcolour{硫华黄} +\showcolour{柚黄} +\showcolour{芒果黄} +\showcolour{蒿黄} +\showcolour{姜黄} +\showcolour{香蕉黄} +\showcolour{草黄} +\showcolour{新禾绿} +\showcolour{月灰} +\showcolour{淡灰绿} +\showcolour{草灰绿} +\showcolour{苔绿} +\showcolour{碧螺春绿} +\showcolour{燕羽灰} +\showcolour{蟹壳灰} +\showcolour{潭水绿} +\showcolour{橄榄绿} +\showcolour{蚌肉白} +\showcolour{豆汁黄} +\showcolour{淡茧黄} +\showcolour{乳鸭黄} +\showcolour{荔肉白} +\showcolour{象牙黄} +\showcolour{炒米黄} +\showcolour{鹦鹉冠黄} +\showcolour{木瓜黄} +\showcolour{浅烙黄} +\showcolour{莲子白} +\showcolour{谷黄} +\showcolour{栀子黄} +\showcolour{芥黄} +\showcolour{银鼠灰} +\showcolour{尘灰} +\showcolour{枯绿} +\showcolour{鲛青} +\showcolour{粽叶绿} +\showcolour{灰绿} +\showcolour{鹤灰} +\showcolour{淡松烟} +\showcolour{暗海水绿} +\showcolour{棕榈绿} +\showcolour{米色} +\showcolour{淡肉色} +\showcolour{麦芽糖黄} +\showcolour{琥珀黄} +\showcolour{甘草黄} +\showcolour{初熟杏黄} +\showcolour{浅驼色} +\showcolour{沙石黄} +\showcolour{虎皮黄} +\showcolour{土黄} +\showcolour{百灵鸟灰} +\showcolour{山鸡黄} +\showcolour{龟背黄} +\showcolour{苍黄} +\showcolour{莱阳梨黄} +\showcolour{蜴蜊绿} +\showcolour{松鼠灰} +\showcolour{橄榄灰} +\showcolour{蟹壳绿} +\showcolour{古铜绿} +\showcolour{焦茶绿} +\showcolour{粉白} +\showcolour{落英淡粉} +\showcolour{瓜瓤粉} +\showcolour{蜜黄} +\showcolour{金叶黄} +\showcolour{金莺黄} +\showcolour{鹿角棕} +\showcolour{凋叶棕} +\showcolour{玳瑁黄} +\showcolour{软木黄} +\showcolour{风帆黄} +\showcolour{桂皮淡棕} +\showcolour{猴毛灰} +\showcolour{山鸡褐} +\showcolour{驼色} +\showcolour{茶褐} +\showcolour{古铜褐} +\showcolour{荷花白} +\showcolour{玫瑰粉} +\showcolour{橘橙} +\showcolour{美人焦橙} +\showcolour{润红} +\showcolour{淡桃红} +\showcolour{海螺橙} +\showcolour{桃红} +\showcolour{颊红} +\showcolour{淡罂粟红} +\showcolour{晨曦红} +\showcolour{蟹壳红} +\showcolour{金莲花橙} +\showcolour{草莓红} +\showcolour{龙睛鱼红} +\showcolour{蜻蜓红} +\showcolour{大红} +\showcolour{柿红} +\showcolour{榴花红} +\showcolour{银朱} +\showcolour{朱红} +\showcolour{鲑鱼红} +\showcolour{金黄} +\showcolour{鹿皮褐} +\showcolour{醉瓜肉} +\showcolour{麂棕} +\showcolour{淡银灰} +\showcolour{淡赭} +\showcolour{槟榔综} +\showcolour{银灰} +\showcolour{海鸥灰} +\showcolour{淡咖啡} +\showcolour{岩石棕} +\showcolour{芒果棕} +\showcolour{石板灰} +\showcolour{珠母灰} +\showcolour{丁香棕} +\showcolour{咖啡} +\showcolour{筍皮棕} +\showcolour{燕颔红} +\showcolour{玉粉红} +\showcolour{金驼} +\showcolour{铁棕} +\showcolour{蛛网灰} +\showcolour{淡可可棕} +\showcolour{中红灰} +\showcolour{淡土黄} +\showcolour{淡豆沙} +\showcolour{椰壳棕} +\showcolour{淡铁灰} +\showcolour{中灰驼} +\showcolour{淡栗棕} +\showcolour{可可棕} +\showcolour{柞叶棕} +\showcolour{野蔷薇红} +\showcolour{菠萝红} +\showcolour{藕荷} +\showcolour{陶瓷红} +\showcolour{晓灰} +\showcolour{余烬红} +\showcolour{火砖红} +\showcolour{火泥棕} +\showcolour{绀红} +\showcolour{橡树棕} +\showcolour{海报灰} +\showcolour{玫瑰灰} +\showcolour{火山棕} +\showcolour{豆沙} +\showcolour{淡米粉} +\showcolour{初桃粉红} +\showcolour{介壳淡粉红} +\showcolour{淡藏花红} +\showcolour{瓜瓤红} +\showcolour{芙蓉红} +\showcolour{莓酱红} +\showcolour{法螺红} +\showcolour{落霞红} +\showcolour{淡玫瑰灰} +\showcolour{蟹蝥红} +\showcolour{火岩棕} +\showcolour{赭石} +\showcolour{暗驼棕} +\showcolour{酱棕} +\showcolour{栗棕} +\showcolour{洋水仙红} +\showcolour{谷鞘红} +\showcolour{苹果红} +\showcolour{铁水红} +\showcolour{桂红} +\showcolour{极光红} +\showcolour{粉红} +\showcolour{舌红} +\showcolour{曲红} +\showcolour{红汞红} +\showcolour{淡绯} +\showcolour{无花果红} +\showcolour{榴子红} +\showcolour{胭脂红} +\showcolour{合欢红} +\showcolour{春梅红} +\showcolour{香叶红} +\showcolour{珊瑚红} +\showcolour{萝卜红} +\showcolour{淡茜红} +\showcolour{艳红} +\showcolour{淡菽红} +\showcolour{鱼鳃红} +\showcolour{樱桃红} +\showcolour{淡蕊香红} +\showcolour{石竹红} +\showcolour{草茉莉红} +\showcolour{茶花红} +\showcolour{枸枢红} +\showcolour{秋海棠红} +\showcolour{丽春红} +\showcolour{夕阳红} +\showcolour{鹤顶红} +\showcolour{鹅血石红} +\showcolour{覆盆子红} +\showcolour{貂紫} +\showcolour{暗玉紫} +\showcolour{栗紫} +\showcolour{葡萄酱紫} +\showcolour{牡丹粉红} +\showcolour{山茶红} +\showcolour{海棠红} +\showcolour{玉红} +\showcolour{高粱红} +\showcolour{满江红} +\showcolour{枣红} +\showcolour{葡萄紫} +\showcolour{酱紫} +\showcolour{淡曙红} +\showcolour{唐菖蒲红} +\showcolour{鹅冠红} +\showcolour{莓红} +\showcolour{枫叶红} +\showcolour{苋菜红} +\showcolour{烟红} +\showcolour{暗紫苑红} +\showcolour{殷红} +\showcolour{猪肝紫} +\showcolour{金鱼紫} +\showcolour{草珠红} +\showcolour{淡绛红} +\showcolour{品红} +\showcolour{凤仙花红} +\showcolour{粉团花红} +\showcolour{夹竹桃红} +\showcolour{榲桲红} +\showcolour{姜红} +\showcolour{莲瓣红} +\showcolour{水红} +\showcolour{报春红} +\showcolour{月季红} +\showcolour{豇豆红} +\showcolour{霞光红} +\showcolour{松叶牡丹红} +\showcolour{喜蛋红} +\showcolour{鼠鼻红} +\showcolour{尖晶玉红} +\showcolour{山黎豆红} +\showcolour{锦葵红} +\showcolour{鼠背灰} +\showcolour{甘蔗紫} +\showcolour{石竹紫} +\showcolour{苍蝇灰} +\showcolour{卵石紫} +\showcolour{李紫} +\showcolour{茄皮紫} +\showcolour{吊钟花红} +\showcolour{兔眼红} +\showcolour{紫荆红} +\showcolour{菜头紫} +\showcolour{鹞冠紫} +\showcolour{葡萄酒红} +\showcolour{磨石紫} +\showcolour{檀紫} +\showcolour{火鹅紫} +\showcolour{墨紫} +\showcolour{晶红} +\showcolour{扁豆花红} +\showcolour{白芨红} +\showcolour{嫩菱红} +\showcolour{菠根红} +\showcolour{酢酱草红} +\showcolour{洋葱紫} +\showcolour{海象紫} +\showcolour{绀紫} +\showcolour{古铜紫} +\showcolour{石蕊红} +\showcolour{芍药耕红} +\showcolour{藏花红} +\showcolour{初荷红} +\showcolour{马鞭草紫} +\showcolour{丁香淡紫} +\showcolour{丹紫红} +\showcolour{玫瑰红} +\showcolour{淡牵牛紫} +\showcolour{凤信紫} +\showcolour{萝兰紫} +\showcolour{玫瑰紫} +\showcolour{藤萝紫} +\showcolour{槿紫} +\showcolour{蕈紫} +\showcolour{桔梗紫} +\showcolour{魏紫} +\showcolour{芝兰紫} +\showcolour{菱锰红} +\showcolour{龙须红} +\showcolour{蓟粉红} +\showcolour{电气石红} +\showcolour{樱草紫} +\showcolour{芦穗灰} +\showcolour{隐红灰} +\showcolour{苋菜紫} +\showcolour{芦灰} +\showcolour{暮云灰} +\showcolour{斑鸠灰} +\showcolour{淡藤萝紫} +\showcolour{淡青紫} +\showcolour{青蛤壳紫} +\showcolour{豆蔻紫} +\showcolour{扁豆紫} +\showcolour{芥花紫} +\showcolour{青莲} +\showcolour{芓紫} +\showcolour{葛巾紫} +\showcolour{牵牛紫} +\showcolour{紫灰} +\showcolour{龙睛鱼紫} +\showcolour{荸荠紫} +\showcolour{古鼎灰} +\showcolour{乌梅紫} +\showcolour{深牵牛紫} +\showcolour{银白} +\showcolour{芡食白} +\showcolour{远山紫} +\showcolour{淡蓝紫} +\showcolour{山梗紫} +\showcolour{螺甸紫} +\showcolour{玛瑙灰} +\showcolour{野菊紫} +\showcolour{满天星紫} +\showcolour{锌灰} +\showcolour{野葡萄紫} +\showcolour{剑锋紫} +\showcolour{龙葵紫} +\showcolour{暗龙胆紫} +\showcolour{晶石紫} +\showcolour{暗蓝紫} +\showcolour{景泰蓝} +\showcolour{尼罗蓝} +\showcolour{远天蓝} +\showcolour{星蓝} +\showcolour{羽扇豆蓝} +\showcolour{花青} +\showcolour{睛蓝} +\showcolour{虹蓝} +\showcolour{湖水蓝} +\showcolour{秋波蓝} +\showcolour{涧石蓝} +\showcolour{潮蓝} +\showcolour{群青} +\showcolour{霁青} +\showcolour{碧青} +\showcolour{宝石蓝} +\showcolour{天蓝} +\showcolour{柏林蓝} +\showcolour{海青} +\showcolour{钴蓝} +\showcolour{鸢尾蓝} +\showcolour{牵牛花蓝} +\showcolour{飞燕草蓝} +\showcolour{品蓝} +\showcolour{银鱼白} +\showcolour{安安蓝} +\showcolour{鱼尾灰} +\showcolour{鲸鱼灰} +\showcolour{海参灰} +\showcolour{沙鱼灰} +\showcolour{钢蓝} +\showcolour{云水蓝} +\showcolour{晴山蓝} +\showcolour{靛青} +\showcolour{大理石灰} +\showcolour{海涛蓝} +\showcolour{蝶翅蓝} +\showcolour{海军蓝} +\showcolour{水牛灰} +\showcolour{牛角灰} +\showcolour{燕颔蓝} +\showcolour{云峰白} +\showcolour{井天蓝} +\showcolour{云山蓝} +\showcolour{釉蓝} +\showcolour{鸥蓝} +\showcolour{搪磁蓝} +\showcolour{月影白} +\showcolour{星灰} +\showcolour{淡蓝灰} +\showcolour{鷃蓝} +\showcolour{嫩灰} +\showcolour{战舰灰} +\showcolour{瓦罐灰} +\showcolour{青灰} +\showcolour{鸽蓝} +\showcolour{钢青} +\showcolour{暗蓝} +\showcolour{月白} +\showcolour{海天蓝} +\showcolour{清水蓝} +\showcolour{瀑布蓝} +\showcolour{蔚蓝} +\showcolour{孔雀蓝} +\showcolour{甸子蓝} +\showcolour{石绿} +\showcolour{竹篁绿} +\showcolour{粉绿} +\showcolour{美蝶绿} +\showcolour{毛绿} +\showcolour{蔻梢绿} +\showcolour{麦苗绿} +\showcolour{蛙绿} +\showcolour{铜绿} +\showcolour{竹绿} +\showcolour{蓝绿} +\showcolour{穹灰} +\showcolour{翠蓝} +\showcolour{胆矾蓝} +\showcolour{樫鸟蓝} +\showcolour{闪蓝} +\showcolour{冰山蓝} +\showcolour{虾壳青} +\showcolour{晚波蓝} +\showcolour{蜻蜓蓝} +\showcolour{玉鈫蓝} +\showcolour{垩灰} +\showcolour{夏云灰} +\showcolour{苍蓝} +\showcolour{黄昏灰} +\showcolour{灰蓝} +\showcolour{深灰蓝} +\showcolour{玉簪绿} +\showcolour{青矾绿} +\showcolour{草原远绿} +\showcolour{梧枝绿} +\showcolour{浪花绿} +\showcolour{海王绿} +\showcolour{亚丁绿} +\showcolour{镍灰} +\showcolour{明灰} +\showcolour{淡绿灰} +\showcolour{飞泉绿} +\showcolour{狼烟灰} +\showcolour{绿灰} +\showcolour{苍绿} +\showcolour{深海绿} +\showcolour{长石灰} +\showcolour{苷蓝绿} +\showcolour{莽丛绿} +\showcolour{淡翠绿} +\showcolour{明绿} +\showcolour{田园绿} +\showcolour{翠绿} +\showcolour{淡绿} +\showcolour{葱绿} +\showcolour{孔雀绿} +\showcolour{艾绿} +\showcolour{蟾绿} +\showcolour{宫殿绿} +\showcolour{松霜绿} +\showcolour{蛋白石绿} +\showcolour{薄荷绿} +\showcolour{瓦松绿} +\showcolour{荷叶绿} +\showcolour{田螺绿} +\showcolour{白屈菜绿} +\showcolour{河豚灰} +\showcolour{蒽油绿} +\showcolour{槲寄生绿} +\showcolour{云杉绿} +\showcolour{嫩菊绿} +\showcolour{艾背绿} +\showcolour{嘉陵水绿} +\showcolour{玉髓绿} +\showcolour{鲜绿} +\showcolour{宝石绿} +\showcolour{海沬绿} +\showcolour{姚黄} +\showcolour{橄榄石绿} +\showcolour{水绿} +\showcolour{芦苇绿} +\showcolour{槐花黄绿} +\showcolour{苹果绿} +\showcolour{芽绿} +\showcolour{蝶黄} +\showcolour{橄榄黄绿} +\showcolour{鹦鹉绿} +\showcolour{油绿} +\showcolour{象牙白} +\showcolour{汉白玉} +\showcolour{雪白} +\showcolour{鱼肚白} +\showcolour{珍珠灰} +\showcolour{浅灰} +\showcolour{铅灰} +\showcolour{中灰} +\showcolour{瓦灰} +\showcolour{夜灰} +\showcolour{雁灰} +\showcolour{深灰} +\end{RaggedRight} + \endgroup \clearpage @@ -907,6 +1988,7 @@ \end{document} \end{tcblisting} +可以自行查阅\href{https://ctan.org/pkg/beamertheme-metropolis}{Metropolis}的详细宏包手册，有很多可客制化的机制，包括各种元素的配色。 \clearpage @@ -970,8 +2052,18 @@ \node {\pgfornamenthan[width=1.25cm,color=殷红]{56}}; \end{tikzpicture} \emph{效果有可能有点狂，请视场合斟酌使用。} + \item 一些可以自己更改的颜色： + \begin{minted}{latex} + \setbeamercolor{structure}{fg=绀青} + \setbeamercolor{headline}{fg=群青} + \setbeamercolor{page number in head/foot}{fg=藏青} + \setbeamercolor{normal text}{bg=淡青} + \setbeamercolor{alerted text}{fg=正黄} + \setbeamercolor{example text}{fg=绿沉} + \end{minted} \end{itemize} +\clearpage \section{天青 Beamer 主题 Tian Qing Beamer Theme \texttt{beamerthemeTianqing.sty}} 几年前看到一个很喜欢的舞台演出，根据个人印象做的一个Beamer主题。本来想取名「青花瓷」的。不过始终没能力重现出来那种感觉啦，眼高手低，惭愧。 @@ -1010,4 +2102,15 @@ \mintinline{latex}|\setCJKfamilyfont{zhkai}{Xingkai SC}| +一些可以自己更改的颜色： +\begin{minted}{latex} +\setbeamercolor{structure}{fg=墨色} +\setbeamercolor{section page}{fg=紫檀} +\setbeamercolor{top deco}{fg=老银} +\setbeamercolor{normal text}{bg=铅白} +\setbeamercolor{alerted text}{fg=玄色} +\setbeamercolor{example text}{fg=鸦青} +\setbeamercolor{block title}{fg=绀青} +\end{minted} + \end{document} diff --git a/graphics/pgf/contrib/pgfornament-han/pgfornament-han_manual.pdf b/graphics/pgf/contrib/pgfornament-han/pgfornament-han_manual.pdf Binary files differdeleted file mode 100644 index 494663e14d..0000000000 --- a/graphics/pgf/contrib/pgfornament-han/pgfornament-han_manual.pdf +++ /dev/null diff --git a/graphics/pgf/contrib/pgfornament-han/tianqing-sample.pdf b/graphics/pgf/contrib/pgfornament-han/tianqing-sample.pdf Binary files differindex 34a21c1205..174e0865d0 100644 --- a/graphics/pgf/contrib/pgfornament-han/tianqing-sample.pdf +++ b/graphics/pgf/contrib/pgfornament-han/tianqing-sample.pdf diff --git a/graphics/pgf/contrib/pgfornament-han/tianqing-sample.tex b/graphics/pgf/contrib/pgfornament-han/tianqing-sample.tex index d882b30349..70c1b3d938 100644 --- a/graphics/pgf/contrib/pgfornament-han/tianqing-sample.tex +++ b/graphics/pgf/contrib/pgfornament-han/tianqing-sample.tex @@ -8,6 +8,14 @@ \author{林莲枝} \subtitle{\texttt{pgfornament-han}附录福利} +% \setbeamercolor{structure}{fg=墨色} +% \setbeamercolor{section page deco}{fg=紫檀} +% \setbeamercolor{top deco}{fg=老银} +% \setbeamercolor{normal text}{bg=铅白} +% \setbeamercolor{alerted text}{fg=玄色} +% \setbeamercolor{example text}{fg=鸦青} +% \setbeamercolor{block title}{fg=绀青} + \begin{document} \begin{frame} |