scsnowman (14feb23)

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

7 files changed, 56 insertions, 83 deletions

diff --git a/Master/texmf-dist/doc/latex/scsnowman/Makefile b/Master/texmf-dist/doc/latex/scsnowman/Makefile
deleted file mode 100644
index 953a1753525..00000000000
--- a/Master/texmf-dist/doc/latex/scsnowman/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-KANJI = -kanji=utf8
-FONTMAP = -f ipaex.map -f ptex-ipaex.map
-TEXMF = $(shell kpsewhich -var-value=TEXMFHOME)
-
-all: scsnowman.pdf \
-	scsnowman-sample.pdf scsnowman-zrtest.pdf
-
-scsnowman.pdf: scsnowman.sty scsnowman.tex
-	lualatex scsnowman.tex
-	lualatex scsnowman.tex
-	lualatex scsnowman.tex
-scsnowman-sample.pdf: scsnowman.sty scsnowman-sample.tex
-	platex scsnowman-sample.tex
-	platex scsnowman-sample.tex
-	dvipdfmx scsnowman-sample.dvi
-scsnowman-zrtest.pdf: scsnowman.sty scsnowman-zrtest.tex
-	pdflatex scsnowman-zrtest.tex
-	pdflatex scsnowman-zrtest.tex
-
-.PHONY: install clean
-install:
-	mkdir -p ${TEXMF}/doc/latex/scsnowman
-	cp ./Makefile ${TEXMF}/doc/latex/scsnowman/
-	cp ./LICENSE ${TEXMF}/doc/latex/scsnowman/
-	cp ./README.md ${TEXMF}/doc/latex/scsnowman/
-	cp ./*.pdf ${TEXMF}/doc/latex/scsnowman/
-	cp ./*.tex ${TEXMF}/doc/latex/scsnowman/
-	mkdir -p ${TEXMF}/tex/latex/scsnowman
-	cp ./*.sty ${TEXMF}/tex/latex/scsnowman/
-	cp ./*.def ${TEXMF}/tex/latex/scsnowman/
-clean:
-	rm -f *.dvi *.pdf
diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-zrtest.pdf b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-zrtest.pdf
deleted file mode 100644
index 7967d13b75e..00000000000
--- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-zrtest.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-zrtest.tex b/Master/texmf-dist/doc/latex/scsnowman/scsnowman-zrtest.tex
deleted file mode 100644
index 8fa2524ecbb..00000000000
--- a/Master/texmf-dist/doc/latex/scsnowman/scsnowman-zrtest.tex
+++ /dev/null
@@ -1,21 +0,0 @@
-\documentclass[a4paper]{article}
-\usepackage[unicode,hidelinks,bookmarksnumbered]{hyperref}
-\usepackage{scsnowman}
-\scsnowmandefault{hat,arms,snow,scale=1.2,adjustbaseline}
-\renewcommand{\thesection}{\enumsnowman[muffler=red]{section}}
-\pagenumbering{enumsnowman}
-\begin{document}
-\setcounter{page}{8}
-\setcounter{section}{86}
-
-\section{Foo}\label{sec:Foo}
-Foo \scsnowmannumeral[muffler=blue]{42}.
-
-\section{Bar}\label{sec:Bar}
-Bar \scsnowmannumeral[muffler=blue]{84}.
-
-\section{Gee}\label{sec:Gee}
-Gee \scsnowmannumeral[muffler=blue]{168}.
-See also Sections \ref{sec:Bar} and \ref{sec:Foo}.
-
-\end{document}
diff --git a/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf b/Master/texmf-dist/doc/latex/scsnowman/scsnowman.pdf
index 776f8f74e7c..8a4b2475505 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 c48931c6cd8..f58388af28a 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: 2018/01/15)
+%% (Last Update: 2023/02/14)
 %% Maintained on GitHub:
 %% https://github.com/aminophen/scsnowman
 %%
-%% Copyright (c) 2015-2018 Hironobu Yamashita
+%% Copyright (c) 2015-2023 Hironobu Yamashita
 %%   Email   :  h.y.acetaminophen[a t]gmail.com
 %%   GitHub  :  https://github.com/aminophen
 %%   Blog    :  http://acetaminophen.hatenablog.com/
@@ -452,6 +452,9 @@ Version 1.2b & 2018-01-05 & Add new keys \Lopt{mikan}, \Lopt{leaf} for drawing `
 Version 1.2c & 2018-01-15 & Add a new key \Lopt{broom} \\
 Version 1.2d & 2018-06-07 & Add new keys \Lopt{nose}, \Lopt{note} \\
              &            & Add a new command \verb+\scsnowmannumeral+ \\
+Version 1.2e & 2019-08-12 & Fix a bug of possible infinite loop \\
+Version 1.3a & 2020-10-10 & Update for new \LaTeX \\
+Version 1.3b & 2023-02-14 & Fix a bug of up\TeX\ engine detection \\
 \end{tabular}
 \end{table}
 
diff --git a/Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty b/Master/texmf-dist/tex/latex/scsnowman/scsnowman.sty
index 609e7c69cec..c1cdf1c83a6 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-2018 Hironobu Yamashita
+%% Copyright (c) 2015-2023 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}[2018/06/07 v1.2d Snowman variants using TikZ]
+\ProvidesPackage{scsnowman}[2023/02/14 v1.3b Snowman variants using TikZ]
 \DeclareOption*{\PassOptionsToPackage{\CurrentOption}{sctkzsym-base}}
 \ProcessOptions\relax
 \RequirePackage{sctkzsym-base}[2017/08/08]
@@ -175,7 +175,8 @@
 
 \DeclareTextCommand{\scsnowman@hy@eight}{PU}{\9046\003}% U+2603
 \DeclareTextCommand{\scsnowman@hy@eight}{PD1}{8}%fallback
-\ifx\forcecjktoken\@undefined\else %upTeX
+
+\ifnum \ifx\ucs\@undefined\z@\else\ucs"3000 \fi ="3000 %upTeX
   \begingroup
     \kansujichar8="2603
     \xdef\scsnowman@hy@eight{\kansuji8}
@@ -247,7 +248,8 @@
   %
   % check body; determine whether "black snowman" or "white snowman"
   \sctkzsym@hndl@key@withbool{snowman}{body}%
-  \ifsctkzsym@snowman@body % "black snowman"; black snow; white eyes/mouth/stroke
+  \ifsctkzsym@snowman@body
+    % "black snowman"; black snow; white eyes/mouth/stroke
     \def\sctkzsym@snowman@bodystroke{\sctkzsym@snowman@body}%
     \def\sctkzsym@snowman@bodyfill{\sctkzsym@snowman@body}%
     \def\sctkzsym@snowman@bodypath{\path[draw=\sctkzsym@snowman@bodystroke,fill=\sctkzsym@snowman@bodyfill]}%
@@ -264,7 +266,8 @@
     \def\sctkzsym@snowman@mufflerfill{\sctkzsym@snowman@muffler}%
     \def\sctkzsym@snowman@buttonstroke{\sctkzsym@defaultanticolor}%
     \def\sctkzsym@snowman@buttonfill{\sctkzsym@snowman@buttons}%
-  \else                    % "white snowman"; white snow; black eyes/mouth/stroke; bodystroke should be there
+  \else
+    % "white snowman"; white snow; black eyes/mouth/stroke; bodystroke should be there
     \def\sctkzsym@snowman@bodystroke{\sctkzsym@defaultcolor}%
     \def\sctkzsym@snowman@bodyfill{}%
     \def\sctkzsym@snowman@bodypath{\path[draw=\sctkzsym@snowman@bodystroke]}%
@@ -282,57 +285,70 @@
     \def\sctkzsym@snowman@buttonstroke{\sctkzsym@snowman@buttons}%
     \def\sctkzsym@snowman@buttonfill{\sctkzsym@snowman@buttons}%
   \fi
-  % check eyes (currently eyes=<color> not supported; falling back to default-(anti)color)
+  % check eyes (only fill)
+  % [TODO] eyes=<color> unsupported; falling back to default-(anti)color)
   \sctkzsym@hndl@key@withbool{snowman}{eyes}%
-  \def\sctkzsym@snowman@eyepath{\path[fill=\sctkzsym@snowman@eyefill]}%
+  \def\sctkzsym@snowman@eyepath
+    {\path[fill=\sctkzsym@snowman@eyefill]}%
   % check nose
   \sctkzsym@hndl@key@withbool{snowman}{nose}%
-  \def\sctkzsym@snowman@nosepath{\path[draw=\sctkzsym@snowman@nosestroke,fill=\sctkzsym@snowman@nosefill]}%
-  % check mouth (currently mouth=<color> not supported; falling back to default-(anti)color)
+  \def\sctkzsym@snowman@nosepath
+    {\path[draw=\sctkzsym@snowman@nosestroke,fill=\sctkzsym@snowman@nosefill]}%
+  % check mouth (only stroke)
+  % [TODO] mouth=<color> unsupported; falling back to default-(anti)color)
   \sctkzsym@hndl@key@withword{snowman}{mouthshape}%
   \sctkzsym@hndl@key@withbool{snowman}{mouth}%
-  \def\sctkzsym@snowman@mouthpath{\path[draw=\sctkzsym@snowman@mouthstroke]}%
+  \def\sctkzsym@snowman@mouthpath
+    {\path[draw=\sctkzsym@snowman@mouthstroke]}%
   % check sweat
   \sctkzsym@hndl@key@withbool{snowman}{sweat}%
-  \def\sctkzsym@snowman@sweatpath{\path[draw=\sctkzsym@snowman@sweatstroke,fill=\sctkzsym@snowman@sweatfill]}%
+  \def\sctkzsym@snowman@sweatpath
+    {\path[draw=\sctkzsym@snowman@sweatstroke,fill=\sctkzsym@snowman@sweatfill]}%
   % check hat
   \sctkzsym@hndl@key@withbool{snowman}{hat}%
   \def\sctkzsym@snowman@hatstroke{\sctkzsym@snowman@hat}%
   \def\sctkzsym@snowman@hatfill{\sctkzsym@snowman@hat}%
-  \def\sctkzsym@snowman@hatpath{\path[draw=\sctkzsym@snowman@hatstroke,fill=\sctkzsym@snowman@hatfill]}%
+  \def\sctkzsym@snowman@hatpath
+    {\path[draw=\sctkzsym@snowman@hatstroke,fill=\sctkzsym@snowman@hatfill]}%
   % check arms
   \sctkzsym@hndl@key@withbool{snowman}{arms}%
   \def\sctkzsym@snowman@armsstroke{\sctkzsym@snowman@arms}%
   \def\sctkzsym@snowman@armsfill{\sctkzsym@snowman@arms}%
-  \def\sctkzsym@snowman@armspath{\path[draw=\sctkzsym@snowman@armsstroke,fill=\sctkzsym@snowman@armsfill]}%
+  \def\sctkzsym@snowman@armspath
+    {\path[draw=\sctkzsym@snowman@armsstroke,fill=\sctkzsym@snowman@armsfill]}%
   % check muffler
   \sctkzsym@hndl@key@withbool{snowman}{muffler}%
-  \def\sctkzsym@snowman@mufflerpath{\path[draw=\sctkzsym@snowman@mufflerstroke,fill=\sctkzsym@snowman@mufflerfill]}%
+  \def\sctkzsym@snowman@mufflerpath
+    {\path[draw=\sctkzsym@snowman@mufflerstroke,fill=\sctkzsym@snowman@mufflerfill]}%
   % check buttons
   \sctkzsym@hndl@key@withbool{snowman}{buttons}%
-  \def\sctkzsym@snowman@buttonpath{\path[draw=\sctkzsym@snowman@buttonstroke,fill=\sctkzsym@snowman@buttonfill]}%
+  \def\sctkzsym@snowman@buttonpath
+    {\path[draw=\sctkzsym@snowman@buttonstroke,fill=\sctkzsym@snowman@buttonfill]}%
   % check snow
   \sctkzsym@hndl@key@withbool{snowman}{snow}%
-  % check note
+  % check note (only fill)
   \sctkzsym@hndl@key@withbool{snowman}{note}%
   \def\sctkzsym@snowman@notefill{\sctkzsym@snowman@note}%
   \def\sctkzsym@snowman@notepath{\path[fill=\sctkzsym@snowman@notefill]}%
-  % check adjustbaseline
-  \sctkzsym@hndl@key@onlybool{snowman}{adjustbaseline}%
   % check mikan/leaf
   \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@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]}%
-  % check broom
+  \def\sctkzsym@snowman@leafpath
+    {\path[draw=\sctkzsym@snowman@leafstroke,fill=\sctkzsym@snowman@leaffill]}%
+  % check broom (only stroke)
   \sctkzsym@hndl@key@withbool{snowman}{broom}%
   \def\sctkzsym@snowman@broomstroke{\sctkzsym@snowman@broom}%
   \def\sctkzsym@snowman@broompath{\path[draw=\sctkzsym@snowman@broomstroke]}%
   %
+  % check adjustbaseline
+  \sctkzsym@hndl@key@onlybool{snowman}{adjustbaseline}%
+  %
   % drawing snowman
   \set@sctkzsym@coord@scl{\sctkzsym@snowman@scale}%
   \ifdim\sctkzsym@coord@scl<\z@\set@sctkzsym@coord@scl{-\sctkzsym@snowman@scale}\fi%
diff --git a/Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty b/Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty
index 9bb904b40f6..55099021aca 100644
--- a/Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty
+++ b/Master/texmf-dist/tex/latex/scsnowman/sctkzsym-base.sty
@@ -3,19 +3,26 @@
 %% Maintained on GitHub:
 %% https://github.com/aminophen/scsnowman
 %%
-%% Copyright (c) 2015-2018 Hironobu Yamashita
+%% Copyright (c) 2015-2020 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}[2018/01/15 v1.2c Base for emoji variants using TikZ]
-\RequirePackage{tikz}
+\ProvidesPackage{sctkzsym-base}
+  [2023/02/14 v1.3b Base for emoji variants using TikZ]
+\RequirePackage{tikz}% pgfutil-latex.def requires everyshi
 \RequirePackage{keyval}
 %
-\ifx\kanjiskip\@undefined\else
-  \IfFileExists{pxeveryshi.sty}{\RequirePackage{pxeveryshi}}{}
+\ifx\pfmtversion\@undefined\else
+  \ifx\@EveryShipout@Output\@undefined
+    % LaTeX2e 2020-10-01: an emulation by ``everyshi-ltx.sty''
+    % => pLaTeX2e 2020-10-01 natively supports it
+  \else
+    % older: the real ``everyshi.sty'' is loaded
+    \IfFileExists{pxeveryshi.sty}{\RequirePackage{pxeveryshi}}{}
+  \fi
 \fi
 %
 % prepare for options
@@ -116,7 +123,7 @@
     \fi
   \fi
 }
-\newcommand{\sctkzsym@hndl@key@withword}[2]{%
+\newcommand{\sctkzsym@hndl@key@withword}[2]{{%
   % initialize
   \@tempcnta\@ne
   \let\sctkzsym@status\relax
@@ -134,7 +141,7 @@
   \ifx\sctkzsym@status\relax
     \PackageError{sc#1}{Unsupported value `\csname sctkzsym@#1@#2\endcsname' for #2}\@ehc
   \fi
-}
+}}
 %
 % setup for tikzpicture
 \newlength{\sctkzsym@coord@baseline}