diff --git a/dwev/.gitignore b/dwev/.gitignore index 249e051..6b55381 100644 --- a/dwev/.gitignore +++ b/dwev/.gitignore @@ -1,6 +1,7 @@ -/*.pdf +demo/*.pdf /*_files /figure/ +/*.pdf diff --git a/dwev/_extension.yml b/dwev/_extension.yml index db5d3dd..faedb9e 100644 --- a/dwev/_extension.yml +++ b/dwev/_extension.yml @@ -1,7 +1,7 @@ -title: eisvogel +title: eisvogel template for drwater author: Ming Su version: 0.0.1 contributes: formats: pdf: - template: eisvogel.tex + template: dweisvogel.tex diff --git a/dwev/_extensions/drwater/dwev/_extension.yml b/dwev/_extensions/drwater/dwev/_extension.yml index db5d3dd..faedb9e 100644 --- a/dwev/_extensions/drwater/dwev/_extension.yml +++ b/dwev/_extensions/drwater/dwev/_extension.yml @@ -1,7 +1,7 @@ -title: eisvogel +title: eisvogel template for drwater author: Ming Su version: 0.0.1 contributes: formats: pdf: - template: eisvogel.tex + template: dweisvogel.tex diff --git a/dwev/_extensions/drwater/dwev/eisvogel.tex b/dwev/_extensions/drwater/dwev/dweisvogel.tex similarity index 97% rename from dwev/_extensions/drwater/dwev/eisvogel.tex rename to dwev/_extensions/drwater/dwev/dweisvogel.tex index 7ac9382..b06056e 100644 --- a/dwev/_extensions/drwater/dwev/eisvogel.tex +++ b/dwev/_extensions/drwater/dwev/dweisvogel.tex @@ -389,7 +389,7 @@ $if(book)$ % 修改目录中的章节编号为中文 \addtokomafont{chapterentry}{\normalfont} % 可选：调整目录字体 \renewcommand*{\chapterformat}{第\zhnumber{\thechapter}章} % 正文标题格式 -\renewcommand*{\chaptermarkformat}{第\zhnumber{\thechapter}章} % 页眉标题格式 +\renewcommand*{\chaptermarkformat}{第\zhnumber{\thechapter}章\quad} % 页眉标题格式 % 关键！覆盖目录中的章节编号 \renewcommand{\addchaptertocentry}[2]{% \addtocentrydefault{chapter}{第\zhnumber{#1}章}{#2}% @@ -655,7 +655,7 @@ $if(lang)$ pdflang={$lang$}, $endif$ $if(subject)$ - pdfsubject={$subject$}, +pdfsubject={$subject$}, $endif$ $if(keywords)$ pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$}, @@ -1017,11 +1017,24 @@ $else$ } \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(book)$ -\deftripstyle{ChapterStyle}{}{}{}{}{\pagemark}{} -\renewcommand*{\chapterpagestyle}{ChapterStyle} +% \deftripstyle{ChapterStyle}{}{}{}{}{\pagemark}{} +% \renewcommand*{\chapterpagestyle}{ChapterStyle} +\renewcommand*{\chapterpagestyle}{eisvogel-chapterpage-header-footer} $endif$ + $if(page-background)$ \backgroundsetup{ scale=1, @@ -1036,6 +1049,15 @@ $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 %% diff --git a/dwev/basic-example.pdf b/dwev/basic-example.pdf deleted file mode 100644 index 63be4d5..0000000 Binary files a/dwev/basic-example.pdf and /dev/null differ diff --git a/dwev/beamer.pdf b/dwev/beamer.pdf deleted file mode 100644 index 7d2c508..0000000 Binary files a/dwev/beamer.pdf and /dev/null differ diff --git a/dwev/book.pdf b/dwev/book.pdf deleted file mode 100644 index 4724f44..0000000 Binary files a/dwev/book.pdf and /dev/null differ diff --git a/dwev/bookcn.pdf b/dwev/bookcn.pdf deleted file mode 100644 index 3c84bf8..0000000 Binary files a/dwev/bookcn.pdf and /dev/null differ diff --git a/dwev/boxes-with-pandoc-latex-environment-and-awesomebox.pdf b/dwev/boxes-with-pandoc-latex-environment-and-awesomebox.pdf deleted file mode 100644 index 9f413f7..0000000 Binary files a/dwev/boxes-with-pandoc-latex-environment-and-awesomebox.pdf and /dev/null differ diff --git a/dwev/boxes-with-pandoc-latex-environment-and-tcolorbox.pdf b/dwev/boxes-with-pandoc-latex-environment-and-tcolorbox.pdf deleted file mode 100644 index 3a50751..0000000 Binary files a/dwev/boxes-with-pandoc-latex-environment-and-tcolorbox.pdf and /dev/null differ diff --git a/dwev/code-blocks-listings.pdf b/dwev/code-blocks-listings.pdf deleted file mode 100644 index 14e2182..0000000 Binary files a/dwev/code-blocks-listings.pdf and /dev/null differ diff --git a/dwev/beamer.qmd b/dwev/demo/beamer.qmd similarity index 100% rename from dwev/beamer.qmd rename to dwev/demo/beamer.qmd diff --git a/dwev/book.qmd b/dwev/demo/book.qmd similarity index 100% rename from dwev/book.qmd rename to dwev/demo/book.qmd diff --git a/dwev/boxes-with-pandoc-latex-environment-and-awesomebox.qmd b/dwev/demo/boxes-with-pandoc-latex-environment-and-awesomebox.qmd similarity index 100% rename from dwev/boxes-with-pandoc-latex-environment-and-awesomebox.qmd rename to dwev/demo/boxes-with-pandoc-latex-environment-and-awesomebox.qmd diff --git a/dwev/boxes-with-pandoc-latex-environment-and-tcolorbox.qmd b/dwev/demo/boxes-with-pandoc-latex-environment-and-tcolorbox.qmd similarity index 100% rename from dwev/boxes-with-pandoc-latex-environment-and-tcolorbox.qmd rename to dwev/demo/boxes-with-pandoc-latex-environment-and-tcolorbox.qmd diff --git a/dwev/code-blocks-listings.qmd b/dwev/demo/code-blocks-listings.qmd similarity index 100% rename from dwev/code-blocks-listings.qmd rename to dwev/demo/code-blocks-listings.qmd diff --git a/dwev/code-blocks-without-listings.qmd b/dwev/demo/code-blocks-without-listings.qmd similarity index 100% rename from dwev/code-blocks-without-listings.qmd rename to dwev/demo/code-blocks-without-listings.qmd diff --git a/dwev/header-and-footer.qmd b/dwev/demo/header-and-footer.qmd similarity index 100% rename from dwev/header-and-footer.qmd rename to dwev/demo/header-and-footer.qmd diff --git a/dwev/images-and-tables.qmd b/dwev/demo/images-and-tables.qmd similarity index 100% rename from dwev/images-and-tables.qmd rename to dwev/demo/images-and-tables.qmd diff --git a/dwev/images-and-tables.tex b/dwev/demo/images-and-tables.tex similarity index 100% rename from dwev/images-and-tables.tex rename to dwev/demo/images-and-tables.tex diff --git a/dwev/language-chinese.qmd b/dwev/demo/language-chinese.qmd similarity index 100% rename from dwev/language-chinese.qmd rename to dwev/demo/language-chinese.qmd diff --git a/dwev/language-german.qmd b/dwev/demo/language-german.qmd similarity index 100% rename from dwev/language-german.qmd rename to dwev/demo/language-german.qmd diff --git a/dwev/language-japanese.qmd b/dwev/demo/language-japanese.qmd similarity index 100% rename from dwev/language-japanese.qmd rename to dwev/demo/language-japanese.qmd diff --git a/dwev/page-background.qmd b/dwev/demo/page-background.qmd similarity index 100% rename from dwev/page-background.qmd rename to dwev/demo/page-background.qmd diff --git a/dwev/table-of-contents.qmd b/dwev/demo/table-of-contents.qmd similarity index 100% rename from dwev/table-of-contents.qmd rename to dwev/demo/table-of-contents.qmd diff --git a/dwev/title-page-background.qmd b/dwev/demo/title-page-background.qmd similarity index 100% rename from dwev/title-page-background.qmd rename to dwev/demo/title-page-background.qmd diff --git a/dwev/title-page-custom.qmd b/dwev/demo/title-page-custom.qmd similarity index 100% rename from dwev/title-page-custom.qmd rename to dwev/demo/title-page-custom.qmd diff --git a/dwev/title-page-default.qmd b/dwev/demo/title-page-default.qmd similarity index 100% rename from dwev/title-page-default.qmd rename to dwev/demo/title-page-default.qmd diff --git a/dwev/title-page-green.qmd b/dwev/demo/title-page-green.qmd similarity index 100% rename from dwev/title-page-green.qmd rename to dwev/demo/title-page-green.qmd diff --git a/dwev/title-page-logo.qmd b/dwev/demo/title-page-logo.qmd similarity index 100% rename from dwev/title-page-logo.qmd rename to dwev/demo/title-page-logo.qmd diff --git a/dwev/eisvogel.tex b/dwev/dweisvogel.tex similarity index 97% rename from dwev/eisvogel.tex rename to dwev/dweisvogel.tex index 7ac9382..b06056e 100644 --- a/dwev/eisvogel.tex +++ b/dwev/dweisvogel.tex @@ -389,7 +389,7 @@ $if(book)$ % 修改目录中的章节编号为中文 \addtokomafont{chapterentry}{\normalfont} % 可选：调整目录字体 \renewcommand*{\chapterformat}{第\zhnumber{\thechapter}章} % 正文标题格式 -\renewcommand*{\chaptermarkformat}{第\zhnumber{\thechapter}章} % 页眉标题格式 +\renewcommand*{\chaptermarkformat}{第\zhnumber{\thechapter}章\quad} % 页眉标题格式 % 关键！覆盖目录中的章节编号 \renewcommand{\addchaptertocentry}[2]{% \addtocentrydefault{chapter}{第\zhnumber{#1}章}{#2}% @@ -655,7 +655,7 @@ $if(lang)$ pdflang={$lang$}, $endif$ $if(subject)$ - pdfsubject={$subject$}, +pdfsubject={$subject$}, $endif$ $if(keywords)$ pdfkeywords={$for(keywords)$$keywords$$sep$, $endfor$}, @@ -1017,11 +1017,24 @@ $else$ } \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(book)$ -\deftripstyle{ChapterStyle}{}{}{}{}{\pagemark}{} -\renewcommand*{\chapterpagestyle}{ChapterStyle} +% \deftripstyle{ChapterStyle}{}{}{}{}{\pagemark}{} +% \renewcommand*{\chapterpagestyle}{ChapterStyle} +\renewcommand*{\chapterpagestyle}{eisvogel-chapterpage-header-footer} $endif$ + $if(page-background)$ \backgroundsetup{ scale=1, @@ -1036,6 +1049,15 @@ $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 %% diff --git a/dwev/figure/fig-fig1-1.pdf b/dwev/figure/fig-fig1-1.pdf index 2711ffe..59f83ef 100644 Binary files a/dwev/figure/fig-fig1-1.pdf and b/dwev/figure/fig-fig1-1.pdf differ diff --git a/dwev/header-and-footer.pdf b/dwev/header-and-footer.pdf deleted file mode 100644 index 378aa8c..0000000 Binary files a/dwev/header-and-footer.pdf and /dev/null differ diff --git a/dwev/inst/drwater-gray1.pdf b/dwev/inst/drwater-gray1.pdf new file mode 100644 index 0000000..7fa9b94 Binary files /dev/null and b/dwev/inst/drwater-gray1.pdf differ diff --git a/dwev/inst/drwater-gray1.svg b/dwev/inst/drwater-gray1.svg new file mode 100644 index 0000000..68a8fc9 --- /dev/null +++ b/dwev/inst/drwater-gray1.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dwev/inst/drwater-green0.pdf b/dwev/inst/drwater-green0.pdf new file mode 100644 index 0000000..88b7fda Binary files /dev/null and b/dwev/inst/drwater-green0.pdf differ diff --git a/dwev/inst/drwater-green0.svg b/dwev/inst/drwater-green0.svg new file mode 100644 index 0000000..00fe227 --- /dev/null +++ b/dwev/inst/drwater-green0.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/dwev/inst/drwater-green1.pdf b/dwev/inst/drwater-green1.pdf new file mode 100644 index 0000000..091548e Binary files /dev/null and b/dwev/inst/drwater-green1.pdf differ diff --git a/dwev/inst/drwater-green1.svg b/dwev/inst/drwater-green1.svg new file mode 100644 index 0000000..b6990aa --- /dev/null +++ b/dwev/inst/drwater-green1.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dwev/inst/drwater-greenline0.pdf b/dwev/inst/drwater-greenline0.pdf new file mode 100644 index 0000000..86786fa Binary files /dev/null and b/dwev/inst/drwater-greenline0.pdf differ diff --git a/dwev/inst/drwater-greenline0.svg b/dwev/inst/drwater-greenline0.svg new file mode 100644 index 0000000..7eec8c8 --- /dev/null +++ b/dwev/inst/drwater-greenline0.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dwev/inst/drwater-white0.pdf b/dwev/inst/drwater-white0.pdf new file mode 100644 index 0000000..ca69ef8 Binary files /dev/null and b/dwev/inst/drwater-white0.pdf differ diff --git a/dwev/inst/drwater-white0.svg b/dwev/inst/drwater-white0.svg new file mode 100644 index 0000000..0a12a38 --- /dev/null +++ b/dwev/inst/drwater-white0.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/dwev/language-chinese.pdf b/dwev/language-chinese.pdf deleted file mode 100644 index 71a32ce..0000000 Binary files a/dwev/language-chinese.pdf and /dev/null differ diff --git a/dwev/language-german.pdf b/dwev/language-german.pdf deleted file mode 100644 index 18b03c2..0000000 Binary files a/dwev/language-german.pdf and /dev/null differ diff --git a/dwev/language-japanese.pdf b/dwev/language-japanese.pdf deleted file mode 100644 index 3b2d668..0000000 Binary files a/dwev/language-japanese.pdf and /dev/null differ diff --git a/dwev/page-background.pdf b/dwev/page-background.pdf deleted file mode 100644 index 96ba269..0000000 Binary files a/dwev/page-background.pdf and /dev/null differ diff --git a/dwev/table-of-contents.pdf b/dwev/table-of-contents.pdf deleted file mode 100644 index 2eae105..0000000 Binary files a/dwev/table-of-contents.pdf and /dev/null differ diff --git a/dwev/bookcn.qmd b/dwev/template.qmd similarity index 85% rename from dwev/bookcn.qmd rename to dwev/template.qmd index ee7350a..fd12ca5 100644 --- a/dwev/bookcn.qmd +++ b/dwev/template.qmd @@ -10,7 +10,6 @@ top-level-division: chapter classoption: - fntef - UTF8 - # - scheme=plain # 标题样式方案 - zihao=-4 # 正文字号小四 - lang=cn # - chinesefont=founder # founder|ctexfont|nofont @@ -20,7 +19,7 @@ classoption: # classoption: [oneside] titlepage: true keep-tex: false -# titlepage-rule-color: "360049" +titlepage-rule-color: "360049" titlepage-text-color: "360049" titlepage-rule-height: 0 titlepage-background: "inst/cover1.pdf" @@ -32,21 +31,21 @@ date-vskip: -1em caption-justification: centering numbersections: true parindent: true -titlepage-logo: "inst/rceeslogo.pdf" -logo-width: 20mm -logo-vskip: -8em -logo-hskip: "-6em" -lang: zh-CN +# titlepage-logo: "inst/rceeslogo.pdf" +# logo-width: 20mm +# logo-vskip: -8em +# logo-hskip: "-6em" +lang: zh-CN # 不能改为cn，否则目录等不是中文 CJK: true fig-pos: "!t" colorlinks: true urlcolor: blue -header-left: "\\hspace{1cm}" -header-center: "\\leftmark" +header-left: "\\leftmark" +header-center: "\\hspace{1cm}" header-right: "第\\thepage 页" -footer-left: "\\thetitle" -# footer-center: "This is \\LaTeX{}" -footer-right: "\\leftmark" +footer-left: "\\hspace{1cm}" # \\thetitle +footer-center: "\\includegraphics[height=1.5em]{inst/drwater-gray1.pdf}" +footer-right: "\\hspace{1cm}" toc: true toc-own-page: true fig-toc: true @@ -58,6 +57,8 @@ CJKmonofont: "Noto Sans Mono CJK SC" CJKoptions: | AutoFakeBold=true # include-in-header: header.tex +# watermark: "drwater" +# watermark-color: "gray!3" format: dwev-pdf --- @@ -81,13 +82,12 @@ rmdify::rmd_init() # 项目背景与国内外现状介绍 -*asdfsd* *你好* 阿斯顿发 **你好** asdf ::: callout-warning Book in early development. Planned release in 202X. ::: -本书分三大部分，分别是机器学习、贝叶斯建模和空间分析。三个部分分别依据任务类型、模型种类和数据类型展开，不同的写作出发点将呈现不一样的写作风格。应用机器学习首先需要确定任务类型，根据不同的任务选用不同的算法。贝叶斯建模从简单到复杂分频率和贝叶斯方法介绍主流的统计模型。应用空间分析方法需要根据空间数据类型（生成机理）而定，不同的生成机理将对应不同的建模和分析方法。机器学习根据任务类型分聚类、分类、回归和排序四个章节。贝叶斯建模根据模型种类分概率推理框架、线性模型、广义线性模型、分层正态模型、混合效应模型、广义可加模型、高斯过程回归、时间序列回归等八个章节。空间分析部分根据空间数据类型分点模式数据分析、点参考数据分析和区域数据分析三个章节。如[@fig-fig1]所示。 +*asdfsd* *你好* 阿斯顿发 **你好** asdf。本书分三大部分，分别是机器学习、贝叶斯建模和空间分析。三个部分分别依据任务类型、模型种类和数据类型展开，不同的写作出发点将呈现不一样的写作风格。应用机器学习首先需要确定任务类型，根据不同的任务选用不同的算法。贝叶斯建模从简单到复杂分频率和贝叶斯方法介绍主流的统计模型。应用空间分析方法需要根据空间数据类型（生成机理）而定，不同的生成机理将对应不同的建模和分析方法。机器学习根据任务类型分聚类、分类、回归和排序四个章节。贝叶斯建模根据模型种类分概率推理框架、线性模型、广义线性模型、分层正态模型、混合效应模型、广义可加模型、高斯过程回归、时间序列回归等八个章节。空间分析部分根据空间数据类型分点模式数据分析、点参考数据分析和区域数据分析三个章节。如[@fig-fig1]所示。 ```{r} @@ -99,9 +99,15 @@ plot(1) -## 环境信息 {#session .unnumbered} +## 环境信息 + +本书采用科学和技术写作排版系统 [Quarto](https://quarto.org/) 编写，所有代码和文本混编在 qmd 格式的纯文本文件中，具有计算可重复性，即内含的 R 语言、Stan 语言和 Python 语言代码都可运行，并将计算结果插入到最终的文档中，本书使用的主要 R 包及版本信息如[@eq-eq1]所示： + +$$ +x^2+y^2+z^2=a^2 +$$ {#eq-eq1} + -本书采用科学和技术写作排版系统 [Quarto](https://quarto.org/) 编写，所有代码和文本混编在 qmd 格式的纯文本文件中，具有计算可重复性，即内含的 R 语言、Stan 语言和 Python 语言代码都可运行，并将计算结果插入到最终的文档中，本书使用的主要 R 包及版本信息如下： # 主要进展1 diff --git a/dwev/title-page-background.pdf b/dwev/title-page-background.pdf deleted file mode 100644 index 22ce0ac..0000000 Binary files a/dwev/title-page-background.pdf and /dev/null differ diff --git a/dwev/title-page-custom.pdf b/dwev/title-page-custom.pdf deleted file mode 100644 index ed147b4..0000000 Binary files a/dwev/title-page-custom.pdf and /dev/null differ diff --git a/dwev/title-page-default.pdf b/dwev/title-page-default.pdf deleted file mode 100644 index 1655a43..0000000 Binary files a/dwev/title-page-default.pdf and /dev/null differ diff --git a/dwev/title-page-green.pdf b/dwev/title-page-green.pdf deleted file mode 100644 index 98fb3fd..0000000 Binary files a/dwev/title-page-green.pdf and /dev/null differ diff --git a/dwev/title-page-logo.pdf b/dwev/title-page-logo.pdf deleted file mode 100644 index 1ea1dc1..0000000 Binary files a/dwev/title-page-logo.pdf and /dev/null differ