UCWTeX: Reforma figure

src/formatitko/tex/formatitko.tex

@@ -103,7 +103,7 @@
 \settextsize{12}
 
 
-\def\floatinsert#1{\par{
+\long\def\floatinsert#1{\par{
 	\setbox0=\vbox{\boxmaxdepth=2pt\relax #1}
 	\dimen0=\dimexpr \ht0 + \dp0 + \baselineskip + \pagetotal - \pageshrink \relax
 	\ifdim\dimen0 > \pagegoal
@@ -124,13 +124,21 @@
 }}
 
 % Obecny plovouci objekt: \float{objekt}{popisek}{mezera pred}{mezera po}
-\def\figure#1#2#3#4{
+\long\def\figure#1#2#3#4{
 \medskip#3
-\centerline{#1}#4
+\hbox to \hsize{\hfil\vtop{
+	\parindent=0pt
+	\leftskip=0pt plus 0.2\hsize
+	\rightskip=0pt plus 0.2\hsize
+	\parfillskip=0pt plus 0.2\hsize
+	\spaceskip=0.3333em
+	\settextsize{10}
+	#1
+}\hfil}#4
 \medskip
 \smallskip
 {
-	\setbox0=\hbox{#2}
+	\setbox0=\hbox{\settextsize{10}#2}
 	\ifdim\wd0 < 0.8\hsize
 		\centerline{\box0}
 	\else
@@ -141,12 +149,12 @@
 			\rightskip=0pt plus 0.3\hsize
 			\parfillskip=0pt
 			\spaceskip=0.3333em
-			#2
+			\settextsize{10}#2
 		}}
 	\fi
 }}
 
-\def\floatpage#1{
+\long\def\floatpage#1{
 \pageinsert
 \vbox to \vsize{#1}
 \endinsert
@@ -170,9 +178,9 @@
 \immediate\openout\tocfile=toc-new.aux
 
 % Voláme: \addtoc\tocmacro{number}{asterisks}{title}
-\long\def\addtoc#1#2#3#4{
+\long\def\addtoc#1#2#3#4{%
-	\edef\brum{
+	\edef\brum{%
-		\write\tocfile{\string#1{\noexpand\the\noexpand\count0}{#2}{#3}{#4}}
+		\write\tocfile{\string#1{\noexpand\the\noexpand\count0}{#2}{#3}{#4}}%
 	}
-	\brum
+	\brum%
 }