summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-04-23 20:32:57 +0000
committerKarl Berry <karl@freefriends.org>2023-04-23 20:32:57 +0000
commit3e8aa2946d28edde5402fb7b753956e597d33c55 (patch)
tree7c263dbfefe26e5aa0bc7c5bdf357af53dd8da4b
parent59968b287ab42c3b4eb7de5856ef3479846a99c0 (diff)
pgfornament-han (23apr23)
git-svn-id: svn://tug.org/texlive/trunk@66920 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.pdfbin1058134 -> 207541 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.tex4
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han_manual.pdfbin3736750 -> 1049657 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han_manual.tex43
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.pdfbin0 -> 115750 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.tex81
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.pdfbin58401 -> 39913 bytes
-rw-r--r--Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.tex2
-rw-r--r--Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeTianQing.sty195
-rw-r--r--Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeXiaoshan.sty5
-rw-r--r--Master/texmf-dist/tex/latex/pgfornament-han/pgfornament-han.sty7
12 files changed, 327 insertions, 14 deletions
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/README.md b/Master/texmf-dist/doc/latex/pgfornament-han/README.md
index 0b231c59350..33084e0a936 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/README.md
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/README.md
@@ -1,7 +1,7 @@
-# pgfornament-han 2019/08/10
+# pgfornament-han 2023/04/23
A pgfornament library for Chinese traditional motifs and patterns.
-以 pgfornament 宏包的机制,实现绘制汉风图纹。
+以 pgfornament 宏包的机制,实现绘制汉风图纹。在此基础上设计了三款beamer主题:「萧山」(XiaoShan)、「神马浮云」(Heavenly Clouds)、「天青」(TianQing)。
# Maintainers 宏包维护
LianTze Lim 林莲枝 (liantze@gmail.com)
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.pdf b/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.pdf
index ba30e0a3d20..c22eb5a439b 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.pdf
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.tex b/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.tex
index 325c61c158e..6fa634ead9d 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.tex
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.tex
@@ -1,5 +1,5 @@
% !TEX program=xelatex
-\documentclass{ctexbeamer}
+\documentclass[aspectratio=1610,linespread=1.2]{ctexbeamer}
\usetheme{HeavenlyClouds}
@@ -61,7 +61,7 @@
\end{frame}
-\begin{frame}[allowframebreaks]
+\begin{frame}%[allowframebreaks]
\frametitle{各种 block}
\begin{block}{你是我天边最美的云彩}
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han_manual.pdf b/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han_manual.pdf
index 6ac00fa5dd8..494663e14d6 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han_manual.pdf
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han_manual.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han_manual.tex b/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han_manual.tex
index f42480947ce..67f66195e13 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han_manual.tex
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/pgfornament-han_manual.tex
@@ -104,7 +104,7 @@
\title{汉风图纹 \texttt{pgfornament-han}}
\author{林莲枝、张晨南}
-\date{2019/08/10\\\url{https://github.com/liantze/pgfornament-han}}
+\date{2023/04/23\\\url{https://github.com/liantze/pgfornament-han}}
\begin{document}
@@ -880,7 +880,7 @@
\bigskip
\begin{tcblisting}{listing side comment,title={使用范例},pdf comment={xiaoshan-sample.pdf}}
-\documentclass{ctexbeamer}
+\documentclass[linespread=1.2,aspectratio=1610]{ctexbeamer}
\usetheme{Xiaoshan}
@@ -917,7 +917,7 @@
\bigskip
\begin{tcblisting}{listing side comment,title={使用范例},pdf comment={heavenlyclouds-sample.pdf}}
-\documentclass{ctexbeamer}
+\documentclass[aspectratio=1610,linespread=1.2]{ctexbeamer}
\usetheme{HeavenlyClouds}
\author{林莲枝}
@@ -972,5 +972,42 @@
\end{itemize}
+\section{天青 Beamer 主题 Tian Qing Beamer Theme \texttt{beamerthemeTianqing.sty}}
+
+几年前看到一个很喜欢的舞台演出,根据个人印象做的一个Beamer主题。本来想取名「青花瓷」的。不过始终没能力重现出来那种感觉啦,眼高手低,惭愧。
+
+(话说拿这个模板去做科研学术性报告,真的不会被导师丢出来吗。)
+
+
+\bigskip
+
+\begin{tcblisting}{listing side comment,title={使用范例},pdf comment={tianqing-sample.pdf}}
+\documentclass[aspectratio=1610,linespread=1.2]{ctexbeamer}
+\usetheme{TianQing}
+
+\author{林莲枝}
+\title{天青Beamer主题}
+\subtitle{\texttt{pgfornament-han}附录福利}
+
+\begin{document}
+
+\begin{frame}
+ \maketitle
+\end{frame}
+
+\section{基本测试}
+
+\begin{frame}{天青色等烟雨,而我在等你}
+ \begin{itemize}
+ \item 炊烟袅袅升起, 隔江千万里。...
+ \end{itemize}
+\end{frame}
+...
+\end{document}
+\end{tcblisting}
+
+如果本地电脑上有比较漂亮的美术字体或书法字体,不妨自己设置一下zhkai,也许会有让人惊喜的效果。例:
+
+\mintinline{latex}|\setCJKfamilyfont{zhkai}{Xingkai SC}|
\end{document}
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.pdf b/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.pdf
new file mode 100644
index 00000000000..34a21c12057
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.tex b/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.tex
new file mode 100644
index 00000000000..d882b303491
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/tianqing-sample.tex
@@ -0,0 +1,81 @@
+% !TEX program=xelatex
+\documentclass[aspectratio=1610,linespread=1.2]{ctexbeamer}
+\usetheme{TianQing}
+% 可以把zhkai更改成自己喜欢的美术字体、书法字体等
+% \setCJKfamilyfont{zhkai}{Xingkai SC}
+
+\title{天青色等烟雨}
+\author{林莲枝}
+\subtitle{\texttt{pgfornament-han}附录福利}
+
+\begin{document}
+
+\begin{frame}
+\maketitle
+\end{frame}
+
+\begin{frame}{\contentsname}
+\tableofcontents
+\end{frame}
+
+
+\section{基本测试}
+
+\begin{frame}{天青色等烟雨,而我在等你}
+ \begin{itemize}
+ \item 炊烟袅袅升起, 隔江千万里。
+ \begin{itemize}
+ \item 在瓶底书刻隶仿前朝的飘逸
+ \begin{itemize}
+ \item 就当我为遇见你伏笔
+ \end{itemize}
+ \end{itemize}
+ \end{itemize}
+
+\begin{enumerate}
+ \item 本来这个beamer主题样式,想取名“青花瓷”的。不过始终没能力重现出来那种感觉啦,就算了。
+ \item 话说拿这个模板去做科研学术性报告,真的不会被导师丢出来吗。
+\end{enumerate}
+
+\end{frame}
+
+\begin{frame}
+\frametitle{雨纷纷 旧故里草木深}
+ \begin{enumerate}
+ \item 我听闻 你始终一个人
+ \begin{enumerate}
+ \item 斑驳的城门 盘踞着老树根
+ \begin{enumerate}
+ \item 石板上回荡的是 再等
+ \item 石板上回荡的是 再等
+ \end{enumerate}
+ \end{enumerate}
+ \end{enumerate}
+
+\end{frame}
+
+\begin{frame}[allowframebreaks]{各种block 123}
+ \begin{exampleblock}{算了我也不知道在写什么,do you?}
+ Now solve $x = \frac{-b \pm \sqrt{b^2 -4ac}}{2a}$. 对各位同学来说应该挑战不大。
+ \end{exampleblock}
+
+ \begin{alertblock}{算了我也不知道在写什么,do you?}
+ \[ x = \frac{-b \pm \sqrt{b^2 -4ac}}{2a} \]
+ \end{alertblock}
+
+ \begin{block}{算了我也不知道在写什么,do you?}
+ \[ x = \frac{-b \pm \sqrt{b^2 -4ac}}{2a} \]
+ \end{block}
+
+ \begin{proof}
+ 显而易见,$1+1=2$.
+ \end{proof}
+
+ \begin{theorem}
+ 有一件很美好的事情将要发生,它终会发生。
+ \end{theorem}
+\end{frame}
+
+\section{内容不要太长,写短一点,汇报是你讲不是观众读片}
+
+\end{document}
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.pdf b/Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.pdf
index ac737ddbbbe..938436b8529 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.pdf
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.tex b/Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.tex
index ae40a97587b..366b5a537aa 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.tex
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.tex
@@ -1,5 +1,5 @@
% !TEX program = xelatex
-\documentclass{ctexbeamer}
+\documentclass[linespread=1.2,aspectratio=1610]{ctexbeamer}
\usetheme{Xiaoshan}
diff --git a/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeTianQing.sty b/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeTianQing.sty
new file mode 100644
index 00000000000..df339a75123
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeTianQing.sty
@@ -0,0 +1,195 @@
+% beamerthemeXiaoshan.sty v1.0 2023/04/23
+% by LianTze Lim (liantze@gmail.com)
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{beamerthemeTianQing}
+\RequirePackage{cncolours}
+\RequirePackage{pgfornament-han}
+\RequirePackage{xpatch}
+\RequirePackage{calc}
+\RequirePackage{relsize}
+\RequirePackage{unicode-math}
+\setmathfont{latinmodern-math.otf}
+\setmathfont{Erewhon-Math.otf}
+\setmainfont{erewhon}
+\RequirePackage{tcolorbox}\tcbuselibrary{skins}
+\RequirePackage[absolute,overlay]{textpos}
+
+
+\usefonttheme[stillsansserifsmall]{serif}
+\renewcommand{\CJKrmdefault}{zhfs}
+\newfontfamily{\romankai}{Alegreya-Medium.otf}
+
+
+\definecolor{天青色}{HTML}{8DD4E8}
+
+\setbeamertemplate{navigation symbols}{}
+\setbeamertemplate{frametitle continuation}[from second]
+\setbeamercolor{structure}{fg=正青}
+\setbeamercolor{palette secondary}{fg=天青色}
+\setbeamercolor{normal text}{bg=精白}
+
+\setbeamerfont{frametitle}{family=\romankai\kaishu,size=\LARGE}
+\setbeamerfont{title}{family=\kaishu,size=\Huge}
+\setbeamerfont{section name}{family=\kaishu,size=\Large}
+\setbeamerfont{section title}{family=\kaishu,size=\huge}
+\setbeamerfont{section in toc}{family=\kaishu,size=\large}
+
+\setbeamercolor{alerted text}{fg=樱桃色}
+\setbeamercolor{example text}{fg=绿沉}
+\setbeamercolor{block title}{fg=宝蓝}
+\setbeamercolor{mini frame}{bg=天青色}
+
+\newsavebox{\bulletboxone}
+\savebox{\bulletboxone}{\usebeamercolor[fg]{structure}\tikz\node[line width=0pt,inner sep=0pt,outer sep=0pt]{\pgfornamenthan[height=1ex]{43}};}
+
+\newsavebox{\bulletboxtwo}
+\savebox{\bulletboxtwo}{\usebeamercolor[fg]{structure}\tikz\node[line width=0pt,inner sep=0pt,outer sep=0pt]{\pgfornamenthan[height=1ex]{41}};}
+
+\newsavebox{\bulletboxthree}
+\savebox{\bulletboxthree}{\usebeamercolor[fg]{structure}\tikz\node[line width=0pt,inner sep=0pt,outer sep=0pt]{\pgfornamenthan[height=1ex]{33}};}
+
+\newsavebox{\topcornermotif}
+\savebox{\topcornermotif}{\tikzset{pgfornamentstyle/.style={rotate=30,draw=墨灰,color=蓝灰色,opacity=.2,inner sep=0pt,ultra thick}}\pgfornamenthan[width=.5\paperheight]{64}}
+
+\newsavebox{\bottomcornermotif}
+\savebox{\bottomcornermotif}{\tikzset{pgfornamentstyle/.style={draw=墨灰,color=正青,opacity=.9,inner sep=0pt,very thick}}\pgfornamenthan[width=.2\paperheight,symmetry=v]{74}}
+
+\setbeamertemplate{itemize item}{\raisebox{.08\ccwd}{\usebox{\bulletboxone}}}
+\setbeamertemplate{itemize subitem}{\raisebox{.08\ccwd}{\usebox{\bulletboxtwo}}}
+\setbeamertemplate{itemize subsubitem}{\raisebox{.08\ccwd}{\usebox{\bulletboxthree}}}
+
+\setbeamertemplate{enumerate item}{\kaishu\relsize{-1}\chinese{enumi}、}
+\setbeamertemplate{enumerate subitem}{\kaishu\relsize{-1}\chinese{enumii}、}
+\setbeamertemplate{enumerate subsubitem}{\kaishu\relsize{-1}\chinese{enumiii}、}
+\xpretocmd{\enumerate}{%
+ \setlength{\labelsep}{0pt}%
+ \setlength{\leftmarginii}{1.8\ccwd}%
+ \setlength{\leftmarginiii}{1.8\ccwd}%
+}{}{}
+
+\xpretocmd{\itemize}{%
+ \setlength{\labelsep}{.5\ccwd}%
+ \setlength{\leftmargini}{2\ccwd}%
+ \setlength{\leftmarginii}{\labelsep+1.1\wd\bulletboxtwo}%
+ \setlength{\leftmarginiii}{\labelsep+1.25\wd\bulletboxthree}%
+}{}{}
+
+
+\setbeamertemplate{background}{%
+ \vadjust{\begin{textblock*}{\wd\topcornermotif}(-.2\paperheight,-.08\paperheight)
+ \usebox{\topcornermotif}
+ \end{textblock*}
+ \begin{textblock*}{\wd\bottomcornermotif}(\paperwidth-\wd\bottomcornermotif,\paperheight-\wd\bottomcornermotif)
+ \usebox{\bottomcornermotif}
+ \end{textblock*}}
+}
+
+\renewtcolorbox{alertblock}[2][]{enhanced,
+ frame code={\tikzset{pgfornamentstyle/.style={line width=0pt}}
+ \path[draw=alerted text.fg,line width=1bp](frame.south west) rectangle (frame.north east);
+ \path[fill=alerted text.bg] ([shift={(0.5bp,0.5bp)}]frame.north east) rectangle ++ (-20bp,-20bp);
+ \node[anchor=north east,inner sep=0pt,outer sep=0pt,shift={(0.5bp,0.5bp)}] at (frame.north east) {\pgfornamenthan[width=20bp,color=alerted text.fg,symmetry=v]{3}};
+ \path[fill=alerted text.bg] ([shift={(-0.5bp,-0.5bp)}]frame.south west) rectangle ++ (20bp,20bp);
+ \node[anchor=south west,inner sep=0pt,outer sep=0pt,shift={(-0.5bp,-0.5bp)}] at (frame.south west) {\pgfornamenthan[width=20bp,color=alerted text.fg,symmetry=h]{3}};
+ },
+ interior titled code = {},
+ title code = {},
+ segmentation code = {},
+ colframe = alerted text.fg,
+ coltitle = alerted text.fg!70!black,
+ colback = alerted text.bg,
+ halign title = flush center,
+ fonttitle=\kaishu\romankai\bfseries,
+ title = #2,
+ #1
+}
+
+\renewtcolorbox{exampleblock}[2][]{enhanced,
+ frame code={\tikzset{pgfornamentstyle/.style={line width=0pt}}
+ \path[draw=example text.fg,line width=1bp](frame.south west) rectangle (frame.north east);
+ \path[fill=example text.bg] ([shift={(0.5bp,0.5bp)}]frame.north east) rectangle ++ (-20bp,-20bp);
+ \node[anchor=north east,inner sep=0pt,outer sep=0pt,shift={(0.5bp,0.5bp)}] at (frame.north east) {\pgfornamenthan[width=20bp,color=example text.fg,symmetry=v]{3}};
+ \path[fill=example text.bg] ([shift={(-0.5bp,-0.5bp)}]frame.south west) rectangle ++ (20bp,20bp);
+ \node[anchor=south west,inner sep=0pt,outer sep=0pt,shift={(-0.5bp,-0.5bp)}] at (frame.south west) {\pgfornamenthan[width=20bp,color=example text.fg,symmetry=h]{3}};
+ },
+ interior titled code = {},
+ title code = {},
+ segmentation code = {},
+ colframe = example text.fg,
+ coltitle = example text.fg!70!black,
+ colback = example text.bg,
+ halign title = flush center,
+ fonttitle=\kaishu\romankai\bfseries,
+ title = #2,
+ #1
+}
+
+\usebeamercolor{block title}
+\renewtcolorbox{block}[2][]{enhanced,
+ frame code={\tikzset{pgfornamentstyle/.style={line width=0pt}}
+ \usebeamercolor{block title}
+ \path[draw=block title.fg,line width=1bp](frame.south west) rectangle (frame.north east);
+ \path[fill=block title.bg] ([shift={(0.5bp,0.5bp)}]frame.north east) rectangle ++ (-20bp,-20bp);
+ \node[anchor=north east,inner sep=0pt,outer sep=0pt,shift={(0.5bp,0.5bp)}] at (frame.north east) {\pgfornamenthan[width=20bp,color=block title.fg,symmetry=v]{3}};
+ \path[fill=block title.bg] ([shift={(-0.5bp,-0.5bp)}]frame.south west) rectangle ++ (20bp,20bp);
+ \node[anchor=south west,inner sep=0pt,outer sep=0pt,shift={(-0.5bp,-0.5bp)}] at (frame.south west) {\pgfornamenthan[width=20bp,color=block title.fg,symmetry=h]{3}};
+ },
+ interior titled code = {},
+ title code = {},
+ segmentation code = {},
+ colframe = block title.fg,
+ coltitle = block title.fg!70!black,
+ colback = block title.bg,
+ halign title = flush center,
+ fonttitle=\kaishu\romankai\bfseries,
+ title = #2,
+ #1
+}
+
+\AtBeginSection{\begingroup
+ \setbeamercolor{normal text}{bg=palette secondary.fg!20}
+ \setbeamertemplate{background}{}
+ \begin{frame}\zhnumsetup{style=Financial}\sectionpage\end{frame}
+ \endgroup
+}
+\renewcommand{\thesection}{\chinese{section}}
+\setbeamercolor{section page}{fg=structure}
+\setbeamertemplate{section page}{\centering
+ \begin{textblock*}{\paperwidth}[0.5,0](0.5\paperwidth,-0.15\paperheight)
+ \tikzset{pgfornamentstyle/.style={opacity=.5,inner sep=0pt,outer sep=0pt,very thick,draw=palette secondary.fg!70!structure.fg}}
+ \usebeamercolor{palette secondary}
+ \pgfornamenthan[width=1.3\paperheight,color=palette secondary.fg]{53}
+ \end{textblock*}
+ \begin{tikzpicture}
+ \usebeamercolor{palette secondary}
+ \foreach \i in {45, 90, ..., 360}
+ \node[inner sep=5.5bp,rotate=-\i,anchor=north west]{\pgfornamenthan[width=1.2\ccwd,color=palette secondary.fg!70!structure.fg]{77}};
+ \node[font=\usebeamerfont{section name},structure.fg]{\thesection};
+ \end{tikzpicture}\par
+ \parbox{\paperheight}{\centering\usebeamerfont{section title}\insertsection}\par\bigskip
+ \pgfornamenthan[color=palette secondary.fg!70!structure.fg,width=.5\paperheight,symmetry=h]{60}\par
+}
+
+\preto\maketitle{\begingroup
+ \setbeamercolor{normal text}{bg=天青色!20}
+ \addtobeamertemplate{background}{\vadjust{%
+ \begin{textblock*}{\paperwidth}(\paperwidth-.36\paperheight,\paperheight-.36\paperheight)
+ \tikzset{pgfornamentstyle/.style={opacity=.25,inner sep=0pt,outer sep=0pt,very thick,draw=palette secondary.fg!70!structure.fg}}
+ \usebeamercolor{palette secondary}
+ \pgfornamenthan[width=.35\paperheight,color=palette secondary.fg,symmetry=v]{74}
+ \end{textblock*}
+ \begin{textblock*}{\paperwidth}(\paperwidth-.55\paperheight,0.5\paperheight)
+ \tikzset{pgfornamentstyle/.style={opacity=.5,inner sep=0pt,outer sep=0pt,very thick,draw=palette secondary.fg!70!structure.fg}}
+ \usebeamercolor{palette secondary}
+ \pgfornamenthan[width=\paperheight,color=palette secondary.fg]{49}
+ \end{textblock*}
+ }}{}
+}
+
+\appto\maketitle{\endgroup}
+
+\titlegraphic{\pgfornamenthan[width=2\ccwd,color=alerted text.fg,symmetry=v]{64}\pgfornamenthan[width=2\ccwd,color=alerted text.fg]{56}\pgfornamenthan[width=2\ccwd,color=alerted text.fg]{64}}
+
+\addtobeamertemplate{section in toc}{\raisebox{.2\ccwd}{\usebox{\bulletboxone}}\hskip\labelsep}{}
+
+\renewcommand{\qedsymbol}{\tikzset{tikzornamentstyle/.style={line width=0pt}}\raisebox{.3\ccwd}{\pgfornamenthan[width=\ccwd,color=alerted text.fg]{57}}}
diff --git a/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeXiaoshan.sty b/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeXiaoshan.sty
index 2058d785ba8..52daf7b8adc 100644
--- a/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeXiaoshan.sty
+++ b/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeXiaoshan.sty
@@ -1,9 +1,10 @@
-% beamerthemeXiaoshan.sty v1.0 2018/04/09
+% beamerthemeXiaoshan.sty v1.1 2023/04/23
% by LianTze Lim (liantze@gmail.com)
\ProvidesPackage{beamerthemeXiaoshan}
\usetheme[progressbar=frametitle]{metropolis}
-
+%v 1.1: fix space after block titles
+\patchcmd{\metropolis@block}{\nointerlineskip}{}{}{}
\RequirePackage{pgfornament-han}
\RequirePackage{tikz}
\usetikzlibrary{decorations,decorations.markings}
diff --git a/Master/texmf-dist/tex/latex/pgfornament-han/pgfornament-han.sty b/Master/texmf-dist/tex/latex/pgfornament-han/pgfornament-han.sty
index 824fb153898..4e9add99bd5 100644
--- a/Master/texmf-dist/tex/latex/pgfornament-han/pgfornament-han.sty
+++ b/Master/texmf-dist/tex/latex/pgfornament-han/pgfornament-han.sty
@@ -1,4 +1,4 @@
-% pgfornamenthan.sty v0.33 2019/08/10
+% pgfornament-han.sty v0.33 2019/08/10
% Authors: pgf and LaTeX code by LIM LianTze
% based on CAD drawing by ZHANG Chennan
@@ -16,16 +16,15 @@
\input{\pgfOrnamentsHanObject}%
\let\pgf@@ornamenthan\pgf@@ornament
-% \patchcmd{\pgf@@ornamenthan}{\OrnamentsFamily}{han}{}{}
\pretocmd{\pgf@@ornamenthan}{%
- \def\OrnamentsFamily{han}
+ \def\OrnamentsFamily{han}%
}{}{}
\patchcmd{\pgf@@ornamenthan}
{\OrnamentsFamily#1.pgf}
{\OrnamentsFamily/\OrnamentsFamily#1.pgf}{}{}
-\tikzset{
+\tikzset{%
ornamenthan/.style={%
to path={%
\pgfextra{%