The branch, 2.0.x, has been updated. - Log -----------------------------------------------------------------
commit fcb49729796c6c041bf94975a490649352581976 Author: Richard Heck <[email protected]> Date: Thu Dec 27 15:50:09 2012 -0500 Add layout for APA v6 class and associated module and template. Also, add Jacob Bishop to the list of contributors, since this is his work. Thanks, Jacob! (cherry picked from commit 824b0313b3da3b1d504c1cff6c320fcd54749c92) diff --git a/lib/generate_contributions.py b/lib/generate_contributions.py index 6358b5e..4a0b5a8 100755 --- a/lib/generate_contributions.py +++ b/lib/generate_contributions.py @@ -433,6 +433,14 @@ contributers = [ "3 January 2009", u"small bugfixes, CMake build system, Slovak translation"), + contributer(u"Jacob Bishop", + "bishop.jacob () gmail ! com", + "GPL", + "Contributions...APA 6 Layout", + "m=135654106502977", + "26 December 2012", + u"APA 6 Layout"), + contributer(u"Punyashloka Biswal", "punya.biswal () gmail ! com", "GPL", diff --git a/lib/layouts/apa6.layout b/lib/layouts/apa6.layout new file mode 100644 index 0000000..f5e2a06 --- /dev/null +++ b/lib/layouts/apa6.layout @@ -0,0 +1,511 @@ +#% Do not delete the line below; configure depends on this +# \DeclareLaTeXClass[apa6,apacite.sty,endfloat.sty,endnotes.sty,flushend.sty,txfonts.sty]{article (APA6)} +# Author: Jacob Bishop <[email protected]> based on the apa +# layout written by Randy Gobbel. +Format 35 +Columns 1 +Sides 1 +PageStyle Headers + + +ClassOptions + Other "man" + FontSize 10|11|12 +End + + +Preamble +EndPreamble + + +Style Standard + LatexName dummy + LatexType Paragraph + Margin Static + ParIndent MM + ParSkip 0.4 + ParSep 0.4 + TopSep 1.0 + BottomSep 1.0 + Align Block + AlignPossible Block, Left, Right, Center + LabelType No_Label +End + + +Style Title + Category FrontMatter + LatexName title + LatexType Command + InTitle 1 + Font + Size Huge + EndFont + Align Center + HTMLTitle true +End + + +Style ShortTitle + Category FrontMatter + LatexName shorttitle + LatexType Command + InTitle 1 + Align Left + AlignPossible Left, Right, Center + Margin Dynamic + Labeltype Static + LabelString "Short title:" + Labelsep M + Font + Shape SmallCaps + Size Small + EndFont + LabelFont + Series Bold + Size Small + Shape Up + EndFont +End + + +Style Author + Category FrontMatter + LatexName author + LatexType Command + InTitle 1 + Align Center + AlignPossible Left, Right, Center + TopSep 0.5 + BottomSep 0.5 + Font + Shape Italic + Size Small + EndFont +End + + +Style TwoAuthors + Category FrontMatter + LatexName twoauthors + LatexType Command + InTitle 1 +End + + +Style ThreeAuthors + Category FrontMatter + LatexName threeauthors + LatexType Command + InTitle 1 +End + + +Style FourAuthors + Category FrontMatter + LatexName fourauthors + LatexType Command + InTitle 1 +End + +Style FiveAuthors + Category FrontMatter + LatexName fiveauthors + LatexType Command + InTitle 1 +End + +Style SixAuthors + Category FrontMatter + LatexName sixauthors + LatexType Command + InTitle 1 +End + +Style LeftHeader + Category FrontMatter + LatexName leftheader + LatexType Command + InTitle 1 + Align Left + AlignPossible Left, Right, Center + Margin Dynamic + Labeltype Static + LabelString "Left header:" + Labelsep M + Font + Size Small + Shape SmallCaps + EndFont + LabelFont + Series Bold + Size Small + EndFont +End + + +Style Affiliation + Category FrontMatter + LatexName affiliation + LatexType Command + InTitle 1 + Margin Dynamic + ParSkip 0.4 + BottomSep 1.0 + TopSep 1.5 + ParSep 1.5 + Align Left + AlignPossible Block, Left, Right, Center + LabelType Static + LabelString "Affiliation:" + Labelsep M + LabelFont + Series Bold + Size Small + EndFont +End + +Style TwoAffiliations + Category FrontMatter + LatexName twoaffiliations + LatexType Command + InTitle 1 +End + +Style ThreeAffiliations + Category FrontMatter + LatexName threeaffiliations + LatexType Command + InTitle 1 +End + +Style FourAffiliations + Category FrontMatter + LatexName fouraffiliations + LatexType Command + InTitle 1 +End + +Style FiveAffiliations + Category FrontMatter + LatexName fiveaffiliations + LatexType Command + InTitle 1 +End + +Style SixAffiliations + Category FrontMatter + LatexName sixaffiliations + LatexType Command + InTitle 1 +End + + +Style Note + Category FrontMatter + LatexName note + LatexType Command + InTitle 1 + Margin Dynamic + ParSkip 0.4 + BottomSep 1.5 + TopSep 1.5 + ParSep 1.5 + Align Left + AlignPossible Block, Left, Right, Center + LabelType Static + LabelString "Note:" + Labelsep M + LabelFont + Series Bold + Size Small + EndFont +End + + +Style Abstract + Category FrontMatter + LatexName abstract + LatexType Command + InTitle 1 + Font + Size Small + EndFont + Margin Dynamic + LeftMargin MMN + RightMargin MMN + Align Block + AlignPossible Block, Left, Right, Center + Labeltype Static + LabelString "Abstract:" + Labelsep M + LabelFont + Series Bold + Size Small + EndFont +End + +Style Keywords + Category FrontMatter + LatexName keywords + LatexType Command + InTitle 1 + Font + Size Small + EndFont + Margin Dynamic + LeftMargin MMN + RightMargin MMN + Align Block + AlignPossible Block, Left, Right, Center + TopSep 0.8 + BottomSep 0.8 + Labeltype Static + LabelString "Keywords:" + Labelsep M + LabelFont + Size Small + Shape Italic + EndFont +End + +Style AuthorNote + Category FrontMatter + LatexName authornote + LatexType Command + InTitle 1 + Font + Size Small + EndFont + Margin Dynamic + ParSkip 0.4 + BottomSep 1.5 + TopSep 1.5 + ParSep 1.5 + Align Left + LeftMargin MMN + RightMargin MMN + Align Block + AlignPossible Block, Left, Right, Center + Labeltype Static + LabelString "Author Note:" + Labelsep M + LabelFont + Series Bold + Size Small + EndFont +End + + +Style Acknowledgments + ObsoletedBy AuthorNote +End + + +Style Journal + Category Preamble + LatexName journal + LatexType Command + InPreamble 1 +End + + +Style Copyright + Category Preamble + LatexName ccoppy + LatexType Command + InPreamble 1 + Align Right +End + + +Style CopNum + Category Preamble + LatexName copnum + LatexType Command + InPreamble 1 + Align Right +End + +Style Volume + Category Preamble + LatexName volume + LatexType Command + InPreamble 1 +End + +Style ThickLine + LatexName thickline + LatexType Command + KeepEmpty 1 +End + + + +Input stdlayouts.inc + +Style CenteredCaption + Margin First_Dynamic + LatexType Command + LatexName caption + NeedProtect 1 + LabelSep xx + ParSkip 0.4 + TopSep 0.5 + Align Center + LabelType Sensitive + LabelString "Senseless!" + OptionalArgs 1 + LabelFont + Series Bold + EndFont + LatexName centeredcaption + Align Center +End + + +Style FitFigure + LatexName fitfigure + LatexType Command +End + + +Style FitBitmap + LatexName fitbitmap + LatexType Command +End + + +Input stdsections.inc +Input stdstarsections.inc +Input stdinsets.inc + +Input stdfloats.inc +Input stdcounters.inc + +NoStyle Part +NoCounter part +NoStyle Part* +NoStyle Chapter +NoCounter chapter +NoStyle Chapter* +NoStyle Section* +NoStyle Subsection* +NoStyle Subsubsection* +NoStyle Paragraph* +NoStyle Subparagraph* + + +Style Section + LabelType No_Label + Align Center + Font + Series Bold + Size Huge + EndFont + TocLevel 1 +End + + +Style Subsection + LabelType No_Label + Font + Series Bold + Size Larger + EndFont + TocLevel 2 +End + + +Style Subsubsection + LabelType No_Label + Font + Series Bold + Size Large + EndFont + TocLevel 3 +End + + +Style Paragraph + LabelType No_Label + Font + Series Bold + Size Normal + EndFont + TocLevel 4 +End + + +Style Subparagraph + LabelType No_Label + Font + Series Bold + Size Normal + Shape Italic + EndFont + TocLevel 5 +End + + +Style Itemize + Category List + Margin Static + LatexType Item_Environment + LatexName APAitemize + NextNoIndent 1 + LeftMargin MMN + LabelSep xx + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Block + AlignPossible Block, Left + LabelType Itemize + LabelString "*" +End + + +Style Enumerate + Category List + Margin Static + LatexType Item_Environment + LatexName APAenumerate + NextNoIndent 1 + LeftMargin MMN + LabelSep xx + ParSkip 0.0 + ItemSep 0.2 + TopSep 0.7 + BottomSep 0.7 + ParSep 0.3 + Align Block + AlignPossible Block, Left + LabelType Enumerate + RefPrefix enu +End + + +Style Seriate + Category List + Margin Static + LatexType Item_Environment + LatexName seriate + NextNoIndent 1 + LeftMargin MMN + LabelSep x + ParSkip 0.0 + ItemSep 0.9 + TopSep 0.5 + BottomSep 0.5 + ParSep 0.0 + Align Block + AlignPossible Block, Left + LabelType Counter + LabelCounter enumii + LabelString "(\alph{enumii})" + LabelStringAppendix "(\alph{enumii})" + RefPrefix ser +End + diff --git a/lib/layouts/natbibapa.module b/lib/layouts/natbibapa.module new file mode 100644 index 0000000..08cd0fa --- /dev/null +++ b/lib/layouts/natbibapa.module @@ -0,0 +1,18 @@ +#\DeclareLyXModule[natbib.sty,apacite.sty]{Natbibapa} +#DescriptionBegin +#This module adds support for using natbib together with +#apacite (the bibliography style need not be apacite--it +# could be apacite, apacitex, or any bibliography +# that works with both the natbib and apacite +# packages. +#DescriptionEnd +#Requires: +#Excludes: + +Format 35 + +Preamble + \usepackage[natbibapa]{apacite} +EndPreamble + +Provides natbib 1 diff --git a/lib/templates/APA6.lyx b/lib/templates/APA6.lyx new file mode 100644 index 0000000..fbca660 --- /dev/null +++ b/lib/templates/APA6.lyx @@ -0,0 +1,286 @@ +#LyX 2.0 created this file. For more info see http://www.lyx.org/ +\lyxformat 413 +\begin_document +\begin_header +\textclass apa6 +\options jou +\use_default_options false +\begin_modules +natbibapa +\end_modules +\maintain_unincluded_children false +\begin_local_layout +Style Journal +LatexName journal +LatexType Command +# InTitle 0 + InPreamble 1 +End +\end_local_layout +\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 +\papersize default +\use_geometry false +\use_amsmath 1 +\use_esint 1 +\use_mhchem 1 +\use_mathdots 1 +\cite_engine natbib_authoryear +\use_bibtopic false +\use_indices false +\paperorientation portrait +\suppress_date false +\use_refstyle 1 +\index Index +\shortcut idx +\color #008000 +\end_index +\secnumdepth 3 +\tocdepth 3 +\paragraph_separation indent +\paragraph_indentation default +\quotes_language english +\papercolumns 1 +\papersides 1 +\paperpagestyle default +\tracking_changes false +\output_changes false +\html_math_output 0 +\html_css_as_file 0 +\html_be_strict false +\end_header + +\begin_body + +\begin_layout Journal +Journal of Important Stuff +\begin_inset Note Note +status open + +\begin_layout Plain Layout +The journal name, volume, ccopy, and copnum appear only in jou and doc modes. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Volume +Vol. + 0 (2007), pp.~1--22 +\end_layout + +\begin_layout Copyright +© The Author +\end_layout + +\begin_layout CopNum +ISSN XXX-XXXX-XXXX +\end_layout + +\begin_layout Title +Long Title of the Paper Which is Very Descriptive of the Work Being Done +\begin_inset Note Note +status open + +\begin_layout Plain Layout +Warning: Don't force a newline in manuscript mode. + It won't compile. + If you want to in jou or doc mode, that's fine. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout ShortTitle +Short Title of Paper +\end_layout + +\begin_layout Author +Author Name +\end_layout + +\begin_layout LeftHeader +Author +\begin_inset Note Note +status open + +\begin_layout Plain Layout +The left header is used for the author's last name(s), and appears on even-page + headers in jou mode. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Affiliation +Big Name University +\begin_inset Newline newline +\end_inset + +Department of Psychology +\end_layout + +\begin_layout Note +Draft of 12/ 16/12. +\end_layout + +\begin_layout Abstract +This the abstract for my document. + The purpose of this document is to demonstrate the new apa6 class that + I have been working on. + There was a layout file for the original apa document class which was authored + by Randy Gobbel. + This document is based on that layout, but includes many additions and + updates. + I really don't like having relevant information in a preamble if it is + not necessary. + So, styles for all the necessary commands have been included as part of + the document instead. +\end_layout + +\begin_layout Keywords +apa6, layout, template, LyX +\end_layout + +\begin_layout AuthorNote +We would like to acknowledge all of the many people who contributed to this + work. +\end_layout + +\begin_layout Section +Section Heading +\end_layout + +\begin_layout Standard +Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + Standard text. + +\end_layout + +\begin_layout Standard +This is more standard text. + This is more standard text. + This is more standard text. + This is more standard text. + This is more standard text. + This is more standard text. + +\end_layout + +\begin_layout Subsection +Subsection Heading +\end_layout + +\begin_layout Standard +This is more standard text. + If you use the nifty natbibapa module, then you can select apacite as the + bibliography style below. + This allows you to do awesome stuff. + For example, check out this inline citation. + +\begin_inset CommandInset citation +LatexCommand citet +key "jame76" + +\end_inset + + declared...notice that it uses +\begin_inset Quotes eld +\end_inset + +and +\begin_inset Quotes erd +\end_inset + + between names. + Now check out this one +\begin_inset CommandInset citation +LatexCommand citep +key "gree00" + +\end_inset + +. + It uses +\begin_inset Quotes eld +\end_inset + +& +\begin_inset Quotes erd +\end_inset + + between names just like it is supposed to. +\end_layout + +\begin_layout Standard +\begin_inset Note Note +status collapsed + +\begin_layout Plain Layout +Unlike the original apa class, the apa6 class does not override whatever + citation style is listed in the bibliography. + However, for compliance with apa6, you should set the style to apacite. +\end_layout + +\end_inset + + +\end_layout + +\begin_layout Standard +\begin_inset CommandInset bibtex +LatexCommand bibtex +bibfiles "sample" +options "apacite" + +\end_inset + + +\end_layout + +\end_body +\end_document ----------------------------------------------------------------------- Summary of changes: lib/generate_contributions.py | 8 + lib/layouts/{apa.layout => apa6.layout} | 232 +++++++++++++++++++------- lib/layouts/natbibapa.module | 18 ++ lib/templates/APA6.lyx | 286 +++++++++++++++++++++++++++++++ 4 files changed, 486 insertions(+), 58 deletions(-) copy lib/layouts/{apa.layout => apa6.layout} (67%) create mode 100644 lib/layouts/natbibapa.module create mode 100644 lib/templates/APA6.lyx hooks/post-receive -- The LyX Source Repository
