The branch, master, has been updated.

- Log -----------------------------------------------------------------

commit cc0c3d0427bcffada1e4b989b69d54df539e21fd
Author: Kornel Benko <[email protected]>
Date:   Fri Mar 1 15:32:58 2013 +0100

    Remove latex-nameclash between
            \newfloat{algorithm} ...
    and
            \newtheorem{algorithm}...

diff --git a/lib/layouts/theorems-ams-extended-bytype.module 
b/lib/layouts/theorems-ams-extended-bytype.module
index 672ee4c..e08c737 100644
--- a/lib/layouts/theorems-ams-extended-bytype.module
+++ b/lib/layouts/theorems-ams-extended-bytype.module
@@ -93,11 +93,11 @@ End
 
 Style Algorithm
        CopyStyle             Theorem
-       LatexName             algorithm
+       LatexName             lyxalgorithm
        LabelString           "Algorithm \thealgorithm."
        Preamble
          \theoremstyle{plain}
-         \newtheorem{algorithm}{\protect\algorithmname}
+         \newtheorem{lyxalgorithm}{\protect\algorithmname}
        EndPreamble
        LangPreamble
          \providecommand{\algorithmname}{_(Algorithm)}
@@ -111,11 +111,11 @@ End
 
 Style Algorithm*
        CopyStyle             Theorem*
-       LatexName             algorithm*
+       LatexName             lyxalgorithm*
        LabelString           "Algorithm."
        Preamble
          \theoremstyle{plain}
-         \newtheorem*{algorithm*}{\protect\algorithmname}
+         \newtheorem*{lyxalgorithm*}{\protect\algorithmname}
        EndPreamble
        LangPreamble
          \providecommand{\algorithmname}{_(Algorithm)}
diff --git a/lib/layouts/theorems-ams-extended.module 
b/lib/layouts/theorems-ams-extended.module
index 7b59033..09c430c 100644
--- a/lib/layouts/theorems-ams-extended.module
+++ b/lib/layouts/theorems-ams-extended.module
@@ -70,11 +70,11 @@ End
 Style Algorithm
        CopyStyle             Theorem
        DependsOn                  Theorem
-       LatexName             algorithm
+       LatexName             lyxalgorithm
        LabelString           "Algorithm \thetheorem."
        Preamble
          \theoremstyle{plain}
-         \newtheorem{algorithm}[thm]{\protect\algorithmname}
+         \newtheorem{lyxalgorithm}[thm]{\protect\algorithmname}
        EndPreamble
        LangPreamble
          \providecommand{\algorithmname}{_(Algorithm)}
@@ -87,11 +87,11 @@ End
 
 Style Algorithm*
        CopyStyle             Theorem*
-       LatexName             algorithm*
+       LatexName             lyxalgorithm*
        LabelString           "Algorithm."
        Preamble
          \theoremstyle{plain}
-         \newtheorem*{algorithm*}{\protect\algorithmname}
+         \newtheorem*{lyxalgorithm*}{\protect\algorithmname}
        EndPreamble
        LangPreamble
          \providecommand{\algorithmname}{_(Algorithm)}

-----------------------------------------------------------------------

Summary of changes:
 lib/layouts/theorems-ams-extended-bytype.module |    8 ++++----
 lib/layouts/theorems-ams-extended.module        |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to