X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Flayouts%2Ftheorems-proof-std.inc;h=61ce3acf4bc512e36fb9e1bfa87e94677a38b8bc;hb=42c2a25fb873727d87ce753b3a3ac4e913e36fe0;hp=34da3d5703c3accada2ed8651709a56dbfc53cdf;hpb=b7d665da7f02a5e918de08ae9fe8727ede838670;p=lyx.git

diff --git a/lib/layouts/theorems-proof-std.inc b/lib/layouts/theorems-proof-std.inc
index 34da3d5703..61ce3acf4b 100644
--- a/lib/layouts/theorems-proof-std.inc
+++ b/lib/layouts/theorems-proof-std.inc
@@ -1,27 +1,65 @@
-# Moved here by rgheck. Original author cloudy.
+# Moved here by rikiheck. Original author cloudy.
+# Edited sep '22 by Udi Fogiel <udifoglle@gmail.com> (more similar version to the amsthm one)
 
-Format 22
+Format 99
 
-#This is just a hacked version of the AMS proof environment
+# This is just a hacked version of the AMS proof environment
 Style Proof
+	Category              Reasoning
+	Margin                First_Dynamic
+	LatexType             Environment
+	LatexName             proof
+	NextNoIndent          1
+	ResetArgs             1
+	Argument 1
+		LabelString       "Alternative Proof String"
+		Tooltip           "Alternative proof string"
+	EndArgument
+	LabelSep              xx
+	ParIndent             MMM
+	ParSkip               0.4
+	ItemSep               0.2
+	TopSep                0.7
+	BottomSep             0.7
+	ParSep                0.3
+	Align                 Block
+	AlignPossible         Block, Left
+	LabelType             Static
+	LabelString           "Proof."
+	EndLabelType          Box
+	Font
+	    Shape             Up
+	    Size              Normal
+	EndFont
+	LabelFont
+	    Shape             Italic
+	EndFont
 	Preamble
-		\ifx\proof\undefined\
-		\newenvironment{proof}[1][\protect\proofname]{\par
-			\normalfont\topsep6\p@\@plus6\p@\relax
-			\trivlist
-			\itemindent\parindent
-			\item[\hskip\labelsep
-					\scshape
-#1]\ignorespaces
-}{%
-			\endtrivlist\@endpefalse
-}
+		\ifcsname proof\endcsname\else
+			\DeclareRobustCommand{\lyx@qed}{%
+			  \ifmmode
+			  \else \leavevmode\unskip\penalty9999 \hbox{}\nobreak\hfill
+			  \fi
+			  \quad\hbox{\lyx@qedsymbol}}
+			\newcommand{\lyx@openbox}{\leavevmode
+			  \hbox to.77778em{%
+			  \hfil\vrule
+			  \vbox to.675em{\hrule width.6em\vfil\hrule}%
+			  \vrule\hfil}}
+			\newcommand{\lyx@qedsymbol}{\lyx@openbox}
+			\newenvironment{proof}[1][\proofname]{\par
+			  \normalfont
+			  \topsep6\p@\@plus6\p@ \trivlist
+			  \item[\hskip\labelsep\itshape
+				#1.]\ignorespaces
+			}{%
+			  \lyx@qed\endtrivlist
+			}
 		\fi
 	EndPreamble
-	LangPreamble
-		\providecommand{\proofname}{_(Proof)}
-	EndLangPreamble
-	BabelPreamble
-		\addto\captions$$lang{\renewcommand{\proofname}{_(Proof)}}
-	EndBabelPreamble
+    # No LangPreamble or BabelPreamble, since babel knows \proofname already.
+	DocBookWrapperTag     figure
+	DocBookWrapperAttr    role='proof'
+	DocBookTag            para
+	DocBookGenerateTitle  true
 End