From: Uwe Stöhr Date: Mon, 6 Oct 2008 22:38:30 +0000 (+0000) Subject: templates: X-Git-Tag: 1.6.10~3133 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=bab737e1a3590037b4e08cdd2688f99349d7f53f;p=features.git templates: - please JMarc and Jürgen and remove the BibTeX example file from templates but use the one from the examples - iopart, ACM-sigplan, elsarticle templates and layouts: various small bug fixes and added informations git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@26789 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 3205aa8d67..3687ae265d 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -1273,7 +1273,6 @@ lib_templates_files = Split(''' agu_article.lyx apa.lyx beamer-conference-ornate-20min.lyx - biblioExample.bib de_beamer-conference-ornate-20min.lyx dinbrief.lyx docbook_article.lyx diff --git a/lib/Makefile.am b/lib/Makefile.am index 029caed8be..6a6decd6f8 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1110,7 +1110,6 @@ dist_templates_DATA = \ templates/agu_article.lyx \ templates/apa.lyx \ templates/beamer-conference-ornate-20min.lyx \ - templates/biblioExample.bib \ templates/de_beamer-conference-ornate-20min.lyx \ templates/dinbrief.lyx \ templates/docbook_article.lyx \ diff --git a/lib/layouts/elsarticle.layout b/lib/layouts/elsarticle.layout index 9b1b2b99bf..632a70c914 100644 --- a/lib/layouts/elsarticle.layout +++ b/lib/layouts/elsarticle.layout @@ -38,8 +38,8 @@ Style Standard LabelType No_Label End - -Input stdtitle.inc +Input stdfloats.inc +Input stdcounters.inc Input stdlists.inc Input stdsections.inc Input stdstarsections.inc @@ -47,10 +47,24 @@ Input stdstarsections.inc NoStyle Chapter NoStyle Chapter* + Style Title - CopyStyle Title + Margin Static + LatexType Command + InTitle 1 OptionalArgs 0 + LatexName title + ParSkip 0.4 + ItemSep 0 + TopSep 0 + BottomSep 1 + ParSep 1 + Align Center AlignPossible None + LabelType No_Label + Font + Size Largest + EndFont End @@ -202,7 +216,3 @@ Style Bibliography EndFont End - -Input stdfloats.inc -Input stdcounters.inc - diff --git a/lib/layouts/iopart.layout b/lib/layouts/iopart.layout index aef10ed807..dc4f9b78df 100644 --- a/lib/layouts/iopart.layout +++ b/lib/layouts/iopart.layout @@ -43,6 +43,8 @@ Style Standard End +Input stdcounters.inc +Input stdfloats.inc Input stdlists.inc Input stdsections.inc Input stdstarsections.inc @@ -279,6 +281,3 @@ Style "Bibliography heading" End -Input stdfloats.inc -Input stdcounters.inc - diff --git a/lib/layouts/sigplanconf.layout b/lib/layouts/sigplanconf.layout index 69fd6d3c13..3a5840eabd 100644 --- a/lib/layouts/sigplanconf.layout +++ b/lib/layouts/sigplanconf.layout @@ -46,6 +46,8 @@ Style Standard End +Input stdcounters.inc +Input stdfloats.inc Input stdlists.inc Input stdsections.inc Input stdstarsections.inc @@ -180,8 +182,3 @@ Style Acknowledgments LabelString "Acknowledgments" End - -Input stdlayouts.inc -Input stdfloats.inc -Input stdcounters.inc - diff --git a/lib/templates/ACM-sigplan.lyx b/lib/templates/ACM-sigplan.lyx index ba5008275d..abb8e1bbf8 100644 --- a/lib/templates/ACM-sigplan.lyx +++ b/lib/templates/ACM-sigplan.lyx @@ -3,6 +3,7 @@ \begin_document \begin_header \textclass sigplanconf +\options natbib \language english \inputencoding default \font_roman default @@ -257,6 +258,22 @@ ed into hardware] \end_inset +\begin_inset Note Note +status open + +\begin_layout Plain Layout + +\series bold + +\backslash +category +\series default + has 3 mandatory + 1 optional arguments +\end_layout + +\end_inset + + \end_layout \begin_layout Terms @@ -273,7 +290,34 @@ Introduction \end_layout \begin_layout Standard -This is the introduction to this paper. +Bla bla, as listed in +\begin_inset CommandInset citation +LatexCommand cite +key "Parkin2005,LComp2004" + +\end_inset + +. +\end_layout + +\begin_layout Subsection +Subsection +\end_layout + +\begin_layout Enumerate +test +\end_layout + +\begin_layout Enumerate +test +\end_layout + +\begin_layout Subsubsection +Subsubsection +\end_layout + +\begin_layout Standard +Bla, bla \end_layout \begin_layout Acknowledgments @@ -289,6 +333,56 @@ First appendix Appendix, only when needed, can also be started behind the bibliography. \end_layout +\begin_layout Section* +----------------- +\end_layout + +\begin_layout Standard +You can use either BibTeX: +\begin_inset Note Note +status open + +\begin_layout Plain Layout +The following bibliography styles are allowed: +\family sans +none +\family default + or +\family sans +plainnat +\family default + (use then the document class option +\family sans +natbib +\family default +) +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset CommandInset bibtex +LatexCommand bibtex +bibfiles "../examples/biblioExample" +options "bibtotoc,plainnat" + +\end_inset + + +\end_layout + +\begin_layout Section* +--------------------- +\end_layout + +\begin_layout Standard +\noindent +Or plain bibliography: +\end_layout + \begin_layout Bibliography \begin_inset CommandInset bibitem LatexCommand bibitem @@ -339,6 +433,22 @@ n Proceedings of the 17th Annual IEEE Symposium on Logic in Computer Science (LICS 2002) \emph default , July 2002. +\begin_inset Note Note +status open + +\begin_layout Plain Layout +Reference parts have to be separated by +\series bold + +\backslash +newblock +\series default +. +\end_layout + +\end_inset + + \end_layout \begin_layout Bibliography diff --git a/lib/templates/biblioExample.bib b/lib/templates/biblioExample.bib deleted file mode 100644 index f1be181d12..0000000000 --- a/lib/templates/biblioExample.bib +++ /dev/null @@ -1,16 +0,0 @@ -This file was created with JabRef 2.2. -Encoding: Cp1252 - -@BOOK{LComp2004, - title = {The LaTeX Companion Second Edition}, - publisher = {Addison-Wesley}, - year = {2004}, - author = {Frank Mittelbach and Michael Goossens} -} - -@MISC{Parkin2005, - author = {Scott Pakin}, - title = {The Comprehensive {\LaTeX{}} Symbol List}, - year = {2005} -} - diff --git a/lib/templates/elsarticle.lyx b/lib/templates/elsarticle.lyx index f076fc8f6a..09a8feb7c8 100644 --- a/lib/templates/elsarticle.lyx +++ b/lib/templates/elsarticle.lyx @@ -95,7 +95,7 @@ tnoteref{t1,t2} \begin_inset Note Note -status open +status collapsed \begin_layout Plain Layout @@ -670,7 +670,7 @@ PACS \backslash MSC \series default - are optional classifications. + are optional classifiactions. \end_layout \end_inset @@ -823,7 +823,7 @@ elsarticle-harv \family sans elsarticle-num-names \family default -, +, or \family sans elsarticle-num \end_layout @@ -836,7 +836,7 @@ elsarticle-num \begin_layout Standard \begin_inset CommandInset bibtex LatexCommand bibtex -bibfiles "biblioExample" +bibfiles "../examples/biblioExample" options "bibtotoc,elsarticle-harv" \end_inset diff --git a/lib/templates/iop-article.lyx b/lib/templates/iop-article.lyx index d23467b3e1..35de6300d8 100644 --- a/lib/templates/iop-article.lyx +++ b/lib/templates/iop-article.lyx @@ -1046,6 +1046,26 @@ A & = & \prod_{i=1}^{\infty}B\nonumber \\ \end_layout +\begin_layout Subsection +Subsection +\end_layout + +\begin_layout Enumerate +test +\end_layout + +\begin_layout Enumerate +test +\end_layout + +\begin_layout Subsubsection +Subsubsection +\end_layout + +\begin_layout Standard +Bla, bla +\end_layout + \begin_layout Standard \end_layout @@ -1083,12 +1103,34 @@ Appendix, only when needed, inserted behind the acknowledgments but before \begin_layout Standard You can use either BibTeX: +\begin_inset Note Note +status open + +\begin_layout Plain Layout +The following bibliography styles are allowed: +\family sans +unsrt +\family default + or +\family sans +jphysicsB +\family default + (part of the LaTeX-package +\series bold +harvard +\series default +) +\end_layout + +\end_inset + + \end_layout \begin_layout Standard \begin_inset CommandInset bibtex LatexCommand bibtex -bibfiles "biblioExample" +bibfiles "../examples/biblioExample" options "bibtotoc,unsrt" \end_inset