pgfornament-han (21may18)

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

10 files changed, 620 insertions, 7 deletions

diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/README.md b/Master/texmf-dist/doc/latex/pgfornament-han/README.md
index ca974241c58..806acb4c9f9 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/README.md
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/README.md
@@ -1,4 +1,4 @@
-# pgfornament-han v0.32 2018/04/09
+# pgfornament-han 2018/05/15
 A pgfornament library for Chinese traditional motifs and patterns.
 
 以 pgfornament 宏包的机制，实现绘制汉风图纹。
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/XiaoshanSample.pdf b/Master/texmf-dist/doc/latex/pgfornament-han/XiaoshanSample.pdf
deleted file mode 100644
index 1a85c9f9479..00000000000
--- a/Master/texmf-dist/doc/latex/pgfornament-han/XiaoshanSample.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.pdf b/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.pdf
new file mode 100644
index 00000000000..c53b1f985b9
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.tex b/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.tex
new file mode 100644
index 00000000000..5f66ee468b1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/heavenlyclouds-sample.tex
@@ -0,0 +1,85 @@
+% !TEX program=xelatex
+% \documentclass[aspectratio=169]{ctexbeamer}
+\documentclass{ctexbeamer}
+
+\usetheme{HeavenlyClouds}
+
+% Mac 或 Linux 上请自己设定 \lishu!!
+% \providecommand{\lishu}{\CJKfontspec{Libian SC}[BoldFont=Baoli SC,Scale=1.2]}
+
+\author{林莲枝}
+\title{神马浮云\\Beamer主题}
+\subtitle{\texttt{pgfornament-han}附录福利}
+
+% 可以放各自高校的校徽，中国高校校徽好像大多数都是圆形的。确保一下背景是透明色的 png 或 pdf 档就可以了
+% \titlegraphic{\includegraphics[width=2cm]{example-grid-100x100pt}}
+
+% \alttitlecircle  %% 试试取消注释，有惊喜
+
+\begin{document}
+
+\begin{frame}[noframenumbering]
+  \maketitle
+\end{frame}
+
+\section{简介}
+
+\begin{frame}[fragile,allowframebreaks]
+  \frametitle{此主题脑洞略大}
+
+  \begin{itemize}
+    \item 每一页的背景的云彩纹样，位置、大小、深浅都是随机的
+    \item 所以如果内容很多页的话，编译时运算可能会比较花时间
+    \item 导言区加上 \verb|\alttitlecircle|，标题页的纹样会变化
+
+    \framebreak
+    \item 标题页的寿字纹，可以用各自高校的标志代替。中国高校校徽很多都是圆形的。确保一下背景是透明色的 png 或 pdf 档就可以了
+
+    \verb|\titlegraphic{\includegraphics[width=2cm]{logo}}|
+
+    \medskip
+
+    \item 浮云有了，神马呢？
+      \begin{itemize}
+        \item 以后如果做出来了马的简易图腾纹样，才考虑取代掉进度条的圆点吧
+      \end{itemize}
+  \end{itemize}
+
+\end{frame}
+
+\begin{frame}
+  \frametitle{套马的汉子你威武雄壮}
+
+  \begin{itemize}
+    \item 飞驰的骏马像疾风一样
+    \item 一望无际的原野随你去流浪
+    \item 你的心海和大地一样宽广
+  \end{itemize}
+
+\end{frame}
+
+\begin{frame}[allowframebreaks]
+  \frametitle{各种 block}
+
+  \begin{block}{你是我天边最美的云彩}
+    让我用心把你留下来
+  \end{block}
+
+  \begin{exampleblock}{你是我天边最美的云彩}
+    让我用心把你留下来
+  \end{exampleblock}
+
+  \begin{alertblock}{你是我天边最美的云彩}
+    让我用心把你留下来
+  \end{alertblock}
+
+  \begin{theorem}[你是我天边最美的云彩]
+    让我用心把你留下来
+  \end{theorem}
+
+  \begin{proof}[你是我天边最美的云彩]
+    让我用心把你留下来
+  \end{proof}
+\end{frame}
+
+\end{document}
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 42056d05d17..8510c7adb66 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
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 7f82c89045f..1d172aa6ff3 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
@@ -5,6 +5,7 @@
 \setmainfont{Linux Libertine O}
 \setsansfont{Linux Biolinum O}
 
+\usepackage{ragged2e}
 \usepackage[dvipsnames]{xcolor}
 \usepackage{pgfornament-han}
 \usetikzlibrary{chains}
@@ -99,11 +100,11 @@
 \pagestyle{fancy}
 \fancypagestyle{plain}{\pagestyle{fancy}}
 
-\usepackage[hidelinks]{hyperref}
+\usepackage[colorlinks]{hyperref}
 
-\title{汉风图纹 \texttt{pgfornament-han} v0.32}
+\title{汉风图纹 \texttt{pgfornament-han}}
 \author{林莲枝、张晨南}
-\date{v0.32 2018/04/09\\\url{https://github.com/liantze/pgfornament-han}}
+\date{2018/05/15\\\url{https://github.com/liantze/pgfornament-han}}
 
 \begin{document}
 
@@ -501,15 +502,19 @@
 
 \clearpage
 \appendix
+\setlength{\parindent}{2\ccwd}\justifying
 \ctexset{section/name={附录}}
 \phantomsection\addcontentsline{toc}{part}{附录}
 
 \section{传统中国颜色 \texttt{cncolours.sty}}
 
 \begingroup
-\centering
+
+
 这是我比较早以前做的一个宏包了，色卡取自 \url{http://ylbook.com/cms/web/chuantongsecai/chuantongsecai.htm}。
 
+感谢网友\href{https://github.com/heangfat}{\emph{端憲}}，加入了三正色，以及提供繁体中文的颜色名称。
+
 \bigskip
 
 \renewcommand{\baselinestretch}{2}
@@ -517,6 +522,7 @@
   \fcolorbox{乌黑}{#1}{\makebox[2em]{\phantom{M}}}~\makebox[5em][l]{#1}%
 }
 
+\begin{RaggedRight}
 \showcolour{粉红}
 \showcolour{妃色}
 \showcolour{品红}
@@ -675,6 +681,181 @@
 \showcolour{铜绿}
 \showcolour{乌金}
 \showcolour{老银}
+\showcolour{正青}
+\showcolour{正赤}
+\showcolour{正黄}
+\end{RaggedRight}
+
+\clearpage
+
+\CJKfontspec{Noto Serif CJK TC}
+以下是繁體中文字體名稱，由網友\href{https://github.com/heangfat}{\emph{端憲}}提供。姜黃、薑黃是兩種植物。未審此指何種，闕之。
+
+\bigskip
+
+\begin{RaggedRight}
+\showcolour{粉紅}
+\showcolour{妃色}
+\showcolour{品紅}
+\showcolour{桃紅}
+\showcolour{海棠紅}
+\showcolour{石榴紅}
+\showcolour{櫻桃色}
+\showcolour{銀紅}
+\showcolour{大紅}
+\showcolour{絳紫}
+\showcolour{緋紅}
+\showcolour{胭脂}
+\showcolour{朱紅}
+\showcolour{丹}
+\showcolour{彤}
+\showcolour{茜色}
+\showcolour{火紅}
+\showcolour{赫赤}
+\showcolour{嫣紅}
+\showcolour{洋紅}
+\showcolour{炎}
+\showcolour{赤}
+\showcolour{綰}
+\showcolour{棗紅}
+\showcolour{檀}
+\showcolour{殷紅}
+\showcolour{酡紅}
+\showcolour{酡顏}
+\showcolour{鵝黃}
+\showcolour{鴨黃}
+\showcolour{櫻草色}
+\showcolour{杏黃}
+\showcolour{杏紅}
+\showcolour{橘黃}
+\showcolour{橙黃}
+\showcolour{橘紅}
+\showcolour{姜黄}
+\showcolour{緗色}
+\showcolour{橙色}
+\showcolour{茶色}
+\showcolour{駝色}
+\showcolour{昏黃}
+\showcolour{栗色}
+\showcolour{椶色}
+\showcolour{椶綠}
+\showcolour{椶黑}
+\showcolour{椶紅}
+\showcolour{椶黃}
+\showcolour{赭色}
+\showcolour{琥珀}
+\showcolour{褐色}
+\showcolour{枯黃}
+\showcolour{黃櫨}
+\showcolour{秋色}
+\showcolour{秋香色}
+\showcolour{嫩綠}
+\showcolour{柳黃}
+\showcolour{柳綠}
+\showcolour{竹青}
+\showcolour{蔥黃}
+\showcolour{蔥綠}
+\showcolour{蔥青}
+\showcolour{青蔥}
+\showcolour{油綠}
+\showcolour{綠沉}
+\showcolour{碧色}
+\showcolour{碧綠}
+\showcolour{青碧}
+\showcolour{翡翠色}
+\showcolour{草綠}
+\showcolour{青色}
+\showcolour{青翠}
+\showcolour{青白}
+\showcolour{鴨卵青}
+\showcolour{蟹殼青}
+\showcolour{鴉青}
+\showcolour{綠色}
+\showcolour{豆綠}
+\showcolour{豆青}
+\showcolour{石青}
+\showcolour{玉色}
+\showcolour{縹}
+\showcolour{艾綠}
+\showcolour{松柏綠}
+\showcolour{松花綠}
+\showcolour{松花色}
+\showcolour{藍}
+\showcolour{靛青}
+\showcolour{靛藍}
+\showcolour{碧藍}
+\showcolour{蔚藍}
+\showcolour{寶藍}
+\showcolour{藍灰色}
+\showcolour{藏青}
+\showcolour{藏藍}
+\showcolour{黛}
+\showcolour{黛綠}
+\showcolour{黛藍}
+\showcolour{黛紫}
+\showcolour{紫色}
+\showcolour{紫醬}
+\showcolour{醬紫}
+\showcolour{紫檀}
+\showcolour{紺青}
+\showcolour{紫棠}
+\showcolour{青蓮}
+\showcolour{群青}
+\showcolour{雪青}
+\showcolour{丁香色}
+\showcolour{藕色}
+\showcolour{藕荷色}
+\showcolour{蒼色}
+\showcolour{蒼黃}
+\showcolour{蒼青}
+\showcolour{蒼黑}
+\showcolour{蒼白}
+\showcolour{水色}
+\showcolour{水紅}
+\showcolour{水綠}
+\showcolour{水藍}
+\showcolour{淡青}
+\showcolour{湖藍}
+\showcolour{湖綠}
+\showcolour{精白}
+\showcolour{象牙白}
+\showcolour{雪白}
+\showcolour{月白}
+\showcolour{縞}
+\showcolour{素}
+\showcolour{荼白}
+\showcolour{霜色}
+\showcolour{花白}
+\showcolour{魚肚白}
+\showcolour{瑩白}
+\showcolour{灰色}
+\showcolour{牙色}
+\showcolour{鉛白}
+\showcolour{玄色}
+\showcolour{玄青}
+\showcolour{烏色}
+\showcolour{烏黑}
+\showcolour{漆黑}
+\showcolour{墨色}
+\showcolour{墨灰}
+\showcolour{黑色}
+\showcolour{緇色}
+\showcolour{煤黑}
+\showcolour{黧}
+\showcolour{黎}
+\showcolour{黝}
+\showcolour{黝黑}
+\showcolour{黯}
+\showcolour{赤金}
+\showcolour{金色}
+\showcolour{銀白}
+\showcolour{銅綠}
+\showcolour{烏金}
+\showcolour{老銀}
+\showcolour{正青}
+\showcolour{正赤}
+\showcolour{正黃}
+\end{RaggedRight}
 
 \endgroup
 
@@ -686,7 +867,7 @@
 
 \bigskip
 
-\begin{tcblisting}{listing side comment,title={使用范例},pdf comment={XiaoShanSample.pdf}}
+\begin{tcblisting}{listing side comment,title={使用范例},pdf comment={xiaoshan-sample.pdf}}
 \documentclass{ctexbeamer}
 
 \usetheme{Xiaoshan}
@@ -714,4 +895,69 @@
 \end{document}
 \end{tcblisting}
 
+
+\clearpage
+
+\section{神马浮云 Beamer 主题 Heavenly Clouds Beamer Theme \texttt{beamerthemeHeavenlyClouds.sty}}
+
+这个Beamer主题是我一次病中摸鱼摸出来的，脑洞略大。每一页的背景的云彩纹样，位置、大小、深浅都是随机的，所以如果内容页数比较多，编译时运算可能会比较花时间，请自行斟酌使用此主题。
+
+\bigskip
+
+\begin{tcblisting}{listing side comment,title={使用范例},pdf comment={heavenlyclouds-sample.pdf}}
+\documentclass{ctexbeamer}
+\usetheme{HeavenlyClouds}
+
+\author{林莲枝}
+\title{神马浮云\\Beamer主题}
+\subtitle{\texttt{pgfornament-han}附录福利}
+
+\begin{document}
+
+\begin{frame}[noframenumbering]
+  \maketitle
+\end{frame}
+
+\section{简介一}
+
+\begin{frame}[fragile,allowframebreaks]
+  \frametitle{此主题脑洞略大}
+  ...
+\end{frame}
+...
+\end{document}
+\end{tcblisting}
+
+一些注意事项：
+\begin{itemize}
+  \item Mac 或 Linux 系统上，\texttt{ctex}是不提供隶书\mintinline{latex}{\lishu}的，请自己设定。例：
+
+  \mintinline{latex}{\providecommand{\lishu}{\CJKfontspec{Libian SC}[BoldFont=Baoli SC,Scale=1.2]}}
+
+  \item 标题页的寿字纹，可以用各自高校的标志代替。中国高校校徽很多都是圆形的。确保一下背景是透明色的 png 或 pdf 档就可以了。
+
+  \mintinline{latex}{\titlegraphic{\includegraphics[width=2cm]{logo}}}
+
+
+  \item 也可以在导言区加一句 \mintinline{latex}{\alttitlecircle}，会得到另一种标题页的装饰纹样。效果如下：
+
+  \begin{tikzpicture}%[transform shape,scale=0.5]
+    \newbox{\circleelem}%
+    \savebox{\circleelem}{%
+      \tikzset{pgfornamentstyle/.style={transform shape}}%
+      \pgfornamenthan[width=0.5236cm,
+         color=殷红!80!black,
+         symmetry=h]{74}%
+    }
+    \begin{scope}[decoration={markings, mark=between positions 0 and 1 step 0.5236cm
+    with { \node[transform shape,inner sep=0pt,outer sep=0pt]{\usebox{\circleelem}}; }} ]
+    \path [postaction={decorate}] circle (1cm);
+    \end{scope}%
+    \node {\pgfornamenthan[width=1.25cm,color=殷红]{56}};
+  \end{tikzpicture} \emph{效果有可能有点狂，请视场合斟酌使用。}
+
+
+\end{itemize}
+
+
 \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
new file mode 100644
index 00000000000..ac737ddbbbe
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.pdf
diff --git a/Master/texmf-dist/doc/latex/pgfornament-han/XiaoshanSample.tex b/Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.tex
index ae40a97587b..ae40a97587b 100644
--- a/Master/texmf-dist/doc/latex/pgfornament-han/XiaoshanSample.tex
+++ b/Master/texmf-dist/doc/latex/pgfornament-han/xiaoshan-sample.tex
diff --git a/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeHeavenlyClouds.sty b/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeHeavenlyClouds.sty
new file mode 100644
index 00000000000..c3e38553b7e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/pgfornament-han/beamerthemeHeavenlyClouds.sty
@@ -0,0 +1,183 @@
+% beamerthemeHeavenlyClouds.sty v1.0 2018/05/15
+% by LianTze Lim (liantze@gmail.com)
+\ProvidesPackage{beamerthemeHeavenlyClouds}
+
+\RequirePackage{cncolours}
+\RequirePackage{pgfornament-han}
+\RequirePackage{tikz}
+\usetikzlibrary{decorations,decorations.markings}
+\RequirePackage{calc}
+
+\setbeamercolor{structure}{fg=殷红}
+\setbeamercolor{headline}{fg=殷红}
+\setbeamercolor{page number in head/foot}{fg=殷红}
+\setbeamercolor{normal text}{bg=牙色}
+\setbeamercolor{alerted text}{fg=紫棠}
+\setbeamercolor{example text}{fg=松花绿}
+% \setbeamercolor{section name}{fg=structure!80!black}
+\setbeamerfont{section name}{size=\Huge,family=\lishu}
+\setbeamerfont{section title}{size=\Huge,family=\lishu}
+\setbeamerfont{section in toc}{family=\lishu}
+
+\usefonttheme[stillsansserifsmall]{serif}
+
+\renewcommand{\CJKrmdefault}{zhfs}
+
+\setbeamerfont{frametitle}{shape=\itshape,family=\lishu,series=\bfseries,size=\LARGE}
+% \setbeamercolor{frametitle}{fg=茜色}
+
+\setbeamerfont{title}{family=\lishu,series=\bfseries,size=\huge}
+
+\setbeamertemplate{itemize items}{$\diamond$}
+\setbeamertemplate{navigation symbols}{}
+\setbeamertemplate{frametitle continuation}[from second]
+
+\newif\if@clouds@alttitlecircle
+\newcommand{\alttitlecircle}{%
+  \@clouds@alttitlecircletrue%
+}
+
+\preto{\maketitle}{%
+  \def\title@circle@rotate{45}%
+  \def\title@circle@symmetry{none}%
+  \if@clouds@alttitlecircle
+    \def\title@circle@rotate{0}%
+    \def\title@circle@symmetry{h}%
+  \fi%
+  \newbox{\clouds@title@circle@elem}%
+  \savebox{\clouds@title@circle@elem}{%
+    \tikzset{pgfornamentstyle/.style={transform shape,rotate=\title@circle@rotate}}%
+    \usebeamercolor{headline}%
+    \pgfornamenthan[width=1.0471cm,
+       color=headline.fg!80!black,
+       symmetry=\title@circle@symmetry]{74}%
+  }
+  \begin{minipage}{4cm}
+  \begin{tikzpicture}
+    \begin{scope}[decoration={markings, mark=between positions 0 and 1 step 1.0471cm
+    with { \node[transform shape,inner sep=0pt,outer sep=0pt]{\usebox{\clouds@title@circle@elem}}; }} ]
+    \path [postaction={decorate}] circle (2cm);
+    \end{scope}%
+    \node {\inserttitlegraphic};
+  \end{tikzpicture}%
+  \end{minipage}%
+  \hfill\titlegraphic{}
+  \begin{minipage}{\dimexpr\textwidth-5cm}
+}
+\appto{\maketitle}{\end{minipage}}
+
+
+% \setbeamerfont{block title}{series=\centering}
+% \addtobeamertemplate{block alerted begin}{}{\centering}
+% \addtobeamertemplate{block example begin}{}{\centering}
+\addtobeamertemplate{block begin}{
+  \preto{\insertblocktitle}{\raisebox{0.75ex}{\pgfornamenthan[width=1em]{44}\space}}
+  % \appto{\insertblocktitle}{\raisebox{0.5ex}{\space\pgfornamenthan[width=1em]{44}}}
+}{}
+
+\addtobeamertemplate{block alerted begin}{
+  \preto{\insertblocktitle}{\raisebox{0.75ex}{\pgfornamenthan[width=1em]{44}\space}}
+  % \appto{\insertblocktitle}{\raisebox{0.5ex}{\space\pgfornamenthan[width=1em]{44}}}
+}{}
+
+\addtobeamertemplate{block example begin}{
+  \preto{\insertblocktitle}{\raisebox{0.75ex}{\pgfornamenthan[width=1em]{44}\space}}
+  % \appto{\insertblocktitle}{\raisebox{0.5ex}{\space\pgfornamenthan[width=1em]{44}}}
+}{}
+
+\newlength{\clouds@frametitle@rawwidth}%
+\newlength{\clouds@frametitle@actualwidth}%
+\AtBeginDocument{%
+  \newbox{\clouds@title@deco}
+  \savebox{\clouds@title@deco}{%
+    \usebeamercolor{headline}%
+    \pgfornamenthan[width=3.5em,color=headline.fg]{70}%
+  }
+  \setbeamertemplate{frametitle}{%
+    \settowidth{\clouds@frametitle@rawwidth}{\insertframetitle}%
+    \pgfmathsetlength{\clouds@frametitle@actualwidth}{max(\clouds@frametitle@rawwidth,\textwidth)}
+    \vskip.25em\centering%
+    \usebeamerfont{frametitle}\usebeamercolor{frametitle}%
+    \begin{minipage}{\clouds@frametitle@actualwidth}%
+      \raisebox{0.5ex}{\reflectbox{\usebox{\clouds@title@deco}}}\hfill%
+      \parbox{\dimexpr\clouds@frametitle@actualwidth-5em}{\centering\insertframetitle}%
+      \hfill\raisebox{0.5ex}{\usebox{\clouds@title@deco}}%
+    \end{minipage}\par%
+  }
+
+  \newbox{\clouds@smallhuiwen}
+  \savebox{\clouds@smallhuiwen}{\usebeamerfont{headline}\usebeamercolor{headline}\pgfornamenthan[width=2.5em,color=headline.fg]{39}}
+  \setbeamertemplate{headline}{%
+  \tikzset{every node/.append style={inner xsep=0pt}}%
+  \begin{tikzpicture}[decoration={markings, mark=between positions 0 and 1 step 2.5em
+    with { \node[transform shape]{\usebox{\clouds@smallhuiwen}}; }} ]
+  \path [postaction={decorate}] (0,0) -- (\paperwidth,0);
+  \end{tikzpicture}
+  }
+
+  \newlength{\clouds@progressinheadfoot}
+  \setbeamertemplate{footline}{%
+  \tikzset{every node/.append style={inner xsep=0pt}}%
+  \setlength{\clouds@progressinheadfoot}{%
+    \paperwidth * \ratio{\insertframenumber pt}{\inserttotalframenumber pt} - 1.25em%
+  }
+  \begin{tikzpicture}[decoration={markings, mark=between positions 0 and 1 step 2.5em
+    with { \node[transform shape]{\usebox{\clouds@smallhuiwen}}; }} ]
+  \path [postaction={decorate}] (0,0) -- (\paperwidth,0);
+  \draw[headline.fg!50,line width=0.6pt] (-1.25em,1.25em) -- (\paperwidth,1.25em);
+  \clip (-1.25em,2em) rectangle (\paperwidth,0pt);
+  \fill[headline.fg] (\clouds@progressinheadfoot,1.25em) circle (2pt);
+  \end{tikzpicture}
+  }
+}
+
+\AtBeginSection{\begin{frame}\sectionpage\end{frame}}
+\renewcommand{\thesection}{\chinese{section}}
+\setbeamertemplate{section page}{
+\usebeamercolor{section title}\usebeamercolor{section name}
+\newbox{\clouds@section@circle@elem}
+\savebox{\clouds@section@circle@elem}{%
+  \usebeamercolor{headline}%
+  \pgfornamenthan[width=1.0471cm,color=headline.fg!80!black]{59}%
+}
+\newlength{\cloud@secname@height}
+\settototalheight{\cloud@secname@height}{\usebeamerfont{section name}节}
+\begin{tikzpicture}
+  \begin{scope}[decoration={markings, mark=between positions 0 and 1 step 1.0471cm
+  with { \node[transform shape,inner sep=0pt,outer sep=0pt,draw=none]{\usebox{\clouds@section@circle@elem}}; }} ]
+  \path [postaction={decorate}] circle (1.5cm);
+  \end{scope}%
+  \node[anchor=center,text height=\cloud@secname@height,text=section name.fg,font=\usebeamerfont{section name}] {\thesection};
+  \node[anchor=west,text=section title.fg,font=\usebeamerfont{section title},
+  text width=\dimexpr\textwidth-5cm\relax] at (2.5cm,0) {\insertsection};
+\end{tikzpicture}
+}
+
+\RequirePackage{pgfmath}
+\newcommand{\randorn}[1]{%
+  \pgfmathsetmacro{\myscale}{(rnd * 0.4 + 0.1)}
+  \pgfmathsetmacro{\myintensity}{rnd * 20 + 65}
+  \pgfmathsetmacro{\mychoice}{int (ifthenelse(rand > 0, 1, -1)}
+  % \pgfmathparse{int(rand)}
+  \ifnum\mychoice > 0\relax
+    \def\myflip{v}
+  \else
+    \def\myflip{none}
+  \fi
+  \pgfmathsetmacro{\myx}{rnd * 0.8}
+  \pgfmathsetmacro{\myy}{rnd * 0.8}
+  \pgfmathtruncatemacro{\myorn}{random(0,1) + #1}
+  \node at (\myx * \paperwidth, \myy * \paperheight) {\pgfornamenthan[
+  color=normal text.bg!\myintensity!white,symmetry=\myflip,scale=\myscale]{\myorn}};
+}
+\setbeamertemplate{background}{%
+\begin{tikzpicture}
+  \clip (0,0) rectangle (\paperwidth,\paperheight);
+  \randorn{66}\randorn{68}\randorn{66}\randorn{70}\randorn{68}
+\end{tikzpicture}
+}
+
+%% 默认寿字纹图案
+\titlegraphic{\usebeamercolor{headline}\pgfornamenthan[width=2.5cm,color=headline.fg]{56}}
+
+\endinput
diff --git a/Master/texmf-dist/tex/latex/pgfornament-han/cncolours.sty b/Master/texmf-dist/tex/latex/pgfornament-han/cncolours.sty
index efc79a6a00c..c0e66e8caba 100644
--- a/Master/texmf-dist/tex/latex/pgfornament-han/cncolours.sty
+++ b/Master/texmf-dist/tex/latex/pgfornament-han/cncolours.sty
@@ -1,153 +1,243 @@
 % Extracted from http://ylbook.com/cms/web/chuantongsecai/chuantongsecai.htm
 % by LianTze Lim (liantze@gmail.com), 27 December 2015
-\ProvidesPackage{cncolours}
+% v1.1 Updated 7 May 2018: 端憲 @heangfat 新增三正色並加傳統字色名
+\ProvidesPackage{cncolours}[2018/07/05 v1.1 Chinese colour names]
 \RequirePackage{xcolor}
 \definecolor{粉红}{RGB}{255,179,167}
+\definecolor{粉紅}{RGB}{255,179,167}
 \definecolor{妃色}{RGB}{237,87,54}
 \definecolor{品红}{RGB}{240,0,86}
+\definecolor{品紅}{RGB}{240,0,86}
 \definecolor{桃红}{RGB}{244,121,131}
+\definecolor{桃紅}{RGB}{244,121,131}
 \definecolor{海棠红}{RGB}{219,90,107}
+\definecolor{海棠紅}{RGB}{219,90,107}
 \definecolor{石榴红}{RGB}{242,12,0}
+\definecolor{石榴紅}{RGB}{242,12,0}
 \definecolor{樱桃色}{RGB}{201,55,86}
+\definecolor{櫻桃色}{RGB}{201,55,86}
 \definecolor{银红}{RGB}{240,86,84}
+\definecolor{銀紅}{RGB}{240,86,84}
 \definecolor{大红}{RGB}{255,33,33}
+\definecolor{大紅}{RGB}{255,33,33}
 \definecolor{绛紫}{RGB}{140,67,86}
+\definecolor{絳紫}{RGB}{140,67,86}
 \definecolor{绯红}{RGB}{200,60,35}
+\definecolor{緋紅}{RGB}{200,60,35}
 \definecolor{胭脂}{RGB}{157,41,51}
 \definecolor{朱红}{RGB}{255,76,0}
+\definecolor{朱紅}{RGB}{255,76,0}
 \definecolor{丹}{RGB}{255,78,32}
 \definecolor{彤}{RGB}{243,83,54}
 \definecolor{茜色}{RGB}{203,58,86}
 \definecolor{火红}{RGB}{255,45,81}
+\definecolor{火紅}{RGB}{255,45,81}
 \definecolor{赫赤}{RGB}{201,31,55}
 \definecolor{嫣红}{RGB}{239,122,130}
+\definecolor{嫣紅}{RGB}{239,122,130}
 \definecolor{洋红}{RGB}{255,0,151}
+\definecolor{洋紅}{RGB}{255,0,151}
 \definecolor{炎}{RGB}{255,51,0}
 \definecolor{赤}{RGB}{195,39,43}
 \definecolor{绾}{RGB}{169,129,117}
+\definecolor{綰}{RGB}{169,129,117}
 \definecolor{枣红}{RGB}{195,33,54}
+\definecolor{棗紅}{RGB}{195,33,54}
 \definecolor{檀}{RGB}{179,109,97}
 \definecolor{殷红}{RGB}{190,0,47}
+\definecolor{殷紅}{RGB}{190,0,47}
 \definecolor{酡红}{RGB}{220,48,35}
+\definecolor{酡紅}{RGB}{220,48,35}
 \definecolor{酡颜}{RGB}{249,144,111}
+\definecolor{酡顏}{RGB}{249,144,111}
 \definecolor{鹅黄}{RGB}{255,241,67}
+\definecolor{鵝黃}{RGB}{255,241,67}
 \definecolor{鸭黄}{RGB}{250,255,114}
+\definecolor{鴨黃}{RGB}{250,255,114}
 \definecolor{樱草色}{RGB}{234,255,86}
+\definecolor{櫻草色}{RGB}{234,255,86}
 \definecolor{杏黄}{RGB}{255,166,49}
+\definecolor{杏黃}{RGB}{255,166,49}
 \definecolor{杏红}{RGB}{255,140,49}
+\definecolor{杏紅}{RGB}{255,140,49}
 \definecolor{橘黄}{RGB}{255,137,54}
+\definecolor{橘黃}{RGB}{255,137,54}
 \definecolor{橙黄}{RGB}{255,164,0}
+\definecolor{橙黃}{RGB}{255,164,0}
 \definecolor{橘红}{RGB}{255,117,0}
+\definecolor{橘紅}{RGB}{255,117,0}
 \definecolor{姜黄}{RGB}{255,199,115}
+% 姜黃、薑黃是兩種植物。未審此指何種，闕之.
 \definecolor{缃色}{RGB}{240,194,57}
+\definecolor{緗色}{RGB}{240,194,57}
 \definecolor{橙色}{RGB}{250,140,53}
 \definecolor{茶色}{RGB}{179,92,68}
 \definecolor{驼色}{RGB}{168,132,98}
+\definecolor{駝色}{RGB}{168,132,98}
 \definecolor{昏黄}{RGB}{200,155,64}
+\definecolor{昏黃}{RGB}{200,155,64}
 \definecolor{栗色}{RGB}{96,40,30}
 \definecolor{棕色}{RGB}{178,93,37}
+\definecolor{椶色}{RGB}{178,93,37}
 \definecolor{棕绿}{RGB}{130,113,0}
+\definecolor{椶綠}{RGB}{130,113,0}
 \definecolor{棕黑}{RGB}{124,75,0}
+\definecolor{椶黑}{RGB}{124,75,0}
 \definecolor{棕红}{RGB}{155,68,0}
+\definecolor{椶紅}{RGB}{155,68,0}
 \definecolor{棕黄}{RGB}{174,112,0}
+\definecolor{椶黃}{RGB}{174,112,0}
 \definecolor{赭色}{RGB}{149,85,57}
 \definecolor{琥珀}{RGB}{202,105,36}
 \definecolor{褐色}{RGB}{110,81,30}
 \definecolor{枯黄}{RGB}{211,177,125}
+\definecolor{枯黃}{RGB}{211,177,125}
 \definecolor{黄栌}{RGB}{226,156,69}
+\definecolor{黃櫨}{RGB}{226,156,69}
 \definecolor{秋色}{RGB}{137,108,57}
 \definecolor{秋香色}{RGB}{217,182,17}
 \definecolor{嫩绿}{RGB}{189,221,34}
+\definecolor{嫩綠}{RGB}{189,221,34}
 \definecolor{柳黄}{RGB}{201,221,34}
+\definecolor{柳黃}{RGB}{201,221,34}
 \definecolor{柳绿}{RGB}{175,221,34}
+\definecolor{柳綠}{RGB}{175,221,34}
 \definecolor{竹青}{RGB}{120,146,98}
 \definecolor{葱黄}{RGB}{163,217,0}
+\definecolor{蔥黃}{RGB}{163,217,0}
 \definecolor{葱绿}{RGB}{158,217,0}
+\definecolor{蔥綠}{RGB}{158,217,0}
 \definecolor{葱青}{RGB}{14,184,58}
+\definecolor{蔥青}{RGB}{14,184,58}
 \definecolor{青葱}{RGB}{10,163,68}
+\definecolor{青蔥}{RGB}{10,163,68}
 \definecolor{油绿}{RGB}{0,188,18}
+\definecolor{油綠}{RGB}{0,188,18}
 \definecolor{绿沉}{RGB}{12,137,24}
+\definecolor{綠沉}{RGB}{12,137,24}
 \definecolor{碧色}{RGB}{27,209,165}
 \definecolor{碧绿}{RGB}{42,221,156}
+\definecolor{碧綠}{RGB}{42,221,156}
 \definecolor{青碧}{RGB}{72,192,163}
 \definecolor{翡翠色}{RGB}{61,225,173}
 \definecolor{草绿}{RGB}{64,222,90}
+\definecolor{草綠}{RGB}{64,222,90}
 \definecolor{青色}{RGB}{0,224,158}
 \definecolor{青翠}{RGB}{0,224,121}
 \definecolor{青白}{RGB}{192,235,215}
 \definecolor{鸭卵青}{RGB}{224,238,232}
+\definecolor{鴨卵青}{RGB}{224,238,232}
 \definecolor{蟹壳青}{RGB}{187,205,197}
+\definecolor{蟹殼青}{RGB}{187,205,197}
 \definecolor{鸦青}{RGB}{66,76,80}
+\definecolor{鴉青}{RGB}{66,76,80}
 \definecolor{绿色}{RGB}{0,229,0}
+\definecolor{綠色}{RGB}{0,229,0}
 \definecolor{豆绿}{RGB}{158,208,72}
+\definecolor{豆綠}{RGB}{158,208,72}
 \definecolor{豆青}{RGB}{150,206,84}
 \definecolor{石青}{RGB}{123,207,166}
 \definecolor{玉色}{RGB}{46,223,163}
 \definecolor{缥}{RGB}{127,236,173}
+\definecolor{縹}{RGB}{127,236,173}
 \definecolor{艾绿}{RGB}{164,226,198}
+\definecolor{艾綠}{RGB}{164,226,198}
 \definecolor{松柏绿}{RGB}{33,166,117}
+\definecolor{松柏綠}{RGB}{33,166,117}
 \definecolor{松花绿}{RGB}{5,119,72}
+\definecolor{松花綠}{RGB}{5,119,72}
 \definecolor{松花色}{RGB}{5,119,72}
 \definecolor{蓝}{RGB}{68,206,246}
+\definecolor{藍}{RGB}{68,206,246}
 \definecolor{靛青}{RGB}{23,124,176}
 \definecolor{靛蓝}{RGB}{6,82,121}
+\definecolor{靛藍}{RGB}{6,82,121}
 \definecolor{碧蓝}{RGB}{62,237,231}
+\definecolor{碧藍}{RGB}{62,237,231}
 \definecolor{蔚蓝}{RGB}{112,243,255}
+\definecolor{蔚藍}{RGB}{112,243,255}
 \definecolor{宝蓝}{RGB}{75,92,196}
+\definecolor{寶藍}{RGB}{75,92,196}
 \definecolor{蓝灰色}{RGB}{161,175,201}
+\definecolor{藍灰色}{RGB}{161,175,201}
 \definecolor{藏青}{RGB}{46,78,126}
 \definecolor{藏蓝}{RGB}{59,46,126}
+\definecolor{藏藍}{RGB}{59,46,126}
 \definecolor{黛}{RGB}{74,66,102}
+\definecolor{黱}{RGB}{74,66,102}
 \definecolor{黛绿}{RGB}{66,102,102}
+\definecolor{黛綠}{RGB}{66,102,102}
 \definecolor{黛蓝}{RGB}{66,80,102}
+\definecolor{黛藍}{RGB}{66,80,102}
 \definecolor{黛紫}{RGB}{87,66,102}
 \definecolor{紫色}{RGB}{141,75,187}
 \definecolor{紫酱}{RGB}{129,84,99}
+\definecolor{紫醬}{RGB}{129,84,99}
 \definecolor{酱紫}{RGB}{129,84,118}
+\definecolor{醬紫}{RGB}{129,84,118}
 \definecolor{紫檀}{RGB}{76,34,27}
 \definecolor{绀青}{RGB}{0,51,113}
+\definecolor{紺青}{RGB}{0,51,113}
 \definecolor{紫棠}{RGB}{86,0,79}
 \definecolor{青莲}{RGB}{128,29,174}
+\definecolor{青蓮}{RGB}{128,29,174}
 \definecolor{群青}{RGB}{76,141,174}
 \definecolor{雪青}{RGB}{176,164,227}
 \definecolor{丁香色}{RGB}{204,164,227}
 \definecolor{藕色}{RGB}{237,209,216}
 \definecolor{藕荷色}{RGB}{228,198,208}
 \definecolor{苍色}{RGB}{117,135,138}
+\definecolor{蒼色}{RGB}{117,135,138}
 \definecolor{苍黄}{RGB}{81,154,115}
+\definecolor{蒼黃}{RGB}{81,154,115}
 \definecolor{苍青}{RGB}{162,155,124}
+\definecolor{蒼青}{RGB}{162,155,124}
 \definecolor{苍黑}{RGB}{115,151,171}
+\definecolor{蒼黑}{RGB}{115,151,171}
 \definecolor{苍白}{RGB}{209,217,224}
+\definecolor{蒼白}{RGB}{209,217,224}
 \definecolor{水色}{RGB}{136,173,166}
 \definecolor{水红}{RGB}{243,211,231}
+\definecolor{水紅}{RGB}{243,211,231}
 \definecolor{水绿}{RGB}{212,242,231}
+\definecolor{水綠}{RGB}{212,242,231}
 \definecolor{水蓝}{RGB}{210,240,244}
+\definecolor{水藍}{RGB}{210,240,244}
 \definecolor{淡青}{RGB}{211,224,243}
 \definecolor{湖蓝}{RGB}{48,223,243}
+\definecolor{湖藍}{RGB}{48,223,243}
 \definecolor{湖绿}{RGB}{37,248,203}
+\definecolor{湖綠}{RGB}{37,248,203}
 \definecolor{精白}{RGB}{255,255,255}
 \definecolor{象牙白}{RGB}{255,251,240}
 \definecolor{雪白}{RGB}{240,252,255}
 \definecolor{月白}{RGB}{214,236,240}
 \definecolor{缟}{RGB}{242,236,222}
+\definecolor{縞}{RGB}{242,236,222}
 \definecolor{素}{RGB}{224,240,233}
 \definecolor{荼白}{RGB}{243,249,241}
 \definecolor{霜色}{RGB}{233,241,246}
 \definecolor{花白}{RGB}{194,204,208}
 \definecolor{鱼肚白}{RGB}{252,239,232}
+\definecolor{魚肚白}{RGB}{252,239,232}
 \definecolor{莹白}{RGB}{227,239,253}
+\definecolor{瑩白}{RGB}{227,239,253}
 \definecolor{灰色}{RGB}{128,128,128}
 \definecolor{牙色}{RGB}{238,222,176}
 \definecolor{铅白}{RGB}{240,240,244}
+\definecolor{鉛白}{RGB}{240,240,244}
 \definecolor{玄色}{RGB}{98,42,29}
 \definecolor{玄青}{RGB}{61,59,79}
 \definecolor{乌色}{RGB}{114,94,130}
+\definecolor{烏色}{RGB}{114,94,130}
 \definecolor{乌黑}{RGB}{57,47,65}
+\definecolor{烏黑}{RGB}{57,47,65}
 \definecolor{漆黑}{RGB}{22,24,35}
 \definecolor{墨色}{RGB}{80,97,109}
 \definecolor{墨灰}{RGB}{117,138,153}
 \definecolor{黑色}{RGB}{0,0,0}
 \definecolor{缁色}{RGB}{73,49,49}
+\definecolor{緇色}{RGB}{73,49,49}
 \definecolor{煤黑}{RGB}{49,37,32}
 \definecolor{黧}{RGB}{93,81,60}
 \definecolor{黎}{RGB}{117,102,77}
@@ -157,6 +247,15 @@
 \definecolor{赤金}{RGB}{242,190,69}
 \definecolor{金色}{RGB}{234,205,118}
 \definecolor{银白}{RGB}{233,231,239}
+\definecolor{銀白}{RGB}{233,231,239}
 \definecolor{铜绿}{RGB}{84,150,136}
+\definecolor{銅綠}{RGB}{84,150,136}
 \definecolor{乌金}{RGB}{167,142,68}
+\definecolor{烏金}{RGB}{167,142,68}
 \definecolor{老银}{RGB}{186,202,198}
+\definecolor{老銀}{RGB}{186,202,198}
+% 以下增補，出處肖世孟《先秦色彩研究》:
+\definecolor{正青}{RGB}{16.27, 51.37, 147.9}%{Hsb}{224, 89, 58}
+\definecolor{正赤}{RGB}{153, 22.95, 33.79}%{Hsb}{335, 85, 60}
+\definecolor{正黄}{RGB}{221.85, 149.45, 24.4}%{Hsb}{38, 89, 87}
+\definecolor{正黃}{RGB}{221.85, 149.45, 24.4}%{Hsb}{38, 89, 87}