From ec47a45d2147dc88d63b369fd54e3da83b0a01f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sun, 26 Oct 2008 02:20:09 +0000 Subject: [PATCH] - beamer.layout: add inset for \inst - beamer-conference-ornate-20min.lyx: use new inset instead of ERT - aastex.layout, braille.module: fix silly mistake from me git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@27130 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/layouts/aastex.layout | 2 -- lib/layouts/beamer.layout | 21 ++++++++++++ lib/layouts/braille.module | 1 - .../beamer-conference-ornate-20min.lyx | 34 +++++++------------ .../de_beamer-conference-ornate-20min.lyx | 34 +++++++------------ .../fr_beamer-conference-ornate-20min.lyx | 34 +++++++------------ 6 files changed, 57 insertions(+), 69 deletions(-) diff --git a/lib/layouts/aastex.layout b/lib/layouts/aastex.layout index efe77057ac..6a6bdb0421 100644 --- a/lib/layouts/aastex.layout +++ b/lib/layouts/aastex.layout @@ -312,7 +312,6 @@ InsetLayout altaffilmark Color green Size Small EndFont - MultiPar true End @@ -596,7 +595,6 @@ InsetLayout tablenotemark Color magenta Size Small EndFont - MultiPar true End diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout index 4d03bd5455..1d271c5b49 100644 --- a/lib/layouts/beamer.layout +++ b/lib/layouts/beamer.layout @@ -842,6 +842,27 @@ Style Institute EndFont End +InsetLayout InstituteMark + LyxType custom + LatexType command + LatexName inst + LabelString "Institute mark" + Font + Color foreground + Size Small + Family Roman + Shape Up + Series Medium + Misc No_Emph + Misc No_Noun + Misc No_Bar + EndFont + LabelFont + Color blue + Size Small + EndFont +End + # Date style definition Style Date Category Titling diff --git a/lib/layouts/braille.module b/lib/layouts/braille.module index 063db48654..2b29510490 100644 --- a/lib/layouts/braille.module +++ b/lib/layouts/braille.module @@ -179,6 +179,5 @@ InsetLayout Braillebox Color green Size Small EndFont - MultiPar true End diff --git a/lib/templates/beamer-conference-ornate-20min.lyx b/lib/templates/beamer-conference-ornate-20min.lyx index 94b9e8e829..1e3e86fb5a 100644 --- a/lib/templates/beamer-conference-ornate-20min.lyx +++ b/lib/templates/beamer-conference-ornate-20min.lyx @@ -1,5 +1,5 @@ #LyX 1.6.0svn created this file. For more info see http://www.lyx.org/ -\lyxformat 341 +\lyxformat 344 \begin_document \begin_header \textclass beamer @@ -10,6 +10,7 @@ \setbeamercovered{transparent} % or whatever (possibly just delete it) \end_preamble +\use_default_options false \language english \inputencoding auto \font_roman times @@ -43,6 +44,7 @@ \tracking_changes false \output_changes false \author "" +\author "" \end_header \begin_body @@ -134,14 +136,11 @@ F. \end_inset Author -\begin_inset ERT -status collapsed +\begin_inset Flex InstituteMark +status open \begin_layout Plain Layout - - -\backslash -inst{1} +1 \end_layout \end_inset @@ -164,14 +163,11 @@ and \end_inset Another -\begin_inset ERT +\begin_inset Flex InstituteMark status collapsed \begin_layout Plain Layout - - -\backslash -inst{2} +2 \end_layout \end_inset @@ -229,14 +225,11 @@ Author et al. \end_layout \begin_layout Institute -\begin_inset ERT +\begin_inset Flex InstituteMark status collapsed \begin_layout Plain Layout - - -\backslash -inst{1} +1 \end_layout \end_inset @@ -259,14 +252,11 @@ and \end_inset -\begin_inset ERT +\begin_inset Flex InstituteMark status collapsed \begin_layout Plain Layout - - -\backslash -inst{2} +2 \end_layout \end_inset diff --git a/lib/templates/de_beamer-conference-ornate-20min.lyx b/lib/templates/de_beamer-conference-ornate-20min.lyx index 7a51caaf04..5136e786b8 100644 --- a/lib/templates/de_beamer-conference-ornate-20min.lyx +++ b/lib/templates/de_beamer-conference-ornate-20min.lyx @@ -1,5 +1,5 @@ #LyX 1.6.0svn created this file. For more info see http://www.lyx.org/ -\lyxformat 341 +\lyxformat 344 \begin_document \begin_header \textclass beamer @@ -10,6 +10,7 @@ \setbeamercovered{transparent} % oder auch nicht \end_preamble +\use_default_options false \language ngerman \inputencoding auto \font_roman times @@ -43,6 +44,7 @@ \tracking_changes false \output_changes false \author "" +\author "" \end_header \begin_body @@ -139,14 +141,11 @@ F. \end_inset Autor -\begin_inset ERT -status collapsed +\begin_inset Flex InstituteMark +status open \begin_layout Plain Layout - - -\backslash -inst{1} +1 \end_layout \end_inset @@ -169,14 +168,11 @@ and \end_inset Anders -\begin_inset ERT +\begin_inset Flex InstituteMark status collapsed \begin_layout Plain Layout - - -\backslash -inst{2} +2 \end_layout \end_inset @@ -235,14 +231,11 @@ Autor et al. \end_layout \begin_layout Institute -\begin_inset ERT +\begin_inset Flex InstituteMark status collapsed \begin_layout Plain Layout - - -\backslash -inst{1} +1 \end_layout \end_inset @@ -265,14 +258,11 @@ and \end_inset -\begin_inset ERT +\begin_inset Flex InstituteMark status collapsed \begin_layout Plain Layout - - -\backslash -inst{2} +2 \end_layout \end_inset diff --git a/lib/templates/fr_beamer-conference-ornate-20min.lyx b/lib/templates/fr_beamer-conference-ornate-20min.lyx index 7fe755b46d..08dede3ac4 100644 --- a/lib/templates/fr_beamer-conference-ornate-20min.lyx +++ b/lib/templates/fr_beamer-conference-ornate-20min.lyx @@ -1,5 +1,5 @@ #LyX 1.6.0svn created this file. For more info see http://www.lyx.org/ -\lyxformat 341 +\lyxformat 344 \begin_document \begin_header \textclass beamer @@ -11,6 +11,7 @@ % or whatever (possibly just delete it) \end_preamble \options handout +\use_default_options false \language french \inputencoding auto \font_roman times @@ -44,6 +45,7 @@ \tracking_changes false \output_changes false \author "" +\author "" \end_header \begin_body @@ -150,14 +152,11 @@ F. \end_inset Auteur -\begin_inset ERT -status collapsed +\begin_inset Flex InstituteMark +status open \begin_layout Plain Layout - - -\backslash -inst{1} +1 \end_layout \end_inset @@ -180,14 +179,11 @@ and \end_inset Lautre -\begin_inset ERT +\begin_inset Flex InstituteMark status collapsed \begin_layout Plain Layout - - -\backslash -inst{2} +2 \end_layout \end_inset @@ -245,14 +241,11 @@ Auteur et al. \end_layout \begin_layout Institute -\begin_inset ERT +\begin_inset Flex InstituteMark status collapsed \begin_layout Plain Layout - - -\backslash -inst{1} +1 \end_layout \end_inset @@ -275,14 +268,11 @@ and \end_inset -\begin_inset ERT +\begin_inset Flex InstituteMark status collapsed \begin_layout Plain Layout - - -\backslash -inst{2} +2 \end_layout \end_inset -- 2.39.5