From c3708ec910865a96322583a3d0498622c367b430 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 15 Jan 2018 22:20:45 +0000 Subject: scsnowman (15jan18) git-svn-id: svn://tug.org/texlive/trunk@46320 c570f23f-e606-0410-a88d-b1316a301751 --- .../doc/latex/scsnowman/scsnowman-sample.pdf | Bin 62011 -> 64890 bytes .../doc/latex/scsnowman/scsnowman-sample.tex | 5 ++++- .../texmf-dist/doc/latex/scsnowman/scsnowman.pdf | Bin 380029 -> 380374 bytes .../texmf-dist/doc/latex/scsnowman/scsnowman.tex | 17 +++++++++-------- .../tex/latex/scsnowman/scsnowman-normal.def | 16 +++++++++++++++- .../texmf-dist/tex/latex/scsnowman/scsnowman.sty | 8 +++++++- .../tex/latex/scsnowman/sctkzsym-base.sty | 2 +- 7 files changed, 36 insertions(+), 12 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf index fe14a255c33..9777af46b81 100644 Binary files a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf and b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf differ diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex index 59006407fb0..58fc8a476f7 100644 --- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex +++ b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex @@ -16,7 +16,7 @@ \usepackage[svgnames]{xcolor} \usepackage{scsnowman} \title{\textsf{scsnowman}パッケージの実用例} -\author{アセトアミノフェン} +\author{Hironobu Yamashita} \begin{document} \maketitle @@ -160,4 +160,7 @@ T. お正月:\scsnowman[eyes=false,mouth=false,mikan]% \scsnowman[eyes=false,mouth=false,mikan=DarkOrange,leaf=DarkOliveGreen] +The World Day of Snowman: +\scsnowman[muffler=Red,arms=Brown,buttons=Green,broom=DarkGoldenrod] + \end{document} diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf index 04b25f26ec7..6fd473c6139 100644 Binary files a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf and b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf differ diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex index 0f6b205fc56..80f8cdecfa8 100644 --- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex +++ b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex @@ -1,6 +1,6 @@ %% %% This is the documentation of scsnowman package. -%% (Last Update: 2018/01/05) +%% (Last Update: 2018/01/15) %% Maintained on GitHub: %% https://github.com/aminophen/scsnowman %% @@ -208,8 +208,8 @@ This will be helpful when a snowman appears to be ``floating in the air.''\\[1ex Following \emph{key}s take a \emph{value} which specifies color. When the \emph{value} is omitted, 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} + \Lopt{body}, \Lopt{eyes}, \Lopt{mouth}, \Lopt{sweat}, \Lopt{arms}, + \Lopt{hat}, \Lopt{muffler}, \Lopt{buttons}, \Lopt{snow}, \Lopt{broom} \end{quote} The following \emph{key}s require one specific \emph{value}: \begin{quote} @@ -226,27 +226,27 @@ 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=2,mouthshape=tight,muffler=red] + \scsnowman[scale=2,muffler=red,arms,broom=brown] \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,muffler=red,arms,broom=brown] \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,muffler=red,arms,broom=brown] \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,muffler=red,arms,broom=brown] \scsnowman[scale=2,mouthshape=frown,hat=green]} \end{minipage} @@ -418,7 +418,8 @@ Version 1.2 & 2017-08-08 & Default color reacts to surrounding text color \\ & & Add a new command \verb+\usescsnowmanlibrary+ \\ Version 1.2a & 2017-11-25 & Fix a bug in scaling with \Lopt{adjustbaseline} \\ Version 1.2b & 2018-01-05 & Add new keys \Lopt{mikan}, \Lopt{leaf} for drawing `kagami-mochi' \\ - & & Stopped loading \Lpack{amsthm} by default + & & Stopped loading \Lpack{amsthm} by default \\ +Version 1.2c & 2018-01-15 & Add a new key \Lopt{broom} \end{tabular} \end{table} diff --git a/Master/texmf-dist/tex/latex/scsnowman/scsnowman-normal.def b/Master/texmf-dist/tex/latex/scsnowman/scsnowman-normal.def index 6d881abacdd..a7ed21fc5d7 100644 --- a/Master/texmf-dist/tex/latex/scsnowman/scsnowman-normal.def +++ b/Master/texmf-dist/tex/latex/scsnowman/scsnowman-normal.def @@ -10,7 +10,7 @@ %% Twitter : @aminophen %% \NeedsTeXFormat{LaTeX2e} -\ProvidesFile{scsnowman-normal.def}[2018/01/05 v1.2b scsnowman definition (normal)] +\ProvidesFile{scsnowman-normal.def}[2018/01/15 v1.2c scsnowman definition (normal)] \def\sctkzsym@snowman@shape@normal{% \setlength{\sctkzsym@coord@baseline}{% \ifsctkzsym@snowman@adjustbaseline @@ -69,6 +69,16 @@ cycle; \fi \fi + \ifsctkzsym@snowman@broom + \sctkzsym@snowman@broompath[line width=0.08ex*\sctkzsym@coord@scl,line cap=butt] + (0.03,0.06) -- (0.12,0.50); + \sctkzsym@snowman@broompath[line width=0.03ex*\sctkzsym@coord@scl,line cap=butt] + (0.11,0.50) -- (0.06,0.75) + (0.12,0.50) -- (0.12,0.72) + (0.12,0.50) -- (0.18,0.76) + (0.12,0.50) -- (0.21,0.70) + (0.13,0.50) -- (0.27,0.74); + \fi \ifsctkzsym@snowman@arms \sctkzsym@snowman@armspath % right arm (SourceHanSans-like) (0.20,0.31) .. controls (0.19,0.33) and (0.14,0.41) .. @@ -116,10 +126,14 @@ \sctkzsym@snowman@buttonpath (0.50,0.29) circle (0.03); \fi\fi \ifsctkzsym@snowman@snow + \ifsctkzsym@snowman@broom + \sctkzsym@snowman@snowpath (0.13,0.81) circle (0.04); + \else \sctkzsym@snowman@snowpath (0.07,0.28) circle (0.04); \sctkzsym@snowman@snowpath (0.08,0.68) circle (0.04); \sctkzsym@snowman@snowpath (0.13,0.55) circle (0.04); \sctkzsym@snowman@snowpath (0.23,0.76) circle (0.04); + \fi \sctkzsym@snowman@snowpath (0.42,0.89) circle (0.04); \sctkzsym@snowman@snowpath (0.74,0.89) circle (0.04); \sctkzsym@snowman@snowpath (0.88,0.73) circle (0.04); diff --git a/Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty b/Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty index 57727fa1d41..c956263a6c4 100644 --- a/Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty +++ b/Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty @@ -10,7 +10,7 @@ %% Twitter : @aminophen %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{scsnowman}[2018/01/05 v1.2b Snowman variants using TikZ] +\ProvidesPackage{scsnowman}[2018/01/15 v1.2c Snowman variants using TikZ] \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{sctkzsym-base}} \ProcessOptions\relax \RequirePackage{sctkzsym-base}[2017/08/08] @@ -120,6 +120,7 @@ \def\sctkzsym@snowman@adjustbaseline{false}% \def\sctkzsym@snowman@mikan{false}% \def\sctkzsym@snowman@leaf{false}% + \def\sctkzsym@snowman@broom{false}% } \newcommand{\sctkzsym@snowman@defaultkeys}{% \sctkzsym@snowman@initkeys @@ -143,6 +144,7 @@ \sctkzsym@define@key@withbool{snowman}{adjustbaseline} \sctkzsym@define@key@withbool{snowman}{mikan} \sctkzsym@define@key@withbool{snowman}{leaf} +\sctkzsym@define@key@withbool{snowman}{broom} % % definition of \scsnowman[...] \DeclareRobustCommand\scsnowman[1][]{% @@ -229,6 +231,10 @@ \def\sctkzsym@snowman@leafstroke{\sctkzsym@snowman@leaf}% \def\sctkzsym@snowman@leaffill{\sctkzsym@snowman@leaf}% \def\sctkzsym@snowman@leafpath{\path[draw=\sctkzsym@snowman@leafstroke,fill=\sctkzsym@snowman@leaffill]}% + % check broom + \sctkzsym@hndl@key@withbool{snowman}{broom}% + \def\sctkzsym@snowman@broomstroke{\sctkzsym@snowman@broom}% + \def\sctkzsym@snowman@broompath{\path[draw=\sctkzsym@snowman@broomstroke]}% % % drawing snowman \set@sctkzsym@coord@scl{\sctkzsym@snowman@scale}% diff --git a/Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty b/Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty index c8143a485ce..9bb904b40f6 100644 --- a/Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty +++ b/Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty @@ -10,7 +10,7 @@ %% Twitter : @aminophen %% \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{sctkzsym-base}[2018/01/05 v1.2b Base for emoji variants using TikZ] +\ProvidesPackage{sctkzsym-base}[2018/01/15 v1.2c Base for emoji variants using TikZ] \RequirePackage{tikz} \RequirePackage{keyval} % -- cgit v1.2.3