From a7f561f571b624afb357d468b28e88f9b5cfc37e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Fri, 27 Oct 2017 00:14:00 +0200 Subject: [PATCH] sweave.lyx: accept changes - also correct 2 file paths in Japanese EmbeddedObjects.lyx --- lib/doc/ja/EmbeddedObjects.lyx | 4 ++-- lib/examples/ja/sweave.lyx | 15 ++++++++++++--- lib/examples/sweave.lyx | 32 ++------------------------------ 3 files changed, 16 insertions(+), 35 deletions(-) diff --git a/lib/doc/ja/EmbeddedObjects.lyx b/lib/doc/ja/EmbeddedObjects.lyx index 460f5a0124..1782cfb6ee 100644 --- a/lib/doc/ja/EmbeddedObjects.lyx +++ b/lib/doc/ja/EmbeddedObjects.lyx @@ -37929,7 +37929,7 @@ textvisiblespace 以下は，原文儘として挿入された子文書です． \begin_inset CommandInset include LatexCommand verbatiminput -filename "DummyTextDocument.txt" +filename "../DummyTextDocument.txt" \end_inset @@ -37944,7 +37944,7 @@ filename "DummyTextDocument.txt" オプションを指定して，原文儘として挿入された子文書です． \begin_inset CommandInset include LatexCommand verbatiminput* -filename "DummyTextDocument.txt" +filename "../DummyTextDocument.txt" \end_inset diff --git a/lib/examples/ja/sweave.lyx b/lib/examples/ja/sweave.lyx index dd702fada0..5a7c683069 100644 --- a/lib/examples/ja/sweave.lyx +++ b/lib/examples/ja/sweave.lyx @@ -67,6 +67,7 @@ sweave \suppress_date false \justification true \use_refstyle 0 +\use_minted 0 \index Index \shortcut idx \color #008000 @@ -82,6 +83,7 @@ sweave \is_math_indent 0 \math_numbering_side default \quotes_style english +\dynamic_quotes 0 \papercolumns 1 \papersides 1 \paperpagestyle default @@ -90,7 +92,6 @@ sweave \html_math_output 0 \html_css_as_file 0 \html_be_strict false -\use_minted 0 \end_header \begin_body @@ -1408,13 +1409,21 @@ reference "tab:xtable-demo" \end_layout \begin_layout Standard -Sweaveのホームページは、 + +\lang english +The user manual of +\lang japanese +Sweave +\lang english +is at +\lang japanese + \begin_inset Flex URL status collapsed \begin_layout Plain Layout -http://www.stat.uni-muenchen.de/~leisch/Sweave/ +https://stat.ethz.ch/R-manual/R-devel/library/utils/doc/Sweave.pdf \end_layout \end_inset diff --git a/lib/examples/sweave.lyx b/lib/examples/sweave.lyx index e2b1299d20..c26c9b7cb1 100644 --- a/lib/examples/sweave.lyx +++ b/lib/examples/sweave.lyx @@ -87,12 +87,11 @@ sweave \papercolumns 1 \papersides 1 \paperpagestyle default -\tracking_changes true +\tracking_changes false \output_changes false \html_math_output 0 \html_css_as_file 0 \html_be_strict false -\author 274215730 "scott" \end_header \begin_body @@ -1598,44 +1597,17 @@ Resources \end_layout \begin_layout Standard -The -\change_deleted 274215730 1507313073 -homepage -\change_inserted 274215730 1507313078 -user manual -\change_unchanged -of Sweave is at -\change_deleted 274215730 1507313083 - -\begin_inset Flex URL -status collapsed - -\begin_layout Plain Layout - -http://www.stat.uni-muenchen.de/~leisch/Sweave/ -\end_layout - -\end_inset - - -\change_inserted 274215730 1507313095 - +The user manual of Sweave is at \begin_inset Flex URL status collapsed \begin_layout Plain Layout -\change_inserted 274215730 1507313100 - https://stat.ethz.ch/R-manual/R-devel/library/utils/doc/Sweave.pdf -\change_unchanged - \end_layout \end_inset - -\change_unchanged . The CRAN task view on \begin_inset Quotes eld -- 2.39.5