- revert the previous layout change where inputenc was mentioned. This was not wrong but too intrusive for a change in branch
- mention that the aa class loads natbib to avoid compilation errors
- aa_sample.lyx: the aa package contains an outdated an customized version of natbib.sty. This file only woks with aa, but breaks the compilation of many other files on your system, therefore remove the bibliography and replace it by BibTeX; also clean up the preamble and add a note about the encoding
- aa.lyx: add a note about the encoding and set it in the document settings
A lot of this involves removing toclevel tags. They got introduced
by the automatic update of some layout files to format 19.
(cherry picked from commit b9f48eb945)
Conflicts:
lib/layouts/beamer.layout
lib/layouts/memoir.layout
lib/layouts/scrartcl.layout
lib/layouts/stdsections.inc
This reverts commit 56da307e19.
Revert the achemso.layout changes because they were not that pressing (preamble stuff was supported via styles).
For modernCV I don't see another way than to let it in because it is not working as it was, neither with TeXLive 2012 nor with MiKTeX and therefore in most cases unusable
Implement a more simple and elegant integration of the R package knitr. Now,
lyxknitr.R does not need to move or copy files at all.
This also fixes a bug: when /tmp was on a different file system (e.g.
encrypted home), lyxknitr.R failed to move files to /tmp because it relied on
R's 'file.rename' function, which in turn relied on the rename function in
<stdio.h>, which was failing with the EXDEV errno.
Patch from Yihui Xie.
- apa.layout: the commands \volume, \copnum and \notes are only allowed in the preamble; fixes bug #8187
- APA.lyx: the template missed the \note command
Repairs to case environment, from Paul Rubin. Modified by RGH to use
enumitem, since we already have a module for that, and there will be
conflicts between enumerate.sty and enumitem.sty.
A side effect of this, however, is that we will load enumitem.sty
whenver we use case environments.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40492 a592a061-630c-0410-9148-cb99ea01b6c8
(cherry picked from commit 4663e5ec88)
Conflicts:
lib/layouts/theorems.inc
Note that we have also changed the layout name to uppercase, but
this should be fine, since it was so far unused.
Conflicts:
src/insets/InsetScript.cpp
- modernCV.lyx: set page size to A4, correct subsection entry, use a separator modify preamble to be compliant with modernCV 0.16 (fixes#7991)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40643 a592a061-630c-0410-9148-cb99ea01b6c8
(i) Validate even for comments when outputting XHTML.
(ii) Output comments as divs hidden by default. Then people
can display them other ways if they wish.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40401 a592a061-630c-0410-9148-cb99ea01b6c8
since it breaks the string freeze. This was unintended.
This reverts commit r40251.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40259 a592a061-630c-0410-9148-cb99ea01b6c8
corresponding templates. Thanks to Yihui for these.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40248 a592a061-630c-0410-9148-cb99ea01b6c8
