Skip to content

Commit

Permalink
makerst: use link titles for external tutorials
Browse files Browse the repository at this point in the history
  • Loading branch information
merumelu committed Jul 29, 2021
1 parent 140905d commit b8752d9
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions doc/tools/makerst.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def __init__(self, name): # type: (str) -> None
self.brief_description = None # type: Optional[str]
self.description = None # type: Optional[str]
self.theme_items = None # type: Optional[OrderedDict[str, List[ThemeItemDef]]]
self.tutorials = [] # type: List[str]
self.tutorials = [] # type: List[Tuple[str, str]]

# Used to match the class with XML source for output filtering purposes.
self.filepath = "" # type: str
Expand Down Expand Up @@ -257,7 +257,7 @@ def parse_class(self, class_root, filepath): # type: (ET.Element, str) -> None
assert link.tag == "link"

if link.text is not None:
class_def.tutorials.append(link.text)
class_def.tutorials.append((link.text.strip(), link.get("title", "")))

def sort_classes(self): # type: () -> None
self.classes = OrderedDict(sorted(self.classes.items(), key=lambda t: t[0]))
Expand Down Expand Up @@ -431,9 +431,8 @@ def make_rst_class(class_def, state, dry_run, output_dir): # type: (ClassDef, S
# Online tutorials
if len(class_def.tutorials) > 0:
f.write(make_heading("Tutorials", "-"))
for t in class_def.tutorials:
link = t.strip()
f.write("- " + make_url(link) + "\n\n")
for url, title in class_def.tutorials:
f.write("- " + make_link(url, title) + "\n\n")

# Properties overview
if len(class_def.properties) > 0:
Expand Down Expand Up @@ -1062,8 +1061,8 @@ def make_footer(): # type: () -> str
# fmt: on


def make_url(link): # type: (str) -> str
match = GODOT_DOCS_PATTERN.search(link)
def make_link(url, title): # type: (str, str) -> str
match = GODOT_DOCS_PATTERN.search(url)
if match:
groups = match.groups()
if match.lastindex == 2:
Expand All @@ -1080,7 +1079,10 @@ def make_url(link): # type: (str) -> str
else:
# External link, for example:
# `http://enet.bespin.org/usergroup0.html`
return "`" + link + " <" + link + ">`_"
if title != "":
return "`" + title + " <" + url + ">`_"
else:
return "`" + url + " <" + url + ">`_"


if __name__ == "__main__":
Expand Down

0 comments on commit b8752d9

Please sign in to comment.