Wrap json loaded in revertible objects.

This is intended to improve compatibility with older games that might use .iteritems and similar methods.
fonts: Allow deallocation and clear face cache.
2025-02-12 23:21:48 -05:00 · 2025-02-12 22:51:50 -05:00 · 2025-02-07 01:24:18 -05:00 · 2025-01-31 22:07:18 -05:00 · 2025-01-24 21:29:51 -05:00 · 2025-01-23 22:32:49 -05:00
365 changed files with 8834 additions and 3150 deletions
@@ -71,14 +71,14 @@ To return to this virtualenv later, run::

 After activating the virtualenv, install additional dependencies::

-    pip install -U "setuptools cython<3.0.0 future six typing pefile requests ecdsa"
+    pip install -U cython future six typing pefile requests ecdsa

 Then, install pygame_sdl2 by running the following commands::

    git clone https://www.github.com/renpy/pygame_sdl2
    pushd pygame_sdl2
    python setup.py install
-    python install_headers.py $VIRTUAL_ENV
+    python setup.py install_headers
    popd

 Next, set RENPY_DEPS_INSTALL To a \:-separated (\;-separated on Windows)
@@ -328,7 +328,7 @@ define gui.vbar_borders = Borders(gui.scale(4), gui.scale(4), gui.scale(4), gui.
 define gui.vscrollbar_borders = Borders(gui.scale(4), gui.scale(4), gui.scale(4), gui.scale(4))
 define gui.vslider_borders = Borders(gui.scale(4), gui.scale(4), gui.scale(4), gui.scale(4))

-## What to do with unscrollable scrollbars in the gui. "hide" hides them, while
+## What to do with unscrollable scrollbars in the game menu. "hide" hides them, while
 ## None shows them.
 define gui.unscrollable = "hide"

@@ -96,7 +96,6 @@ style frame:
 ## https://www.renpy.org/doc/html/screen_special.html#say

 screen say(who, what):
-    style_prefix "say"

    window:
        id "window"
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -76,14 +76,24 @@ class BinFile(object):
        self.addr = addr

    def tostring(self):
-        return self.a.tobytes()
+        if PY2:
+            return self.a.tostring() # type: ignore
+        else:
+            return self.a.tobytes()

    def substring(self, start, len): # @ReservedAssignment
-        return self.a[start:start + len].tobytes()
+        if PY2:
+            return self.a[start:start + len].tostring() # type: ignore
+        else:
+            return self.a[start:start + len].tobytes()

    def __init__(self, data):
        self.a = array.array('B')
-        self.a.frombytes(data)
+
+        if PY2:
+            self.a.fromstring(data) # type: ignore
+        else:
+            self.a.frombytes(data)

 ##############################################################################
 # These functions parse data out of the file. In these functions, offset is
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -432,7 +432,10 @@ fix_dlc("renios", "renios")
            for f in sorted(self, key=lambda a : a.name):
                f.hash(sha, distributor)

-            return sha.hexdigest()
+            if PY2:
+                return sha.hexdigest().decode("utf-8")
+            else:
+                return sha.hexdigest()

        def split_by_prefix(self, prefix):
            """
@@ -658,6 +661,7 @@ fix_dlc("renios", "renios")
            # Build the mac app and windows exes.
            self.add_mac_files()
            self.add_windows_files()
+            self.add_main_py()

            # Add the main.py.
            self.add_main_py()
@@ -1071,8 +1075,11 @@ fix_dlc("renios", "renios")

            rv = self.temp_filename("Info.plist")

-            with open(rv, "wb") as f:
-                plistlib.dump(plist, f)
+            if PY2:
+                plistlib.writePlist(plist, rv)
+            else:
+                with open(rv, "wb") as f:
+                    plistlib.dump(plist, f)

            return rv

@@ -1093,12 +1100,14 @@ fix_dlc("renios", "renios")

            prefix = py("lib/py{major}-")

-            if os.path.exists(linux_i686):
+            i686fn = os.path.join(config.renpy_base, prefix + "linux-i686/renpy")
+
+            if os.path.exists(i686fn):

                self.add_file(
                    linux_i686,
                    prefix + "linux-i686/" + self.executable_name,
-                    os.path.join(config.renpy_base, prefix + "linux-i686/renpy"),
+                    i686fn,
                    True)

            self.add_file(
@@ -1219,8 +1228,19 @@ fix_dlc("renios", "renios")
                if os.path.exists(tmp):
                    self.add_file(fl, dst, tmp)

-            write_exe("lib/py3-windows-x86_64/renpy.exe", self.exe, self.exe, windows)
-            write_exe("lib/py3-windows-x86_64/pythonw.exe", "lib/py3-windows-x86_64/pythonw.exe", "pythonw-64.exe", windows)
+            if PY2:
+
+                if self.build["include_i686"]:
+                    write_exe("lib/py2-windows-i686/renpy.exe", self.exe32, self.exe32, windows_i686)
+                    write_exe("lib/py2-windows-i686/pythonw.exe", "lib/py2-windows-i686/pythonw.exe", "pythonw-32.exe", windows_i686)
+
+                write_exe("lib/py2-windows-x86_64/renpy.exe", self.exe, self.exe, windows)
+                write_exe("lib/py2-windows-x86_64/pythonw.exe", "lib/py2-windows-x86_64/pythonw.exe", "pythonw-64.exe", windows)
+
+            else:
+
+                write_exe("lib/py3-windows-x86_64/renpy.exe", self.exe, self.exe, windows)
+                write_exe("lib/py3-windows-x86_64/pythonw.exe", "lib/py3-windows-x86_64/pythonw.exe", "pythonw-64.exe", windows)


        def add_main_py(self):
@@ -1518,7 +1538,7 @@ fix_dlc("renios", "renios")

            if self.include_update and not format.startswith("app-"):

-                with open(update_fn, "w") as f:
+                with open(update_fn, "wb" if PY2 else "w") as f:
                    json.dump(update, f, indent=2)

                if (not dlc) or (format == "update"):
@@ -1554,6 +1574,11 @@ fix_dlc("renios", "renios")
                    if os.path.exists(update_fn):
                        shutil.copy(update_fn, final_update_fn)

+                if not directory:
+                    file_hash = hash_file(path)
+                else:
+                    file_hash = ""
+
            if format == "tar.bz2" or format == "bare-tar.bz2":
                pkg = TarPackage(path, "w:bz2")
            elif format == "update":
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -158,8 +158,12 @@ screen front_page_project:

                frame style "l_indent":
                    has vbox
-                    for button_name, path in p.data["renpy_launcher"]["open_directory"].items():
-                        textbutton button_name action OpenDirectory(os.path.join(p.path, path), absolute=True)
+
+                    textbutton "game" action OpenDirectory(os.path.join(p.path, "game"), absolute=True)
+                    textbutton "base" action OpenDirectory(os.path.join(p.path, "."), absolute=True)
+                    textbutton "images" action OpenDirectory(os.path.join(p.path, "game/images"), absolute=True)
+                    textbutton "audio" action OpenDirectory(os.path.join(p.path, "game/audio"), absolute=True)
+                    textbutton "gui" action OpenDirectory(os.path.join(p.path, "game/gui"), absolute=True)

            vbox:
                if persistent.show_edit_funcs:
@@ -169,8 +173,10 @@ screen front_page_project:
                    frame style "l_indent":
                        has vbox

-                        for button_name, path in p.data["renpy_launcher"]["edit_file"].items():
-                            textbutton button_name action editor.Edit(path, check=True)
+                        textbutton "script.rpy" action editor.Edit("game/script.rpy", check=True)
+                        textbutton "options.rpy" action editor.Edit("game/options.rpy", check=True)
+                        textbutton "gui.rpy" action editor.Edit("game/gui.rpy", check=True)
+                        textbutton "screens.rpy" action editor.Edit("game/screens.rpy", check=True)

                        if editor.CanEditProject():
                            textbutton _("Open project") action editor.EditProject()
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -81,7 +81,10 @@ init python:

 label install_live2d:
    python hide:
-        _prefix = r"lib/py3-"
+        if PY2:
+            _prefix = r"lib/py2-"
+        else:
+            _prefix = r"lib/py3-"

        patterns = [
            (r".*/Core/dll/linux/x86_64/(libLive2DCubismCore.so)", _prefix + r"linux-x86_64/\1"),
@@ -94,6 +97,11 @@ label install_live2d:
            (r".*/Core/dll/android/(x86_64/libLive2DCubismCore.so)", r"rapt/prototype/renpyandroid/src/main/jniLibs/\1"),
        ]

+        if PY2:
+           patterns.extend([
+                (r".*/Core/dll/windows/x86/(Live2DCubismCore.dll)", _prefix + r"windows-i686/\1"),
+           ])
+
        install_from_zip("Live2D Cubism SDK for Native", "CubismSdkForNative-[45]-*.zip", patterns)

    jump front_page
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -33,6 +33,10 @@ init python in interface:
    DOC_URL = "http://www.renpy.org/doc/html/"
    DOC_LOCAL_URL = "file:///" + DOC_PATH

+    # If true, the launcher should not link back to renpy.org.
+    NO_LAUNCHER_LINKS = os.path.exists(os.path.join(config.renpy_base, "no_launcher_links.txt"))
+
+
    local_doc_exists = os.path.exists(DOC_PATH)

    def get_doc_url(page):
@@ -40,7 +44,7 @@ init python in interface:
        Returns the URL to the documentation page.
        """

-        if local_doc_exists and not persistent.use_web_doc:
+        if local_doc_exists and (NO_LAUNCHER_LINKS or not persistent.use_web_doc):
            from urllib.parse import urljoin
            from urllib.request import pathname2url

@@ -117,7 +121,10 @@ screen bottom_info:
                hbox:
                    spacing INDENT
                    textbutton _("Documentation") style "l_link" action interface.OpenDocumentation()
-                    textbutton _("Ren'Py Website") style "l_link" action OpenURL(interface.RENPY_URL)
+
+                    if not interface.NO_LAUNCHER_LINKS:
+                        textbutton _("Ren'Py Website") style "l_link" action OpenURL(interface.RENPY_URL)
+
                    textbutton _("[interface.version]") style "l_link" action Jump("about")

                hbox:
@@ -133,7 +140,7 @@ screen bottom_info:
                    textbutton _("preferences") style "l_link" action Jump("preferences")
                    textbutton _("quit") style "l_link" action Quit(confirm=False)

-            if persistent.sponsor_message:
+            if persistent.sponsor_message and not interface.NO_LAUNCHER_LINKS:

                textbutton _("Ren'Py Sponsor Information"):
                    style "l_link"
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -164,6 +164,9 @@ init python:

        print("Eliminating __pycache__...")

+        if PY2:
+            return
+
        import pathlib
        import sys

@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -50,7 +50,7 @@ init python:
            pass

        with interface.error_handling(_("Downloading the itch.io butler.")):
-            url = "https://broth.itch.ovh/butler/{}/LATEST/archive/default".format(platform)
+            url = "https://broth.itch.zone/butler/{}/LATEST/archive/default".format(platform)

            response = requests.get(url, headers={'User-Agent' : "Renpy"}, proxies=renpy.proxies)

@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -34,6 +34,9 @@ label new_project:
    if persistent.projects_directory is None:
        $ interface.error(_("The projects directory could not be set. Giving up."))

+    if PY2:
+        $ interface.info(_("Warning : you are using Ren'Py 7. It is recommended to start new projects using Ren'Py 8 instead."))
+
    python:
        new_project_language = __("{#language name and font}")
        gui_kind = "new_gui_project"
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -322,7 +322,7 @@ init python:
        """

        if py is True:
-            py = 'pycache'
+            py = 'pyo' if PY2 else 'pycache'

        if py == 'pycache':
            build.classify_renpy(pattern + "/**__pycache__/", binary)
@@ -357,7 +357,6 @@ init python:

        build.classify_renpy(pattern + "/**", source)

-    build.classify_renpy("renpy/gl/", None)

    build.classify_renpy("renpy.py", "binary")
    source_and_binary("renpy")
@@ -411,14 +410,27 @@ init python:
    build.classify_renpy("module/libhydrogen/**", "source")

    # all-platforms binary.
+    build.classify_renpy("lib/**/libpython{}.{}.dll".format(sys.version_info.major, sys.version_info.minor), "binary")
+    build.classify_renpy("lib/**/libpython*.dll", None)
+
    build.classify_renpy("lib/**/*steam_api*", "steam")
    build.classify_renpy("lib/**/*Live2D*", None)

-    build.classify_renpy("lib/py3-linux-armv7l/**", None)
-    build.classify_renpy("lib/py3-linux-aarch64/**", "linux_arm")
-    source_and_binary("lib/py3-**", "binary", "binary")
-    source_and_binary("lib/python3**", "binary", "binary", py='pyc')
-    build.classify_renpy("renpy3.sh", "binary")
+
+    libpython = "lib/python{}.{}".format(sys.version_info.major, sys.version_info.minor)
+
+    if PY2:
+        build.classify_renpy("lib/py2-linux-armv7l/**", "linux_arm")
+        build.classify_renpy("lib/py2-linux-aarch64/**", "linux_arm")
+        source_and_binary("lib/py2-**", "binary", "binary")
+        source_and_binary("lib/python2**", "binary", "binary")
+        build.classify_renpy("renpy2.sh", "binary")
+    else:
+        build.classify_renpy("lib/py3-linux-armv7l/**", "linux_arm")
+        build.classify_renpy("lib/py3-linux-aarch64/**", "linux_arm")
+        source_and_binary("lib/py3-**", "binary", "binary")
+        source_and_binary("lib/python3**", "binary", "binary", py='pyc')
+        build.classify_renpy("renpy3.sh", "binary")

    build.classify_renpy("lib/", "binary")

@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -34,21 +34,106 @@ init python in distribute:
    from zipfile import crc32

    # Since the long type doesn't exist on py3, define it here
-    long = int
+    if not PY2:
+        long = int

    zlib.Z_DEFAULT_COMPRESSION = 5

-    class ZipFile(zipfile.ZipFile):
+    if PY2:

-        def write_with_info(self, zinfo, filename):
+        class ZipFile(zipfile.ZipFile):

-            if zinfo.filename.endswith("/"):
-                data = b''
-            else:
-                with open(filename, "rb") as f:
-                    data = f.read()
+            def write_with_info(self, zinfo, filename):
+                """Put the bytes from filename into the archive under the name
+                arcname."""
+                if not self.fp:
+                    raise RuntimeError(
+                        "Attempt to write to ZIP archive that was already closed")

-            self.writestr(zinfo, data)
+                st = os.stat(filename)
+                isdir = stat.S_ISDIR(st.st_mode)
+
+                zinfo.file_size = st.st_size
+                zinfo.flag_bits = 0x00
+                zinfo.header_offset = self.fp.tell()    # Start of header bytes
+
+                self._writecheck(zinfo)
+                self._didModify = True
+
+                if isdir:
+                    zinfo.file_size = 0
+                    zinfo.compress_size = 0
+                    zinfo.CRC = 0
+                    self.filelist.append(zinfo)
+                    self.NameToInfo[zinfo.filename] = zinfo
+                    self.fp.write(zinfo.FileHeader())
+                    return
+
+                with open(filename, "rb") as fp:
+                    # Must overwrite CRC and sizes with correct data later
+                    zinfo.CRC = CRC = 0
+                    zinfo.compress_size = compress_size = 0
+                    file_size = 0
+
+                    zip64 = self._allowZip64 and \
+                            zinfo.file_size * 1.05 > zipfile.ZIP64_LIMIT
+
+                    self.fp.write(zinfo.FileHeader(zip64))
+
+                    if zinfo.compress_type == zipfile.ZIP_DEFLATED:
+                        cmpr = zlib.compressobj(zlib.Z_DEFAULT_COMPRESSION,
+                            zlib.DEFLATED, -15)
+                    else:
+                        cmpr = None
+                    while 1:
+                        buf = fp.read(1024 * 1024)
+                        if not buf:
+                            break
+                        file_size = file_size + len(buf)
+                        CRC = crc32(buf, CRC) & 0xffffffff
+                        if cmpr:
+                            buf = cmpr.compress(buf)
+                            compress_size = compress_size + len(buf)
+                        self.fp.write(buf)
+                if cmpr:
+                    buf = cmpr.flush()
+                    compress_size = compress_size + len(buf)
+                    self.fp.write(buf)
+                    zinfo.compress_size = compress_size
+                else:
+                    zinfo.compress_size = file_size
+                zinfo.CRC = CRC
+                zinfo.file_size = file_size
+
+                if not zip64 and self._allowZip64:
+                    if file_size > zipfile.ZIP64_LIMIT:
+                        raise RuntimeError('File size has increased during compressing')
+                    if compress_size > zipfile.ZIP64_LIMIT:
+                        raise RuntimeError('Compressed size larger than uncompressed size')
+
+                # Seek backwards and write CRC and file sizes
+                position = self.fp.tell()       # Preserve current position in file
+                self.fp.seek(zinfo.header_offset, 0)
+
+                self.fp.write(zinfo.FileHeader(zip64))
+
+                self.fp.seek(position, 0)
+                self.filelist.append(zinfo)
+                self.NameToInfo[zinfo.filename] = zinfo
+
+    else:
+
+        class ZipFile(zipfile.ZipFile):
+
+            def write_with_info(self, zinfo, filename):
+
+                if zinfo.filename.endswith("/"):
+                    data = b''
+                else:
+                    with open(filename, "rb") as f:
+                        data = f.read()
+
+                self.writestr(zinfo, data)


    class ZipPackage(object):
@@ -384,5 +469,3 @@ init python in distribute:
        for i in parallel_threads:
            if i.done:
                i.done()
-
-        parallel_threads.clear()
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -116,32 +116,13 @@ init python in project:

            try:
                with open(os.path.join(self.path, "project.json"), "w") as f:
-                    json.dump(self.data, f, indent=2)
+                    json.dump(self.data, f)
            except Exception:
                self.load_data()

        def update_data(self):
            data = self.data

-            data.setdefault("renpy_launcher",
-            {
-                "open_directory":
-                {
-                    "game": "game",
-                    "base": ".",
-                    "images": "game/images",
-                    "audio": "game/audio",
-                    "gui": "game/gui"
-                },
-                "edit_file":
-                {
-                    "script.rpy": "game/script.rpy",
-                    "options.rpy": "game/options.rpy",
-                    "gui.rpy": "game/gui.rpy",
-                    "screens.rpy": "game/screens.rpy"
-                }
-            })
-
            data.setdefault("build_update", False)
            data.setdefault("packages", [ "pc", "mac" ])
            data.setdefault("add_from", True)
@@ -371,6 +352,12 @@ init python in project:

                    line = line[:1024]

+                    if PY2:
+                        try:
+                            line = line.decode("utf-8")
+                        except Exception:
+                            continue
+
                    m = re.search(r"#\s*TODO(\s*:\s*|\s+)(.*)", line, re.I)

                    if m is None:
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-
+
 translate german strings:

    # screens.rpy:9
@@ -53,7 +53,7 @@

    # game/editor.rpy:327
    old "An exception occured while launching the text editor:\n[exception!q]"
-    new "Ocorreu uma exceção ao executar o editor de texto:\[exception!q]"
+    new "Ocorreu uma exceção ao executar o editor de texto:\n[exception!q]"

    # game/editor.rpy:423
    old "Select Editor"
@@ -1874,7 +1874,7 @@

    # game/androidstrings.rpy:43
    old "I was unable to use javac to compile a test file. If you haven't installed the Java Development Kit yet, please download it from:\n\n{a=https://adoptium.net/?variant=openjdk8}https://adoptium.net/?variant=openjdk8{/a}\n\nThe JDK is different from the JRE, so it's possible you have Java without having the JDK. Please make sure you installed the 'JavaSoft (Oracle) registry keys'.\n\nWithout a working JDK, I can't continue."
-    new "Не удалось использовать javac для компиляции тестового файла. Если вы еще не установили Java Development Kit, загрузите его с:\n\n{a=https://adoptium.net/?variant=openjdk8}https://adoptium.net/?variant=openjdk8{/a}\n\JDK отличается от JRE, поэтому возможно, что у вас есть Java без JDK. Пожалуйста, убедитесь, что вы установили 'переменные окружения JavaSoft (Oracle)'.\n\nБез работающего JDK я не могу продолжать."
+    new "Не удалось использовать javac для компиляции тестового файла. Если вы еще не установили Java Development Kit, загрузите его с:\n\n{a=https://adoptium.net/?variant=openjdk8}https://adoptium.net/?variant=openjdk8{/a}\n\nJDK отличается от JRE, поэтому возможно, что у вас есть Java без JDK. Пожалуйста, убедитесь, что вы установили 'переменные окружения JavaSoft (Oracle)'.\n\nБез работающего JDK я не могу продолжать."

    # game/androidstrings.rpy:64
    old "I've opened the directory containing android.keystore and bundle.keystore. Please back them up, and keep them in a safe place."
@@ -884,7 +884,7 @@ translate spanish strings:

    # renpy/common/00sync.rpy:593
    old "You can use this ID to download your save on another device.\nThis sync will expire in an hour.\nRen'Py Sync is supported by {a=https://www.renpy.org/sponsors.html}Ren'Py's Sponsors{/a}."
-    new "Puede usar esta ID para descargar su guardado en otro dispositivo.\nEsta sincronización caducará en una hora.\RenPy Sync está para {a=https://www.renpy.org/sponsors.html}los patrocinadores de Ren'Py{/a}."
+    new "Puede usar esta ID para descargar su guardado en otro dispositivo.\nEsta sincronización caducará en una hora.\nRenPy Sync está para {a=https://www.renpy.org/sponsors.html}los patrocinadores de Ren'Py{/a}."

    # renpy/common/00sync.rpy:619
    old "Sync Error"
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # 00action_file.rpy:26
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # 00console.rpy:255
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # 00gltest.rpy:70
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # gui/game/gui.rpy:2
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # game/about.rpy:39
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # gui/game/options.rpy:1
@@ -1,4 +1,4 @@
-
+
 translate ukrainian strings:

    # gui/game/screens.rpy:9
@@ -1,4 +1,4 @@
-# У цьому файлі міститься сценарій гри.
+# У цьому файлі міститься сценарій гри.

 # Визначення персонажів для гри.
 # Аргумент color змінює колір ім’я персонажа.
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -440,12 +440,13 @@ init python:
        # Find the presplash and copy it over.
        presplash = None

-        for fn in [ "web-presplash.png", "web-presplash.jpg", "web-presplash.webp" ]:
-            fullfn = os.path.join(project.current.path, fn)
+        if not PY2:
+            for fn in [ "web-presplash.png", "web-presplash.jpg", "web-presplash.webp" ]:
+                fullfn = os.path.join(project.current.path, fn)

-            if os.path.exists(fullfn):
-                presplash = fn
-                break
+                if os.path.exists(fullfn):
+                    presplash = fn
+                    break

        if presplash:
            os.unlink(os.path.join(destination, "web-presplash.jpg"))
@@ -455,16 +456,20 @@ init python:
        with io.open(os.path.join(WEB_PATH, "index.html"), encoding='utf-8') as f:
            html = f.read()

-        html = html.replace("Ren'Py Web Game", display_name)
+        if PY2:
+            html = html.replace("%%TITLE%%", display_name)
+        else:
+            html = html.replace("Ren'Py Web Game", display_name)

-        if presplash:
-            html = html.replace("web-presplash.jpg", presplash)
+            if presplash:
+                html = html.replace("web-presplash.jpg", presplash)

        with io.open(os.path.join(destination, "index.html"), "w", encoding='utf-8') as f:
            f.write(html)

-        generate_web_icons(p, destination)
-        prepare_pwa_files(p, destination)
+        if not PY2:
+            generate_web_icons(p, destination)
+            prepare_pwa_files(p, destination)

        # Zip up the game.

@@ -6,6 +6,7 @@ renpy.lexersupport gen/renpy.lexersupport.c
 renpy.pydict gen/renpy.pydict.c
 renpy.style gen/renpy.style.c
 renpy.encryption gen/renpy.encryption.c
+renpy.compat.dictviews gen/renpy.compat.dictviews.c
 renpy.styledata.styleclass gen/renpy.styledata.styleclass.c
 renpy.styledata.stylesets gen/renpy.styledata.stylesets.c
 renpy.styledata.style_selected_hover_functions gen/renpy.styledata.style_selected_hover_functions.c
@@ -24,6 +25,11 @@ renpy.display.accelerator gen/renpy.display.accelerator.c
 renpy.display.quaternion gen/renpy.display.quaternion.c
 renpy.uguu.gl gen/renpy.uguu.gl.c
 renpy.uguu.uguu gen/renpy.uguu.uguu.c
+renpy.gl.gldraw gen/renpy.gl.gldraw.c
+renpy.gl.gltexture gen/renpy.gl.gltexture.c
+renpy.gl.glenviron_shader gen/renpy.gl.glenviron_shader.c
+renpy.gl.glrtt_copy gen/renpy.gl.glrtt_copy.c
+renpy.gl.glrtt_fbo gen/renpy.gl.glrtt_fbo.c
 renpy.gl2.gl2mesh gen/renpy.gl2.gl2mesh.c
 renpy.gl2.gl2mesh2 gen/renpy.gl2.gl2mesh2.c
 renpy.gl2.gl2mesh3 gen/renpy.gl2.gl2mesh3.c
@@ -1,5 +1,5 @@
 # -*- python -*-
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>

 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -71,11 +71,7 @@ static int rwops_read(void *opaque, uint8_t *buf, int buf_size) {

 }

-#if (LIBAVFORMAT_VERSION_MAJOR < 61)
 static int rwops_write(void *opaque, uint8_t *buf, int buf_size) {
-#else
-static int rwops_write(void *opaque, const uint8_t *buf, int buf_size) {
-#endif
    printf("Writing to an SDL_rwops is a really bad idea.\n");
    return -1;
 }
@@ -694,14 +690,9 @@ static void decode_audio(MediaState *ms) {
 			}

            converted_frame->sample_rate = audio_sample_rate;
-#if (LIBAVUTIL_VERSION_MAJOR < 59)
            converted_frame->channel_layout = AV_CH_LAYOUT_STEREO;
-#else
-            converted_frame->ch_layout = (AVChannelLayout) AV_CHANNEL_LAYOUT_STEREO;
-#endif
            converted_frame->format = AV_SAMPLE_FMT_S16;

-#if (LIBAVUTIL_VERSION_MAJOR < 59)
 			if (!ms->audio_decode_frame->channel_layout) {
 				ms->audio_decode_frame->channel_layout = av_get_default_channel_layout(ms->audio_decode_frame->channels);

@@ -720,26 +711,6 @@ static void decode_audio(MediaState *ms) {
 				    swr_set_matrix(ms->swr, stereo_matrix, 1);
 				}
 			}
-#else
-			if (ms->audio_decode_frame->ch_layout.order == AV_CHANNEL_ORDER_UNSPEC) {
-				av_channel_layout_default(&ms->audio_decode_frame->ch_layout, ms->audio_decode_frame->ch_layout.nb_channels);
-
-				if (audio_equal_mono && (ms->audio_decode_frame->ch_layout.nb_channels == 1)) {
-				    swr_alloc_set_opts2(
-                        &ms->swr,
-                        &converted_frame->ch_layout,
-                        converted_frame->format,
-                        converted_frame->sample_rate,
-                        &ms->audio_decode_frame->ch_layout,
-                        ms->audio_decode_frame->format,
-                        ms->audio_decode_frame->sample_rate,
-                        0,
-                        NULL);
-
-				    swr_set_matrix(ms->swr, stereo_matrix, 1);
-				}
-			}
-#endif

 			if(swr_convert_frame(ms->swr, converted_frame, ms->audio_decode_frame)) {
 				av_frame_free(&converted_frame);
@@ -1188,11 +1159,7 @@ static int decode_thread(void *arg) {

 	// Compute the number of samples we need to play back.
 	if (ms->audio_duration < 0) {
-#if (LIBAVFORMAT_VERSION_MAJOR < 62)
 		if (av_fmt_ctx_get_duration_estimation_method(ctx) != AVFMT_DURATION_FROM_BITRATE) {
-#else
-		if (ctx->duration_estimation_method != AVFMT_DURATION_FROM_BITRATE) {
-#endif

 			long long duration = ((long long) ctx->duration) * audio_sample_rate;
 			ms->audio_duration = (unsigned int) (duration /  AV_TIME_BASE);
@@ -1352,11 +1319,7 @@ static int decode_sync_start(void *arg) {

 	// Compute the number of samples we need to play back.
 	if (ms->audio_duration < 0) {
-#if (LIBAVFORMAT_VERSION_MAJOR < 62)
 		if (av_fmt_ctx_get_duration_estimation_method(ctx) != AVFMT_DURATION_FROM_BITRATE) {
-#else
-		if (ctx->duration_estimation_method != AVFMT_DURATION_FROM_BITRATE) {
-#endif

 			long long duration = ((long long) ctx->duration) * audio_sample_rate;
 			ms->audio_duration = (unsigned int) (duration /  AV_TIME_BASE);
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -8,25 +8,12 @@ cdef extern from "stdlib.h":
 cdef extern from "pyfreetype.h":
    #ftconfig.h
    #Some tweaking may be needed on a platform-by-platform basis
-    DEF FT_SIZEOF_INT = 4
-    DEF FT_SIZEOF_LONG = 4
-
    ctypedef signed short      FT_Int16
    ctypedef unsigned short    FT_UInt16
-    IF FT_SIZEOF_INT == 4:
-        ctypedef signed int    FT_Int32
-        ctypedef unsigned int  FT_UInt32
-    ELIF FT_SIZEOF_LONG == 4:
-        ctypedef signed long   FT_Int32
-        ctypedef unsigned long FT_UInt32
-
-    IF FT_SIZEOF_INT >= 4:
-        ctypedef int           FT_Fast
-        ctypedef unsigned int  FT_UFast
-    ELIF FT_SIZEOF_LONG >= 4:
-        ctypedef long          FT_Fast
-        ctypedef unsigned long FT_UFast
-
+    ctypedef signed int    FT_Int32
+    ctypedef unsigned int  FT_UInt32
+    ctypedef int           FT_Fast
+    ctypedef unsigned int  FT_UFast

    # Moved up.
    cdef struct FT_ModuleRec_
@@ -1,6 +1,6 @@
 #!/usr/bin/env python

-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -154,6 +154,10 @@ cython("renpy.style")

 cython("renpy.encryption")

+# renpy.compat
+if PY2:
+    cython("renpy.compat.dictviews")
+
 # renpy.styledata
 cython("renpy.styledata.styleclass")
 cython("renpy.styledata.stylesets")
@@ -170,6 +174,12 @@ cython("renpy.display.quaternion", libs=[ 'm' ])
 cython("renpy.uguu.gl", libs=sdl)
 cython("renpy.uguu.uguu", libs=sdl)

+cython("renpy.gl.gldraw", libs=sdl)
+cython("renpy.gl.gltexture", libs=sdl)
+cython("renpy.gl.glenviron_shader", libs=sdl)
+cython("renpy.gl.glrtt_copy", libs=sdl)
+cython("renpy.gl.glrtt_fbo", libs=sdl)
+
 cython("renpy.gl2.gl2mesh")
 cython("renpy.gl2.gl2mesh2")
 cython("renpy.gl2.gl2mesh3")
@@ -191,10 +201,12 @@ cython(
    [ "ftsupport.c", "ttgsubtable.c" ],
    libs=sdl + [ 'freetype', 'z', 'm' ])

-cython(
-    "renpy.text.hbfont",
-    [ "ftsupport.c" ],
-    libs=sdl + [ 'harfbuzz', 'freetype', 'z', 'm' ])
+if not (PY2 and emscripten):
+
+    cython(
+        "renpy.text.hbfont",
+        [ "ftsupport.c" ],
+        libs=sdl + [ 'harfbuzz', 'freetype', 'z', 'm' ])

 generate_all_cython()
 find_unnecessary_gen()
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -28,12 +28,11 @@ import os
 import sys
 import re
 import threading
-import warnings
-
-import setuptools
-
-warnings.simplefilter("ignore", category=setuptools.SetuptoolsDeprecationWarning)

+if sys.version_info.major == 2:
+    import distutils.core as setuptools
+else:
+    import setuptools

 # This flag determines if we are compiling for Android or not.
 android = "RENPY_ANDROID" in os.environ
@@ -3,7 +3,7 @@
 # This file is part of Ren'Py. The license below applies to Ren'Py only.
 # Games and other projects that use Ren'Py may use a different license.

-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -223,6 +223,7 @@ backup_blacklist = {
    "renpy.test.testmouse",
    "renpy.test.testparser",
    "renpy.gl2",
+    "renpy.gl",
    "renpycoverage",
    }

@@ -253,7 +254,6 @@ name_blacklist = {
    "renpy.exports.sdl_dll",
    "renpy.sl2.slast.serial",
    "renpy.gl2.gl2draw.default_position",
-    "renpy.lexer._python_updatecache",
    }

 class Backup(_object):
@@ -405,9 +405,12 @@ def import_all():
    # Adds in the Ren'Py loader.
    import renpy.loader

-    import renpy.pyanalysis
-    sys.modules["renpy.py3analysis"] = renpy.pyanalysis
+    if not PY2:
+        import renpy.py3analysis
+    else:
+        import renpy.py2analysis

+    import renpy.pyanalysis
    import renpy.parameter

    import renpy.ast
@@ -476,6 +479,7 @@ def import_all():

    sys.modules[pystr('renpy.display.text')] = renpy.text.text

+    import renpy.gl
    import renpy.gl2

    import renpy.display.layout
@@ -718,6 +722,8 @@ if 1 == 0:
    from . import performance
    from . import persistent
    from . import preferences
+    from . import py2analysis
+    from . import py3analysis
    from . import pyanalysis
    from . import pydict
    from . import python
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -43,11 +43,17 @@ from renpy.parameter import Parameter, Signature, ParameterInfo, ArgumentInfo, \
    apply_arguments, EMPTY_PARAMETERS, EMPTY_ARGUMENTS


+# The name of the current statement.
+current_statement_name = "init"
+
 def statement_name(name):
    """
    Reports the name of this statement to systems like window auto.
    """

+    global current_statement_name
+    current_statement_name = name
+
    for i in renpy.config.statement_callbacks:
        i(name)

@@ -157,7 +163,10 @@ class PyCode(object):
        if isinstance(source, PyExpr):
            loc = (source.filename, source.linenumber, source)

-        self.py = 3
+        if PY2:
+            self.py = 2
+        else:
+            self.py = 3

        # The source code.
        self.source = source
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -422,7 +422,7 @@ class ATLTransformBase(renpy.object.Object):
            rv_parameters = []
            for name, value in self.context.context.items():
                if name not in self.parameters.parameters:
-                    rv_parameters.append(ValuedParameter(name, ValuedParameter.KEYWORD_ONLY, default=value))
+                    rv_parameters.append(ValuedParameter(name, ValuedParameter.KEYWORD_ONLY, value))
            if rv_parameters:
                rv_parameters = list(self.parameters.parameters.values()) + rv_parameters
                rv_parameters.sort(key=lambda p: p.kind)
@@ -657,10 +657,10 @@ class ATLTransformBase(renpy.object.Object):
            #     continue

            if passed: # turn into elif when possible
-                param = ValuedParameter(name, param.KEYWORD_ONLY, default=scope[name])
+                param = ValuedParameter(name, param.KEYWORD_ONLY, scope[name])

            elif param.has_default:
-                param = ValuedParameter(name, pkind, default=scope[name])
+                param = ValuedParameter(name, pkind, scope[name])

            else:
                ## not passed and no default value
@@ -1334,7 +1334,7 @@ class RawMultipurpose(RawStatement):
            except Exception:
                continue

-            if isinstance(i, ATLTransformBase):
+            if isinstance(i, ATLTransformBase) and (i.child is None):
                i.atl.predict(ctx)
                return

@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -365,9 +365,12 @@ class Channel(object):
        ExecutionContext to point to the copy, and returns the copy.
        """

-        mcd = renpy.game.context().music
+        context = renpy.game.context()
+        mcd = dict(context.music)
+        context.music = mcd

        ctx = self.get_context().copy()
+
        mcd[self.name] = ctx
        return ctx

@@ -455,7 +458,11 @@ class Channel(object):

        # Update the channel volume.

-        mixer_volume = renpy.game.preferences.volumes.get(self.mixer, 1.0)
+        if self.mixer:
+            mixer_volume = renpy.game.preferences.volumes.get(self.mixer, 1.0)
+        else:
+            mixer_volume = 1.0
+
        main_volume = renpy.game.preferences.volumes.get("main", 1.0)

        if renpy.game.preferences.self_voicing:
@@ -720,9 +727,8 @@ class Channel(object):
        with lock:

            for filename in filenames:
-                if renpy.exports.is_seen_allowed():
-                    filename, _, _ = self.split_filename(filename, False)
-                    renpy.game.persistent._seen_audio[str(filename)] = True # type: ignore
+                filename, _, _ = self.split_filename(filename, False)
+                renpy.game.persistent._seen_audio[str(filename)] = True # type: ignore

            if not loop_only:

@@ -1264,12 +1270,8 @@ def interact():

                c.interact()

-                # if _music_volumes.get(i, 1.0) != c.chan_volume:
-                #    c.set_volume(_music_volumes.get(i, 1.0))
-
                ctx = c.context

-
                # If we're in the same music change, then do nothing with the
                # music.
                if c.last_changed == ctx.last_changed:
@@ -20,6 +20,6 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

-ctypedef void (*apply_audio_filter_type)(object, float *, int, int, int)
+ctypedef void (*apply_audio_filter_type)(object, float *, int, int, int) noexcept

 cdef apply_audio_filter_type *get_apply_audio_filter()
@@ -1,5 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
-#
+1#
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
 # (the "Software"), to deal in the Software without restriction,
@@ -60,7 +59,7 @@ cdef struct SampleBuffer:
 # A linked list of sample buffers with 0-16 subchannels.
 cdef SampleBuffer *free_buffers[SUBCHANNELS+1]

-cdef SampleBuffer *allocate_buffer(int subchannels, int length) nogil:
+cdef SampleBuffer *allocate_buffer(int subchannels, int length) noexcept nogil:
    """
    Allocates a sample buffer.
    """
@@ -91,7 +90,7 @@ cdef SampleBuffer *allocate_buffer(int subchannels, int length) nogil:
    return buf


-cdef void free_buffer(SampleBuffer *buf) nogil:
+cdef void free_buffer(SampleBuffer *buf) noexcept nogil:
    """
    Frees a sample buffer, by putting it back on the free list.
    """
@@ -123,7 +122,7 @@ cdef class AudioFilter:

        raise NotImplementedError("prepare")

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:
        """
        Applies the filter to the given samples.
        """
@@ -157,7 +156,7 @@ cdef class Null(AudioFilter):
    def prepare(self, int samplerate):
        pass

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:
        cdef SampleBuffer *result = allocate_buffer(samples.subchannels, samples.length)
        memcpy(result.samples, samples.samples, samples.length * samples.subchannels * sizeof(float))
        return result
@@ -188,7 +187,7 @@ cdef class FilterList:
    def __dealloc__(self):
        free(self.filters)

-    cdef SampleBuffer *apply(self, int index, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, int index, SampleBuffer *samples) noexcept nogil:
        return (<AudioFilter> self.filters[index]).apply(samples)

    def __iter__(self):
@@ -223,7 +222,7 @@ cdef class Sequence(AudioFilter):
        for f in self.filters:
            f.prepare(samplerate)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

        cdef SampleBuffer *result
        cdef SampleBuffer *old_result = samples
@@ -408,7 +407,7 @@ cdef class Biquad(AudioFilter):
        self.cy2 = a2 / a0


-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

        cdef SampleBuffer *result = allocate_buffer(samples.subchannels, samples.length)
        cdef int i, j
@@ -634,7 +633,7 @@ cdef class Crossfade(AudioFilter):

        self.duration_samples = int(self.duration * samplerate)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

        cdef SampleBuffer *result1
        cdef SampleBuffer *result2
@@ -705,7 +704,7 @@ cdef class Mix(AudioFilter):
        for f in self.filters:
            f.prepare(samplerate)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

            cdef SampleBuffer *result = NULL
            cdef SampleBuffer *temp
@@ -744,7 +743,7 @@ cdef class Multiply(AudioFilter):
    def prepare(self, int samplerate):
        return

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

            cdef SampleBuffer *result
            cdef int i, j
@@ -807,7 +806,7 @@ cdef class DelayBuffer:
    def __dealloc__(self):
        free(self.buffer)

-    cdef void queue(self, SampleBuffer *samples) nogil:
+    cdef void queue(self, SampleBuffer *samples) noexcept nogil:

        cdef int i, j

@@ -816,7 +815,7 @@ cdef class DelayBuffer:
                self.buffer[self.write_index[j]] = samples.samples[i * samples.subchannels + j]
                self.write_index[j] = (self.write_index[j] + 1) % self.length

-    cdef SampleBuffer * dequeue(self, int subchannels, int length) nogil:
+    cdef SampleBuffer * dequeue(self, int subchannels, int length) noexcept nogil:

        cdef SampleBuffer *result = allocate_buffer(subchannels, length)
        cdef int i, j
@@ -865,7 +864,7 @@ cdef class Delay(AudioFilter):
        if self.buffer is None and self.max_delay >= 0.01:
            self.buffer = DelayBuffer(self.delay, samplerate, SUBCHANNELS)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:
        cdef SampleBuffer *result

        if self.max_delay < 0.01:
@@ -936,7 +935,7 @@ cdef class Comb(AudioFilter):

        self.filter.prepare(samplerate)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

        cdef SampleBuffer *delayed
        cdef SampleBuffer *result
@@ -1001,7 +1000,7 @@ cdef class WetDry(AudioFilter):
    def prepare(self, int samplerate):
        self.filter.prepare(samplerate)

-    cdef SampleBuffer *apply(self, SampleBuffer *samples) nogil:
+    cdef SampleBuffer *apply(self, SampleBuffer *samples) noexcept nogil:

        cdef SampleBuffer *result
        cdef SampleBuffer *filtered
@@ -1107,7 +1106,7 @@ def to_audio_filter(o):
    raise TypeError("Expected an AudioFilter, got {!r}.".format(o))


-cdef void apply_audio_filter(AudioFilter af, float *samples, int subchannels, int length, int samplerate) nogil:
+cdef void apply_audio_filter(AudioFilter af, float *samples, int subchannels, int length, int samplerate) noexcept nogil:
    """
    :undocumented:
    """
@@ -1140,5 +1139,5 @@ cdef void apply_audio_filter(AudioFilter af, float *samples, int subchannels, in
    return


-cdef apply_audio_filter_type *get_apply_audio_filter():
+cdef apply_audio_filter_type *get_apply_audio_filter() noexcept:
    return <apply_audio_filter_type *> apply_audio_filter
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -136,6 +136,7 @@ def play(filenames, channel="music", loop=None, fadeout=None, synchro_start=None

            t = get_serial()
            ctx.last_changed = t
+            c.last_changed = t

            if loop:
                ctx.last_filenames = filenames
@@ -233,6 +234,7 @@ def queue(filenames, channel="music", loop=None, clear_queue=True, fadein=0, tig

            t = get_serial()
            ctx.last_changed = t
+            c.last_changed = t

            if loop:
                ctx.last_filenames = filenames
@@ -305,6 +307,7 @@ def stop(channel="music", fadeout=None):

            t = get_serial()
            ctx.last_changed = t
+            c.last_changed = t
            ctx.last_filenames = [ ]
            ctx.last_tight = False

@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -95,7 +95,7 @@ cdef extern from "renpysound_core.h":


 from renpy.audio.filter cimport get_apply_audio_filter
-RPS_apply_audio_filter = <void (*)(object, float *, int, int, int)> get_apply_audio_filter()
+RPS_apply_audio_filter = <void (*)(object, float *, int, int, int) noexcept> get_apply_audio_filter()


 def check_error():
@@ -518,7 +518,7 @@ def set_generate_audio_c_function(fn):
        import ctypes
        fn = ctypes.cast(fn, ctypes.c_void_p).value

-    RPS_generate_audio_c_function = <void (*)(float *, int)> <uintptr_t> fn
+    RPS_generate_audio_c_function = <void (*)(float *, int) noexcept> <uintptr_t> fn


 # Store the sample surfaces so they stay alive.
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -37,6 +37,12 @@ FSENCODING = sys.getfilesystemencoding() or "utf-8"
 old_stdout = sys.stdout
 old_stderr = sys.stderr

+if PY2:
+    sys_executable = sys.executable
+    reload(sys) # type: ignore
+    sys.setdefaultencoding("utf-8") # type: ignore
+    sys.executable = sys_executable
+
 def _setdefaultencoding(name):
    """
    This is install in sys to prevent games from trying to change the default
@@ -371,7 +377,10 @@ You may be using a system install of python. Please run {0}.sh,
                    if hasattr(sys, "renpy_executable"):
                        subprocess.Popen([sys.renpy_executable] + sys.argv[1:]) # type: ignore
                    else:
-                        subprocess.Popen([sys.executable] + sys.argv)
+                        if PY2:
+                            subprocess.Popen([sys.executable, "-EO"] + sys.argv)
+                        else:
+                            subprocess.Popen([sys.executable] + sys.argv)

            except renpy.game.ParseErrorException:
                pass
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -714,7 +714,10 @@ def display_say(
                    if scry.extend_text is renpy.ast.DoesNotExtend:
                        break
                    elif scry.extend_text is not None:
-                        extend_text += scry.extend_text
+                        try:
+                            extend_text += renpy.substitutions.substitute(scry.extend_text, scope=None, force=False, translate=True)[0]
+                        except Exception:
+                            pass

                    scry = scry.next()
                    scry_count += 1
@@ -1295,6 +1298,9 @@ class ADVCharacter(object):

        rv = renpy.substitutions.substitute(who)[0]

+        if PY2:
+            rv = rv.encode("utf-8")
+
        return rv

    def __format__(self, spec):
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -111,7 +111,7 @@ init -1600 python hide:
            try:
                return self.dict[self.key]
            except LookupError as e:
-                raise Exception("The {!r} {} does not exist.".format(key, self.kind)) from e
+                raise Exception("The {!r} {} does not exist.".format(key, self.kind)) # from e # PY3 only

    class ScreenVariable(Accessor):
        """
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -69,6 +69,37 @@ init -1500 python:
        else:
            return false

+
+    class _ActionList(Action, DictEquality):
+        """
+        :undocumented:
+
+        Encapsulates a list of actions, so that they can be treated as a single action,
+        for the purposes of SelectedIf and SensitiveIf.
+        """
+
+        def __init__(self, actions):
+            self.actions = actions
+
+        def get_selected(self):
+            return renpy.display.behavior.is_selected(self.actions)
+
+        def get_sensitive(self):
+            return renpy.display.behavior.is_sensitive(self.actions)
+
+        def get_tooltip(self):
+            return renpy.display.behavior.get_tooltip(self.actions)
+
+        def periodic(self, st):
+            return renpy.display.behavior.run_periodic(self.actions, st)
+
+        def unhovered(self):
+            return renpy.display.behavior.run_unhovered(self.actions)
+
+        def __call__(self):
+            return renpy.run(self.actions)
+
+
    @renpy.pure
    class SelectedIf(Action, DictEquality):
        """
@@ -89,10 +120,13 @@ init -1500 python:
        # Note: This had been documented to take a boolean.

        def __init__(self, expression):
+            if isinstance(expression, (list, tuple)):
+                expression = _ActionList(expression)
+
            self.expression = expression

            if isinstance(expression, Action):
-                for i in ("get_selected", "get_sensitive", "get_tooltip", "periodic", "unhovered"):
+                for i in ("get_selected", "get_sensitive", "get_tooltip", "periodic", "unhovered", "alt"):
                    setattr(self, i, getattr(expression, i, None))

        def __call__(self):
@@ -123,10 +157,13 @@ init -1500 python:
        # Note: This had been documented to take a boolean.

        def __init__(self, expression):
+            if isinstance(expression, (list, tuple)):
+                expression = _ActionList(expression)
+
            self.expression = expression

            if isinstance(expression, Action):
-                for i in ("get_selected", "get_sensitive", "get_tooltip", "periodic", "unhovered"):
+                for i in ("get_selected", "get_sensitive", "get_tooltip", "periodic", "unhovered", "alt"):
                    setattr(self, i, getattr(expression, i, None))

        def __call__(self):
@@ -544,8 +581,12 @@ init -1500 python:
            if type(self) is not type(other):
                return False

-            if self.callable != other.callable:
-                return False
+            if PY2:
+                if self.callable is not other.callable:
+                    return False
+            else:
+                if self.callable != other.callable:
+                    return False

            if self.args != other.args:
                return False
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -215,7 +215,7 @@ init -1500 python:
            try:
                self.dict[self.key] = value
            except LookupError as e:
-                raise Exception("The {!r} {} does not exist".format(self.key, self.kind)) from e
+                raise Exception("The {!r} {} does not exist".format(self.key, self.kind)) # from e # PY3 only

    @renpy.pure
    class FieldValue(__GenericValue):
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -63,13 +63,23 @@ init -1500 python in build:

    renpy_sh = "renpy.sh"

-    renpy_patterns = pattern_list([
-        ("renpy/**__pycache__/**.{}.pyc".format(sys.implementation.cache_tag), "all"),
-        ("renpy/**__pycache__", "all"),
-    ])
+    if PY2:
+        renpy_patterns = pattern_list([
+            ("renpy/**.pyo", "all"),
+            ("renpy/**__pycache__", None),
+        ])

-    if os.path.exists(os.path.join(config.renpy_base, "renpy3.sh")):
-        renpy_sh = "renpy3.sh"
+        if os.path.exists(os.path.join(config.renpy_base, "renpy2.sh")):
+            renpy_sh = "renpy2.sh"
+
+    else:
+        renpy_patterns = pattern_list([
+            ("renpy/**__pycache__/**.{}.pyc".format(sys.implementation.cache_tag), "all"),
+            ("renpy/**__pycache__", "all"),
+        ])
+
+        if os.path.exists(os.path.join(config.renpy_base, "renpy3.sh")):
+            renpy_sh = "renpy3.sh"


    # Patterns that are used to classify Ren'Py.
@@ -113,7 +123,7 @@ init -1500 python in build:
        ( "lib/*/pythonw.exe", None),

        # Ignore the wrong Python.
-        ( "lib/py2-*/", None),
+        ( "lib/py3-*/" if PY2 else "lib/py2-*/", None),

        # Windows patterns.
        ( "lib/py*-windows-i686/**", "windows_i686"),
@@ -129,7 +139,7 @@ init -1500 python in build:
        ( "lib/py*-mac-*/**", "mac"),

        # Old Python library.
-        ( "lib/python2.*/**", None),
+        ( "lib/python3.*/**" if PY2 else "lib/python2.*/**", None),

        # Shared patterns.
        ( "lib/**", "windows linux mac android ios"),
@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
@@ -217,6 +217,7 @@ init -1100 python:

        if version <= (7, 4, 4):
            config.pause_after_rollback = True
+            config.gl2 = False
            config.gl_lod_bias = -1.0
            config.who_what_sub_compat = 1

@@ -293,6 +294,7 @@ init -1100 python:
        if _compat_versions(version, (7, 6, 1), (8, 1, 1)):
            config.tts_front_to_back = False
            _greedy_rollback = False
+            config.dissolve_shrinks = True

        if _compat_versions(version, (7, 6, 99), (8, 1, 99)):
            config.simple_box_reverse = True
@@ -156,8 +156,12 @@ init -1500 python in _console:
                s = s[:i] + self._ellipsis + s[len(s) - i:]
            return s

-        repr_bytes = _repr_bytes
-        repr_str = _repr_string
+        if PY2:
+            repr_str = _repr_bytes
+            repr_unicode = _repr_string
+        else:
+            repr_bytes = _repr_bytes
+            repr_str = _repr_string

        def repr_tuple(self, x, level):
            if not x: return "()"
@@ -208,7 +212,7 @@ init -1500 python in _console:

            if level <= 0: return "{...}"

-            iter_keys = self._to_shorted_list(x, self.maxdict, sort=False)
+            iter_keys = self._to_shorted_list(x, self.maxdict, sort=PY2)
            iter_x = self._make_pretty_items(x, iter_keys, '{', '}')
            return self._repr_iterable(iter_x, level, '{', '}')

@@ -223,7 +227,7 @@ init -1500 python in _console:

            if level <= 0: return left + "...})"

-            iter_keys = self._to_shorted_list(x, self.maxdict, sort=False)
+            iter_keys = self._to_shorted_list(x, self.maxdict, sort=PY2)
            iter_x = self._make_pretty_items(x, iter_keys, left, '})')
            return self._repr_iterable(iter_x, level, left, '})')

@@ -1,4 +1,4 @@
-# Copyright 2004-2024 Tom Rothamel <pytom@bishoujo.us>
+# Copyright 2004-2025 Tom Rothamel <pytom@bishoujo.us>
 #
 # Permission is hereby granted, free of charge, to any person
 # obtaining a copy of this software and associated documentation files
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Tom Rothamel	8a21aa55dc	Wrap json loaded in revertible objects. This is intended to improve compatibility with older games that might use .iteritems and similar methods.	2025-02-12 23:21:48 -05:00
Tom Rothamel	6c948bf046	fonts: Allow deallocation and clear face cache. So fonts can be reloaded when required. Fixes #6153.	2025-02-12 22:51:50 -05:00
Tom Rothamel	8de2bda1e6	Proxy SelectedIf and SensitiveIf lists into a single Action. Fixes #6132.	2025-02-07 01:24:18 -05:00
Tom Rothamel	5e3b209ba2	Fix the name of config.dissolve_shrinks. Fixes #6122.	2025-01-31 22:07:18 -05:00
Tom Rothamel	2e45c3e609	doc: Fixes. Fixes #6097.	2025-01-24 21:29:51 -05:00
Tom Rothamel	8c7a3b13bf	Merge pull request #6105 from nullvoid8/docs_nearrect Update `nearrect` documentation	2025-01-23 22:32:49 -05:00
Tom Rothamel	4a0738f2aa	Document build.version. Fixes #6102.	2025-01-22 22:19:42 -05:00
nullvoid8	899eb6616f	merge documentation of nearrect the class, and nearrect the statement	2025-01-23 02:46:14 +00:00
Tom Rothamel	536fce4a22	sl2: Add box properties to imagemap. As documented. Fixes #6090.	2025-01-18 23:03:42 -05:00
Tom Rothamel	ca9e2dfe47	Fix regexp.	2025-01-14 01:49:35 -05:00
Tom Rothamel	321434e95e	Allow a displayable with size to opt out of mouse focus. And do that for viewports. Fixes #6081.	2025-01-14 01:44:45 -05:00
the66F95	41b6e689d3	fix some newline typos	2025-01-13 08:56:13 -05:00
Tom Rothamel	7958f5445a	Make gles2 the default renderer on arm-linux. As it's much faster on Raspberry Pi, and probably other arm-linux devices.	2025-01-11 22:36:46 -05:00
Gio	efd4cc6b5e	Document cb_args cb_ prefix behavior	2025-01-11 15:34:01 -05:00
Tom Rothamel	35c4ba4a41	Make all fields in gl2draw public. Fixes #6060.	2025-01-10 22:56:34 -05:00
Tom Rothamel	5361a8e9a5	Ignore text tag errors that happen after {done}.	2025-01-10 01:21:56 -05:00
Tom Rothamel	ba76f970c5	Perform substitution when scrying extend text. This prevents problems if the scryed text substitutes things. Fixes #6071	2025-01-10 01:07:25 -05:00
Tom Rothamel	7d8d05107b	Allow the fix branch to run on python 3.12.	2025-01-09 22:44:43 -05:00
Tom Rothamel	2639028ce7	Document config.has_music, config.has_sound, and config.has_voice. Also, slight correction on how a channel without a mixer works. Fixes #6068.	2025-01-08 08:27:10 -05:00
Kassy	beedbc0a22	Do not kill Renders that cache the last video frame on Web (#6057 ) Fixes and issue where, when the next video frame is not ready, the previous one is returned by get_movie_texture_web(). Normally, this is just a GLTexture instance, but when using a mask, that frame is a Render instance instead. The problem is that Render instances get killed soon after they have been drawn, so get_movie_texture_web() returns a dead instance when re-using the previous frame which causes a crash because of missing uniforms when drawing the screen. Fixes #6050.	2025-01-05 00:50:49 -05:00
Tom Rothamel	74157a4ad6	Update copyright for 2025.	2025-01-02 18:48:44 -05:00
Ruben Garcia	25b4a17d1a	Fix typo	2025-01-02 18:47:03 -05:00
Tom Rothamel	4163c1396c	Merge pull request #6035 from shawna-p/default-focus-fix2 Don't overrule focus override for max focus	2024-12-25 20:39:00 -05:00
shawna-p	d6ab06dd1f	Don't overrule focus override for max focus	2024-12-25 16:42:56 -05:00
Tichq	3db515db3c	fix: function `staticmethod` of `TransformMatrix`	2024-12-25 07:29:53 -05:00
Tom Rothamel	cc654ebfeb	atl: Distinguish between children and included transforms. During prediction. Fixes #6014.	2024-12-25 00:04:04 -05:00
Tom Rothamel	f389c13b29	Better error if textshaders are used incorrectly.	2024-12-24 00:23:35 -05:00
Tom Rothamel	c57dbe7a9d	Use the correct condition for including i686. Fixes #6028.	2024-12-23 20:34:28 -05:00
Tom Rothamel	e35fcb2e86	Only include the current libpython3.{x}.dll in builds.	2024-12-22 09:32:23 -05:00
Tom Rothamel	38b505ba36	Fix code-typo regarding tight playback. Fixes #6019.	2024-12-22 01:32:26 -05:00
Tom Rothamel	f132d49157	text: Handle events in virtual coordinates. Fixes #6013.	2024-12-18 23:17:56 -05:00
Tom Rothamel	ba0bc218c2	cy3: Add noexcept annotations. These allow Ren'Py to be compiled by cython 3.0.	2024-12-14 20:50:07 -05:00
Tom Rothamel	97331e2464	Fix to how SetCharacterVolume sets the volume. Previously, it would try to adjust the volume. Now it treats it the same way _CharacterVolumeValue does. Fixes #6001.	2024-12-13 20:05:12 -05:00
Tom Rothamel	8d38a6ae4d	Add no_launcher_links.txt. If a file named ``no_launcher_links.txt`` exists in the Ren'Py base directory (the one with renpy.exe, renpy.sh, and renpy.app in it), the launcher will disable links to renpy.org. While not guaranteed, this is intended in educational and homeschool environments to prevent young Ren'Py users from seeing adult sponsors.	2024-12-11 22:27:36 -05:00
Tom Rothamel	e3c4993487	Bump the fix version.	2024-12-08 23:48:49 -05:00
Tom Rothamel	d0270729c1	doc: Changelog.	2024-12-07 22:57:53 -05:00
Tom Rothamel	3bc3bf3e19	Avoid reporting string errors on triple-quoted strings. Which tend to be much more intentional, and cause errors when monologue mode exists.	2024-12-07 22:31:04 -05:00
Tom Rothamel	831fb59d49	Produce a better error for monologue mode with an id clause. Fixes #5980.	2024-12-07 22:16:19 -05:00
Tom Rothamel	f5555d6f1a	Merge pull request #5982 from mal/fix-5981 Prevent MultipleDict masking builtins during interpolation	2024-12-05 22:02:58 -05:00
Mal Graty	e7eb0e135b	Meet expectation to raise KeyError on missing keys Fixes #5981	2024-12-06 00:15:14 +00:00
Tom Rothamel	bf9de85f75	Offer config.screen_width, config.screen_height to imagemaps. This shouldn't affect normal imagemaps that use images, but should make using non-image displayables in imagemaps work better. Fixes #5976.	2024-12-03 23:28:01 -05:00
Tom Rothamel	6470a37b40	Use itch.zone instead of itch.ovh. Per https://github.com/itchio/butler/commit/898b30bb2cadaaf561d91c4f7784aa1927c5cfb2 Fixes #5795.	2024-12-03 19:18:34 -05:00
Tom Rothamel	99a5ac89db	Remove style_prefix from the template say screen. As it's not used. Fixes #5973.	2024-12-03 00:34:17 -05:00
Tom Rothamel	e46073b059	Allow renpy.register_style_preference to take a style by name. Per the documentation. Fixes #5972.	2024-12-02 21:57:17 -05:00
Mal Graty	88ddee9d5e	doc: Missing version headers in changelog	2024-12-02 01:24:05 +00:00
Tom Rothamel	d8283c958c	doc: Changelog.	2024-12-01 20:17:41 -05:00
Tom Rothamel	31025cdadb	doc: Credits, sponsors.	2024-12-01 19:27:10 -05:00
naughty road	e66a9b8c6d	Code cleanup: remove superfluous line	2024-12-01 19:10:20 -05:00
naughty road	2b5b9835b7	Fix order of attempting to load presplash images Checks for foreground+background first, before falling back to the single presplash image, instead of the other way around, to match behavior in the documentation (https://www.renpy.org/doc/html/splashscreen_presplash.html#adding-a-progress-bar).	2024-12-01 19:10:08 -05:00
the66F95	3f667e3ef1	Update dragdrop.py should fix #5968 (not extensively tested)	2024-12-01 19:08:38 -05:00
Tom Rothamel	823e235a1c	Remove debug raise. Fixes #5966.	2024-12-01 17:09:27 -05:00
Tom Rothamel	1df2c15b07	Stop movies that may have been restarted when returning to a channel. Fixes #5960. (Replicated as bug5911.)	2024-12-01 00:20:18 -05:00
Tom Rothamel	5c5252a516	Use the correct variable name.	2024-11-30 08:25:11 -05:00
Tom Rothamel	70bb4208bc	Avoid save scanning restarting the interaction. The strategy chosen was to keep track of which slots have had information by the rest of Ren'Py, and only restarting if one of those slots is accessed. This is motivated by a series of interaction restarts at choice menus, caused by the autosaves that happen when a choice menu is reached.	2024-11-29 21:42:03 -05:00
Tom Rothamel	2e1c09dbbd	Remove the ATL "update" event. This was rarely used, and caused problems, like #5926, with no actual benefit. Fixes #5956 by virtue of reverting #5927.	2024-11-29 21:09:41 -05:00
Tom Rothamel	fc5f8e0d3e	Revert "Update screen.py" This reverts commit `cb10f2a21a`.	2024-11-29 20:23:41 -05:00
Tom Rothamel	28ae4a7c0c	Fix where nvl_hide sets store._window. So that _window is False before the empty window is shown.	2024-11-29 14:36:51 -05:00
Tom Rothamel	ec5738c6e0	Add renpy.get_statement_name. To make available the statement name.	2024-11-29 14:30:40 -05:00
Tom Rothamel	2da8beecd7	Handle non-keyboard focusable displayables. Specifically, before doing any sort of keyboard focus, check that the current focus supports the keyboard, and drop it if it does. Per #5936. Keeps the fix for #5173.	2024-11-29 13:07:57 -05:00
Tom Rothamel	e0062cbebc	Compat #4717 . Fixes #5954.	2024-11-28 22:31:14 -05:00
Tom Rothamel	9b290e07f5	Fix keyboard focus of viewports. Based on #5936, fixes #5934.	2024-11-28 21:53:27 -05:00
Tom Rothamel	864feaba02	Indentation fix from #5947 .	2024-11-24 11:48:50 -05:00
Tom Rothamel	76b068c6dc	Take the CaretBlink change from #5947 .	2024-11-24 11:45:22 -05:00
Tom Rothamel	ebc6e66433	Add a ZWSP to pad out an empty line. This fixes the same thing seen in #5947, in a different way.	2024-11-24 11:11:00 -05:00
Tom Rothamel	f25dcea3cb	Take the remaining fix from #5931 . Fixes #5929.	2024-11-23 22:35:03 -05:00
ヽ◕◡◕✿ノ	78899cfef3	Live2D.blend_opacity wasn't usable	2024-11-23 22:28:51 -05:00
Tom Rothamel	339c7357dc	Update and modernize SpriteManager. Fixes #5939 * Make SpriteManager pickleable. * Update the idea of a fast render to take gl2 into account.	2024-11-23 22:15:35 -05:00
Tom Rothamel	4a1182cdd5	Ensure inputs are at least 1px wide. Fixes #5944 while retaining #5929 and #5913.	2024-11-23 21:41:38 -05:00
Tom Rothamel	9ff3bb67e8	Revert "input mask regression" This reverts commit `89d5858d2b`.	2024-11-23 21:19:45 -05:00
Jan Masek	f7a5e874ea	Mention screen calling labels in Special Labels	2024-11-22 23:39:29 -05:00
HorBro38	ec758301ac	Update displaying_images.rst Corrects errant use of .jxl file type discovered in #5933	2024-11-21 17:56:47 -05:00
the66F95	19122e45c8	Update screen.py seems to fix #5926 while preserving #5905	2024-11-20 23:10:26 -05:00
the66F95	89d5858d2b	input mask regression should fix #5929 while preserving #5913	2024-11-20 23:10:12 -05:00
the66F95	5a65eea075	Update viewport.py should fix #5921	2024-11-19 22:59:21 -05:00
Edward Nicholes Jr.	4e5dd16606	Fix the ATL part of the tutorial to show the correct example code In the "Tutorial" > "Transforms and Animation", there is a section that demonstrated that `repeat` can take an integer argument. However, the `alt_image1` example code is shown twice on lines 543 and 548 for two different examples. Line 548, should be changed to show the `alt_image2` example code which removed the `repeat 2` line from the previous example, showing that the animation will only happen once.	2024-11-19 22:59:12 -05:00
Tom Rothamel	dd61e71beb	Ensure the cache is maintained under lock. And also check that cache entry is in the cache when it's killed. Fixes #5923.	2024-11-19 22:25:23 -05:00
naughty road	70f30147df	fix link to pyjnius docs Seems the original URL refering to "stable" doesn't exist anymore, this updates it to direct to "latest" instead.	2024-11-18 22:41:47 -05:00
Tom Rothamel	fa84f0c61e	doc: Changelog wording fix.	2024-11-16 03:06:09 -05:00
Tom Rothamel	74339b0432	Bump the fix version.	2024-11-16 01:59:03 -05:00
Tom Rothamel	f6f4b3bce3	Empty masked inputs no longer show a single mask glyph. Fixes #5913.	2024-11-15 20:34:32 -05:00
Tom Rothamel	5dbd50159a	doc: Correct the notify screen.	2024-11-15 00:11:26 -05:00
Tom Rothamel	1e85fd051a	doc: Sponsors.	2024-11-14 23:16:13 -05:00
Tom Rothamel	dc65afd6f1	Duplicate the children of Movie. Fixes #5907.	2024-11-13 22:55:57 -05:00
Tom Rothamel	e3222ec11d	Store the old_max_default even if it's not used. Fixes #5903.	2024-11-12 22:30:57 -05:00
Tom Rothamel	37c78dccda	config.nvl_adv_transition no longer forces the dialogue window to be hidden. Fixes #5904.	2024-11-12 22:11:46 -05:00
Tom Rothamel	1a7f0ca8c3	Screens go from SHOW to UPDATE upon first update. Fixes #5905. The underlying issue was caused by the screen being run for a second time in SHOW mode, which in turn prevented scopes of used screens from being saved.	2024-11-12 21:55:58 -05:00
Tom Rothamel	be8831b4b2	doc: Changelog and credits.	2024-11-11 00:50:46 -05:00
Tom Rothamel	fc87c053c3	Do not focus a displayable that's been transformed to nothing. Fixes #5869.	2024-11-11 00:41:32 -05:00
Tom Rothamel	10cc039460	Merge pull request #5900 from Kassy2048/fix Do not offer to open "traceback.txt" on mobile	2024-11-10 23:48:00 -05:00
Tom Rothamel	fd027dbdbd	Duplicate an AlphaMask's mask.	2024-11-10 23:47:28 -05:00
Kassy	15eb9a9c13	Do not offer to open "traceback.txt" on mobile renpy.launch_editor() is not supported on mobile (or Web) so clicking on the button does nothing.	2024-11-11 05:31:11 +01:00
woolion	2ded06bc5d	steam: fix get_session_ticket	2024-11-10 13:56:08 -05:00
Tom Rothamel	c5cdd0038e	Merge pull request #5891 from DipeshAggarwal/patch-2 Fix the wrong keymap for accessibility	2024-11-08 21:18:51 -05:00
Tom Rothamel	8bac98c29a	Merge pull request #5892 from DipeshAggarwal/patch-3 Replace `balloon` with 'bubble` to represent a valid type for callbacks	2024-11-08 21:18:37 -05:00
Dipesh Aggarwal	421d8cc37d	Replace `balloon` with 'bubble` to represent a valid type for callbacks	2024-11-09 07:08:01 +05:30
Dipesh Aggarwal	c097434036	Fix the wrong keymap for accessibility	2024-11-09 06:59:12 +05:30
Dipesh Aggarwal	e3cc4be1b8	Fix UnboundLocalError: local variable 'keyboard_mode' referenced before assignment (cherry picked from commit `15f498516a`)	2024-11-09 03:31:10 +04:00
Tom Rothamel	b5711f7e11	doc: Changelog whitespace changes.	2024-11-08 01:07:11 -05:00
Tom Rothamel	8f2649e3a7	doc: Changelog.	2024-11-07 22:29:47 -05:00
Tom Rothamel	ab42c0f6e1	Only skip the BOM, not other characters.	2024-11-07 22:02:23 -05:00
Tom Rothamel	01eacd2932	Avoid forcing synchro_start when playing a movie. Fixes #5887. This may cause mask_channel to get a bit more out of sync, but it's already so-so, and side_mask is the superior alternative.	2024-11-07 21:55:08 -05:00
Tom Rothamel	c25f22fe4f	doc: Credits.	2024-11-07 21:54:55 -05:00
Tom Rothamel	fe3b800cab	Change Model to create meshes as documented. Fixes #5692.	2024-11-05 00:36:12 -05:00
Tom Rothamel	ccde74bdb8	doc: Fix config.skip_sounds. Fixes #5883.	2024-11-04 08:47:28 -05:00
Tom Rothamel	ab6f469811	textshader: Consider all glyphs when assigning coordinates. Fixes #5884.	2024-11-03 23:22:46 -05:00
Tom Rothamel	f92b70d38c	Protect against errors with disconnected audio sources. Fixes #5882, with low confidence.	2024-11-03 21:14:34 -05:00
Andy_kl	e89338342a	Skip BOM in `ren_py_to_rpy` so RENPY can start at first line.	2024-11-04 02:29:14 +04:00
Tom Rothamel	62ca262aec	Fix tyop.	2024-11-02 15:49:52 -04:00
Tom Rothamel	eb5a84d420	Remove unnecessary locking in im.Cache. This is the most likely cause of the performance issues in #5295. Now, the lock should be held for brief periods of time.	2024-11-02 15:48:08 -04:00
Tom Rothamel	3280bcc5ff	Clarify where gui.unscrollable works. Fixes #5218.	2024-11-02 15:06:05 -04:00
Tom Rothamel	5c5f72659c	Restore old behavior of screenshot. When render_tree is None, screenshot takes the old contents of the framebuffer. Which isn't great, but since it happens when at the main menu, isn't a huge deal. Fixes #5879.	2024-11-01 22:47:15 -04:00
Tom Rothamel	b9789ae25c	Fix icon font in the director. Fixes #5876.	2024-10-31 01:29:21 -04:00
Tom Rothamel	58e56cff88	Quote attributes in the image attributes screen. Per #5877.	2024-10-30 22:30:28 -04:00
Tom Rothamel	4b532ac11e	Produce a sensible error when monologue mode is used in a menu. Fixes #5872.	2024-10-29 21:40:41 -04:00
Tom Rothamel	a7f16eee3f	Remove the "always" steam deck keyboard mode.	2024-10-29 21:13:53 -04:00
Tom Rothamel	fff2558083	Revert "Fix an issue that could stop audio rollback from working." This reverts commit `14ced3377a`.	2024-10-28 01:03:30 -04:00
Tom Rothamel	944b7d0e9c	Copy the music dictionary when it changes. Fixes #5868 while continuing to fix #5802.	2024-10-28 00:51:38 -04:00
Tom Rothamel	7022001dbe	Keep high-rate drawing for 12 frames (.2s). This ensures that a static image is pushed through any sort of compositor that requires constant flipping. Fixes #5867.	2024-10-27 01:38:58 -04:00
Tom Rothamel	0ab9444676	hbfont: Underlines and strikethroughs should not include glyph.x_offset. Fixes #5861.	2024-10-26 19:19:17 -04:00