- landslide.lyx: fix compilation (broken image path)

- docbook_article.lyx: save in current file format
- jss.layout: this class needs a further LaTeX-package
- JSS-article.lyx: add info how to install the JSS LaTeX class file (described in new Wiki page)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39053 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/examples/landslide.lyx b/lib/examples/landslide.lyx
index fcad230402487ff2b67dbe939cceef11d1b8b1c0..34e25b0e976dddd42b689e8efd93c6000a3f8dd5 100644 (file)
--- a/lib/examples/landslide.lyx
+++ b/lib/examples/landslide.lyx
@@ -1,21 +1,30 @@
-#LyX 1.6.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 345
+#LyX 2.0 created this file. For more info see http://www.lyx.org/
+\lyxformat 413
 \begin_document
 \begin_header
-\use_default_options false
 \textclass foils
 \options dvips
+\use_default_options false
+\maintain_unincluded_children false
 \language english
+\language_package default
 \inputencoding default
+\fontencoding global
 \font_roman default
 \font_sans default
 \font_typewriter default
 \font_default_family default
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
+
 \graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
 \paperfontsize default
 \spacing single
 \use_hyperref false
@@ -23,9 +32,18 @@
 \use_geometry false
 \use_amsmath 0
 \use_esint 0
+\use_mhchem 1
+\use_mathdots 1
 \cite_engine basic
 \use_bibtopic false
+\use_indices false
 \paperorientation landscape
+\suppress_date false
+\use_refstyle 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation skip
@@ -36,7 +54,9 @@
 \paperpagestyle foilheadings
 \tracking_changes false
 \output_changes false
-\author ""
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
 \end_header
 
 \begin_body
@@ -64,8 +84,15 @@ Landscape slide example with a figure
 \end_layout
 
 \begin_layout Standard
+\noindent
+\begin_inset CommandInset line
+LatexCommand rule
+offset "0.5ex"
+width "100line%"
+height "1pt"
+
+\end_inset
 
-\lyxline
 
 \end_layout
 
@@ -76,6 +103,7 @@ hor_pos "c"
 has_inner_box 1
 inner_pos "c"
 use_parbox 0
+use_makebox 0
 width "52page%"
 special "none"
 height "1pt"
@@ -112,6 +140,7 @@ hor_pos "c"
 has_inner_box 1
 inner_pos "c"
 use_parbox 0
+use_makebox 0
 width "45page%"
 special "none"
 height "1pt"
@@ -128,7 +157,7 @@ status open
 \begin_layout Plain Layout
 \align center
 \begin_inset Graphics
-       filename ../clipart/platypus.eps
+       filename ../doc/clipart/platypus.eps
        width 10cm
        rotateOrigin center
 
@@ -158,8 +187,15 @@ How it was done
 \end_layout
 
 \begin_layout Standard
+\noindent
+\begin_inset CommandInset line
+LatexCommand rule
+offset "0.5ex"
+width "100line%"
+height "1pt"
+
+\end_inset
 
-\lyxline
 
 \end_layout
 

diff --git a/lib/layouts/jss.layout b/lib/layouts/jss.layout
index 48d42f86dec45c4a2d3df445ad6440c3addfc8c9..098f2fe9a5c333817f04d96b1596f76978d6b7bc 100644 (file)
--- a/lib/layouts/jss.layout
+++ b/lib/layouts/jss.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this      
-#  \DeclareLaTeXClass[jss,ae.sty,color.sty,fancyvrb.sty,hyperref.sty,natbib.sty]{article (Journal of Statistical Software)}
+#  \DeclareLaTeXClass[jss,ae.sty,color.sty,fancyvrb.sty,hyperref.sty,natbib.sty,upquote.sty]{article (Journal of Statistical Software)}
 # Journal of Statistical Software (JSS) article textclass definition file
 # Author: Andreas Karlsson <andreas.karlsson@ltv.se>
 # License: GNU GPL version 2 or later

diff --git a/lib/templates/JSS-article.lyx b/lib/templates/JSS-article.lyx
index 2da8616381f8d6f4ce3aee3ac9b6142a76ad6bd6..a7646556a1ba98f1e02c5b8a544971840794693e 100644 (file)
--- a/lib/templates/JSS-article.lyx
+++ b/lib/templates/JSS-article.lyx
@@ -1,8 +1,7 @@
-#LyX 2.0.1svn created this file. For more info see http://www.lyx.org/
+#LyX 2.0 created this file. For more info see http://www.lyx.org/
 \lyxformat 413
 \begin_document
 \begin_header
-\use_default_options false
 \textclass jss
 \begin_preamble
 %the following commands are used only for articles and codesnippets
@@ -77,18 +76,27 @@
 %% need no \usepackage{Sweave.sty}
 \end_preamble
 \options article
+\use_default_options false
+\maintain_unincluded_children false
 \language english
 \language_package default
 \inputencoding auto
+\fontencoding global
 \font_roman default
 \font_sans default
 \font_typewriter default
 \font_default_family default
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
+
 \graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
 \paperfontsize default
 \spacing single
 \use_hyperref false
@@ -100,20 +108,27 @@
 \use_mathdots 1
 \cite_engine natbib_authoryear
 \use_bibtopic false
+\use_indices false
 \paperorientation portrait
+\suppress_date false
+\use_refstyle 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation indent
-\defskip medskip
+\paragraph_indentation default
 \quotes_language english
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
 \tracking_changes false
 \output_changes false
-\author 1 "" 
-\author 2 "" 
-\use_refstyle 0
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
 \end_header
 
 \begin_body
@@ -124,13 +139,17 @@ status open
 
 \begin_layout Plain Layout
 This is a template LyX file for an article written using the Journal of
- Statistical Software (JSS) LaTeX style file, which can be downloaded from
- http://www.jstatsoft.org/downloads/JSSstyle.zip.
- These files have to be installed before this template can be used.
- Consult chapter 5.1 in the LyX Customization manual.
- See also the documentation included with the JSS LaTeX style file.
+ Statistical Software (JSS) LaTeX style file.
+ How to install the JSS LaTeX class file to your LaTeX system is explained
+ in http://wiki.lyx.org/Layouts/JSS.
 \end_layout
 
+\end_inset
+
+
+\begin_inset Note Note
+status open
+
 \begin_layout Plain Layout
 Note that title, author, address, abstract, keywords etc for this article
  style are written in the LaTeX preamble (accessed from Document\SpecialChar \menuseparator

diff --git a/lib/templates/docbook_article.lyx b/lib/templates/docbook_article.lyx
index 9b511ba1991652f3e21ff5591aa9e4c7dd8a70cc..c6d418f1c986eda1188b7864c071126410bd194c 100644 (file)
--- a/lib/templates/docbook_article.lyx
+++ b/lib/templates/docbook_article.lyx
@@ -1,21 +1,29 @@
-#LyX 2.0.1svn created this file. For more info see http://www.lyx.org/
+#LyX 2.0 created this file. For more info see http://www.lyx.org/
 \lyxformat 413
 \begin_document
 \begin_header
 \textclass docbook
 \use_default_options false
+\maintain_unincluded_children false
 \language english
 \language_package default
 \inputencoding auto
+\fontencoding global
 \font_roman default
 \font_sans default
 \font_typewriter default
 \font_default_family default
+\use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
+
 \graphics default
+\default_output_format default
+\output_sync 0
+\bibtex_command default
+\index_command default
 \paperfontsize default
 \use_hyperref false
 \papersize default
@@ -26,20 +34,27 @@
 \use_mathdots 1
 \cite_engine basic
 \use_bibtopic false
+\use_indices false
 \paperorientation portrait
+\suppress_date false
+\use_refstyle 0
+\index Index
+\shortcut idx
+\color #008000
+\end_index
 \secnumdepth 3
 \tocdepth 3
 \paragraph_separation indent
-\defskip medskip
+\paragraph_indentation default
 \quotes_language english
 \papercolumns 1
 \papersides 1
 \paperpagestyle default
 \tracking_changes false
 \output_changes false
-\author 1 "" 
-\author 2 "" 
-\use_refstyle 0
+\html_math_output 0
+\html_css_as_file 0
+\html_be_strict false
 \end_header
 
 \begin_body

diff --git a/status.20x b/status.20x
index 2978384c5f135e6b92f8690fa053d9519dd597d7..0de9d1496b2150211f131d13067cbaa4eb0de7a4 100644 (file)
--- a/status.20x
+++ b/status.20x
@@ -167,6 +167,8 @@ What's new
 
 - fixed compilation of the amsbook-test example file.
 
+- fixed compilation of the landslide example file.
+
 - Many translations updated from 2.0.0.