From 86a274f8d5d3884667aa380c73d697899ee00ffd Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Fri, 5 Jan 2018 21:48:55 +0000 Subject: scsnowman (5jan18) git-svn-id: svn://tug.org/texlive/trunk@46223 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/scsnowman/scsnowman-normal.def | 15 +++++++++++++-- Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty | 17 +++++++++++++++-- Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty | 16 ++++++++++++---- 3 files changed, 40 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/tex/latex/scsnowman') 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 -- cgit v1.2.3