diff --git a/MS/RN.qmd b/MS/RN.qmd index 6ba2d23..35f02a8 100644 --- a/MS/RN.qmd +++ b/MS/RN.qmd @@ -13,6 +13,8 @@ filters: - latex-environment - authoraffil lightbox: auto +execute: + excute: false --- ```{r} diff --git a/MS/SM.qmd b/MS/SM.qmd index 169bcbe..3b24131 100644 --- a/MS/SM.qmd +++ b/MS/SM.qmd @@ -17,7 +17,6 @@ format: filters: - latex-environment - authoraffil -lightbox: auto commands: [clab] --- diff --git a/RP/20231231_XX项目报告/index.qmd b/RP/20231231_XX项目报告/index.qmd deleted file mode 100644 index 80d66e6..0000000 --- a/RP/20231231_XX项目报告/index.qmd +++ /dev/null @@ -1,44 +0,0 @@ ---- -author: "中国科学院生态环境研究中心" -metadata-files: - - ../_metadata.yml ---- - -::: {.content-visible when-format="html"} -# Color tip {.unnumbered} - -- [Something should be deleted]{.del} -- [Something bad]{.bad} -- [Something good]{.good} -- [Something todo]{.todo} -- [Something should be added]{.add} -- [I am a comment]{.com} -::: - - -```{r} -#| label: setup -#| include: false -#| cache: false -lang <- "cn" -RM <- "F" # global rendermode, L: load pdata; F: fast load pdf -isRendering <- !isTRUE(getOption('knitr.in.progress')) -require(lubridate) -require(tidyverse) -require(patchwork) -require(drwateR) -rmdify::rmd_init() -``` - -# 摘要 - -# 项目背景与国内外现状介绍 - -# 主要进展1 - -# 主要进展2 - -# 结论与下一步计划 - - -# 参考文献{-} diff --git a/RP/20231231_XX项目报告/.gitignore b/RP/20231231_report/.gitignore similarity index 100% rename from RP/20231231_XX项目报告/.gitignore rename to RP/20231231_report/.gitignore diff --git a/RP/20231231_XX项目报告/_extensions b/RP/20231231_report/_extensions similarity index 100% rename from RP/20231231_XX项目报告/_extensions rename to RP/20231231_report/_extensions diff --git a/RP/20231231_report/index.qmd b/RP/20231231_report/index.qmd new file mode 100644 index 0000000..49d6968 --- /dev/null +++ b/RP/20231231_report/index.qmd @@ -0,0 +1,33 @@ +--- +subtitle: "Research Progress Report" +author: "" +format: + dwhm-html: default + dwms-docx: default + dwev-pdf: default +--- + +```{r} +#| include: false +lang <- "cn" +RM <- "F" # global rendermode, L: load pdata; F: fast load pdf +isRendering <- !isTRUE(getOption('knitr.in.progress')) +require(lubridate) +require(tidyverse) +require(patchwork) +require(drwateR) +rmdify::rmd_init() +``` + +# 摘要 + +# 研究背景与国内外现状介绍 + +# 主要进展1 + +# 主要进展2 + +# 结论与下一步计划 + + +# 参考文献{-} diff --git a/RP/_metadata.yml b/RP/_metadata.yml index 9430dd1..243289e 100644 --- a/RP/_metadata.yml +++ b/RP/_metadata.yml @@ -50,11 +50,8 @@ CJKsansfont: "Noto Sans CJK SC" CJKmonofont: "Noto Sans Mono CJK SC" CJKoptions: | AutoFakeBold=true + # include-in-header: header.tex # watermark: "drwater" # watermark-color: "gray!3" -format: - dwhm-html: default - dwms-docx: default - # epub: default - dwev-pdf: default + diff --git a/RP/index.qmd b/RP/index.qmd index 2148be0..5d47458 100644 --- a/RP/index.qmd +++ b/RP/index.qmd @@ -1,8 +1,10 @@ --- -subtitle: "Report" +subtitle: "Reports" +author: "" +execute: + freeze: false --- - ```{r} #| output: asis data.frame(fd = dir(".", pattern = "\\d{4}[-_]")) |> @@ -26,11 +28,9 @@ data.frame(fd = dir(".", pattern = "\\d{4}[-_]")) |> !grepl("qmd$", .x), "", paste0( - "\n\n" + "{{< pdf ", + gsub("qmd$", "pdf", .x), + " width=400 height=510 button=\"Download\" >}}\n\n" ) ) ) diff --git a/SD/20230101_outline/index.qmd b/SD/20230101_outline/index.qmd index 27596b7..c047c3a 100644 --- a/SD/20230101_outline/index.qmd +++ b/SD/20230101_outline/index.qmd @@ -2,10 +2,6 @@ subtitle: "Outline & Key figures" author: "AUTHOR" institute: "RCEES, CAS" -lang: en -background-image: _extensions/drwater/dwsd/inst/rceeslogo.svg -format: - dwsd-revealjs: default # filters: # - watermark --- diff --git a/SD/_metadata.yml b/SD/_metadata.yml new file mode 100644 index 0000000..4a17bf8 --- /dev/null +++ b/SD/_metadata.yml @@ -0,0 +1,6 @@ +author: "" +background-image: _extensions/drwater/dwsd/inst/rceeslogo.svg +format: + dwsd-revealjs: default +execute: + freeze: true diff --git a/SD/index.qmd b/SD/index.qmd index 148e799..858fda9 100644 --- a/SD/index.qmd +++ b/SD/index.qmd @@ -1,5 +1,8 @@ --- subtitle: "Slides" +author: "" +execute: + freeze: false --- diff --git a/_extensions/drwater b/_extensions/drwater index ad3cd1a..5affc0d 160000 --- a/_extensions/drwater +++ b/_extensions/drwater @@ -1 +1 @@ -Subproject commit ad3cd1a0a4c7e376711f4676a07619f4b557b34a +Subproject commit 5affc0d0a1abde4446cd6e356927b02d5d42518f diff --git a/_metadata-protected.yml b/_metadata-protected.yml new file mode 100644 index 0000000..cdeaf70 --- /dev/null +++ b/_metadata-protected.yml @@ -0,0 +1,72 @@ +project: + type: website + output-dir: www/ + render: + - index.qmd + - version.qmd + - MS/SM.qmd + - MS/MS.qmd + - MS/RN.qmd + - MS/CL.qmd + - MS/HL.qmd + - MS/RP.qmd + - MS/index.qmd + - TC/index.qmd + - SD/ + - MS/RN.qmd + - MS/AC.qmd + - RP/ + - AC/ + - about.qmd + +website: + navbar: + logo: "./_extensions/drwater/dwinst/drwater-white0.svg" + background: "#3D6E3B" + search: true + right: + - icon: house + text: "Home" + file: index.qmd + - text: "Main files" + menu: + - text: "Manuscript" + file: MS/MS.qmd + - text: "Supplementary Materials" + file: MS/SM.qmd + - text: "Highlights" + file: MS/HL.qmd + - text: "Revision Notes" + file: MS/RN.qmd + - text: "Cover Letter" + file: MS/CL.qmd + - text: "Slides" + file: SD/index.qmd + - text: "Links" + menu: + - text: "Version" + href: version.qmd + - text: "DRC" + href: "https://drc.drwater.net/" + - text: "Dr. Water" + href: "https://drwater.net/" + - text: "Others" + menu: + - text: "Reports" + file: RP/index.qmd + - text: "Author Credits" + file: MS/AC.qmd + - text: "Accomplishment" + file: AC/index.qmd + - text: "Trackchanges" + file: TC/index.qmd + # - text: "MS with raw bibkey" + # file: MS/MS_nobib.docx + - text: "About" + file: about.qmd + - icon: git + menu: + - text: Codes + url: https://git.drwater.net/{{< var projtype >}}/{{< var reponame >}}/src/branch/{{< var branch >}} + - text: Issue + url: https://git.drwater.net/manuscript/{{< var reponame >}}/issues diff --git a/_metadata-public.yml b/_metadata-public.yml new file mode 100644 index 0000000..0cd8150 --- /dev/null +++ b/_metadata-public.yml @@ -0,0 +1,56 @@ +project: + type: website + output-dir: www/ + render: + - index.qmd + - version.qmd + - MS/HL.qmd + - MS/SM.qmd + - MS/MS.qmd + - MS/index.qmd + - PS/ + - SD/ + - MS/AC.qmd + - about.qmd + +website: + navbar: + logo: "./_extensions/drwater/dwinst/drwater-white0.svg" + background: "#3D6E3B" + search: true + right: + - icon: house + text: "Home" + file: index.qmd + - text: "Main files" + menu: + - text: "Manuscript" + file: MS/MS.qmd + - text: "Supplementary Materials" + file: MS/SM.qmd + - text: "Highlights" + file: MS/HL.qmd + - text: "Poster" + file: PS/index.qmd + - text: "Slides" + file: SD/index.qmd + - text: "Links" + menu: + - text: "Version" + href: version.qmd + - text: "DRC" + href: "https://drc.drwater.net/" + - text: "Dr. Water" + href: "https://drwater.net/" + - text: "Others" + menu: + - text: "Accomplishment" + file: AC/index.qmd + - text: "About" + file: about.qmd + - icon: git + menu: + - text: Codes + url: https://git.drwater.net/{{< var projtype >}}/{{< var reponame >}}/src/branch/{{< var branch >}} + - text: Issue + url: https://git.drwater.net/manuscript/{{< var reponame >}}/issues diff --git a/_metadata.yml b/_metadata.yml index c06b93d..7cfaaf2 100644 --- a/_metadata.yml +++ b/_metadata.yml @@ -1,29 +1,12 @@ project: type: website output-dir: www/ - render: - - index.qmd - - version.qmd - - MS/SM.qmd - - MS/MS.qmd - - MS/RN.qmd - - MS/CL.qmd - - MS/HL.qmd - - MS/RP.qmd - - MS/index.qmd - - TC/index.qmd - - SD/ - - MS/RN.qmd - - MS/AC.qmd - - RP/ - - AC/ - - about.qmd bibliography: [BB/Ref.bib, BB/localRef.bib] lang: en date: last-modified -# bibliography: [BB/Ref.bib, BB/localRef.bib] prefer-html: true + crossref: fig-title: Fig. # (default is "Figure") tbl-title: Table # (default is "Table") @@ -98,6 +81,7 @@ crossref: latex-env: etb latex-list-of-file-extension: lost latex-list-of-description: Extended Data Table + website: title: "{{< var reponame >}}: {{< var branch >}}" reader-mode: true @@ -105,58 +89,12 @@ website: repo-url: https://git.drwater.net/{{< var projtype >}}/{{< var reponame >}} repo-actions: [edit, source, issue] page-navigation: true - page-footer: "Copyright 2025, [Dr. Water](https://drwater.net)" - navbar: - logo: "./_extensions/drwater/dwinst/drwater-white0.svg" - background: "#3D6E3B" - search: true - right: - - icon: house - text: "Home" - file: index.qmd - - text: "Main files" - menu: - - text: "Manuscript" - file: MS/MS.qmd - - text: "Supplementary Materials" - file: MS/SM.qmd - - text: "Revision Notes" - file: MS/RN.qmd - - text: "Cover Letter" - file: MS/CL.qmd - - text: "Highlights" - file: MS/HL.qmd - - text: "Slides" - file: SD/index.qmd - - text: "Links" - menu: - - text: "Version" - href: version.qmd - - text: "DRC" - href: "https://drc.drwater.net/" - - text: "Dr. Water" - href: "https://drwater.net/" - - text: "Others" - menu: - - text: "Reports" - file: RP/index.qmd - - text: "Author Credits" - file: MS/AC.qmd - - text: "Accomplishment" - file: AC/index.qmd - - text: "Trackchanges" - file: TC/index.qmd - # - text: "MS with raw bibkey" - # file: MS/MS_nobib.docx - - text: "About" - file: about.qmd - - icon: git - menu: - - text: Codes - url: https://git.drwater.net/{{< var projtype >}}/{{< var reponame >}}/src/branch/{{< var branch >}} - - text: Issue - url: https://git.drwater.net/manuscript/{{< var reponame >}}/issues - + page-footer: "© 2024 [DRWATER Resource Center](https://drc.drwater.net).All rights reserved.
Empowering Research and Innovation" + google-analytics: "G-047QTSHC6Y" + twitter-card: + card-style: summary_large_image + creator: "@msu86" + site: "@msu86" comments: hypothesis: theme: clean @@ -186,3 +124,5 @@ watermark: revealjs-plugins: - pointer + +lightbox: auto diff --git a/_metadata_pub.yml b/_metadata_pub.yml deleted file mode 100644 index 3be6260..0000000 --- a/_metadata_pub.yml +++ /dev/null @@ -1,164 +0,0 @@ -project: - type: website - output-dir: www/ - render: - - index.qmd - - version.qmd - - MS/HL.qmd - - MS/SM.qmd - - MS/MS.qmd - - MS/index.qmd - - PS/ - - SD/ - - MS/AC.qmd - # - RP/ - # - AC/ - - about.qmd - -lang: en -date: last-modified -bibliography: [BB/Ref.bib, BB/localRef.bib] -prefer-html: true -crossref: - fig-title: Fig. # (default is "Figure") - tbl-title: Table # (default is "Table") - eq-title: Eq. # (default is "Equation") - title-delim: ":" # (default is ":") - fig-prefix: Fig. # (default is "Figure") - tbl-prefix: Table # (default is "Table") - eq-prefix: Eq. - ref-hyperlink: true # (default is true) - custom: - - kind: float - key: sfg - reference-prefix: "Supplementary Fig." - space-before-numbering: true - caption-prefix: "Supplementary Fig." - latex-env: sfg - latex-list-of-file-extension: lost - latex-list-of-description: Supplementary Figure - - kind: float - key: stb - reference-prefix: "Supplementary Table" - space-before-numbering: true - caption-prefix: "Supplementary Table" - latex-env: stb - latex-list-of-file-extension: lost - latex-list-of-description: Supplementary Table - - kind: float - key: seq - reference-prefix: "Supplementary Eq." - space-before-numbering: true - caption-prefix: "Supplementary Eq." - latex-env: seq - latex-list-of-file-extension: lost - latex-list-of-description: Supplementary Equation - - kind: float - key: rfg - reference-prefix: "Fig. R" - space-before-numbering: false - caption-prefix: "Fig. R" - latex-env: rfg - latex-list-of-file-extension: lost - latex-list-of-description: Revision Figure - - kind: float - key: rtb - reference-prefix: "Table R" - space-before-numbering: false - caption-prefix: "Table R" - latex-env: rtb - latex-list-of-file-extension: lost - latex-list-of-description: Revision Table - - kind: float - key: req - reference-prefix: "Eq R" - space-before-numbering: false - caption-prefix: "Eq R" - latex-env: req - latex-list-of-file-extension: lost - latex-list-of-description: Revision Equation - - kind: float - key: efg - reference-prefix: "Extended Data Fig." - space-before-numbering: true - caption-prefix: "Extended Data Fig." - latex-env: efg - latex-list-of-file-extension: lost - latex-list-of-description: Extended Data Figure - - kind: float - key: etb - reference-prefix: "Extended Data Table" - space-before-numbering: true - caption-prefix: "Extended Data Table" - latex-env: etb - latex-list-of-file-extension: lost - latex-list-of-description: Extended Data Table -website: - title: "{{< var reponame >}}: {{< var branch >}}" - reader-mode: true - site-url: https://drc.drwater.net/{{< var projtype >}}/{{< var reponame >}}/{{< var branch >}} - repo-url: https://git.drwater.net/{{< var projtype >}}/{{< var reponame >}} - repo-actions: [edit, source, issue] - page-navigation: true - page-footer: "Copyright 2025, [Dr. Water](https://drwater.net)" - navbar: - logo: "./_extensions/drwater/dwinst/drwater-white0.svg" - background: "#3D6E3B" - search: true - right: - - icon: house - text: "Home" - file: index.qmd - - text: "Main files" - menu: - - text: "Manuscript" - file: MS/MS.qmd - - text: "Supplementary Materials" - file: MS/SM.qmd - - text: "Highlights" - file: MS/HL.qmd - - text: "Poster" - file: PS/index.qmd - - text: "Slides" - file: SD/index.qmd - - text: "Links" - menu: - - text: "Version" - href: version.qmd - - text: "DRC" - href: "https://drc.drwater.net/" - - text: "Dr. Water" - href: "https://drwater.net/" - - text: "Others" - menu: - # - text: "Reports" - # file: RP/index.qmd - # - text: "Author Credits" - # file: MS/AC.qmd - - text: "Accomplishment" - file: AC/index.qmd - # - text: "Trackchanges" - # file: TC/index.qmd - # - text: "MS with raw bibkey" - # file: MS/MS_nobib.docx - - text: "About" - file: about.qmd - - icon: git - menu: - - text: Codes - url: https://git.drwater.net/{{< var projtype >}}/{{< var reponame >}}/src/branch/{{< var branch >}} - - text: Issue - url: https://git.drwater.net/manuscript/{{< var reponame >}}/issues - - comments: - hypothesis: - theme: clean - openSidebar: false - -execute: - freeze: true # re-render only when source changes - cache: false - echo: false - -format: - dwhm-html: default diff --git a/_quarto.yml b/_quarto.yml index d8e345f..1a4e2da 100644 --- a/_quarto.yml +++ b/_quarto.yml @@ -62,3 +62,5 @@ affiliations: metadata-files: - _metadata.yml + - _metadata-protected.yml +