src/formatitko/tex/formatitko.tex

@@ -168,10 +168,10 @@
 	\fi
 }}
 
-% Obecny plovouci objekt: \float{objekt}{popisek}{mezera pred}{mezera po}
+% Obecny plovouci objekt: \float{objekt}{popisek}{optional-id}
-\def\figure#1#2#3#4{
+\def\float#1#2#3{\floatinsert{
-\medskip#3
+\medskip
-\centerline{#1}#4
+\centerline{#1}
 \medskip
 \smallskip
 {
@@ -189,13 +189,7 @@
 			#2
 		}}
 	\fi
-}}
+}}}
-
-\def\floatpage#1{
-\pageinsert
-\vbox to \vsize{#1}
-\endinsert
-}
 
 % Dva floaty vedle sebe: \float{objekt1}{popisek1}{id1}{objekt2}{popisek2}{id2}
 \def\twofloats#1#2#3#4#5#6{\floatinsert{

src/formatitko/tex_generator.py

@@ -24,8 +24,6 @@ class UCWTexGenerator(OutputGenerator):
 		self.imageProcessor = imageProcessor
 		self._bold = 0
 		self._italic = 0
-
-		self._floatpages = {}
 		super().__init__(output_file, *args, **kwargs)
 
 	def escape_special_chars(self, text: str) -> str:
@@ -161,8 +159,9 @@ class UCWTexGenerator(OutputGenerator):
 		self.write(e.text)
 		self.write(r"`")
 
-	def generate_nonfloat_Figure(self, e: Figure):
+	def generate_Figure(self, e: Figure):
-		self.writeln(r"\figure{")
+		self.ensure_empty(2)
+		self.writeln(r"\float{")
 		self.indent_more()
 		self.generate(e.content)
 		self.indent_less()
@@ -178,30 +177,7 @@ class UCWTexGenerator(OutputGenerator):
 			self.indent_less()
 			self.writeln("}")
 		self.indent_less()
-		self.writeln(r"}{}{}")
+		self.writeln(r"}{}")
-
-
-	def generate_Figure(self, e: Figure):
-		if "floatpage" in e.attributes:
-			fp = e.attributes["floatpage"]
-			flush = fp[-1]=="!"
-			if flush:
-				fp = fp[:-1]
-			self._floatpages.setdefault(fp, [])
-			self._floatpages[fp].append(e)
-			if flush:
-				self.writeln(r"\floatpage{")
-				self.writeln(r"\vfill")
-				for x in self._floatpages[fp]:
-					self.generate_nonfloat_Figure(x)
-					self.writeln(r"\vfill")
-				self.writeln(r"}")
-				del self._floatpages[fp]
-		else:
-			self.ensure_empty(2)
-			self.writeln(r"\floatinsert{")
-			self.generate_nonfloat_Figure(e)
-			self.writeln(r"}")
 		self.ensure_empty(2)
 
 	def generate_Emph(self, e: Emph):
@@ -260,9 +236,9 @@ class UCWTexGenerator(OutputGenerator):
 		self.writeln(r"\halign{\strut"+"&".join([aligns[col[0]] for col in e.colspec])+r"\cr")
 		self.indent_more()
 		self.generate(e.head.content)
-		self.writeln(r"\noalign{\vskip 0.3em\hrule\vskip 0.3em}")
+		self.writeln(r"\noalign{\hrule}")
 		self.generate(e.content[0].content)
-		self.writeln(r"\noalign{\vskip 0.3em\hrule\vskip 0.3em}")
+		self.writeln(r"\noalign{\hrule}")
 		self.generate(e.foot.content)
 		self.indent_less()
 		self.writeln("}")