Merge branch 'ja_knitr_sweave_updates'

This merges updates from Koji Yokota, and adapts the ctests
accordingly.

(cherry picked from commit 299b730318137e01e74ed95353cfc6ef00839612)

diff --git a/development/autotests/ignoredTests b/development/autotests/ignoredTests
index 5e10cd0f5f8c7dd3e904001fd244746829cee4e1..1a1a4ce73d64759239db0c7a0e1f4f296d6f30ca 100644 (file)
--- a/development/autotests/ignoredTests
+++ b/development/autotests/ignoredTests
@@ -54,6 +54,11 @@ export/.*/zh_CN/.*texF
 # see also INVERTED.TODO_export/export/latex/ja_wrong_auto_encoding_(dvi|pdf(|3)).*
 # For a discussion of alternatives for Japanese with LaTeX , see also
 # http://www.preining.info/blog/2014/12/writing-japanese-in-latex-part-1-introduction/
+# 
+# Exception: ja knitr.lyx and sweave.lyx support only XeLaTeX with system fonts
+# because they use the "bxjsarticle" class
+!export/.*/ja/(knitr|sweave).*_(lyx.*|xhtml|pdf4_systemF)
+export/.*/ja/(knitr|sweave).*
 export/.*/ja/.*_(pdf[245]|dvi3).*
 
 # These files are not expected to compile, they use math-macros

diff --git a/lib/examples/ja/knitr.lyx b/lib/examples/ja/knitr.lyx
index 5c35edaebdc49743f78a9a39d82edbdb321dbb91..73ad9912f8f42760f823a4a30cb0d4d2dbb923da 100644 (file)
--- a/lib/examples/ja/knitr.lyx
+++ b/lib/examples/ja/knitr.lyx
@@ -4,7 +4,7 @@
 \begin_header
 \save_transient_properties true
 \origin /systemlyxdir/examples/ja/
-\textclass article
+\textclass bxjsarticle
 \use_default_options true
 \begin_modules
 knitr
@@ -12,14 +12,14 @@ knitr
 \maintain_unincluded_children false
 \language japanese
 \language_package default
-\inputencoding auto
+\inputencoding utf8-platex
 \fontencoding global
 \font_roman "palatino" "default"
 \font_sans "lmss" "default"
 \font_typewriter "lmtt" "default"
 \font_math "auto" "auto"
 \font_default_family default
-\use_non_tex_fonts false
+\use_non_tex_fonts true
 \font_sc false
 \font_osf false
 \font_sf_scale 100 100
@@ -210,6 +210,25 @@ knitr
 ソース文書へのリンクがあります。
 \end_layout
 
+\begin_layout Standard
+\SpecialChar LyX
+ 2.3以降、
+\series bold
+knitr
+\series default
+を使ってコンパイルするためには
+\family sans
+設定\SpecialChar menuseparator
+ファイル処理\SpecialChar menuseparator
+変換子
+\family default
+で
+\emph on
+needauth
+\emph default
+変換子の使用を可能にする必要があります。
+\end_layout
+
 \begin_layout Standard
 
 \series bold
@@ -220,32 +239,37 @@ knitr
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Chunk
 status open
 
 \begin_layout Plain Layout
 
-<<show-off>>=
-\end_layout
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
 
-rnorm(5)
+show-off
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Plain Layout
 
-df=data.frame(y=rnorm(100), x=1:100)
+rnorm(5)
 \end_layout
 
 \begin_layout Plain Layout
 
-summary(lm(y~x, data=df))
+df=data.frame(y=rnorm(100), x=1:100)
 \end_layout
 
 \begin_layout Plain Layout
 
-@
+summary(lm(y~x, data=df))
 \end_layout
 
 \end_inset

diff --git a/lib/examples/ja/sweave.lyx b/lib/examples/ja/sweave.lyx
index a398404281dcb9bf004ede12eda330f18220c82b..49077ef700f7ca4f6737c714a9b52e0b9cdf1959 100644 (file)
--- a/lib/examples/ja/sweave.lyx
+++ b/lib/examples/ja/sweave.lyx
@@ -4,7 +4,7 @@
 \begin_header
 \save_transient_properties true
 \origin /systemlyxdir/examples/ja/
-\textclass jarticle
+\textclass bxjsarticle
 \begin_preamble
 %% maxwidth is the original width if it's less than linewidth
 %% otherwise use linewidth (to make sure the graphics do not exceed the margin)
@@ -31,7 +31,7 @@ sweave
 \font_typewriter "lmtt" "default"
 \font_math "auto" "auto"
 \font_default_family default
-\use_non_tex_fonts false
+\use_non_tex_fonts true
 \font_sc false
 \font_osf false
 \font_sf_scale 100 100
@@ -303,22 +303,27 @@ bin
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Chunk
 status open
 
 \begin_layout Plain Layout
 
-<<where-is-R-bin,eval=FALSE>>=
-\end_layout
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
 
-R.home('bin')
+where-is-R-bin,eval=FALSE
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Plain Layout
 
-@
+R.home('bin')
 \end_layout
 
 \end_inset
@@ -355,22 +360,27 @@ Sweave.sty
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Chunk
 status open
 
 \begin_layout Plain Layout
 
-<<sweave-sty,eval=FALSE>>=
-\end_layout
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
 
-file.path(R.home('share'), 'texmf', 'tex', 'latex')
+sweave-sty,eval=FALSE
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Plain Layout
 
-@
+file.path(R.home('share'), 'texmf', 'tex', 'latex')
 \end_layout
 
 \end_inset
@@ -463,12 +473,22 @@ useFancyQuotes
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Chunk
+status open
+
+\begin_layout Plain Layout
+
+\begin_inset Argument 1
 status open
 
 \begin_layout Plain Layout
 
-<<setup, keep.source=TRUE>>=
+setup, keep.source=TRUE
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Plain Layout
@@ -481,82 +501,91 @@ status open
 options(width = 70, useFancyQuotes = FALSE, digits = 4)
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
+
 
-@
 \end_layout
 
+\begin_layout Standard
+\begin_inset Flex Chunk
+status open
+
 \begin_layout Plain Layout
 
-<<sweave-manual, eval=FALSE, keep.source=TRUE>>=
-\end_layout
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
 
-## Sweaveのvignetteを見る (要 R >= 2.13.0)
+sweave-manual, eval=FALSE, keep.source=TRUE
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
+
 
-vignette("Sweave", package = "utils")
 \end_layout
 
 \begin_layout Plain Layout
 
-@
+## Sweaveのvignetteを見る (要 R >= 2.13.0)
 \end_layout
 
-\end_inset
-
+\begin_layout Plain Layout
 
+vignette("Sweave", package = "utils")
 \end_layout
 
-\begin_layout Standard
+\end_inset
+
 下記は、どのSエンジンでも動作する単純な例です。
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Chunk
 status open
 
 \begin_layout Plain Layout
 
-<<print-integers, keep.source=TRUE>>=
-\end_layout
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
 
-## 1から10までの整数は
+print-integers, keep.source=TRUE
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
+
 
-1:10 
 \end_layout
 
 \begin_layout Plain Layout
 
-@
+## 1から10までの整数は
 \end_layout
 
 \begin_layout Plain Layout
 
-<<hide-results, results=hide>>=
+1:10
 \end_layout
 
-\begin_layout Plain Layout
+\end_inset
+
 
-## results=hide を設定して意図的に出力を隠す
 \end_layout
 
+\begin_layout Standard
+\begin_inset Flex Chunk
+status open
+
 \begin_layout Plain Layout
 
-print(1:20)
-\end_layout
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
 
-@
+hide-results, results=hide
 \end_layout
 
 \end_inset
@@ -564,32 +593,48 @@ print(1:20)
 
 \end_layout
 
-\begin_layout Standard
+\begin_layout Plain Layout
+
+## results=hide を設定して意図的に出力を隠す
+\end_layout
+
+\begin_layout Plain Layout
+
+print(1:20)
+\end_layout
+
+\end_inset
+
 単純な計算機をエミュレートすることもできます。
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Chunk
 status open
 
 \begin_layout Plain Layout
 
-<<calculator>>=
-\end_layout
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
 
-1 + pi
+calculator
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Plain Layout
 
-sin(pi/6)
+1 + pi
 \end_layout
 
 \begin_layout Plain Layout
 
-@
+sin(pi/6)
 \end_layout
 
 \end_inset
@@ -602,12 +647,22 @@ sin(pi/6)
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Chunk
 status open
 
 \begin_layout Plain Layout
 
-<<rnorm>>=
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+
+rnorm
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Plain Layout
@@ -630,11 +685,6 @@ print(x)
 t1 <- t.test(x)
 \end_layout
 
-\begin_layout Plain Layout
-
-@
-\end_layout
-
 \end_inset
 
 
@@ -728,22 +778,27 @@ iris
 \end_layout
 
 \begin_layout Standard
-\begin_inset ERT
+\begin_inset Flex Chunk
 status open
 
 \begin_layout Plain Layout
 
-<<iris-summary>>=
-\end_layout
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
 
-summary(iris[,-5])
+iris-summary
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Plain Layout
 
-@
+summary(iris[,-5])
 \end_layout
 
 \end_inset
@@ -782,16 +837,22 @@ name "tab:xtable-demo"
 
 \begin_layout Plain Layout
 \align center
-\begin_inset ERT
+\begin_inset Flex Chunk
 status open
 
 \begin_layout Plain Layout
 
-\end_layout
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
 
-<<xtable-demo,results=tex,echo=FALSE>>=
+xtable-demo,results=tex,echo=FALSE
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Plain Layout
@@ -810,11 +871,6 @@ print(xtable(sapply(iris[,-5], quantile)), floating=FALSE)
 )')
 \end_layout
 
-\begin_layout Plain Layout
-
-@
-\end_layout
-
 \end_inset
 
 
@@ -889,22 +945,27 @@ epsとpdfの両方をtrueにして、latexとpdflatexの両方を動作するよ
 \end_inset
 
 
-\begin_inset ERT
+\begin_inset Flex Chunk
 status open
 
 \begin_layout Plain Layout
 
-<<iris-pairs,fig=TRUE,width=4.5,height=4.5,eps=TRUE,pdf=TRUE>>=
-\end_layout
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
 
-pairs(iris, col = iris$Species)
+iris-pairs,fig=TRUE,width=4.5,height=4.5,eps=TRUE,pdf=TRUE
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Plain Layout
 
-@
+pairs(iris, col = iris$Species)
 \end_layout
 
 \end_inset
@@ -948,27 +1009,32 @@ status open
 
 \begin_layout Plain Layout
 \align center
-\begin_inset ERT
+\begin_inset Flex Chunk
 status open
 
 \begin_layout Plain Layout
 
-<<iris-boxplots,fig=TRUE,width=7,height=2,keep.source=F,eps=T,pdf=T>>=
-\end_layout
+\begin_inset Argument 1
+status open
 
 \begin_layout Plain Layout
 
-par(mar=c(4,5,.1,.3), las=1)
+iris-boxplots,fig=TRUE,width=7,height=2,keep.source=F,eps=T,pdf=T
+\end_layout
+
+\end_inset
+
+
 \end_layout
 
 \begin_layout Plain Layout
 
-boxplot(Sepal.Length~Species,data=iris,horizontal=TRUE,xlab='Sepal.Length')
+par(mar=c(4,5,.1,.3), las=1)
 \end_layout
 
 \begin_layout Plain Layout
 
-@
+boxplot(Sepal.Length~Species,data=iris,horizontal=TRUE,xlab='Sepal.Length')
 \end_layout
 
 \end_inset
@@ -1409,7 +1475,7 @@ reference "tab:xtable-demo"
 \end_layout
 
 \begin_layout Standard
-The user manual of Sweave is at 
+Sweaveの利用者の手引きは
 \begin_inset Flex URL
 status collapsed
 
@@ -1420,8 +1486,7 @@ https://stat.ethz.ch/R-manual/R-devel/library/utils/doc/Sweave.pdf
 
 \end_inset
 
-にあります。 The CRAN task view on 「Reproducible Research」にあるCRANタスクビューには、便利と思われるSweav
-e関連パッケージの一覧があります。
+にあります。「Reproducible Research」にあるCRANタスクビューには、便利と思われるSweave関連パッケージの一覧があります。
 \begin_inset Flex URL
 status collapsed