update eisvogel

dwev/.gitignore

@@ -1,6 +1,6 @@
 /*.pdf
 /*_files
-
+/figure/
 
 
 

dwev/_extensions/drwater/dwev/eisvogel.tex

@@ -83,6 +83,7 @@ $if(background-image)$
 \pgfdeclareimage[width=\paperwidth,height=\paperheight]{background}{$background-image$}
 \usebackgroundtemplate{\pgfuseimage{background}}
 $endif$
+
 \usepackage{pgfpages}
 \setbeamertemplate{caption}[numbered]
 \setbeamertemplate{caption label separator}{: }
@@ -364,9 +365,6 @@ $endif$
 
 % 为中文添加支持 by Ming Su
 $if(CJK)$
-\usepackage[fallback]{xeCJK}
-\setCJKmainfont{Noto Serif CJK SC}[BoldFont=NotoSerifCJKsc-Bold, ItalicFont=NotoSansCJKsc-Light]
-\setCJKfallbackfamilyfont{rm}{Noto Serif CJK SC}
 $if(book)$
 \usepackage{ctex} %调用中文字体宏包
 \usepackage{indentfirst} %调用首行缩进宏包
@@ -801,6 +799,10 @@ $endif$
   $endif$
 \fi
 
+
+% setup for chinese font, by Ming
+\setCJKmainfont{$CJKmainfont$}[BoldFont=$CJKboldfont$, ItalicFont=$CJKitalicfont$]
+
 %
 % heading color
 %
@@ -1050,7 +1052,7 @@ $if(titlepage)$
 $if(titlepage-background)$
 \newgeometry{top=2cm, right=4cm, bottom=3cm, left=4cm}
 $else$
-\newgeometry{left=6cm}
+\newgeometry{left=2cm}
 $endif$
 $if(titlepage-color)$
 \definecolor{titlepage-color}{HTML}{$titlepage-color$}
@@ -1060,7 +1062,12 @@ $if(titlepage-background)$
 \tikz[remember picture,overlay] \node[inner sep=0pt] at (current page.center){\includegraphics[width=\paperwidth,height=\paperheight]{$titlepage-background$}};
 $endif$
 \newcommand{\colorRule}[3][black]{\textcolor[HTML]{#1}{\rule{#2}{#3}}}
-\begin{flushleft}
+
+\NewDocumentEnvironment{dynalign}{}
+  {\begin{$if(titlepage-halign)$$titlepage-halign$$else$center$endif$}}
+  {\end{$if(titlepage-halign)$$titlepage-halign$$else$center$endif$}}
+
+\begin{dynalign}
 \noindent
 \\[-1em]
 \color[HTML]{$if(titlepage-text-color)$$titlepage-text-color$$else$5F5F5F$endif$}
@@ -1068,6 +1075,12 @@ $endif$
 \par
 \noindent
 
+$if(titlepage-logo)$
+\noindent
+\vskip $if(logo-vskip)$$logo-vskip$$else$-8em$endif$
+\hskip $if(logo-hskip)$$logo-hskip$$else$-6em$endif$
+\includegraphics[width=$if(logo-width)$$logo-width$$else$35mm$endif$, left]{$titlepage-logo$}
+$endif$
 
 $if(titlepage-background)$
 % The titlepage with a background image has other text spacing and text size
@@ -1114,41 +1127,67 @@ $if(titlepage-background)$
   $if(date-vskip)$
   \vskip $date-vskip$
   $endif$
-
-\textsf{$date$}}
+{\textsf{$if(institute)$$institute$\vskip 0.6em$endif$$date$}}
+}
   \vfill
 }
 $else$
 {
   \setstretch{1.4}
   \vfill
+  \vskip 8em
+  $if(title-vskip)$
+  \vskip $title-vskip$
+  $endif$
+  $if(title-hskip)$
+  \vskip $title-hskip$
+  $endif$
   \noindent {\huge \textbf{\textsf{$title$}}}
   $if(subtitle)$
   \vskip 1em
   {\Large \textsf{$subtitle$}}
   $endif$
-  \vskip 2em
-  \noindent {\Large \textsf{$for(author)$$author$$sep$, $endfor$}}
+  \vskip 4em
+  $if(author-vskip)$
+  \vskip $author-vskip$
+  $endif$
+  \noindent {
+  $if(author-size)$
+  $author-size$
+  $else$
+  \Large
+  $endif$
+
+\textsf{$for(author)$$author$$sep$, $endfor$} 
+\vskip 0.6em
+  $if(date-vskip)$
+  \vskip $date-vskip$
+  $endif$
+}
   \vfill
 }
 $endif$
 
-$if(titlepage-logo)$
-\noindent
-\includegraphics[width=$if(logo-width)$$logo-width$$else$35mm$endif$, left]{$titlepage-logo$}
-$endif$
 
 $if(titlepage-background)$
 $else$
-\textsf{$date$}
+
+  $if(author-size)$
+  $author-size$
+  $else$
+  \Large
+  $endif$
+{\textsf{$if(institute)$$institute$\vskip 0.6em$endif$$date$}}
 $endif$
-\end{flushleft}
+\end{dynalign}
 \end{titlepage}
 \restoregeometry
 \pagenumbering{arabic}
 $endif$
 $endif$
 
+
+
 %%
 %% end titlepage
 %%

dwev/bookcn.qmd

@@ -1,6 +1,7 @@
 ---
 title: "中文报告模板"
 author: "苏命"
+institute: "中国科学院生态环境研究中心"
 date: "today"
 subject: "Markdown"
 keywords: [Markdown, Example]
@@ -23,14 +24,18 @@ keep-tex: false
 titlepage-text-color: "360049"
 titlepage-rule-height: 0
 titlepage-background: "inst/cover1.pdf"
+titlepage-halign: "center" # flushleft | flushright
 title-vskip: -30em
 title-size: "Huge"
 author-vskip: -4em
 date-vskip: -1em
+caption-justification: centering
 numbersections: true
 parindent: true
-# titlepage-logo: "inst/rceeslogo.pdf"
-# logo-width: 30mm
+titlepage-logo: "inst/rceeslogo.pdf"
+logo-width: 20mm
+logo-vskip: -8em
+logo-hskip: "-6em"
 lang: zh-CN
 CJK: true
 fig-pos: "!t"
@@ -46,6 +51,8 @@ toc: true
 toc-own-page: true
 fig-toc: true
 CJKmainfont: "Noto Serif CJK SC"
+CJKmainboldfont: "NotoSerifCJKsc-Bold"
+CJKmainitalicfont: "NotoSansCJKsc-Light"
 CJKsansfont: "Noto Sans CJK SC"
 CJKmonofont: "Noto Sans Mono CJK SC"
 CJKoptions: |

dwev/eisvogel.tex

@@ -83,6 +83,7 @@ $if(background-image)$
 \pgfdeclareimage[width=\paperwidth,height=\paperheight]{background}{$background-image$}
 \usebackgroundtemplate{\pgfuseimage{background}}
 $endif$
+
 \usepackage{pgfpages}
 \setbeamertemplate{caption}[numbered]
 \setbeamertemplate{caption label separator}{: }
@@ -364,9 +365,6 @@ $endif$
 
 % 为中文添加支持 by Ming Su
 $if(CJK)$
-\usepackage[fallback]{xeCJK}
-\setCJKmainfont{Noto Serif CJK SC}[BoldFont=NotoSerifCJKsc-Bold, ItalicFont=NotoSansCJKsc-Light]
-\setCJKfallbackfamilyfont{rm}{Noto Serif CJK SC}
 $if(book)$
 \usepackage{ctex} %调用中文字体宏包
 \usepackage{indentfirst} %调用首行缩进宏包
@@ -801,6 +799,10 @@ $endif$
   $endif$
 \fi
 
+
+% setup for chinese font, by Ming
+\setCJKmainfont{$CJKmainfont$}[BoldFont=$CJKboldfont$, ItalicFont=$CJKitalicfont$]
+
 %
 % heading color
 %
@@ -1050,7 +1052,7 @@ $if(titlepage)$
 $if(titlepage-background)$
 \newgeometry{top=2cm, right=4cm, bottom=3cm, left=4cm}
 $else$
-\newgeometry{left=6cm}
+\newgeometry{left=2cm}
 $endif$
 $if(titlepage-color)$
 \definecolor{titlepage-color}{HTML}{$titlepage-color$}
@@ -1060,7 +1062,12 @@ $if(titlepage-background)$
 \tikz[remember picture,overlay] \node[inner sep=0pt] at (current page.center){\includegraphics[width=\paperwidth,height=\paperheight]{$titlepage-background$}};
 $endif$
 \newcommand{\colorRule}[3][black]{\textcolor[HTML]{#1}{\rule{#2}{#3}}}
-\begin{flushleft}
+
+\NewDocumentEnvironment{dynalign}{}
+  {\begin{$if(titlepage-halign)$$titlepage-halign$$else$center$endif$}}
+  {\end{$if(titlepage-halign)$$titlepage-halign$$else$center$endif$}}
+
+\begin{dynalign}
 \noindent
 \\[-1em]
 \color[HTML]{$if(titlepage-text-color)$$titlepage-text-color$$else$5F5F5F$endif$}
@@ -1068,6 +1075,12 @@ $endif$
 \par
 \noindent
 
+$if(titlepage-logo)$
+\noindent
+\vskip $if(logo-vskip)$$logo-vskip$$else$-8em$endif$
+\hskip $if(logo-hskip)$$logo-hskip$$else$-6em$endif$
+\includegraphics[width=$if(logo-width)$$logo-width$$else$35mm$endif$, left]{$titlepage-logo$}
+$endif$
 
 $if(titlepage-background)$
 % The titlepage with a background image has other text spacing and text size
@@ -1114,41 +1127,67 @@ $if(titlepage-background)$
   $if(date-vskip)$
   \vskip $date-vskip$
   $endif$
-
-\textsf{$date$}}
+{\textsf{$if(institute)$$institute$\vskip 0.6em$endif$$date$}}
+}
   \vfill
 }
 $else$
 {
   \setstretch{1.4}
   \vfill
+  \vskip 8em
+  $if(title-vskip)$
+  \vskip $title-vskip$
+  $endif$
+  $if(title-hskip)$
+  \vskip $title-hskip$
+  $endif$
   \noindent {\huge \textbf{\textsf{$title$}}}
   $if(subtitle)$
   \vskip 1em
   {\Large \textsf{$subtitle$}}
   $endif$
-  \vskip 2em
-  \noindent {\Large \textsf{$for(author)$$author$$sep$, $endfor$}}
+  \vskip 4em
+  $if(author-vskip)$
+  \vskip $author-vskip$
+  $endif$
+  \noindent {
+  $if(author-size)$
+  $author-size$
+  $else$
+  \Large
+  $endif$
+
+\textsf{$for(author)$$author$$sep$, $endfor$} 
+\vskip 0.6em
+  $if(date-vskip)$
+  \vskip $date-vskip$
+  $endif$
+}
   \vfill
 }
 $endif$
 
-$if(titlepage-logo)$
-\noindent
-\includegraphics[width=$if(logo-width)$$logo-width$$else$35mm$endif$, left]{$titlepage-logo$}
-$endif$
 
 $if(titlepage-background)$
 $else$
-\textsf{$date$}
+
+  $if(author-size)$
+  $author-size$
+  $else$
+  \Large
+  $endif$
+{\textsf{$if(institute)$$institute$\vskip 0.6em$endif$$date$}}
 $endif$
-\end{flushleft}
+\end{dynalign}
 \end{titlepage}
 \restoregeometry
 \pagenumbering{arabic}
 $endif$
 $endif$
 
+
+
 %%
 %% end titlepage
 %%