summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/scsnowman/LICENSE2
-rw-r--r--Master/texmf-dist/doc/latex/scsnowman/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdfbin61462 -> 62011 bytes
-rw-r--r--Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex6
-rw-r--r--Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdfbin371580 -> 380029 bytes
-rw-r--r--Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex38
-rw-r--r--Master/texmf-dist/tex/latex/scsnowman/scsnowman-normal.def15
-rw-r--r--Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty17
-rw-r--r--Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty16
9 files changed, 80 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/scsnowman/LICENSE b/Master/texmf-dist/doc/latex/scsnowman/LICENSE
index c0bef0eeb91..0d1ab853604 100644
--- a/Master/texmf-dist/doc/latex/scsnowman/LICENSE
+++ b/Master/texmf-dist/doc/latex/scsnowman/LICENSE
@@ -1,6 +1,6 @@
(The BSD 2-Clause License)
-Copyright (c) 2015-2017 Hironobu Yamashita
+Copyright (c) 2015-2018 Hironobu Yamashita
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff --git a/Master/texmf-dist/doc/latex/scsnowman/README.md b/Master/texmf-dist/doc/latex/scsnowman/README.md
index 8573223adf2..af14c4af467 100644
--- a/Master/texmf-dist/doc/latex/scsnowman/README.md
+++ b/Master/texmf-dist/doc/latex/scsnowman/README.md
@@ -27,5 +27,5 @@ Then, execute mktexlsr.
This package is distributed under the BSD 2-Clause License.
See [LICENSE](./LICENSE).
-Copyright (c) 2015-2017 Hironobu Yamashita
+Copyright (c) 2015-2018 Hironobu Yamashita
http://acetaminophen.hatenablog.com/
diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf
index 27eb8f09e02..fe14a255c33 100644
--- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf
+++ b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex
index c34144f9bda..59006407fb0 100644
--- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex
+++ b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-sample.tex
@@ -3,7 +3,7 @@
%% Maintained on GitHub:
%% https://github.com/aminophen/scsnowman
%%
-%% Copyright (c) 2015-2017 Hironobu Yamashita
+%% Copyright (c) 2015-2018 Hironobu Yamashita
%% Email : h.y.acetaminophen[a t]gmail.com
%% GitHub : https://github.com/aminophen
%% Blog : http://acetaminophen.hatenablog.com/
@@ -156,4 +156,8 @@ T.
{\color{red}色が\scsnowman[body]ついても、勿論大丈夫。}
\end{minipage}
+\scsnowmandefault{adjustbaseline,scale=5.5}%
+お正月:\scsnowman[eyes=false,mouth=false,mikan]%
+\scsnowman[eyes=false,mouth=false,mikan=DarkOrange,leaf=DarkOliveGreen]
+
\end{document}
diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf
index 1770f669e00..04b25f26ec7 100644
--- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf
+++ b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex
index 88fb32d9386..0f6b205fc56 100644
--- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex
+++ b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.tex
@@ -1,10 +1,10 @@
%%
%% This is the documentation of scsnowman package.
-%% (Last Update: 2017/01/22)
+%% (Last Update: 2018/01/05)
%% Maintained on GitHub:
%% https://github.com/aminophen/scsnowman
%%
-%% Copyright (c) 2015-2017 Hironobu Yamashita
+%% Copyright (c) 2015-2018 Hironobu Yamashita
%% Email : h.y.acetaminophen[a t]gmail.com
%% GitHub : https://github.com/aminophen
%% Blog : http://acetaminophen.hatenablog.com/
@@ -16,6 +16,7 @@
\usepackage{scsnowman}
\GetFileInfo{scsnowman.sty}
\usepackage{array}
+\usepackage{amsthm}
\usepackage{luatexja}
\usepackage{luatexja-fontspec}
\def\BigSnowman#1{\fontsize{60pt}{60pt}\selectfont\symbol{"#1}}
@@ -290,7 +291,9 @@ Here is a description of adding a shape named \Lopt{myfavorite}.
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}
+\section{Funny Usages}
+
+\subsection{Changing Item Labels and QED Symbols}
For those who want more snowmen in the documents, currently \Lpack{scsnowman} provides
the following additional commands:
@@ -372,7 +375,30 @@ Here are some examples:\\[1ex]
The names of these commands are, of course, named after the \LaTeX\ \verb+\makeatletter+
and \verb+\makeatother+;-)
-\newpage
+\subsection{Drawing ``\emph{Kagami-mochi}''}
+
+Using \Lpack{scsnowman} package, you can also draw ``\emph{kagami-mochi}''
+(mirror rice cake). It is a traditional Japanese New Year decoration,
+which usually consists of two round ``\emph{mochi}'' (rice cakes), the smaller
+placed atop the larger, and a ``\emph{daidai}'' (a Japanese bitter orange)
+with an attached leaf on top.
+
+Following \emph{key}s are implemented for this usage:\footnote{Strictly speaking,
+the orange on top of rice cakes should be ``\emph{daidai}''; however,
+a ``\emph{mikan}'' is often substituted for the original ``\emph{daidai}''.}
+\begin{quote}
+ \Lopt{mikan}, \Lopt{leaf}
+\end{quote}
+The \emph{key} \Lopt{leaf} is effective only when \Lopt{mikan} is specified.
+Here is an example:\\[1ex]
+\begin{minipage}{.85\textwidth}\begin{verbatim}
+ \scsnowmandefault{scale=5.5}
+ \scsnowman[eyes=false,mouth=false,mikan=orange,leaf=green]
+\end{verbatim}\end{minipage}
+\begin{minipage}{.1\textwidth}
+ \scsnowmandefault{scale=5.5}
+ \scsnowman[eyes=false,mouth=false,mikan=orange,leaf=green]
+\end{minipage}
\section*{Version History}
@@ -390,7 +416,9 @@ 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+ \\
-Version 1.2a & 2017-11-25 & Fix a bug in scaling with \Lopt{adjustbaseline}
+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
\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 3046d81c648..6d881abacdd 100644
--- a/Master/texmf-dist/tex/latex/scsnowman/scsnowman-normal.def
+++ b/Master/texmf-dist/tex/latex/scsnowman/scsnowman-normal.def
@@ -3,14 +3,14 @@
%% Maintained on GitHub:
%% https://github.com/aminophen/scsnowman
%%
-%% Copyright (c) 2015-2017 Hironobu Yamashita
+%% Copyright (c) 2015-2018 Hironobu Yamashita
%% Email : h.y.acetaminophen[a t]gmail.com
%% GitHub : https://github.com/aminophen
%% Blog : http://acetaminophen.hatenablog.com/
%% Twitter : @aminophen
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{scsnowman-normal.def}[2017/11/25 v1.2a scsnowman definition (normal)]
+\ProvidesFile{scsnowman-normal.def}[2018/01/05 v1.2b scsnowman definition (normal)]
\def\sctkzsym@snowman@shape@normal{%
\setlength{\sctkzsym@coord@baseline}{%
\ifsctkzsym@snowman@adjustbaseline
@@ -58,6 +58,17 @@
(0.58,0.90) --
cycle;
\fi
+ \ifsctkzsym@snowman@mikan
+ \sctkzsym@snowman@mikanpath % mikan
+ (0.50,0.80) circle (0.15 and 0.12);
+ \ifsctkzsym@snowman@leaf
+ \sctkzsym@snowman@leafpath
+ (0.50,0.93) .. controls (0.58,0.95) ..
+ (0.65,0.88) .. controls (0.50,0.87) ..
+ (0.50,0.93) --
+ cycle;
+ \fi
+ \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) ..
diff --git a/Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty b/Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty
index e51a7737fe5..57727fa1d41 100644
--- a/Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty
+++ b/Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty
@@ -3,14 +3,14 @@
%% Maintained on GitHub:
%% https://github.com/aminophen/scsnowman
%%
-%% Copyright (c) 2015-2017 Hironobu Yamashita
+%% Copyright (c) 2015-2018 Hironobu Yamashita
%% Email : h.y.acetaminophen[a t]gmail.com
%% GitHub : https://github.com/aminophen
%% Blog : http://acetaminophen.hatenablog.com/
%% Twitter : @aminophen
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{scsnowman}[2017/11/25 v1.2a Snowman variants using TikZ]
+\ProvidesPackage{scsnowman}[2018/01/05 v1.2b Snowman variants using TikZ]
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{sctkzsym-base}}
\ProcessOptions\relax
\RequirePackage{sctkzsym-base}[2017/08/08]
@@ -118,6 +118,8 @@
\def\sctkzsym@snowman@buttons{false}%
\def\sctkzsym@snowman@snow{false}%
\def\sctkzsym@snowman@adjustbaseline{false}%
+ \def\sctkzsym@snowman@mikan{false}%
+ \def\sctkzsym@snowman@leaf{false}%
}
\newcommand{\sctkzsym@snowman@defaultkeys}{%
\sctkzsym@snowman@initkeys
@@ -139,6 +141,8 @@
\sctkzsym@define@key@withbool{snowman}{buttons}
\sctkzsym@define@key@withbool{snowman}{snow}
\sctkzsym@define@key@withbool{snowman}{adjustbaseline}
+\sctkzsym@define@key@withbool{snowman}{mikan}
+\sctkzsym@define@key@withbool{snowman}{leaf}
%
% definition of \scsnowman[...]
\DeclareRobustCommand\scsnowman[1][]{%
@@ -216,6 +220,15 @@
\sctkzsym@hndl@key@withbool{snowman}{snow}%
% check adjustbaseline
\sctkzsym@hndl@key@onlybool{snowman}{adjustbaseline}%
+ % check mikan
+ \sctkzsym@hndl@key@withbool{snowman}{mikan}%
+ \sctkzsym@hndl@key@withbool{snowman}{leaf}%
+ \def\sctkzsym@snowman@mikanstroke{\sctkzsym@snowman@mikan}%
+ \def\sctkzsym@snowman@mikanfill{\sctkzsym@snowman@mikan}%
+ \def\sctkzsym@snowman@mikanpath{\path[draw=\sctkzsym@snowman@mikanstroke,fill=\sctkzsym@snowman@mikanfill]}%
+ \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]}%
%
% 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 04757143f3c..c8143a485ce 100644
--- a/Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty
+++ b/Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty
@@ -3,14 +3,14 @@
%% Maintained on GitHub:
%% https://github.com/aminophen/scsnowman
%%
-%% Copyright (c) 2015-2017 Hironobu Yamashita
+%% Copyright (c) 2015-2018 Hironobu Yamashita
%% Email : h.y.acetaminophen[a t]gmail.com
%% GitHub : https://github.com/aminophen
%% Blog : http://acetaminophen.hatenablog.com/
%% Twitter : @aminophen
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{sctkzsym-base}[2017/11/25 v1.2a Base for emoji variants using TikZ]
+\ProvidesPackage{sctkzsym-base}[2018/01/05 v1.2b Base for emoji variants using TikZ]
\RequirePackage{tikz}
\RequirePackage{keyval}
%
@@ -35,9 +35,17 @@
%
% save QED symbol before change (joke)
\ifsctkzsym@qed
- \RequirePackage{amsthm}
+ \def\sctkzsym@saving@qedsymbol{%
+ \ifx\qedsymbol\@undefined\else
+ \let\sctkzsym@saved@qedsymbol\qedsymbol
+ \fi
+ }
+ % if `amsthm' is already loaded, save it now
+ \sctkzsym@saving@qedsymbol
+ % otherwise, saving is delayed till \begin{document}
+ % (hope \makeqed... is not already executed...)
\ifx\sctkzsym@saved@qedsymbol\@undefined
- \let\sctkzsym@saved@qedsymbol\qedsymbol
+ \AtBeginDocument{\sctkzsym@saving@qedsymbol}
\fi
\newcommand{\makeqedother}{%
\let\qedsymbol\sctkzsym@saved@qedsymbol