Merge branch '3.x'

3 files changed, 7 insertions, 3 deletions

diff --git a/sphinx/util/cfamily.py b/sphinx/util/cfamily.py
index d4c21bfdb..66ee96374 100644
--- a/sphinx/util/cfamily.py
+++ b/sphinx/util/cfamily.py
@@ -374,7 +374,7 @@ class BaseParser:
                       % startPos)
         return self.definition[startPos:self.pos]
 
-    def _parse_attribute(self) -> ASTAttribute:
+    def _parse_attribute(self) -> Optional[ASTAttribute]:
         self.skip_ws()
         # try C++11 style
         startPos = self.pos
diff --git a/sphinx/util/i18n.py b/sphinx/util/i18n.py
index e8bd14db9..e5d4f112e 100644
--- a/sphinx/util/i18n.py
+++ b/sphinx/util/i18n.py
@@ -12,7 +12,7 @@ import os
 import re
 from datetime import datetime, timezone
 from os import path
-from typing import Callable, Generator, List, NamedTuple, Tuple
+from typing import Callable, Generator, List, NamedTuple, Tuple, Union
 from typing import TYPE_CHECKING
 
 import babel.dates
@@ -117,8 +117,10 @@ class CatalogRepository:
             yield CatalogInfo(basedir, domain, self.encoding)
 
 
-def docname_to_domain(docname: str, compation: bool) -> str:
+def docname_to_domain(docname: str, compation: Union[bool, str]) -> str:
     """Convert docname to domain for catalogs."""
+    if isinstance(compation, str):
+        return compation
     if compation:
         return docname.split(SEP, 1)[0]
     else:
diff --git a/sphinx/util/template.py b/sphinx/util/template.py
index 18047d687..bb078a2a2 100644
--- a/sphinx/util/template.py
+++ b/sphinx/util/template.py
@@ -84,6 +84,8 @@ class LaTeXRenderer(SphinxRenderer):
         self.env.variable_end_string = '%>'
         self.env.block_start_string = '<%'
         self.env.block_end_string = '%>'
+        self.env.comment_start_string = '<#'
+        self.env.comment_end_string = '<#'
 
 
 class ReSTRenderer(SphinxRenderer):