diff --git a/dwcl/CL1.html b/dwcl/CL1.html deleted file mode 100644 index 01b2697..0000000 --- a/dwcl/CL1.html +++ /dev/null @@ -1,514 +0,0 @@ - - - - - - - - - - - -MANUSCRIPT TITLE - - - - - - - - - - - - - - - - - - - - - -
- -
- -
-
-

MANUSCRIPT TITLE

-
- - - -
- -
-
Author
-
-

Ming Su

-
-
- -
-
Published
-
-

July 27, 2025

-
-
- - -
- - - -
- - -

We are pleased to submit our manuscript, “MANUSCRIPT TITLE”, for consideration at JOURNAL.

-

Among all algal-derived taste-and-odor compounds, 2-methylisoborneol (MIB) stands out as the most notorious and widespread offender. Since its initial identification, nearly 300 documented MIB-related odor outbreaks have been reported globally. With an exceptionally low odor threshold (10 ng L-1), MIB imparts a distinct earthy-musty smell that is immediately detectable in drinking water—transforming it from a mere water quality parameter into a critical public concern capable of triggering widespread complaints during outbreaks.

-

The partitioning of MIB between intracellular and extracellular compartments critically determines treatment strategy selection. When MIB is primarily intracellular, conventional treatment processes such as coagulation-sedimentation can achieve cost-effective removal. However, when MIB becomes predominantly extracellular, utilities must implement advanced treatment options like ozone-activated carbon - a significantly more expensive approach that remains unavailable at many facilities. This fundamental distinction creates a critical decision point for water treatment optimization, where accurate prediction of MIB partitioning directly impacts both operational efficiency and treatment costs.

-

Yet, current research and monitoring practices overlook a key limitation: most studies and water treatment plants measure only total MIB concentrations, assuming a fixed intracellular/extracellular ratio. This oversimplification leads to suboptimal process selection, unstable removal efficiency, and, in some cases, exacerbates MIB release through inappropriate treatment.

-

Our study systematically investigates the dynamic partitioning of MIB between intracellular and extracellular compartments through controlled experiments with two major MIB-producing cyanobacteria (Pseudanabaena and Planktothricoides). We demonstrate that the extracellular fraction exhibits distinct growth phase-dependent patterns, where crowding effects during rapid growth phases trigger substantial MIB release. Building on these observations, we developed a mechanistic model based on logistic growth dynamics that quantitatively predicts MIB release patterns across the complete cyanobacterial life cycle.

-

Our model’s application to Lake Taihu’s MIB outbreaks uncovered novel spatiotemporal patterns in cyanobacterial populations responsible for odorant production. More significantly, we established a predictive risk assessment framework that pinpoints key environmental drivers controlling both MIB occurrence and its release dynamics. This framework enables proactive identification of high-risk conditions preceding major release events.

-

Key Findings of this study include:

-
    -

  1. Crowding effects during cellular growth govern MIB partitioning.

    2. -

  2. The model successfully forecasts large-scale MIB release events.

    3. -

  3. It provides actionable guidance for optimizing water treatment processes.

    4. -
-

To our knowledge, this is the first mechanistic framework explaining growth-dependent MIB release dynamics. Importantly, our approach shows promise for modeling other algal metabolites (e.g., geosmin, cyanotoxins), offering broader implications for water quality management.

-

We believe this study will interest researchers working on algal metabolites, water treatment engineers, and resource managers addressing cyanobacterial blooms. The combination of fundamental insights and practical applications aligns well with JOURNAL’s mission to bridge scientific discovery and environmental technology.

-

To ensure a thorough and expert evaluation of our manuscript, we suggest the following potential reviewers with specialized expertise in algal metabolites, water treatment technologies, and cyanobacterial ecology. Additional information about each candidate reviewer is available via the Web link provided.

-

Potential Reviewers:

-
    -

  1. Tsair-Fuh Lin: National Cheng Kung University. Email: ; Web Link

    2. -

  2. Arash Zamyadi: Civil & Environmental Engineering, Monash University. Email: ; Web Link

    3. -

  3. Xuwei Deng: Institute of hydrobiology, Chinese Academy of Sciences. Email: ; Web Link

    4. -

  4. Shushi Peng: Peking University. Email: ; Web Link

    5. -

  5. Tom Andersen: University of Oslo. Email: ; Web Link

    6. -

  6. Muhe Diao: University of Calgray. Email: ; Web Link

    7. -
-

Thank you for considering our work. We would be pleased to address any questions or suggestions during the review process.

- -
- - -
- - - - - \ No newline at end of file diff --git a/dwcl/CL1.pdf b/dwcl/CL1.pdf deleted file mode 100644 index 99675de..0000000 Binary files a/dwcl/CL1.pdf and /dev/null differ diff --git a/dwcl/CL1.qmd b/dwcl/CL1.qmd index 1acb428..35b14e6 100644 --- a/dwcl/CL1.qmd +++ b/dwcl/CL1.qmd @@ -1,15 +1,15 @@ --- format: + dwcl-docx: default dwcl-html: default - dwcl-pdf: - keep-tex: true + dwcl-pdf: default date: today author: "Ming Su" affliction: Key Laboratory of Environmental Aquatic Chemistry, State Key Laboratory of Regional Environment and Sustainability, Research Center for Eco-Environmental Sciences, Chinese Academy of Sciences from_email: "mingsu@rcees.ac.cn" from_phone: "+86 (10) 62843038" -from_institution_logo: "_extensions/drwater/dwcl/inst/rceeslonglogo.png" -from_sign: "_extensions/drwater/dwcl/inst/signms.png" +from_institution_logo: "_extensions/drwater/dwcl/inst/rceeslonglogo.pdf" +from_sign: "_extensions/drwater/dwcl/inst/signms.pdf" from_position: "Professor" from_professional_title: "Ph.D." from_institution: "Chinese Academy of Sciences" diff --git a/dwcl/CL1.tex b/dwcl/CL1.tex deleted file mode 100644 index 4e6a28e..0000000 --- a/dwcl/CL1.tex +++ /dev/null @@ -1,359 +0,0 @@ -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Academic Letter LaTeX and RMarkdown Structure % -% Author: Pedro Henrique Pereira Braga % -% % -% License: % -% CC BY-NC-SA 3.0 (http://creativecommons.org/licenses/by-nc-sa/3.0/) % -% % -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Set the font size (11pt, for now) and paper size (e.g. letterpaper, a4paper) -\documentclass[11pt, letterpaper]{letter} - -%---------------------------------------------------------------------- -% PACKAGES AND OTHER DOCUMENT CONFIGURATIONS -%---------------------------------------------------------------------- - -\usepackage{graphicx} % Required for including pictures -\usepackage{fancyhdr} % Allows the use of fancy headers and footers - -\usepackage{microtype} % For typography improvement - -\usepackage{url} % Allows the use of hyperlinks -\urlstyle{same} % Allows hyperlink fonts to be the same as the mainfont -\usepackage[hidelinks]{hyperref} % Allows the use of hyperlinks and -% removes the blue boxes around the link - -\pagestyle{empty} % Removes headers and footers - -\usepackage{setspace} % Allows the use of double spacing in the letter body - -\setlength\parindent{1cm} % Paragraph indentation - -% Create a new command for the horizontal rule in the document which allows -% thickness specification -\makeatletter - \def\@texttop{} % force the address to start above -\renewcommand*{\opening}[1]{\ifx\@empty\fromaddress - \thispagestyle{firstpage}% - {\raggedleft\@date\par}% - \else % home address - \thispagestyle{empty}% - {\raggedleft\begin{tabular}{l@{}}\ignorespaces - \fromaddress \\*[2\parskip]% - \@date \end{tabular}\par}% - \fi - %\vspace{2\parskip}% <-- Removed - %{\raggedright \toname \\ \toaddress \par}% <-- Removed - %\vspace{2\parskip}% <-- Removed - #1\par\nobreak} -\let\ps@empty\ps@plain -\let\ps@firstpage\ps@plain -\makeatother - -%-------------------------------------------------------------------------- -% FONTS -%-------------------------------------------------------------------------- - -\usepackage[T1]{fontenc} % Output font encoding for international characters -% \usepackage[utf8]{inputenc} % Required for inputting international characters -\usepackage[quiet]{fontspec} % Allows the use of fontspec -\setmainfont{Calibri} -% \usepackage{txfonts} % Allows the use of Lato fonts - - -%---------------------------------------------------------------------------- -% DOCUMENT MARGINS -%---------------------------------------------------------------------------- - -\usepackage{geometry} % Required for adjusting page dimensions - -\geometry{ - headheight = 0.7in, % Header height - top=1.5in, % Top margin - bottom=1.5cm, % Bottom margin - left=3cm, % Left margin - right=3cm, % Right margin - % showframe, % Uncomment to show how the type block is set on the page -} - -%----------------------------------------------------------------------------- -% AUTHOR AND RECIPIENTS NEW COMMANDS AND DETAILS STRUCTURE -%----------------------------------------------------------------------------- - -\newcommand{\authordetails}[1]{\renewcommand{\authordetails}{#1}} -\newcommand{\recipientdetails}[1]{\renewcommand{\recipientdetails}{#1}} - -%----------------------------------------------------------------------------- -% HEADER STRUCTURE -%----------------------------------------------------------------------------- - -\address{ - % Include the author's details on the right side of the page under the line - \raggedleft{ - \footnotesize{ % Use a smaller font size - Ming Su\\ % Author name - \authordetails\\ - \hspace{1mm} - } - } - \vspace{-0.05\textheight} % Move the date and letter content up -} - -%------------------------------------------------------------------------------ -% COMPOSE THE ENTIRE HEADER -%------------------------------------------------------------------------------ - -\renewcommand{\opening}[1]{ - {\fromaddress - \vspace{0.05\textheight}\\ % Print the sender's address here and add some whitespace to allow the printing of the date - \raggedleft{2025-07-27} % Include the date, aligned to the right - \par % par - } - {\raggedright - \toname\\ - \toaddress - \par} % Print the recipient's name and adress - \vspace{0.25cm} % White vertical space after recipient's address - \noindent #1 % Following this, insert the opening info -} - -%------------------------------------------------------------------------------ -% SIGNATURE STRUCTURE -%------------------------------------------------------------------------------ -% The signature is a combination of the author's name, title and institution -\signature{Ming Su, on behalf of all authors\\ - Email: mingsu@rcees.ac.cn} - -% I will later combine the option of inserting a signature within it - -\renewcommand{\closing}[1]{ - \vspace{2.5mm} % Some whitespace after the letter content and before the signature - \noindent % Stop paragraph indentation - % \hspace*{\longindentation} % Move the signature right to the value of \longindentation - \parbox{\indentedwidth}{ - \raggedright - #1 % Print the signature text - % \vskip 1.65cm % Whitespace between the closing text and author's name for a physical signature - \\\includegraphics[height=0.6in, keepaspectratio=true]{\_extensions/drwater/dwcl/inst/signmy.png}\\ - \fromsig % Prints the value of \signature{}, i.e. author name and title - } -} - -%------------------------------------------------------------------------------- -% AUTHOR'S INFORMATION -%------------------------------------------------------------------------------- - -\authordetails{ - Professor\\ - Research Center for Eco-Environmental -Sciences\\ % Sender's department/institution - Chinese Academy of Sciences\\ - P.O. Box 2871, Beijing % Sender's address - % , \\ % Sender's city, state or province, - % \\ % postal code - % -} - -%------------------------------------------------------------------------------ -% RECIPIENT'S INFORMATION -%------------------------------------------------------------------------------ - -\recipientdetails{ - Editor-in-Chief\\ - \textit{JOURNAL} -} - -%------------------------------------------------------------------------------ -% HEADER CONTENTS -%------------------------------------------------------------------------------ - -\fancypagestyle{firstpage}{ - \fancyhf{} - \fancyhead[L]{ - \includegraphics[height=0.6in, keepaspectratio=true]{\_extensions/drwater/dwcl/inst/rceeslonglogo.png} - } - \fancyhead[R]{Ming Su\\ - \footnotesize{ - mingsu@rcees.ac.cn\\ % Sender's email address - % \\ % Sender's URL - +86 (10) 62843038 % Sender's phone number - } - } - } - -\fancypagestyle{plain}{ - \fancyhf{} - \fancyhead[L]{ - \includegraphics[height=0.6in, keepaspectratio=true]{\_extensions/drwater/dwcl/inst/rceeslonglogo.png} - } - \fancyhead[R]{Ming Su\\ - \footnotesize{ - mingsu@rcees.ac.cn\\ % Sender's email address - % \\ % Sender's URL - +86 (10) 62843038 % Sender's phone number - } - } - } - -\fancypagestyle{empty}{ - \fancyhf{} - \fancyhead[L]{ - \includegraphics[height=0.6in, keepaspectratio=true]{\_extensions/drwater/dwcl/inst/rceeslonglogo.png} - } - \fancyhead[R]{Ming Su\\ - \footnotesize{ - mingsu@rcees.ac.cn\\ % Sender's email address - % \\ % Sender's URL - +86 (10) 62843038 % Sender's phone number - } - } - } - -%------------------------------------------------------------------------------ -\pagestyle{plain} - -\begin{document} - -%------------------------------------------------------------------------------ -% TO ADDRESS -%------------------------------------------------------------------------------ - -\begin{letter}{\recipientdetails} - -%------------------------------------------------------------------------------ -% LETTER CONTENT -%------------------------------------------------------------------------------ - -\opening{Dear Editor,} -% \begin{doublespacing} - -We are pleased to submit our manuscript, \textbf{``MANUSCRIPT TITLE''}, -for consideration at \textbf{\emph{JOURNAL}}. - -Among all algal-derived taste-and-odor compounds, 2-methylisoborneol -(MIB) stands out as the most notorious and widespread offender. Since -its initial identification, nearly 300 documented MIB-related odor -outbreaks have been reported globally. With an exceptionally low odor -threshold (10 ng L\textsuperscript{-1}), MIB imparts a distinct -earthy-musty smell that is immediately detectable in drinking -water---transforming it from a mere water quality parameter into a -critical public concern capable of triggering widespread complaints -during outbreaks. - -The partitioning of MIB between intracellular and extracellular -compartments critically determines treatment strategy selection. When -MIB is primarily intracellular, conventional treatment processes such as -coagulation-sedimentation can achieve cost-effective removal. However, -when MIB becomes predominantly extracellular, utilities must implement -advanced treatment options like ozone-activated carbon - a significantly -more expensive approach that remains unavailable at many facilities. -This fundamental distinction creates a critical decision point for water -treatment optimization, where accurate prediction of MIB partitioning -directly impacts both operational efficiency and treatment costs. - -Yet, current research and monitoring practices overlook a key -limitation: most studies and water treatment plants measure only total -MIB concentrations, assuming a fixed intracellular/extracellular ratio. -This oversimplification leads to suboptimal process selection, unstable -removal efficiency, and, in some cases, exacerbates MIB release through -inappropriate treatment. - -Our study systematically investigates the dynamic partitioning of MIB -between intracellular and extracellular compartments through controlled -experiments with two major MIB-producing cyanobacteria -(\emph{Pseudanabaena} and \emph{Planktothricoides}). We demonstrate that -the extracellular fraction exhibits distinct growth phase-dependent -patterns, where crowding effects during rapid growth phases trigger -substantial MIB release. Building on these observations, we developed a -\textbf{mechanistic model} based on logistic growth dynamics that -quantitatively predicts MIB release patterns across the complete -cyanobacterial life cycle. - -Our model's application to Lake Taihu's MIB outbreaks uncovered novel -spatiotemporal patterns in cyanobacterial populations responsible for -odorant production. More significantly, we established a predictive risk -assessment framework that pinpoints key environmental drivers -controlling both MIB occurrence and its release dynamics. This framework -enables proactive identification of high-risk conditions preceding major -release events. - -Key Findings of this study include: - -\begin{enumerate} -\def\labelenumi{\arabic{enumi}.} -\item - Crowding effects during cellular growth govern MIB partitioning. -\item - The model successfully forecasts large-scale MIB release events. -\item - It provides actionable guidance for optimizing water treatment - processes. -\end{enumerate} - -To our knowledge, this is the first mechanistic framework explaining -growth-dependent MIB release dynamics. Importantly, our approach shows -promise for modeling other algal metabolites (e.g., geosmin, -cyanotoxins), offering broader implications for water quality -management. - -We believe this study will interest researchers working on algal -metabolites, water treatment engineers, and resource managers addressing -cyanobacterial blooms. The combination of fundamental insights and -practical applications aligns well with \textbf{\emph{JOURNAL}}'s -mission to bridge scientific discovery and environmental technology. - -To ensure a thorough and expert evaluation of our manuscript, we suggest -the following potential reviewers with specialized expertise in algal -metabolites, water treatment technologies, and cyanobacterial ecology. -Additional information about each candidate reviewer is available via -the \emph{Web link} provided. - -\textbf{Potential Reviewers:} - -\begin{enumerate} -\def\labelenumi{\arabic{enumi}.} -\item - \textbf{Tsair-Fuh Lin}: National Cheng Kung University. Email: - \href{mailto:tflin@mail.ncku.edu.tw}{\nolinkurl{tflin@mail.ncku.edu.tw}}; - \emph{\href{https://researchoutput.ncku.edu.tw/en/persons/tsair-fuh-lin}{Web - Link}} -\item - \textbf{Arash Zamyadi}: Civil \& Environmental Engineering, Monash - University. Email: - \href{mailto:Arash.Zamyadi@monash.edu}{\nolinkurl{Arash.Zamyadi@monash.edu}}; - \emph{\href{https://research.monash.edu/en/persons/arash-zamyadi}{Web - Link}} -\item - \textbf{Xuwei Deng}: Institute of hydrobiology, Chinese Academy of - Sciences. Email: - \href{mailto:dengxuwei@ihb.ac.cn}{\nolinkurl{dengxuwei@ihb.ac.cn}}; - \emph{\href{https://www.researchgate.net/profile/Deng-Xuwei}{Web - Link}} -\item - \textbf{Shushi Peng}: Peking University. Email: - \href{mailto:speng@pku.edu.cn}{\nolinkurl{speng@pku.edu.cn}}; - \emph{\href{https://www.researchgate.net/profile/Shushi-Peng}{Web - Link}} -\item - \textbf{Tom Andersen}: University of Oslo. Email: - \href{mailto:tom.andersen@ibv.uio.no}{\nolinkurl{tom.andersen@ibv.uio.no}}; - \emph{\href{https://www.mn.uio.no/ibv/english/people/aca/tomand/}{Web - Link}} -\item - \textbf{Muhe Diao}: University of Calgray. Email: - \href{mailto:muhe.diao@ucalgary.ca}{\nolinkurl{muhe.diao@ucalgary.ca}}; - \emph{\href{https://www.ucalgary.ca/labs/ebg/people/muhe-diao}{Web - Link}} -\end{enumerate} - -Thank you for considering our work. We would be pleased to address any -questions or suggestions during the review process. - -% \end{doublespacing} -\closing{Yours Sincerely,} - -%------------------------------------------------------------------------------ - -\end{letter} -\end{document} diff --git a/dwcl/CL2.qmd b/dwcl/CL2.qmd index 0c817f2..347fdf1 100644 --- a/dwcl/CL2.qmd +++ b/dwcl/CL2.qmd @@ -1,15 +1,15 @@ --- format: + dwcl-docx: default dwcl-html: default - dwcl-pdf: - keep-tex: true + dwcl-pdf: default date: today author: "Min Yang" affliction: State Key Laboratory of Environmental Aquatic Chemistry, Research Center for Eco-Environmental Sciences, Chinese Academy of Sciences from_email: "yangmin@rcees.ac.cn" from_phone: "+86 (10) 62843038" -from_institution_logo: "_extensions/drwater/dwcl/inst/rceeslonglogo.png" -from_sign: "_extensions/drwater/dwcl/inst/signmy.png" +from_institution_logo: "_extensions/drwater/dwcl/inst/rceeslonglogo.pdf" +from_sign: "_extensions/drwater/dwcl/inst/signmy.pdf" from_position: "Vice Director, Professor" from_professional_title: "Ph.D." from_institution: "Chinese Academy of Sciences" diff --git a/dwcl/_extensions/drwater/dwcl/_extension.yaml b/dwcl/_extensions/drwater/dwcl/_extension.yaml index de9f038..bfec31a 100644 --- a/dwcl/_extensions/drwater/dwcl/_extension.yaml +++ b/dwcl/_extensions/drwater/dwcl/_extension.yaml @@ -14,6 +14,6 @@ contributes: reference-doc: _extensions/drwater/dwcl/inst/CL.docx pdf: latex_engine: xelatex - template: dwcl.tex + template: _extensions/drwater/dwcl/dwcl.tex keep-tex: false keep-md: false diff --git a/dwcl/_extensions/drwater/dwcl/inst/CL.docx b/dwcl/_extensions/drwater/dwcl/inst/CL.docx deleted file mode 120000 index 8f7a164..0000000 --- a/dwcl/_extensions/drwater/dwcl/inst/CL.docx +++ /dev/null @@ -1 +0,0 @@ -../../../../../dwinst/CL.docx \ No newline at end of file diff --git a/dwcl/_extensions/drwater/dwcl/inst/CL.docx b/dwcl/_extensions/drwater/dwcl/inst/CL.docx new file mode 100755 index 0000000..3727b07 Binary files /dev/null and b/dwcl/_extensions/drwater/dwcl/inst/CL.docx differ diff --git a/dwcl/_extensions/drwater/dwcl/inst/drwater.css b/dwcl/_extensions/drwater/dwcl/inst/drwater.css deleted file mode 120000 index b67c701..0000000 --- a/dwcl/_extensions/drwater/dwcl/inst/drwater.css +++ /dev/null @@ -1 +0,0 @@ -../../../../../dwinst/drwater.css \ No newline at end of file diff --git a/dwcl/_extensions/drwater/dwcl/inst/drwater.css b/dwcl/_extensions/drwater/dwcl/inst/drwater.css new file mode 100755 index 0000000..0bbdcff --- /dev/null +++ b/dwcl/_extensions/drwater/dwcl/inst/drwater.css @@ -0,0 +1,109 @@ +.udot { + text-decoration-line: underline; + text-decoration-color: rgb(50, 50, 50); + text-decoration-style: dashed; + text-decoration-thickness: 1px; +} + +.good { + background-color: forestgreen; + color: lightyellow; +} + +.bad { + background-color: orangered; + color: lightyellow; +} + +.del { + text-decoration-line: line-through; + text-decoration-color: rgb(222 13 13); + text-decoration-style: initial; + text-decoration-thickness: 1.5px; +} + + +.todo { + background-color: darkorange; + color: lightyellow; +} + +.com { + background-color: #0025ff; + font-weight: bold; + color: lightyellow; +} + +.add { + text-decoration-line: underline; + text-decoration-color: rgb(222 13 13); + background-color: violet; + text-decoration-style: initial; + text-decoration-thickness: 2px; +} + + +del { + text-decoration-line: line-through; + text-decoration-color: rgb(222 13 13); + text-decoration-style: initial; + text-decoration-thickness: 1.0px; +} + + +ins { + text-decoration-color: rgb(222 93 93); + background-color: violet; + text-decoration-style: initial; + text-decoration-thickness: 2px; +} + +.clab { + background-color: rgb(255, 245, 240); +} + +.rem { + background-color: darkorange; + color: lightyellow; + text-decoration-thickness: 2px; +} + + +#criticnav { + position: fixed; + z-index: 1100; + top: 0; + right: 0; + width: 120px; + border-bottom: solid 1px #ffffff; + margin: 0; + padding: 10; + background-color: rgb(143 38 38 / 95%); + color: #ffffff; + font-size: 12px; + font-family: "Helvetica Neue", helvetica, arial, sans-serif !important +} + +#criticnav ul { + list-style-type: none; + width: 90%; + margin: 0 auto; + padding: 0 +} + +#criticnav ul li { + display: block; + width: 100px; + min-width: 80px; + text-align: center; + padding: 5px 0 3px !important; + margin: 5px 2px !important; + line-height: 1em; + float: center; + text-transform: uppercase; + cursor: pointer; + border-radius: 20px; + border: 3px solid rgba(255,255,255,0); + color: #fff !important +} + diff --git a/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.pdf b/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.pdf deleted file mode 120000 index 226288a..0000000 --- a/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.pdf +++ /dev/null @@ -1 +0,0 @@ -../../../../../dwinst/rceeslogo.pdf \ No newline at end of file diff --git a/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.pdf b/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.pdf new file mode 100644 index 0000000..51d1a45 Binary files /dev/null and b/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.pdf differ diff --git a/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.svg b/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.svg deleted file mode 120000 index 0c9e5cf..0000000 --- a/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.svg +++ /dev/null @@ -1 +0,0 @@ -../../../../../dwinst/rceeslogo.svg \ No newline at end of file diff --git a/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.svg b/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.svg new file mode 100644 index 0000000..44431ff --- /dev/null +++ b/dwcl/_extensions/drwater/dwcl/inst/rceeslogo.svg @@ -0,0 +1,5 @@ + + viewBox="0 0 621 690"> + + + diff --git a/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.pdf b/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.pdf deleted file mode 120000 index 354bffa..0000000 --- a/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.pdf +++ /dev/null @@ -1 +0,0 @@ -../../../../../dwinst/rceeslonglogo.pdf \ No newline at end of file diff --git a/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.pdf b/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.pdf new file mode 100644 index 0000000..50017f7 Binary files /dev/null and b/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.pdf differ diff --git a/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.svg b/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.svg deleted file mode 120000 index 2af1ae2..0000000 --- a/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.svg +++ /dev/null @@ -1 +0,0 @@ -../../../../../dwinst/rceeslonglogo.svg \ No newline at end of file diff --git a/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.svg b/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.svg new file mode 100644 index 0000000..013b69d --- /dev/null +++ b/dwcl/_extensions/drwater/dwcl/inst/rceeslonglogo.svg @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dwcl/_extensions/drwater/dwcl/inst/signms.pdf b/dwcl/_extensions/drwater/dwcl/inst/signms.pdf deleted file mode 120000 index 350cf56..0000000 --- a/dwcl/_extensions/drwater/dwcl/inst/signms.pdf +++ /dev/null @@ -1 +0,0 @@ -../../../../../dwinst/signms.pdf \ No newline at end of file diff --git a/dwcl/_extensions/drwater/dwcl/inst/signms.pdf b/dwcl/_extensions/drwater/dwcl/inst/signms.pdf new file mode 100644 index 0000000..8b9afc3 Binary files /dev/null and b/dwcl/_extensions/drwater/dwcl/inst/signms.pdf differ diff --git a/dwcl/_extensions/drwater/dwcl/inst/signms.png b/dwcl/_extensions/drwater/dwcl/inst/signms.png new file mode 100644 index 0000000..c292ad6 Binary files /dev/null and b/dwcl/_extensions/drwater/dwcl/inst/signms.png differ diff --git a/dwcl/_extensions/drwater/dwcl/inst/signmy.pdf b/dwcl/_extensions/drwater/dwcl/inst/signmy.pdf deleted file mode 120000 index 2747f7d..0000000 --- a/dwcl/_extensions/drwater/dwcl/inst/signmy.pdf +++ /dev/null @@ -1 +0,0 @@ -../../../../../dwinst/signmy.pdf \ No newline at end of file diff --git a/dwcl/_extensions/drwater/dwcl/inst/signmy.pdf b/dwcl/_extensions/drwater/dwcl/inst/signmy.pdf new file mode 100644 index 0000000..cbf0425 Binary files /dev/null and b/dwcl/_extensions/drwater/dwcl/inst/signmy.pdf differ diff --git a/dwcl/_extensions/drwater/dwcl/inst/signmy.png b/dwcl/_extensions/drwater/dwcl/inst/signmy.png new file mode 100755 index 0000000..325b81a Binary files /dev/null and b/dwcl/_extensions/drwater/dwcl/inst/signmy.png differ diff --git a/dwev/_extensions/drwater/dwev/_extension.yml b/dwev/_extensions/drwater/dwev/_extension.yml index faedb9e..06ab037 100644 --- a/dwev/_extensions/drwater/dwev/_extension.yml +++ b/dwev/_extensions/drwater/dwev/_extension.yml @@ -4,4 +4,4 @@ version: 0.0.1 contributes: formats: pdf: - template: dweisvogel.tex + template: _extensions/drwater/dwev/dweisvogel.tex diff --git a/dwev/_extensions/drwater/dwev/dweisvogel.tex b/dwev/_extensions/drwater/dwev/dweisvogel.tex index b06056e..50b9664 100644 --- a/dwev/_extensions/drwater/dwev/dweisvogel.tex +++ b/dwev/_extensions/drwater/dwev/dweisvogel.tex @@ -73,7 +73,7 @@ $for(classoption)$ $classoption$$sep$, $endfor$ ,captions=tableheading -]{$if(beamer)$$documentclass$$else$$if(book)$scrbook$else$scrartcl$endif$$endif$} +]{$if(beamer)$$documentclass$$else$$if(isbook)$scrbook$else$scrartcl$endif$$endif$} $if(beamer)$ $if(background-image)$ \usebackgroundtemplate{% @@ -365,7 +365,7 @@ $endif$ % 为中文添加支持 by Ming Su $if(CJK)$ -$if(book)$ +$if(isbook)$ \usepackage{ctex} %调用中文字体宏包 \usepackage{indentfirst} %调用首行缩进宏包 \usepackage{ctex} % 确保中文字体支持 @@ -1028,7 +1028,7 @@ $else$ } -$if(book)$ +$if(isbook)$ % \deftripstyle{ChapterStyle}{}{}{}{}{\pagemark}{} % \renewcommand*{\chapterpagestyle}{ChapterStyle} \renewcommand*{\chapterpagestyle}{eisvogel-chapterpage-header-footer} diff --git a/dwev/_extensions/drwater/dwev/inst b/dwev/_extensions/drwater/dwev/inst deleted file mode 120000 index 541d62c..0000000 --- a/dwev/_extensions/drwater/dwev/inst +++ /dev/null @@ -1 +0,0 @@ -../../../../dwinst \ No newline at end of file diff --git a/dwev/_extensions/drwater/dwev/inst/CL.docx b/dwev/_extensions/drwater/dwev/inst/CL.docx new file mode 100755 index 0000000..3727b07 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/CL.docx differ diff --git a/dwev/_extensions/drwater/dwev/inst/MS.docx b/dwev/_extensions/drwater/dwev/inst/MS.docx new file mode 100755 index 0000000..5b9ad12 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/MS.docx differ diff --git a/dwev/_extensions/drwater/dwev/inst/RN.docx b/dwev/_extensions/drwater/dwev/inst/RN.docx new file mode 100755 index 0000000..a74403c Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/RN.docx differ diff --git a/dwev/_extensions/drwater/dwev/inst/RP.docx b/dwev/_extensions/drwater/dwev/inst/RP.docx new file mode 100755 index 0000000..18580b1 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/RP.docx differ diff --git a/dwev/_extensions/drwater/dwev/inst/american-chemical-society.csl b/dwev/_extensions/drwater/dwev/inst/american-chemical-society.csl new file mode 100755 index 0000000..01f8c49 --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/american-chemical-society.csl @@ -0,0 +1,280 @@ + + diff --git a/dwev/_extensions/drwater/dwev/inst/china-national-standard-gb-t-7714-2015-numeric.csl b/dwev/_extensions/drwater/dwev/inst/china-national-standard-gb-t-7714-2015-numeric.csl new file mode 100755 index 0000000..f7c84f0 --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/china-national-standard-gb-t-7714-2015-numeric.csl @@ -0,0 +1,435 @@ + + diff --git a/dwev/_extensions/drwater/dwev/inst/cover1.pdf b/dwev/_extensions/drwater/dwev/inst/cover1.pdf new file mode 100644 index 0000000..9111c08 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/cover1.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/cover2.pdf b/dwev/_extensions/drwater/dwev/inst/cover2.pdf new file mode 100644 index 0000000..7b8b2a1 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/cover2.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/cover3.pdf b/dwev/_extensions/drwater/dwev/inst/cover3.pdf new file mode 100644 index 0000000..4bc55bf Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/cover3.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/cover4.pdf b/dwev/_extensions/drwater/dwev/inst/cover4.pdf new file mode 100644 index 0000000..2eaf27f Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/cover4.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/covers.pdf b/dwev/_extensions/drwater/dwev/inst/covers.pdf new file mode 100644 index 0000000..845d1f0 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/covers.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/covers.pptx b/dwev/_extensions/drwater/dwev/inst/covers.pptx new file mode 100644 index 0000000..0bcbfab Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/covers.pptx differ diff --git a/dwev/_extensions/drwater/dwev/inst/drwater-gray1.pdf b/dwev/_extensions/drwater/dwev/inst/drwater-gray1.pdf new file mode 100644 index 0000000..7fa9b94 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/drwater-gray1.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/drwater-gray1.svg b/dwev/_extensions/drwater/dwev/inst/drwater-gray1.svg new file mode 100644 index 0000000..68a8fc9 --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/drwater-gray1.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dwev/_extensions/drwater/dwev/inst/drwater-green0.pdf b/dwev/_extensions/drwater/dwev/inst/drwater-green0.pdf new file mode 100644 index 0000000..88b7fda Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/drwater-green0.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/drwater-green0.svg b/dwev/_extensions/drwater/dwev/inst/drwater-green0.svg new file mode 100644 index 0000000..00fe227 --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/drwater-green0.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/dwev/_extensions/drwater/dwev/inst/drwater-green1.pdf b/dwev/_extensions/drwater/dwev/inst/drwater-green1.pdf new file mode 100644 index 0000000..091548e Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/drwater-green1.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/drwater-green1.svg b/dwev/_extensions/drwater/dwev/inst/drwater-green1.svg new file mode 100644 index 0000000..b6990aa --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/drwater-green1.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dwev/_extensions/drwater/dwev/inst/drwater-greenline0.pdf b/dwev/_extensions/drwater/dwev/inst/drwater-greenline0.pdf new file mode 100644 index 0000000..86786fa Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/drwater-greenline0.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/drwater-greenline0.svg b/dwev/_extensions/drwater/dwev/inst/drwater-greenline0.svg new file mode 100644 index 0000000..7eec8c8 --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/drwater-greenline0.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dwev/_extensions/drwater/dwev/inst/drwater-white0.pdf b/dwev/_extensions/drwater/dwev/inst/drwater-white0.pdf new file mode 100644 index 0000000..ca69ef8 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/drwater-white0.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/drwater-white0.svg b/dwev/_extensions/drwater/dwev/inst/drwater-white0.svg new file mode 100644 index 0000000..0a12a38 --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/drwater-white0.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/dwev/_extensions/drwater/dwev/inst/drwater.css b/dwev/_extensions/drwater/dwev/inst/drwater.css new file mode 100755 index 0000000..0bbdcff --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/drwater.css @@ -0,0 +1,109 @@ +.udot { + text-decoration-line: underline; + text-decoration-color: rgb(50, 50, 50); + text-decoration-style: dashed; + text-decoration-thickness: 1px; +} + +.good { + background-color: forestgreen; + color: lightyellow; +} + +.bad { + background-color: orangered; + color: lightyellow; +} + +.del { + text-decoration-line: line-through; + text-decoration-color: rgb(222 13 13); + text-decoration-style: initial; + text-decoration-thickness: 1.5px; +} + + +.todo { + background-color: darkorange; + color: lightyellow; +} + +.com { + background-color: #0025ff; + font-weight: bold; + color: lightyellow; +} + +.add { + text-decoration-line: underline; + text-decoration-color: rgb(222 13 13); + background-color: violet; + text-decoration-style: initial; + text-decoration-thickness: 2px; +} + + +del { + text-decoration-line: line-through; + text-decoration-color: rgb(222 13 13); + text-decoration-style: initial; + text-decoration-thickness: 1.0px; +} + + +ins { + text-decoration-color: rgb(222 93 93); + background-color: violet; + text-decoration-style: initial; + text-decoration-thickness: 2px; +} + +.clab { + background-color: rgb(255, 245, 240); +} + +.rem { + background-color: darkorange; + color: lightyellow; + text-decoration-thickness: 2px; +} + + +#criticnav { + position: fixed; + z-index: 1100; + top: 0; + right: 0; + width: 120px; + border-bottom: solid 1px #ffffff; + margin: 0; + padding: 10; + background-color: rgb(143 38 38 / 95%); + color: #ffffff; + font-size: 12px; + font-family: "Helvetica Neue", helvetica, arial, sans-serif !important +} + +#criticnav ul { + list-style-type: none; + width: 90%; + margin: 0 auto; + padding: 0 +} + +#criticnav ul li { + display: block; + width: 100px; + min-width: 80px; + text-align: center; + padding: 5px 0 3px !important; + margin: 5px 2px !important; + line-height: 1em; + float: center; + text-transform: uppercase; + cursor: pointer; + border-radius: 20px; + border: 3px solid rgba(255,255,255,0); + color: #fff !important +} + diff --git a/dwev/_extensions/drwater/dwev/inst/dweisvogel.tex b/dwev/_extensions/drwater/dwev/inst/dweisvogel.tex new file mode 100644 index 0000000..50b9664 --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/dweisvogel.tex @@ -0,0 +1,1323 @@ +%% +% Copyright (c) 2017 - 2024, Pascal Wagler; +% Copyright (c) 2014 - 2024, John MacFarlane +% +% All rights reserved. +% +% Redistribution and use in source and binary forms, with or without +% modification, are permitted provided that the following conditions +% are met: +% +% - Redistributions of source code must retain the above copyright +% notice, this list of conditions and the following disclaimer. +% +% - Redistributions in binary form must reproduce the above copyright +% notice, this list of conditions and the following disclaimer in the +% documentation and/or other materials provided with the distribution. +% +% - Neither the name of John MacFarlane nor the names of other +% contributors may be used to endorse or promote products derived +% from this software without specific prior written permission. +% +% THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +% "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +% LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +% FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +% COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +% INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +% BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +% LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +% CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +% LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +% ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +% POSSIBILITY OF SUCH DAMAGE. +%% + +%% +% This is the Eisvogel pandoc LaTeX template. +% +% For usage information and examples visit the official GitHub page: +% https://github.com/Wandmalfarbe/pandoc-latex-template +%% + +% Options for packages loaded elsewhere +\PassOptionsToPackage{unicode$for(hyperrefoptions)$,$hyperrefoptions$$endfor$}{hyperref} +\PassOptionsToPackage{hyphens}{url} +\PassOptionsToPackage{dvipsnames,svgnames,x11names,table}{xcolor} +$if(CJKmainfont)$ +\PassOptionsToPackage{space}{xeCJK} +$endif$ +% +\documentclass[ +$if(fontsize)$ + $fontsize$, +$endif$ +$if(papersize)$ + $papersize$paper, +$else$ + paper=a4, +$endif$ +$if(beamer)$ + ignorenonframetext, +$if(handout)$ + handout, +$endif$ +$if(aspectratio)$ + aspectratio=$aspectratio$, +$endif$ +$if(babel-lang)$ + $babel-lang$, +$endif$ +$endif$ +$for(classoption)$ + $classoption$$sep$, +$endfor$ + ,captions=tableheading +]{$if(beamer)$$documentclass$$else$$if(isbook)$scrbook$else$scrartcl$endif$$endif$} +$if(beamer)$ +$if(background-image)$ +\usebackgroundtemplate{% + \includegraphics[width=\paperwidth]{$background-image$}% +} +% In beamer background-image does not work well when other images are used, so this is the workaround +\pgfdeclareimage[width=\paperwidth,height=\paperheight]{background}{$background-image$} +\usebackgroundtemplate{\pgfuseimage{background}} +$endif$ + +\usepackage{pgfpages} +\setbeamertemplate{caption}[numbered] +\setbeamertemplate{caption label separator}{: } +\setbeamercolor{caption name}{fg=normal text.fg} +\beamertemplatenavigationsymbols$if(navigation)$$navigation$$else$empty$endif$ +$for(beameroption)$ +\setbeameroption{$beameroption$} +$endfor$ +% Prevent slide breaks in the middle of a paragraph +\widowpenalties 1 10000 +\raggedbottom +$if(section-titles)$ +\setbeamertemplate{part page}{ + \centering + \begin{beamercolorbox}[sep=16pt,center]{part title} + \usebeamerfont{part title}\insertpart\par + \end{beamercolorbox} +} +\setbeamertemplate{section page}{ + \centering + \begin{beamercolorbox}[sep=12pt,center]{section title} + \usebeamerfont{section title}\insertsection\par + \end{beamercolorbox} +} +\setbeamertemplate{subsection page}{ + \centering + \begin{beamercolorbox}[sep=8pt,center]{subsection title} + \usebeamerfont{subsection title}\insertsubsection\par + \end{beamercolorbox} +} +\AtBeginPart{ + \frame{\partpage} +} +\AtBeginSection{ + \ifbibliography + \else + \frame{\sectionpage} + \fi +} +\AtBeginSubsection{ + \frame{\subsectionpage} +} +$endif$ +$endif$ +$if(beamerarticle)$ +\usepackage{beamerarticle} % needs to be loaded first +$endif$ +\usepackage{amsmath,amssymb} +$if(linestretch)$ +\usepackage{setspace} +$else$ +% Use setspace anyway because we change the default line spacing. +% The spacing is changed early to affect the titlepage and the TOC. +\usepackage{setspace} +\setstretch{1.2} +$endif$ +\usepackage{iftex} +\ifPDFTeX + \usepackage[$if(fontenc)$$fontenc$$else$T1$endif$]{fontenc} + \usepackage[utf8]{inputenc} + \usepackage{textcomp} % provide euro and other symbols +\else % if luatex or xetex +$if(mathspec)$ + \ifXeTeX + \usepackage{mathspec} % this also loads fontspec + \else + \usepackage{unicode-math} % this also loads fontspec + \fi +$else$ + \usepackage{unicode-math} % this also loads fontspec +$endif$ + \defaultfontfeatures{Scale=MatchLowercase}$-- must come before Beamer theme + \defaultfontfeatures[\rmfamily]{Ligatures=TeX,Scale=1} +\fi +$if(fontfamily)$ +$else$ +$-- Set default font before Beamer theme so the theme can override it +\usepackage{lmodern} +$endif$ +$-- Set Beamer theme before user font settings so they can override theme +$if(beamer)$ +$if(theme)$ +\usetheme[$for(themeoptions)$$themeoptions$$sep$,$endfor$]{$theme$} +$endif$ +$if(colortheme)$ +\usecolortheme{$colortheme$} +$endif$ +$if(fonttheme)$ +\usefonttheme{$fonttheme$} +$endif$ +$if(mainfont)$ +\usefonttheme{serif} % use mainfont rather than sansfont for slide text +$endif$ +$if(innertheme)$ +\useinnertheme{$innertheme$} +$endif$ +$if(outertheme)$ +\useoutertheme{$outertheme$} +$endif$ +$endif$ +$-- User font settings (must come after default font and Beamer theme) +$if(fontfamily)$ +\usepackage[$for(fontfamilyoptions)$$fontfamilyoptions$$sep$,$endfor$]{$fontfamily$} +$endif$ +\ifPDFTeX\else + % xetex/luatex font selection +$if(mainfont)$ + $if(mainfontfallback)$ + \ifLuaTeX + \usepackage{luaotfload} + \directlua{luaotfload.add_fallback("mainfontfallback",{ + $for(mainfontfallback)$"$mainfontfallback$"$sep$,$endfor$ + })} + \fi + $endif$ + \setmainfont[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$$if(mainfontfallback)$,RawFeature={fallback=mainfontfallback}$endif$]{$mainfont$} +$endif$ +$if(sansfont)$ + $if(sansfontfallback)$ + \ifLuaTeX + \usepackage{luaotfload} + \directlua{luaotfload.add_fallback("sansfontfallback",{ + $for(sansfontfallback)$"$sansfontfallback$"$sep$,$endfor$ + })} + \fi + $endif$ + \setsansfont[$for(sansfontoptions)$$sansfontoptions$$sep$,$endfor$$if(sansfontfallback)$,RawFeature={fallback=sansfontfallback}$endif$]{$sansfont$} +$endif$ +$if(monofont)$ + $if(monofontfallback)$ + \ifLuaTeX + \usepackage{luaotfload} + \directlua{luaotfload.add_fallback("monofontfallback",{ + $for(monofontfallback)$"$monofontfallback$"$sep$,$endfor$ + })} + \fi + $endif$ + \setmonofont[$for(monofontoptions)$$monofontoptions$$sep$,$endfor$$if(monofontfallback)$,RawFeature={fallback=monofontfallback}$endif$]{$monofont$} +$endif$ +$for(fontfamilies)$ + \newfontfamily{$fontfamilies.name$}[$for(fontfamilies.options)$$fontfamilies.options$$sep$,$endfor$]{$fontfamilies.font$} +$endfor$ +$if(mathfont)$ +$if(mathspec)$ + \ifXeTeX + \setmathfont(Digits,Latin,Greek)[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} + \else + \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} + \fi +$else$ + \setmathfont[$for(mathfontoptions)$$mathfontoptions$$sep$,$endfor$]{$mathfont$} +$endif$ +$endif$ +$if(CJKmainfont)$ + \ifXeTeX + \usepackage{xeCJK} + \setCJKmainfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} + $if(CJKsansfont)$ + \setCJKsansfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKsansfont$} + $endif$ + $if(CJKmonofont)$ + \setCJKmonofont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmonofont$} + $endif$ + \fi +$endif$ +$if(luatexjapresetoptions)$ + \ifLuaTeX + \usepackage[$for(luatexjapresetoptions)$$luatexjapresetoptions$$sep$,$endfor$]{luatexja-preset} + \fi +$endif$ +$if(CJKmainfont)$ + \ifLuaTeX + \usepackage[$for(luatexjafontspecoptions)$$luatexjafontspecoptions$$sep$,$endfor$]{luatexja-fontspec} + \setmainjfont[$for(CJKoptions)$$CJKoptions$$sep$,$endfor$]{$CJKmainfont$} + \fi +$endif$ +\fi +$if(zero-width-non-joiner)$ +%% Support for zero-width non-joiner characters. +\makeatletter +\def\zerowidthnonjoiner{% + % Prevent ligatures and adjust kerning, but still support hyphenating. + \texorpdfstring{% + \TextOrMath{\nobreak\discretionary{-}{}{\kern.03em}% + \ifvmode\else\nobreak\hskip\z@skip\fi}{}% + }{}% +} +\makeatother +\ifPDFTeX + \DeclareUnicodeCharacter{200C}{\zerowidthnonjoiner} +\else + \catcode`^^^^200c=\active + \protected\def ^^^^200c{\zerowidthnonjoiner} +\fi +%% End of ZWNJ support +$endif$ +% Use upquote if available, for straight quotes in verbatim environments +\IfFileExists{upquote.sty}{\usepackage{upquote}}{} +\IfFileExists{microtype.sty}{% use microtype if available + \usepackage[$for(microtypeoptions)$$microtypeoptions$$sep$,$endfor$]{microtype} + \UseMicrotypeSet[protrusion]{basicmath} % disable protrusion for tt fonts +}{} +$if(indent)$ +$else$ +\makeatletter +\@ifundefined{KOMAClassName}{% if non-KOMA class + \IfFileExists{parskip.sty}{% + \usepackage{parskip} + }{% else + \setlength{\parindent}{0pt} + \setlength{\parskip}{6pt plus 2pt minus 1pt}} +}{% if KOMA class + \KOMAoptions{parskip=half}} +\makeatother +$endif$ +$if(verbatim-in-note)$ +\usepackage{fancyvrb} +$endif$ +\usepackage{xcolor} +\definecolor{default-linkcolor}{HTML}{A50000} +\definecolor{default-filecolor}{HTML}{A50000} +\definecolor{default-citecolor}{HTML}{4077C0} +\definecolor{default-urlcolor}{HTML}{4077C0} +$if(footnotes-pretty)$ +% load footmisc in order to customize footnotes (footmisc has to be loaded before hyperref, cf. https://tex.stackexchange.com/a/169124/144087) +\usepackage[hang,flushmargin,bottom,multiple]{footmisc} +\setlength{\footnotemargin}{0.8em} % set space between footnote nr and text +\setlength{\footnotesep}{\baselineskip} % set space between multiple footnotes +\setlength{\skip\footins}{0.3cm} % set space between page content and footnote +\setlength{\footskip}{0.9cm} % set space between footnote and page bottom +$endif$ +$if(geometry)$ +$if(beamer)$ +\geometry{$for(geometry)$$geometry$$sep$,$endfor$} +$else$ +\usepackage[$for(geometry)$$geometry$$sep$,$endfor$]{geometry} +$endif$ +$else$ +$if(beamer)$ +$else$ +\usepackage[margin=2.5cm,includehead=true,includefoot=true,centering,$for(geometry)$$geometry$$sep$,$endfor$]{geometry} +$endif$ +$endif$ +$if(titlepage-logo)$ +\usepackage[export]{adjustbox} +\usepackage{graphicx} +$endif$ +$if(beamer)$ +\newif\ifbibliography +$endif$ +$if(listings)$ +\usepackage{listings} +\newcommand{\passthrough}[1]{#1} +\lstset{defaultdialect=[5.3]Lua} +\lstset{defaultdialect=[x86masm]Assembler} +$endif$ +$if(listings-no-page-break)$ +\usepackage{etoolbox} +\BeforeBeginEnvironment{lstlisting}{\par\noindent\begin{minipage}{\linewidth}} +\AfterEndEnvironment{lstlisting}{\end{minipage}\par\addvspace{\topskip}} +$endif$ +$if(lhs)$ +\lstnewenvironment{code}{\lstset{language=Haskell,basicstyle=\small\ttfamily}}{} +$endif$ +$if(highlighting-macros)$ +$highlighting-macros$ + +% Workaround/bugfix from jannick0. +% See https://github.com/jgm/pandoc/issues/4302#issuecomment-360669013) +% or https://github.com/Wandmalfarbe/pandoc-latex-template/issues/2 +% +% Redefine the verbatim environment 'Highlighting' to break long lines (with +% the help of fvextra). Redefinition is necessary because it is unlikely that +% pandoc includes fvextra in the default template. +\usepackage{fvextra} +\DefineVerbatimEnvironment{Highlighting}{Verbatim}{breaklines,fontsize=$if(code-block-font-size)$$code-block-font-size$$else$\small$endif$,commandchars=\\\{\}} + +$endif$ + +% 为中文添加支持 by Ming Su +$if(CJK)$ +$if(isbook)$ +\usepackage{ctex} %调用中文字体宏包 +\usepackage{indentfirst} %调用首行缩进宏包 +\usepackage{ctex} % 确保中文字体支持 +\usepackage{zhnumber} +% 修改 chapter 格式为 "第X章" +% \renewcommand{\chapterformat}{第~\thechapter~章} +% \renewcommand{\chapterformat}{第\zhnumber{\thechapter}章} +\renewcommand{\chaptermarkformat}{第~\zhnumber{\thechapter}~章} +\renewcommand{\chapterformat}{第\zhnumber{\thechapter}章} +\renewcommand*{\chapterlinesformat}[3]{% + \parbox{\linewidth}{\centering #2~\quad~#3} % 居中 + "·" 分隔 + % 或改用冒号分隔： + % \parbox{\linewidth}{\centering #2：#3} +} +\RedeclareSectionCommand[ + beforeskip=1.5em plus 0.5em minus 0.5em, + afterskip=1em plus 0.2em, + font=\large\bfseries +]{section} +\usepackage{zhnumber} % 确保已加载（或直接用 ctex） +% 修改目录中的章节编号为中文 +\addtokomafont{chapterentry}{\normalfont} % 可选：调整目录字体 +\renewcommand*{\chapterformat}{第\zhnumber{\thechapter}章} % 正文标题格式 +\renewcommand*{\chaptermarkformat}{第\zhnumber{\thechapter}章\quad} % 页眉标题格式 +% 关键！覆盖目录中的章节编号 +\renewcommand{\addchaptertocentry}[2]{% + \addtocentrydefault{chapter}{第\zhnumber{#1}章}{#2}% +} +\RedeclareSectionCommand[ + tocentryindent=0pt, + tocentrynumwidth=3.5em % 确保编号区域足够宽 +]{chapter} +$endif$ +$endif$ + +$if(tables)$ +\usepackage{longtable,booktabs,array} +$if(multirow)$ +\usepackage{multirow} +$endif$ +\usepackage{calc} % for calculating minipage widths +$if(beamer)$ +\usepackage{caption} +% Make caption package work with longtable +\makeatletter +\def\fnum@table{\tablename~\thetable} +\makeatother +$else$ +% Correct order of tables after \paragraph or \subparagraph +\usepackage{etoolbox} +\makeatletter +\patchcmd\longtable{\par}{\if@noskipsec\mbox{}\fi\par}{}{} +\makeatother +% Allow footnotes in longtable head/foot +\IfFileExists{footnotehyper.sty}{\usepackage{footnotehyper}}{\usepackage{footnote}} +\makesavenoteenv{longtable} +$endif$ +$endif$ +% add backlinks to footnote references, cf. https://tex.stackexchange.com/questions/302266/make-footnote-clickable-both-ways +$if(footnotes-disable-backlinks)$ +$else$ +\usepackage{footnotebackref} +$endif$ +$if(graphics)$ +\usepackage{graphicx} +\makeatletter +% \def\maxwidth{\ifdim\Gin@nat@width>\linewidth\linewidth\else\Gin@nat@width\fi} +% \def\maxheight{\ifdim\Gin@nat@height>\textheight\textheight\else\Gin@nat@height\fi} +% \makeatother +% % Scale images if necessary, so that they will not overflow the page +% % margins by default, and it is still possible to overwrite the defaults +% % using explicit options in \includegraphics[width, height, ...]{} +% \setkeys{Gin}{width=\maxwidth,height=\maxheight,keepaspectratio} +\newsavebox\pandoc@box +\newcommand*\pandocbounded[1]{% scales image to fit in text height/width + \sbox\pandoc@box{#1}% + \Gscale@div\@tempa{\textheight}{\dimexpr\ht\pandoc@box+\dp\pandoc@box\relax}% + \Gscale@div\@tempb{\linewidth}{\wd\pandoc@box}% + \ifdim\@tempb\p@<\@tempa\p@\let\@tempa\@tempb\fi% select the smaller of both + \ifdim\@tempa\p@<\p@\scalebox{\@tempa}{\usebox\pandoc@box}% + \else\usebox{\pandoc@box}% + \fi% +} +% Set default figure placement to htbp +\makeatletter +\def\fps@figure{htbp} +\makeatother +% \makeatletter Old options from template, replaced with quarto defaults above +% \newsavebox\pandoc@box +% \newcommand*\pandocbounded[1]{% scales image to fit in text height/width +% \sbox\pandoc@box{#1}% +% \Gscale@div\@tempa{\textheight}{\dimexpr\ht\pandoc@box+\dp\pandoc@box\relax}% +% \Gscale@div\@tempb{\linewidth}{\wd\pandoc@box}% +% \ifdim\@tempb\p@<\@tempa\p@\let\@tempa\@tempb\fi% select the smaller of both +% \ifdim\@tempa\p@<\p@\scalebox{\@tempa}{\usebox\pandoc@box}% +% \else\usebox{\pandoc@box}% +% \fi% +% } +% % Set default figure placement to htbp +% % Make use of float-package and set default placement for figures to H. +% % The option H means 'PUT IT HERE' (as opposed to the standard h option which means 'You may put it here if you like'). +% \usepackage{float} +% \floatplacement{figure}{$if(float-placement-figure)$$float-placement-figure$$else$H$endif$} +% \makeatother +$endif$ +$if(svg)$ +\usepackage{svg} +$endif$ +$if(strikeout)$ +$-- also used for underline +\ifLuaTeX + \usepackage{luacolor} + \usepackage[soul]{lua-ul} +\else +\usepackage{soul} +$if(beamer)$ + \makeatletter + \let\HL\hl + \renewcommand\hl{% fix for beamer highlighting + \let\set@color\beamerorig@set@color + \let\reset@color\beamerorig@reset@color + \HL} + \makeatother +$endif$ +$if(CJKmainfont)$ + \ifXeTeX + % soul's \st doesn't work for CJK: + \usepackage{xeCJKfntef} + \renewcommand{\st}[1]{\sout{#1}} + \fi +$endif$ +\fi +$endif$ +\setlength{\emergencystretch}{3em} % prevent overfull lines +\providecommand{\tightlist}{% + \setlength{\itemsep}{0pt}\setlength{\parskip}{0pt}} +$if(numbersections)$ +\setcounter{secnumdepth}{$if(secnumdepth)$$secnumdepth$$else$5$endif$} +$else$ +\setcounter{secnumdepth}{-\maxdimen} % remove section numbering +$endif$ +$if(subfigure)$ +\usepackage{subcaption} +$endif$ +$if(beamer)$ +$else$ +$if(block-headings)$ +% Make \paragraph and \subparagraph free-standing +\makeatletter +\ifx\paragraph\undefined\else + \let\oldparagraph\paragraph + \renewcommand{\paragraph}{ + \@ifstar + \xxxParagraphStar + \xxxParagraphNoStar + } + \newcommand{\xxxParagraphStar}[1]{\oldparagraph*{#1}\mbox{}} + \newcommand{\xxxParagraphNoStar}[1]{\oldparagraph{#1}\mbox{}} +\fi +\ifx\subparagraph\undefined\else + \let\oldsubparagraph\subparagraph + \renewcommand{\subparagraph}{ + \@ifstar + \xxxSubParagraphStar + \xxxSubParagraphNoStar + } + \newcommand{\xxxSubParagraphStar}[1]{\oldsubparagraph*{#1}\mbox{}} + \newcommand{\xxxSubParagraphNoStar}[1]{\oldsubparagraph{#1}\mbox{}} +\fi +\makeatother +$endif$ +$endif$ +$if(pagestyle)$ +\pagestyle{$pagestyle$} +$endif$ +$if(csl-refs)$ +% definitions for citeproc citations +\NewDocumentCommand\citeproctext{}{} +\NewDocumentCommand\citeproc{mm}{% + \begingroup\def\citeproctext{#2}\cite{#1}\endgroup} +\makeatletter + % allow citations to break across lines + \let\@cite@ofmt\@firstofone + % avoid brackets around text for \cite: + \def\@biblabel#1{} + \def\@cite#1#2{{#1\if@tempswa , #2\fi}} +\makeatother +\newlength{\cslhangindent} +\setlength{\cslhangindent}{1.5em} +\newlength{\csllabelwidth} +\setlength{\csllabelwidth}{3em} +\newenvironment{CSLReferences}[2] % #1 hanging-indent, #2 entry-spacing + {\begin{list}{}{% + \setlength{\itemindent}{0pt} + \setlength{\leftmargin}{0pt} + \setlength{\parsep}{0pt} + % turn on hanging indent if param 1 is 1 + \ifodd #1 + \setlength{\leftmargin}{\cslhangindent} + \setlength{\itemindent}{-1\cslhangindent} + \fi + % set entry spacing + \setlength{\itemsep}{#2\baselineskip}}} + {\end{list}} +\usepackage{calc} +\newcommand{\CSLBlock}[1]{\hfill\break\parbox[t]{\linewidth}{\strut\ignorespaces#1\strut}} +\newcommand{\CSLLeftMargin}[1]{\parbox[t]{\csllabelwidth}{\strut#1\strut}} +\newcommand{\CSLRightInline}[1]{\parbox[t]{\linewidth - \csllabelwidth}{\strut#1\strut}} +\newcommand{\CSLIndent}[1]{\hspace{\cslhangindent}#1} +$endif$ +$if(lang)$ +\ifLuaTeX +\usepackage[bidi=basic]{babel} +\else +\usepackage[bidi=default]{babel} +\fi +$if(babel-lang)$ +\babelprovide[main,import]{$babel-lang$} +$if(mainfont)$ +\ifPDFTeX +\else +\babelfont{rm}[$for(mainfontoptions)$$mainfontoptions$$sep$,$endfor$$if(mainfontfallback)$,RawFeature={fallback=mainfontfallback}$endif$]{$mainfont$} +\fi +$endif$ +$endif$ +$for(babel-otherlangs)$ +\babelprovide[import]{$babel-otherlangs$} +$endfor$ +$for(babelfonts/pairs)$ +\babelfont[$babelfonts.key$]{rm}{$babelfonts.value$} +$endfor$ +% get rid of language-specific shorthands (see #6817): +\let\LanguageShortHands\languageshorthands +\def\languageshorthands#1{} +$if(selnolig-langs)$ +\ifLuaTeX + \usepackage[$for(selnolig-langs)$$it$$sep$,$endfor$]{selnolig} % disable illegal ligatures +\fi +$endif$ +$endif$ +$for(header-includes)$ +$header-includes$ +$endfor$ +$if(dir)$ +\ifPDFTeX + \TeXXeTstate=1 + \newcommand{\RL}[1]{\beginR #1\endR} + \newcommand{\LR}[1]{\beginL #1\endL} + \newenvironment{RTL}{\beginR}{\endR} + \newenvironment{LTR}{\beginL}{\endL} +\fi +$endif$ +$if(natbib)$ +\usepackage[$natbiboptions$]{natbib} +\bibliographystyle{$if(biblio-style)$$biblio-style$$else$plainnat$endif$} +$endif$ +$if(biblatex)$ +\usepackage[$if(biblio-style)$style=$biblio-style$,$endif$$for(biblatexoptions)$$biblatexoptions$$sep$,$endfor$]{biblatex} +$for(bibliography)$ +\addbibresource{$bibliography$} +$endfor$ +$endif$ +$if(nocite-ids)$ +\nocite{$for(nocite-ids)$$it$$sep$, $endfor$} +$endif$ +$if(csquotes)$ +\usepackage{csquotes} +$endif$ +\usepackage{bookmark} +\IfFileExists{xurl.sty}{\usepackage{xurl}}{} % add URL line breaks if available +\urlstyle{$if(urlstyle)$$urlstyle$$else$same$endif$} +$if(links-as-notes)$ +% Make links footnotes instead of hotlinks: +\DeclareRobustCommand{\href}[2]{#2\footnote{\url{#1}}} +$endif$ +$if(verbatim-in-note)$ +\VerbatimFootnotes % allow verbatim text in footnotes +$endif$ +\hypersetup{ +$if(title-meta)$ + pdftitle={$title-meta$}, +$endif$ +$if(author-meta)$ + pdfauthor={$author-meta$}, +$endif$ +$if(lang)$ + pdflang={$lang$}, +$endif$ +$if(subject)$ +pdfsubject={$subject$}, +$endif$ +$if(keywords)$ + pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$}, +$endif$ +$if(colorlinks)$ + colorlinks=true, + linkcolor={$if(linkcolor)$$linkcolor$$else$default-linkcolor$endif$}, + filecolor={$if(filecolor)$$filecolor$$else$default-filecolor$endif$}, + citecolor={$if(citecolor)$$citecolor$$else$default-citecolor$endif$}, + urlcolor={$if(urlcolor)$$urlcolor$$else$default-urlcolor$endif$}, +$else$ +$if(boxlinks)$ +$else$ + hidelinks, +$endif$ +$endif$ + breaklinks=true, + pdfcreator={LaTeX via pandoc with the Eisvogel template}} +$if(title)$ +\title{$title$$if(thanks)$\thanks{$thanks$}$endif$} +$endif$ +$if(subtitle)$ +$if(beamer)$ +$else$ +\usepackage{etoolbox} +\makeatletter +\providecommand{\subtitle}[1]{% add subtitle to \maketitle + \apptocmd{\@title}{\par {\large #1 \par}}{}{} +} +\makeatother +$endif$ +\subtitle{$subtitle$} +$endif$ +\author{$for(author)$$author$$sep$ \and $endfor$} +\date{$date$} +$if(beamer)$ +$if(institute)$ +\institute{$for(institute)$$institute$$sep$ \and $endfor$} +$endif$ +$if(titlegraphic)$ +\titlegraphic{\includegraphics$if(titlegraphicoptions)$[$for(titlegraphicoptions)$$titlegraphicoptions$$sep$, $endfor$]$endif${$titlegraphic$}} +$endif$ +$if(logo)$ +\logo{\includegraphics{$logo$}} +$endif$ +$endif$ + + + +%% +%% added +%% + +$if(page-background)$ +\usepackage[pages=all]{background} +$endif$ + +% +% for the background color of the title page +% +$if(titlepage)$ +\usepackage{pagecolor} +\usepackage{afterpage} +$if(titlepage-background)$ +\usepackage{tikz} +$endif$ +$if(geometry)$ +$else$ +\usepackage[margin=2.5cm,includehead=true,includefoot=true,centering]{geometry} +$endif$ +$endif$ + +% +% break urls +% +\PassOptionsToPackage{hyphens}{url} + +% +% When using babel or polyglossia with biblatex, loading csquotes is recommended +% to ensure that quoted texts are typeset according to the rules of your main language. +% +\usepackage{csquotes} + +% +% captions +% +\definecolor{caption-color}{HTML}{777777} +$if(beamer)$ +$else$ +\usepackage[font={stretch=1.2}, textfont={color=caption-color}, position=top, skip=4mm, labelfont=bf, singlelinecheck=false, justification=$if(caption-justification)$$caption-justification$$else$raggedright$endif$]{caption} +\setcapindent{0em} +$endif$ + +% +% blockquote +% +\definecolor{blockquote-border}{RGB}{221,221,221} +\definecolor{blockquote-text}{RGB}{119,119,119} +\usepackage{mdframed} +\newmdenv[rightline=false,bottomline=false,topline=false,linewidth=3pt,linecolor=blockquote-border,skipabove=\parskip]{customblockquote} +\renewenvironment{quote}{\begin{customblockquote}\list{}{\rightmargin=0em\leftmargin=0em}% +\item\relax\color{blockquote-text}\ignorespaces}{\unskip\unskip\endlist\end{customblockquote}} + +% +% Source Sans Pro as the default font family +% Source Code Pro for monospace text +% +% 'default' option sets the default +% font family to Source Sans Pro, not \sfdefault. +% +\ifnum 0\ifxetex 1\fi\ifluatex 1\fi=0 % if pdftex + $if(fontfamily)$ + $else$ + \usepackage[default]{sourcesanspro} + \usepackage{sourcecodepro} + $endif$ +\else % if not pdftex + $if(mainfont)$ + $else$ + \usepackage[default]{sourcesanspro} + \usepackage{sourcecodepro} + + % XeLaTeX specific adjustments for straight quotes: https://tex.stackexchange.com/a/354887 + % This issue is already fixed (see https://github.com/silkeh/latex-sourcecodepro/pull/5) but the + % fix is still unreleased. + % TODO: Remove this workaround when the new version of sourcecodepro is released on CTAN. + \ifxetex + \makeatletter + \defaultfontfeatures[\ttfamily] + { Numbers = \sourcecodepro@figurestyle, + Scale = \SourceCodePro@scale, + Extension = .otf } + \setmonofont + [ UprightFont = *-\sourcecodepro@regstyle, + ItalicFont = *-\sourcecodepro@regstyle It, + BoldFont = *-\sourcecodepro@boldstyle, + BoldItalicFont = *-\sourcecodepro@boldstyle It ] + {SourceCodePro} + \makeatother + \fi + $endif$ +\fi + + +% setup for chinese font, by Ming +\setCJKmainfont{$CJKmainfont$}[BoldFont=$CJKboldfont$, ItalicFont=$CJKitalicfont$] + +% +% heading color +% +\definecolor{heading-color}{RGB}{40,40,40} +$if(beamer)$ +$else$ +\addtokomafont{section}{\color{heading-color}} +$endif$ +% When using the classes report, scrreprt, book, +% scrbook or memoir, uncomment the following line. +%\addtokomafont{chapter}{\color{heading-color}} + +% +% variables for title, author and date +% +$if(beamer)$ +$else$ +\usepackage{titling} +\title{$title$} +\author{$for(author)$$author$$sep$, $endfor$} +\date{$date$} +$endif$ + +% +% tables +% +$if(tables)$ + +\definecolor{table-row-color}{HTML}{F5F5F5} +\definecolor{table-rule-color}{HTML}{999999} + +%\arrayrulecolor{black!40} +\arrayrulecolor{table-rule-color} % color of \toprule, \midrule, \bottomrule +\setlength\heavyrulewidth{0.3ex} % thickness of \toprule, \bottomrule +\renewcommand{\arraystretch}{1.3} % spacing (padding) + +$if(table-use-row-colors)$ +% Unfortunately the colored cells extend beyond the edge of the +% table because pandoc uses @-expressions (@{}) like so: +% +% \begin{longtable}[]{@{}ll@{}} +% \end{longtable} +% +% https://en.wikibooks.org/wiki/LaTeX/Tables#.40-expressions +\usepackage{etoolbox} +\AtBeginEnvironment{longtable}{\rowcolors{2}{}{table-row-color!100}} +\preto{\toprule}{\hiderowcolors}{}{} +\appto{\endhead}{\showrowcolors}{}{} +\appto{\endfirsthead}{\showrowcolors}{}{} +$endif$ +$endif$ + +% +% remove paragraph indentation +% +% \setlength{\parindent}{0pt} +$if(parindent)$ +\setlength{\parindent}{2em} %设置首行缩进为2字符 +$else$ +\setlength{\parindent}{0pt} +$endif$ +\setlength{\parskip}{6pt plus 2pt minus 1pt} +\setlength{\emergencystretch}{3em} % prevent overfull lines + + + +% +% +% Listings +% +% + +$if(listings)$ + +% +% general listing colors +% +\definecolor{listing-background}{HTML}{F7F7F7} +\definecolor{listing-rule}{HTML}{B3B2B3} +\definecolor{listing-numbers}{HTML}{B3B2B3} +\definecolor{listing-text-color}{HTML}{000000} +\definecolor{listing-keyword}{HTML}{435489} +\definecolor{listing-keyword-2}{HTML}{1284CA} % additional keywords +\definecolor{listing-keyword-3}{HTML}{9137CB} % additional keywords +\definecolor{listing-identifier}{HTML}{435489} +\definecolor{listing-string}{HTML}{00999A} +\definecolor{listing-comment}{HTML}{8E8E8E} + +\lstdefinestyle{eisvogel_listing_style}{ + language = java, +$if(listings-disable-line-numbers)$ + xleftmargin = 0.6em, + framexleftmargin = 0.4em, +$else$ + numbers = left, + xleftmargin = 2.7em, + framexleftmargin = 2.5em, +$endif$ + backgroundcolor = \color{listing-background}, + basicstyle = \color{listing-text-color}\linespread{1.0}% + \lst@ifdisplaystyle% + $if(code-block-font-size)$$code-block-font-size$$else$\small$endif$% + \fi\ttfamily{}, + breaklines = true, + frame = single, + framesep = 0.19em, + rulecolor = \color{listing-rule}, + frameround = ffff, + tabsize = 4, + numberstyle = \color{listing-numbers}, + aboveskip = 1.0em, + belowskip = 0.1em, + abovecaptionskip = 0em, + belowcaptionskip = 1.0em, + keywordstyle = {\color{listing-keyword}\bfseries}, + keywordstyle = {[2]\color{listing-keyword-2}\bfseries}, + keywordstyle = {[3]\color{listing-keyword-3}\bfseries\itshape}, + sensitive = true, + identifierstyle = \color{listing-identifier}, + commentstyle = \color{listing-comment}, + stringstyle = \color{listing-string}, + showstringspaces = false, + escapeinside = {/*@}{@*/}, % Allow LaTeX inside these special comments + literate = + {á}{{\'a}}1 {é}{{\'e}}1 {í}{{\'i}}1 {ó}{{\'o}}1 {ú}{{\'u}}1 + {Á}{{\'A}}1 {É}{{\'E}}1 {Í}{{\'I}}1 {Ó}{{\'O}}1 {Ú}{{\'U}}1 + {à}{{\`a}}1 {è}{{\`e}}1 {ì}{{\`i}}1 {ò}{{\`o}}1 {ù}{{\`u}}1 + {À}{{\`A}}1 {È}{{\`E}}1 {Ì}{{\`I}}1 {Ò}{{\`O}}1 {Ù}{{\`U}}1 + {ä}{{\"a}}1 {ë}{{\"e}}1 {ï}{{\"i}}1 {ö}{{\"o}}1 {ü}{{\"u}}1 + {Ä}{{\"A}}1 {Ë}{{\"E}}1 {Ï}{{\"I}}1 {Ö}{{\"O}}1 {Ü}{{\"U}}1 + {â}{{\^a}}1 {ê}{{\^e}}1 {î}{{\^i}}1 {ô}{{\^o}}1 {û}{{\^u}}1 + {Â}{{\^A}}1 {Ê}{{\^E}}1 {Î}{{\^I}}1 {Ô}{{\^O}}1 {Û}{{\^U}}1 + {œ}{{\oe}}1 {Œ}{{\OE}}1 {æ}{{\ae}}1 {Æ}{{\AE}}1 {ß}{{\ss}}1 + {ç}{{\c c}}1 {Ç}{{\c C}}1 {ø}{{\o}}1 {å}{{\r a}}1 {Å}{{\r A}}1 + {€}{{\EUR}}1 {£}{{\pounds}}1 {«}{{\guillemotleft}}1 + {»}{{\guillemotright}}1 {ñ}{{\~n}}1 {Ñ}{{\~N}}1 {¿}{{?`}}1 + {…}{{\ldots}}1 {≥}{{>=}}1 {≤}{{<=}}1 {„}{{\glqq}}1 {“}{{\grqq}}1 + {”}{{''}}1 +} +\lstset{style=eisvogel_listing_style} + +% +% Java (Java SE 12, 2019-06-22) +% +\lstdefinelanguage{Java}{ + morekeywords={ + % normal keywords (without data types) + abstract,assert,break,case,catch,class,continue,default, + do,else,enum,exports,extends,final,finally,for,if,implements, + import,instanceof,interface,module,native,new,package,private, + protected,public,requires,return,static,strictfp,super,switch, + synchronized,this,throw,throws,transient,try,volatile,while, + % var is an identifier + var + }, + morekeywords={[2] % data types + % primitive data types + boolean,byte,char,double,float,int,long,short, + % String + String, + % primitive wrapper types + Boolean,Byte,Character,Double,Float,Integer,Long,Short + % number types + Number,AtomicInteger,AtomicLong,BigDecimal,BigInteger,DoubleAccumulator,DoubleAdder,LongAccumulator,LongAdder,Short, + % other + Object,Void,void + }, + morekeywords={[3] % literals + % reserved words for literal values + null,true,false, + }, + sensitive, + morecomment = [l]//, + morecomment = [s]{/*}{*/}, + morecomment = [s]{/**}{*/}, + morestring = [b]", + morestring = [b]', +} + +\lstdefinelanguage{XML}{ + morestring = [b]", + moredelim = [s][\bfseries\color{listing-keyword}]{<}{\ }, + moredelim = [s][\bfseries\color{listing-keyword}]{}, + moredelim = [l][\bfseries\color{listing-keyword}]{/>}, + moredelim = [l][\bfseries\color{listing-keyword}]{>}, + morecomment = [s]{}, + morecomment = [s]{}, + commentstyle = \color{listing-comment}, + stringstyle = \color{listing-string}, + identifierstyle = \color{listing-identifier} +} +$endif$ + +% +% header and footer +% +$if(beamer)$ +$else$ +$if(disable-header-and-footer)$ +$else$ +\usepackage[headsepline,footsepline]{scrlayer-scrpage} + +\newpairofpagestyles{eisvogel-header-footer}{ + \clearpairofpagestyles + \ihead*{$if(header-left)$$header-left$$else$$title$$endif$} + \chead*{$if(header-center)$$header-center$$else$$endif$} + \ohead*{$if(header-right)$$header-right$$else$$date$$endif$} + \ifoot*{$if(footer-left)$$footer-left$$else$$for(author)$$author$$sep$, $endfor$$endif$} + \cfoot*{$if(footer-center)$$footer-center$$else$$endif$} + \ofoot*{$if(footer-right)$$footer-right$$else$\thepage$endif$} + \addtokomafont{pageheadfoot}{\upshape} +} +\pagestyle{eisvogel-header-footer} + +\newpairofpagestyles{eisvogel-chapterpage-header-footer}{ + \clearpairofpagestyles + \setheadtopline{0pt} % 移除页眉顶部的横线（如果有） + \setheadsepline{0pt} + \ifoot*{$if(footer-left)$$footer-left$$else$$for(author)$$author$$sep$, $endfor$$endif$} + \cfoot*{$if(footer-center)$$footer-center$$else$$endif$} + \ofoot*{$if(footer-right)$$footer-right$$else$\thepage$endif$} + \addtokomafont{pageheadfoot}{\upshape} +} + + +$if(isbook)$ +% \deftripstyle{ChapterStyle}{}{}{}{}{\pagemark}{} +% \renewcommand*{\chapterpagestyle}{ChapterStyle} +\renewcommand*{\chapterpagestyle}{eisvogel-chapterpage-header-footer} +$endif$ + + +$if(page-background)$ +\backgroundsetup{ +scale=1, +color=black, +opacity=$if(page-background-opacity)$$page-background-opacity$$else$0.2$endif$, +angle=0, +contents={% + \includegraphics[width=\paperwidth,height=\paperheight]{$page-background$} + }% +} +$endif$ +$endif$ +$endif$ + +% watermark +$if(watermark)$ +\usepackage{draftwatermark,xcolor} +\SetWatermarkText{\textcolor{$if(watermark-color)$$watermark-color$$else$gray!3$endif$}{$watermark$}} +\SetWatermarkScale{1.2} % 缩小水印尺寸（数值越小越密集） +\SetWatermarkAngle{45} % 斜角排列（经典水印样式） +\SetWatermarkLightness{0.99} % 亮度调节 +$endif$ + +%% +%% end added +%% + +\begin{document} + +%% +%% begin titlepage +%% +$if(beamer)$ +$else$ +$if(titlepage)$ +\begin{titlepage} +$if(titlepage-background)$ +\newgeometry{top=2cm, right=4cm, bottom=3cm, left=4cm} +$else$ +\newgeometry{left=2cm} +$endif$ +$if(titlepage-color)$ +\definecolor{titlepage-color}{HTML}{$titlepage-color$} +\newpagecolor{titlepage-color}\afterpage{\restorepagecolor} +$endif$ +$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}}} + +\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$} +\makebox[0pt][l]{\colorRule[$if(titlepage-rule-color)$$titlepage-rule-color$$else$435488$endif$]{1.3\textwidth}{$if(titlepage-rule-height)$$titlepage-rule-height$$else$4$endif$pt}} +\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 +{ + \setstretch{2} + \vfill + \vskip -8em + $if(title-vskip)$ + \vskip $title-vskip$ + $endif$ + $if(title-hskip)$ + \vskip $title-hskip$ + $endif$ + \noindent { + $if(title-size)$ + \$title-size$ + $else$ + \huge + $endif$ +\textbf{\textsf{$title$}}} + $if(subtitle)$ + \vskip 1em + { + $if(subtitle-size)$ + \$subtitle-size$ + $else$ + \Large + $endif$ + \textsf{$subtitle$}} + $endif$ + \vskip 2em + $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$ +{\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 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-background)$ +$else$ + + $if(author-size)$ + $author-size$ + $else$ + \Large + $endif$ +{\textsf{$if(institute)$$institute$\vskip 0.6em$endif$$date$}} +$endif$ +\end{dynalign} +\end{titlepage} +\restoregeometry +\pagenumbering{arabic} +$endif$ +$endif$ + + + +%% +%% end titlepage +%% + +$if(has-frontmatter)$ +\frontmatter +$endif$ +$if(title)$ +$if(beamer)$ +\frame{\titlepage} +% don't generate the default title +% $else$ +% \maketitle +$endif$ +$if(abstract)$ +\begin{abstract} +$abstract$ +\end{abstract} +$endif$ +$endif$ + +$if(first-chapter)$ +\setcounter{chapter}{$first-chapter$} +\addtocounter{chapter}{-1} +$endif$ + +$for(include-before)$ +$include-before$ + +$endfor$ +$if(toc)$ +$if(toc-title)$ +\renewcommand*\contentsname{$toc-title$} +$endif$ +$if(beamer)$ +\begin{frame}[allowframebreaks] +$if(toc-title)$ + \frametitle{$toc-title$} +$endif$ + \setcounter{tocdepth}{$toc-depth$} + \tableofcontents +\end{frame} +$if(toc-own-page)$ +\newpage +$endif$ +$else$ +{ +$if(colorlinks)$ +\hypersetup{linkcolor=$if(toccolor)$$toccolor$$else$$endif$} +$endif$ +\setcounter{tocdepth}{$toc-depth$} +\tableofcontents +$if(toc-own-page)$ +\newpage +$endif$ +} +$endif$ +$endif$ +$if(lof)$ +\listoffigures +$endif$ +$if(lot)$ +\listoftables +$endif$ +$if(linestretch)$ +\setstretch{$linestretch$} +$endif$ +$if(has-frontmatter)$ +\mainmatter +$endif$ +$body$ + +$if(has-frontmatter)$ +\backmatter +$endif$ +$if(natbib)$ +$if(bibliography)$ +$if(biblio-title)$ +$if(has-chapters)$ +\renewcommand\bibname{$biblio-title$} +$else$ +\renewcommand\refname{$biblio-title$} +$endif$ +$endif$ +$if(beamer)$ +\begin{frame}[allowframebreaks]{$biblio-title$} + \bibliographytrue +$endif$ + \bibliography{$for(bibliography)$$bibliography$$sep$,$endfor$} +$if(beamer)$ +\end{frame} +$endif$ + +$endif$ +$endif$ +$if(biblatex)$ +$if(beamer)$ +\begin{frame}[allowframebreaks]{$biblio-title$} + \bibliographytrue + \printbibliography[heading=none] +\end{frame} +$else$ +\printbibliography$if(biblio-title)$[title=$biblio-title$]$endif$ +$endif$ + +$endif$ +$for(include-after)$ +$include-after$ + +$endfor$ +\end{document} diff --git a/dwev/_extensions/drwater/dwev/inst/elsevier-harvard.csl b/dwev/_extensions/drwater/dwev/inst/elsevier-harvard.csl new file mode 100755 index 0000000..5d88c51 --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/elsevier-harvard.csl @@ -0,0 +1,239 @@ + + diff --git a/dwev/_extensions/drwater/dwev/inst/nature-biotechnology.csl b/dwev/_extensions/drwater/dwev/inst/nature-biotechnology.csl new file mode 100644 index 0000000..216c8b9 --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/nature-biotechnology.csl @@ -0,0 +1,17 @@ + + diff --git a/dwev/_extensions/drwater/dwev/inst/nature.csl b/dwev/_extensions/drwater/dwev/inst/nature.csl new file mode 100644 index 0000000..7b058ba --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/nature.csl @@ -0,0 +1,154 @@ + + diff --git a/dwev/_extensions/drwater/dwev/inst/rceeslogo.pdf b/dwev/_extensions/drwater/dwev/inst/rceeslogo.pdf new file mode 100644 index 0000000..51d1a45 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/rceeslogo.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/rceeslogo.svg b/dwev/_extensions/drwater/dwev/inst/rceeslogo.svg new file mode 100644 index 0000000..44431ff --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/rceeslogo.svg @@ -0,0 +1,5 @@ + + viewBox="0 0 621 690"> + + + diff --git a/dwev/_extensions/drwater/dwev/inst/rceeslonglogo.pdf b/dwev/_extensions/drwater/dwev/inst/rceeslonglogo.pdf new file mode 100644 index 0000000..50017f7 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/rceeslonglogo.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/rceeslonglogo.svg b/dwev/_extensions/drwater/dwev/inst/rceeslonglogo.svg new file mode 100644 index 0000000..013b69d --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/rceeslonglogo.svg @@ -0,0 +1,352 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dwev/_extensions/drwater/dwev/inst/signms.pdf b/dwev/_extensions/drwater/dwev/inst/signms.pdf new file mode 100644 index 0000000..8b9afc3 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/signms.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/signms.png b/dwev/_extensions/drwater/dwev/inst/signms.png new file mode 100644 index 0000000..c292ad6 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/signms.png differ diff --git a/dwev/_extensions/drwater/dwev/inst/signms.pptx b/dwev/_extensions/drwater/dwev/inst/signms.pptx new file mode 100644 index 0000000..94e54f5 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/signms.pptx differ diff --git a/dwev/_extensions/drwater/dwev/inst/signms.svg b/dwev/_extensions/drwater/dwev/inst/signms.svg new file mode 100644 index 0000000..1218831 --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/signms.svg @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dwev/_extensions/drwater/dwev/inst/signmy.pdf b/dwev/_extensions/drwater/dwev/inst/signmy.pdf new file mode 100644 index 0000000..cbf0425 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/signmy.pdf differ diff --git a/dwev/_extensions/drwater/dwev/inst/signmy.png b/dwev/_extensions/drwater/dwev/inst/signmy.png new file mode 100755 index 0000000..325b81a Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/signmy.png differ diff --git a/dwev/_extensions/drwater/dwev/inst/signmy.pptx b/dwev/_extensions/drwater/dwev/inst/signmy.pptx new file mode 100644 index 0000000..0a8c283 Binary files /dev/null and b/dwev/_extensions/drwater/dwev/inst/signmy.pptx differ diff --git a/dwev/_extensions/drwater/dwev/inst/signmy.svg b/dwev/_extensions/drwater/dwev/inst/signmy.svg new file mode 100644 index 0000000..308039c --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/signmy.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dwev/_extensions/drwater/dwev/inst/the-isme-j.csl b/dwev/_extensions/drwater/dwev/inst/the-isme-j.csl new file mode 100755 index 0000000..730aefc --- /dev/null +++ b/dwev/_extensions/drwater/dwev/inst/the-isme-j.csl @@ -0,0 +1,181 @@ + + diff --git a/dwev/template.qmd b/dwev/template.qmd index 288f157..cce05ef 100644 --- a/dwev/template.qmd +++ b/dwev/template.qmd @@ -5,7 +5,7 @@ institute: "中国科学院生态环境研究中心" date: "today" subject: "Markdown" keywords: [Markdown, Example] -book: true +isbook: true top-level-division: chapter classoption: - fntef diff --git a/dwhm/_extensions/drwater/dwhm/_extension.yml b/dwhm/_extensions/drwater/dwhm/_extension.yml index 2a7ff8a..a1fb3fc 100644 --- a/dwhm/_extensions/drwater/dwhm/_extension.yml +++ b/dwhm/_extensions/drwater/dwhm/_extension.yml @@ -6,4 +6,4 @@ contributes: formats: html: toc: true - css: inst/drwater.css + css: _extensions/drwater/dwhm/inst/drwater.css diff --git a/dwhm/_extensions/drwater/dwhm/inst/drwater.css b/dwhm/_extensions/drwater/dwhm/inst/drwater.css deleted file mode 120000 index b67c701..0000000 --- a/dwhm/_extensions/drwater/dwhm/inst/drwater.css +++ /dev/null @@ -1 +0,0 @@ -../../../../../dwinst/drwater.css \ No newline at end of file diff --git a/dwhm/_extensions/drwater/dwhm/inst/drwater.css b/dwhm/_extensions/drwater/dwhm/inst/drwater.css new file mode 100755 index 0000000..0bbdcff --- /dev/null +++ b/dwhm/_extensions/drwater/dwhm/inst/drwater.css @@ -0,0 +1,109 @@ +.udot { + text-decoration-line: underline; + text-decoration-color: rgb(50, 50, 50); + text-decoration-style: dashed; + text-decoration-thickness: 1px; +} + +.good { + background-color: forestgreen; + color: lightyellow; +} + +.bad { + background-color: orangered; + color: lightyellow; +} + +.del { + text-decoration-line: line-through; + text-decoration-color: rgb(222 13 13); + text-decoration-style: initial; + text-decoration-thickness: 1.5px; +} + + +.todo { + background-color: darkorange; + color: lightyellow; +} + +.com { + background-color: #0025ff; + font-weight: bold; + color: lightyellow; +} + +.add { + text-decoration-line: underline; + text-decoration-color: rgb(222 13 13); + background-color: violet; + text-decoration-style: initial; + text-decoration-thickness: 2px; +} + + +del { + text-decoration-line: line-through; + text-decoration-color: rgb(222 13 13); + text-decoration-style: initial; + text-decoration-thickness: 1.0px; +} + + +ins { + text-decoration-color: rgb(222 93 93); + background-color: violet; + text-decoration-style: initial; + text-decoration-thickness: 2px; +} + +.clab { + background-color: rgb(255, 245, 240); +} + +.rem { + background-color: darkorange; + color: lightyellow; + text-decoration-thickness: 2px; +} + + +#criticnav { + position: fixed; + z-index: 1100; + top: 0; + right: 0; + width: 120px; + border-bottom: solid 1px #ffffff; + margin: 0; + padding: 10; + background-color: rgb(143 38 38 / 95%); + color: #ffffff; + font-size: 12px; + font-family: "Helvetica Neue", helvetica, arial, sans-serif !important +} + +#criticnav ul { + list-style-type: none; + width: 90%; + margin: 0 auto; + padding: 0 +} + +#criticnav ul li { + display: block; + width: 100px; + min-width: 80px; + text-align: center; + padding: 5px 0 3px !important; + margin: 5px 2px !important; + line-height: 1em; + float: center; + text-transform: uppercase; + cursor: pointer; + border-radius: 20px; + border: 3px solid rgba(255,255,255,0); + color: #fff !important +} + diff --git a/dwinst/dweisvogel.tex b/dwinst/dweisvogel.tex index b06056e..50b9664 100644 --- a/dwinst/dweisvogel.tex +++ b/dwinst/dweisvogel.tex @@ -73,7 +73,7 @@ $for(classoption)$ $classoption$$sep$, $endfor$ ,captions=tableheading -]{$if(beamer)$$documentclass$$else$$if(book)$scrbook$else$scrartcl$endif$$endif$} +]{$if(beamer)$$documentclass$$else$$if(isbook)$scrbook$else$scrartcl$endif$$endif$} $if(beamer)$ $if(background-image)$ \usebackgroundtemplate{% @@ -365,7 +365,7 @@ $endif$ % 为中文添加支持 by Ming Su $if(CJK)$ -$if(book)$ +$if(isbook)$ \usepackage{ctex} %调用中文字体宏包 \usepackage{indentfirst} %调用首行缩进宏包 \usepackage{ctex} % 确保中文字体支持 @@ -1028,7 +1028,7 @@ $else$ } -$if(book)$ +$if(isbook)$ % \deftripstyle{ChapterStyle}{}{}{}{}{\pagemark}{} % \renewcommand*{\chapterpagestyle}{ChapterStyle} \renewcommand*{\chapterpagestyle}{eisvogel-chapterpage-header-footer}