diff --git a/src/formatitko/tex_generator.py b/src/formatitko/tex_generator.py
index 8d0d414..8af85af 100644
--- a/src/formatitko/tex_generator.py
+++ b/src/formatitko/tex_generator.py
@@ -170,14 +170,17 @@ class UCWTexGenerator(OutputGenerator):
 		self.writeln(r"}{")
 		self.indent_more()
 		if 'number' in e.attributes:
-			self.writeln(f"Obrázek {e.attributes['number']}:")
+			type_text = e.attributes.get("type_text", "Obrázek")
+			self.writeln(f"{type_text} {e.attributes['number']}:")
 		self.generate(e.caption)
 		if 'number' in e.attributes:
-			self.writeln(r"\addtoc\tocpicture{"+str(e.attributes['number'])+"}{}{")
-			self.indent_more()
-			self.generate(e.caption.content)
-			self.indent_less()
-			self.writeln("}")
+			tocmac = e.attributes.get("tocmac", "tocpicture")
+			if tocmac:
+				self.writeln("\\addtoc\\"+tocmac+r"{"+str(e.attributes['number'])+"}{}{")
+				self.indent_more()
+				self.generate(e.caption.content)
+				self.indent_less()
+				self.writeln("}")
 		self.indent_less()
 		self.writeln(r"}{}{}")