...

R/beamer_presentation_ja.R

@@ -98,11 +98,7 @@ beamer_presentation_ja <- function(
     pandoc_args_base <- c(pandoc_args_base, rmarkdown::pandoc_variable_arg("tablename", "図"))
   }
   if(missing(template) || identical(template, "") || identical(template, "default")){
-<<<<<<< HEAD
-    template <- file.path(system.file("resources", package = "rmdja"), "pandoc-template/beamer-ja.template")
-=======
     template <- system.file("resources/pandoc-templates/beamer-ja.tex.template", package = "rmdja")
->>>>>>> development
   }
 
   if("preamble" %in% names(includes)){
@@ -173,27 +169,13 @@ beamer_presentation_ja <- function(
     return(autodetect_and_set_jfont(metadata, input_file, runtime, knit_meta, files_dir, output_dir, latex_engine))
   }
   out <- rmarkdown::output_format(
-<<<<<<< HEAD
-    pre_knit = function(input, ...) {
-      knitr::opts_chunk$set(dev.args = list(pointsize = fontsize_as_integer(rmarkdown::metadata$fontsize)))
-      return(input)
-    },
-=======
     pre_knit = adjust_fontsize,
->>>>>>> development
     knitr = do.call(rmarkdown::knitr_options, list(opts_chunk = args_opts_chunk)),
     pandoc = do.call(rmarkdown::pandoc_options, args_pandoc_options),
     pre_processor = preproc,
     clean_supporting = !keep_tex,
     keep_md = keep_md,
     base_format = base
     )
-<<<<<<< HEAD
-  if(!file.exists("./.latexmkrc")){
-    file.copy(file.path(system.file("resources", package = "rmdja"), "latexmk/.latexmkrc"), to = "./")
-  }
-=======
-
->>>>>>> development
   return(out)
 }

inst/resources/examples/bookdown/_bookdown.yml

@@ -15,9 +15,9 @@ rmd_files:
     - chapters/multi-media.Rmd
     - chapters/appendix.Rmd
     - chapters/reference-title.Rmd
-view: Gedevan-Aleksizde/my_latex_templates/blob/master/rmdja/inst/resources/examples/bookdown/chapter/%s # 現在のページのソースを確認するためのリンク
-history: Gedevan-Aleksizde/my_latex_templates/blob/master/rmdja/inst/resources/examples/bookdown/chapter/%s # 現在のページのコミットログ確認するためのリンク
-edit: Gedevan-Aleksizde/my_latex_templates/edit/master/rmdja/inst/resources/examples/bookdown/chapter/%s # 現在のページを編集するためのリンク, github pages でホスティングする前提
+view: tree/rmdja/inst/resources/examples/bookdown/chapter/%s # 現在のページのソースを確認するためのリンク
+history: blob/master/rmdja/inst/resources/examples/bookdown/chapter/%s # 現在のページのコミットログ確認するためのリンク
+edit: edit/master/rmdja/inst/resources/examples/bookdown/chapter/%s # 現在のページを編集するためのリンク, github pages でホスティングする前提
 repo: https://github.com/rstudio/bookdown/
 # ---- 用語の変更 ----
 language:                 

inst/resources/pandoc-templates/beamer-ja.tex.template

@@ -155,6 +155,7 @@ $else$
 % if fonts are set by each family
 \ifxetex
   \usepackage[AutoFallBack=true]{zxjatype}
+  \usepackage{xeCJKfntef}
 $if(jmainfont)$
   \setjamainfont[$for(jmainfontoptions)$$jmainfontoptions$$sep$,$endfor$]{$jmainfont$}
 $endif$

inst/rmarkdown/templates/beamer_presentation_ja/skeleton/skeleton.Rmd

@@ -1,9 +1,5 @@
 ---
 title: "無題"
-<<<<<<< HEAD
-author: ""
-=======
->>>>>>> development
 date: "`r Sys.Date()`"
 output:
   rmdja::beamer_presentation_ja:
@@ -16,16 +12,6 @@ output:
         - \patchcmd{\beamer@sectionintoc}{\vskip1.5em}{\vskip0.5em}{}{}
         - \makeatother
 fontsize: 12pt
-<<<<<<< HEAD
-mainfont: "`r if(Sys.info()['sysname'] == 'Linux'){'DejaVu Serif'} else {'Times New Roman'}`"
-mainfontoptions:
-  - Scale=MatchLowercase
-  - Ligatures=TeX
-sansfont: "`r if(Sys.info()['sysname'] == 'Linux'){'DejaVu Sans'} else {'Arial'}`"
-monofont: 'Courier New'
-jfontpreset: "`r switch(Sys.info()['sysname'], 'Linux' = 'noto', 'Darwin' = 'hiragino-pro', 'Windows' = 'ms')`"
-=======
->>>>>>> development
 ---
 
 ```{r setup-document, include=F}