scsnowman (8aug17)

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

4 files changed, 77 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf
index b9973bca309..27eb8f09e02 100644
--- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf
+++ b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex
index 634f945f60c..c34144f9bda 100644
--- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex
+++ b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex
@@ -11,6 +11,7 @@
 %%
 % platex + dvipdfmx
 \documentclass[dvipdfmx,twocolumn]{jsarticle}
+\usepackage{plext}
 \usepackage[margin=21truemm]{geometry}
 \usepackage[svgnames]{xcolor}
 \usepackage{scsnowman}
@@ -46,7 +47,7 @@
 \begin{table}[htb]
   \begin{tabular}{ccc}
     \texttt{U+2603} & \texttt{U+26C4} & \texttt{U+26C7} \\
-    \texttt{SNOWMAN} & \texttt{SNOWMAN WITHOUT SNOW} & \texttt{BLACK SNOWMAN} \\
+    \texttt{\small SNOWMAN} & \texttt{\small SNOWMAN WITHOUT SNOW} & \texttt{\small BLACK SNOWMAN} \\
     \scsnowman[scale=5,body=false,snow=true] & \scsnowman[scale=5,body=false,snow=false] & \scsnowman[scale=5,body=true,snow=true]
   \end{tabular}
 \end{table}
@@ -54,7 +55,7 @@
 \begin{table}[htb]
   \begin{tabular}{ccc}
     \texttt{U+2603} & \texttt{U+26C4} & \texttt{U+26C7} \\
-    \texttt{SNOWMAN} & \texttt{SNOWMAN WITHOUT SNOW} & \texttt{BLACK SNOWMAN} \\
+    \texttt{\small SNOWMAN} & \texttt{\small SNOWMAN WITHOUT SNOW} & \texttt{\small BLACK SNOWMAN} \\
     \scsnowman[scale=5,body=false,snow=true,muffler=true] & \scsnowman[scale=5,body=false,snow=false,muffler=true] & \scsnowman[scale=5,body=true,snow=true,muffler=true]
   \end{tabular}
 \end{table}
@@ -62,7 +63,7 @@
 \begin{table}[htb]
   \begin{tabular}{ccc}
     \texttt{U+2603} & \texttt{U+26C4} & \texttt{U+26C7} \\
-    \texttt{SNOWMAN} & \texttt{SNOWMAN WITHOUT SNOW} & \texttt{BLACK SNOWMAN} \\
+    \texttt{\small SNOWMAN} & \texttt{\small SNOWMAN WITHOUT SNOW} & \texttt{\small BLACK SNOWMAN} \\
     \scsnowman[scale=5,body=false,snow=true,hat=true,arms=true] & \scsnowman[scale=5,body=false,snow=false,hat=true,arms=true] & \scsnowman[scale=5,body=true,snow=true,hat=true,arms=true]
   \end{tabular}
 \end{table}
@@ -70,11 +71,17 @@
 \begin{table}[htb]
   \begin{tabular}{ccc}
     \texttt{U+????} & \texttt{U+????} & \texttt{U+????} \\
-    \texttt{RED SNOWMAN} & \texttt{BLUE SNOWMAN} & \texttt{GREEN SNOWMAN} \\
+    \texttt{\small RED SNOWMAN} & \texttt{\small BLUE SNOWMAN} & \texttt{\small GREEN SNOWMAN} \\
     \scsnowman[scale=5,body=red,snow=red,hat=red] & \scsnowman[scale=5,body=blue,hat=blue,arms=blue,muffler=blue] & \scsnowman[scale=5,body=green,snow=green,arms=green]
   \end{tabular}
 \end{table}
 
+% 周囲の色に追随
+テキストが黒色の場合\scsnowman[hat,muffler=red]、
+{\color{blue}テキストが青色の場合\scsnowman[hat,muffler=red]、
+{\color{green}テキストが緑色の場合\scsnowman[hat,muffler=red]}}、
+元通り\scsnowman[hat,muffler=red]。
+
 \newpage
 
 \scsnowmandefault{body,hat,snow,muffler}%
@@ -88,19 +95,18 @@
 ただし、\scsnowman[hat=red]のように帽子に色が付いた宛名を見ると、
 白\scsnowman さんは喜んでいました。
 
+\medskip
 % buttons で「ボタン」（マフラーの有無で微妙に位置が変わる）
-\scsnowmandefault{scale=5,hat=Green,arms=Brown,snow=SkyBlue}
-\scsnowman[buttons=RoyalBlue,muffler=Red]
-\scsnowman[buttons=RoyalBlue]
-
+\scsnowmandefault{scale=4,hat=Green,arms=Brown,snow=SkyBlue}%
+\scsnowman[buttons=RoyalBlue,muffler=Red]%
+\scsnowman[buttons=RoyalBlue]%
 % mouthshape で「口の形」
-\scsnowmandefault{scale=5,hat,muffler=Red}
+\scsnowmandefault{scale=4,hat,muffler=Red}%
 \scsnowman[mouthshape=smile]% にっこり
 \scsnowman[mouthshape=frown]% しかめっ面
 \scsnowman[mouthshape=tight]% 真一文字
-
 % sweat で「汗」
-\scsnowmandefault{scale=5,hat}
+\scsnowmandefault{scale=4,hat}%
 \scsnowman[mouthshape=tight,arms,buttons,sweat]
 
 ゆきだるまで箇条書き：
@@ -128,6 +134,8 @@
 \end{itemize}
 \makeitemother
 
+\medskip
+\begin{minipage}{16zw}
 ベースラインの調節なし：\par
 Text,
 \scsnowman[scale=1]%
@@ -140,5 +148,12 @@ Text,
 \scsnowman[adjustbaseline,scale=4]%
 \scsnowman[adjustbaseline,scale=7],
 T.
+\end{minipage}\quad
+\begin{minipage}<t>{12zw}
+\scsnowmandefault{}
+縦書ーきで\scsnowman[hat,muffler=red]のテスト。
+私の大好きな\scsnowman[scale=2,muffler]\scsnowman[scale=2,hat]がたくさん。
+{\color{red}色が\scsnowman[body]ついても、勿論大丈夫。}
+\end{minipage}
 
 \end{document}
diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf
index 975969af609..fd512ff6ac5 100644
--- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf
+++ b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf
diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex
index 77688f561b1..431e2def470 100644
--- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex
+++ b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex
@@ -205,29 +205,48 @@ This will be helpful when a snowman appears to be ``floating in the air.''\\[1ex
 \subsection{Design Options}
 
 Following \emph{key}s take a \emph{value} which specifies color. When the \emph{value} is omitted,
-the default color, black or white, will be used:
+it reacts to the surrounding text color:
 \begin{quote}
   \Lopt{body}, \Lopt{eyes}, \Lopt{mouth}, \Lopt{sweat},
   \Lopt{hat}, \Lopt{arms}, \Lopt{muffler}, \Lopt{buttons}, \Lopt{snow}
 \end{quote}
-The following \emph{key} require one specific \emph{value}:
+The following \emph{key}s require one specific \emph{value}:
 \begin{quote}
-  \Lopt{mouthshape}
+  \Lopt{shape}, \Lopt{mouthshape}
 \end{quote}
+
+The key \Lopt{shape} specifies the outline shape of the snowman body.
+Currently, only \Lopt{shape=normal} is officially available, but you can define and use other shapes
+using \verb+\usescsnowmanlibrary+ command (described later, section \ref{usescsnowmanlibrary}).
+
 The key \Lopt{mouthshape} takes one of the followings: \Lopt{smile}, \Lopt{tight} or \Lopt{frown}.
 
 Here are some examples:\\[1ex]
 \begin{minipage}{.7\textwidth}\begin{verbatim}
   \scsnowman[scale=2,body,hat=red,muffler=blue]
   \scsnowman[scale=3,hat,snow,arms,buttons]
-  \scsnowman[scale=3,mouthshape=tight,muffler=red]
-  \scsnowman[scale=3,mouthshape=frown,hat=green]
+  \scsnowman[scale=2,mouthshape=tight,muffler=red]
+  \scsnowman[scale=2,mouthshape=frown,hat=green]
 \end{verbatim}\end{minipage}
 \begin{minipage}{.25\textwidth}
   \scsnowman[scale=2,body,hat=red,muffler=blue]
   \scsnowman[scale=3,hat,snow,arms,buttons]
   \scsnowman[scale=2,mouthshape=tight,muffler=red]
   \scsnowman[scale=2,mouthshape=frown,hat=green]
+\end{minipage}\\[1ex]
+\begin{minipage}{.7\textwidth}\begin{verbatim}
+ {\color{blue}
+  \scsnowman[scale=2,body,hat=red,muffler=blue]
+  \scsnowman[scale=3,hat,snow,arms,buttons]
+  \scsnowman[scale=2,mouthshape=tight,muffler=red]
+  \scsnowman[scale=2,mouthshape=frown,hat=green]}
+\end{verbatim}\end{minipage}
+\begin{minipage}{.25\textwidth}
+ {\color{blue}
+  \scsnowman[scale=2,body,hat=red,muffler=blue]
+  \scsnowman[scale=3,hat,snow,arms,buttons]
+  \scsnowman[scale=2,mouthshape=tight,muffler=red]
+  \scsnowman[scale=2,mouthshape=frown,hat=green]}
 \end{minipage}
 
 \section{Changing the Default}
@@ -241,7 +260,7 @@ The available \emph{key}s are the same as those in \verb+\scsnowman+.
 
 Here are some examples:\\[1ex]
 \begin{minipage}{.6\textwidth}\begin{verbatim}
-  \scsnowmandefault{scale=3,hat=red}
+  \scsnowmandefault{scale=5,hat=red}
   \scsnowman
   \scsnowman[body,muffler=blue]
   \scsnowman[hat=green,snow]
@@ -253,6 +272,24 @@ Here are some examples:\\[1ex]
   \scsnowman[hat=green,snow]
 \end{minipage}
 
+\section{Adding User-defined Snowman Shapes}\label{usescsnowmanlibrary}
+
+Any users can define and use custom snowman shape definitions.
+Here is a description of adding a shape named \Lopt{myfavorite}.
+\begin{enumerate}
+  \item Prepare a snowman definition file \texttt{scsnowman-myfavorite.def}
+    and put it into \verb+$TEXMF+ tree (e.g. \verb+texmf-local/tex/latex/scsnowman/+).
+    For the format of snowman definition files, please refer to \texttt{scsnowman-normal.def}.
+  \item Use \verb+\usescsnowmanlibrary+ command (don't forget \emph{sc}!) to load it.
+\begin{verbatim}
+  \usepackage{scsnowman}
+  \usescsnowmanlibrary{myfavorite}
+\end{verbatim}
+  \item You can use the shape by \verb+\scsnowman[shape=myfavorite]+ command.
+\end{enumerate}
+If you have created a fancy snowman, please contact me, so that I can incorporate it
+into the official release!
+
 \section{Changing Item Labels and QED Symbols}
 
 For those who want more snowmen in the documents, currently \Lpack{scsnowman} provides
@@ -335,6 +372,8 @@ Here are some examples:\\[1ex]
 The names of these commands are, of course, named after the \LaTeX\ \verb+\makeatletter+
 and \verb+\makeatother+;-)
 
+\newpage
+
 \section*{Version History}
 
 This is the summary of changes. For more detail, see GitHub repository.
@@ -345,7 +384,12 @@ Version 0.1 & 2015-12-13 & First public version on GitHub \\
 Version 0.8 & 2016-08-08 & Second public version on GitHub: \\
             &            & new variants \Lopt{buttons}, \Lopt{mouthshape}, \Lopt{sweat} are added \\
 Version 1.0 & 2016-12-22 & First CTAN release \\
-Version 1.1 & 2017-01-22 & Add new key \Lopt{adjustbaseline}, documentation update
+Version 1.1 & 2017-01-22 & Add a new key \Lopt{adjustbaseline} \\
+            &            & Update documentation \\
+Version 1.2 & 2017-08-08 & Default color reacts to surrounding text color \\
+            &            & Support vertical writing on (u)p\TeX\ and Lua\TeX-ja \\
+            &            & Add a new key \Lopt{shape} \\
+            &            & Add a new command \verb+\usescsnowmanlibrary+
 \end{tabular}
 \end{table}