Merge branch 'master' of ssh://bilbo/cours-maths-dis

[cours-maths-dis.git] / main.tex

diff --git a/main.tex b/main.tex
index 2bcee48e5e78ddc046efa217013ba00bb62578e5..136be90c0be56d5b419657fe7d3767ba72fe24a1 100755 (executable)
--- a/main.tex
+++ b/main.tex
@@ -7,7 +7,7 @@
 \usepackage{amsfonts}
 \usepackage{amssymb}
 \usepackage{optional}
-\usepackage{enumitem}
+%\usepackage{enumitem}
 \usepackage{framed}
 \usepackage[amsmath,thmmarks,thref,framed]{ntheorem}
 \usepackage[dvips]{graphics}
@@ -79,7 +79,6 @@
 \theoremstyle{plain}
 \theoremheaderfont{\normalfont\bfseries\sc}
 \theorembodyfont{\slshape}
-\theoremsymbol{\ensuremath{\diamondsuit}}
 \theoremprework{\bigskip}
 \theoremseparator{.}
 \newtheorem{Def}{Définition}[chapter]
@@ -119,6 +118,14 @@
 %\newtheorem{Pre}{Preuve}
 
 
+\theoremstyle{plain}
+\theoremheaderfont{\normalfont\sc}
+\theorembodyfont{\slshape}
+\theoremsymbol{$\dagger$}
+\theoremprework{\medskip}
+%\theorempostwork{}
+\theoremseparator{. }
+\newtheorem{Proof}{Preuve}%[chapter]
 
 
 \theoremstyle{plain}
@@ -127,7 +134,7 @@
 \theoremsymbol{$\dagger$}
 \theoremprework{\medskip}
 %\theorempostwork{}
-\theoremseparator{ :}
+\theoremseparator{. }
 \newtheorem{Pre}{Preuve}%[chapter]
 
 
@@ -137,11 +144,6 @@
 \theoremnumbering{greek}
 \newtheorem{Lemma}{Lemme}[chapter]
 
-\theoremheaderfont{\sc}\theorembodyfont{\upshape}
-\theoremstyle{nonumberplain}
-\theoremseparator{}
-\theoremsymbol{\rule{1ex}{1ex}}
-\newtheorem{Proof}{Preuve}[chapter]
 
 
 \theoremstyle{plain}
@@ -154,8 +156,8 @@
 
 \def\Qu{\begin{center}-----------------------------------\end{center}\begin{Qq}}
 \def\finQu{\end{Qq}}
-\def\Rep{\itshape\begin{enumerate}}
-\def\finRep{\end{enumerate}\upshape}
+%\def\Rep{\itshape\begin{enumeate}}
+%\def\finRep{\end{enumerate}\upshape}
 
 
 
@@ -225,7 +227,7 @@ showstringspaces=false}     % no special string spaces
 
 
 
-\include{Remerciements}
+%\include{Remerciements}
 
 \part{Théorie des ensembles}