The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 586124c6a7bbad3d28bb756622613334da4a9a23 Merge: 5002ef3 f75becd Author: Uwe Stöhr <[email protected]> Date: Sun May 26 03:05:28 2013 +0200 Merge branch 'master' of git.lyx.org:lyx commit 5002ef33f03fdd5a7e401b6dd36285e2e4dee004 Author: Uwe Stöhr <[email protected]> Date: Sun May 26 03:04:59 2013 +0200 aa: fix compilation of the templates/aa.lyx - aa already loads inputenc diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout index 5decd34..57f6c80 100644 --- a/lib/layouts/aa.layout +++ b/lib/layouts/aa.layout @@ -1,5 +1,5 @@ #% Do not delete the line below; configure depends on this -# \DeclareLaTeXClass[aa]{Astronomy & Astrophysics} +# \DeclareLaTeXClass[aa,answers.sty]{Astronomy & Astrophysics} # \DeclareCategory{Articles} # # Author: Peter Sütterlin <[email protected]> @@ -24,6 +24,8 @@ SecNumDepth 3 TocDepth 0 PageStyle Plain +# Pre-loaded packages +Provides inputenc 1 Style Standard Category MainText diff --git a/lib/templates/aa.lyx b/lib/templates/aa.lyx index 240f7ae..09d03fb 100644 --- a/lib/templates/aa.lyx +++ b/lib/templates/aa.lyx @@ -8,9 +8,9 @@ \maintain_unincluded_children false \language english \language_package default -\inputencoding auto +\inputencoding default \fontencoding global -\font_roman times +\font_roman default \font_sans default \font_typewriter default \font_default_family default ----------------------------------------------------------------------- Summary of changes: lib/layouts/aa.layout | 4 +++- lib/templates/aa.lyx | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) hooks/post-receive -- The LyX Source Repository
