diff --git a/.gitignore b/.gitignore
index 94db17f..af9ac4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ Impressive-0.10.2.tar.gz
 /Impressive-0.11.2.tar.gz
 /Impressive-0.11.3.tar.gz
 /Impressive-0.12.0.tar.gz
+/Impressive-0.13.0-WIP-20190902svn275.tar.gz
diff --git a/Impressive-0.12.0-235-245.patch b/Impressive-0.12.0-235-245.patch
deleted file mode 100644
index 811f94e..0000000
--- a/Impressive-0.12.0-235-245.patch
+++ /dev/null
@@ -1,447 +0,0 @@
-Binärdateien Impressive-0.12.0/demo.pdf und Impressive-0.12.1-WIP/demo.pdf sind verschieden.
-diff -u Impressive-0.12.0/impressive.1 Impressive-0.12.1-WIP/impressive.1
---- Impressive-0.12.0/impressive.1	2018-02-04 21:31:39.000000000 +0100
-+++ Impressive-0.12.1-WIP/impressive.1	2019-08-18 16:25:04.000000000 +0200
-@@ -1,5 +1,5 @@
- .\" generated by KeyJ's html2man.py version 0.1.1
--.TH IMPRESSIVE 1 2018-02-04 "Martin J. Fiedler" "Impressive Documentation">
-+.TH IMPRESSIVE 1 2018-02-07 "Martin J. Fiedler" "Impressive Documentation">
- .SH "NAME"
- Impressive \- presentation tool with eye candy
- .SH "SYNOPSIS"
-@@ -666,6 +666,16 @@
- .RE
- .PP
- .br
-+\fBA\fR key 
-+.RS
-+Toggle automatic slideshow mode.
-+.br
-+If an automatic presentation has been started with the \fB\-a\fR/\:\fB\-\-auto\fR option, it is temporarily disabled until this key is pressed again. It is not automatically re\-enabled after changing the page. If the \fB\-a\fR/\:\fB\-\-auto\fR has not been used, an automatic presentation with a timeout of 30 seconds is started when this key is pressed for the first time.
-+.br
-+Note that if a page has a \fBtimeout\fR PageProp, the specified timeout is \fIalways\fR in effect when the page is entered, even if the automatic slideshow is otherwise disabled.
-+.RE
-+.PP
-+.br
- \fBS\fR key 
- .RS
- Save the info script associated with the current presentation. The main purpose for this is to permanently save highlight boxes or keyboard shortcuts, so they will be restored the next time this presentation is started.
-@@ -857,6 +867,26 @@
- The following list describes all actions supported by Impressive, together with the conditions under which they will match. Note that most actions will not match in overview mode and during video playback, unless mentioned otherwise in the description.
- .PP
- .br
-+\fBauto\-start\fR 
-+.RS
-+(Re\-)enable automatic presentation mode. If the current page has no \fBtimeout\fR PageProp and no \fB\-a\fR/\:\fB\-\-auto\fR option has been specified, an automatic presentation is started with a 30\-second page interval.
-+.RE
-+.PP
-+.br
-+\fBauto\-stop\fR 
-+.RS
-+Disable automatic presentation mode. If the current page has a \fBtimeout\fR PageProp or an \fB\-a\fR/\:\fB\-\-auto\fR option has been specified, the timeout for the current page is stopped.
-+.br
-+The automatic presentation stays disabled after changing pages, unless a \fBtimeout\fR PageProp is specified for the target page, which will take precedence over the otherwise disabled automatic presentation mode.
-+.RE
-+.PP
-+.br
-+\fBauto\-toggle\fR 
-+.RS
-+Disables or (re\-)enables automatic presentations, depending on the current state.
-+.RE
-+.PP
-+.br
- \fBbox\-add\fR 
- .RS
- Draw a highlight box if the mouse has been moved since the button has been pressed down. This action must only be bound to a mouse button event, otherwise it will not function properly.
-diff -u Impressive-0.12.0/impressive.html Impressive-0.12.1-WIP/impressive.html
---- Impressive-0.12.0/impressive.html	2018-02-04 21:31:39.000000000 +0100
-+++ Impressive-0.12.1-WIP/impressive.html	2019-08-18 16:25:04.000000000 +0200
-@@ -13,12 +13,12 @@
- <!--VERSION-->
- <p style="text-indent:0;">
- <a href="http://impressive.sourceforge.net/">http://impressive.sourceforge.net/</a><br />
--<b>Version:</b> 0.12.0<br />
-+<b>Version:</b> 0.12.1-WIP<br />
- <b>Author:</b> <a href="mailto:martin.fiedler@gmx.net">Martin J. Fiedler</a><br />
--<b>Last updated:</b> 2018-02-04</p>
-+<b>Last updated:</b> 2018-02-07</p>
- <!--END-->
- <!--man
--.TH IMPRESSIVE 1 2018-02-04 "Martin J. Fiedler" "Impressive Documentation">
-+.TH IMPRESSIVE 1 2018-02-07 "Martin J. Fiedler" "Impressive Documentation">
- .SH "NAME"
- Impressive \- presentation tool with eye candy
- .SH "SYNOPSIS"
-@@ -461,6 +461,11 @@
- <dt><strong>RMB</strong> (right mouse button) over a highlight box</dt>
- <dd>If the right mouse button is clicked while the mouse cursor is above a highlight box, the box will be removed. If the last box on a page is removed, the page will turn bright and sharp again.</dd>
- 
-+<dt><strong>A</strong> key</dt>
-+<dd>Toggle automatic slideshow mode.<br />
-+If an automatic presentation has been started with the <code>-a</code>/<code>--auto</code> option, it is temporarily disabled until this key is pressed again. It is not automatically re-enabled after changing the page. If the <code>-a</code>/<code>--auto</code> has not been used, an automatic presentation with a timeout of 30 seconds is started when this key is pressed for the first time.<br />
-+Note that if a page has a <code>timeout</code> PageProp, the specified timeout is <em>always</em> in effect when the page is entered, even if the automatic slideshow is otherwise disabled.</dd>
-+
- <dt><strong>S</strong> key</dt>
- <dd>Save the info script associated with the current presentation. The main purpose for this is to permanently save highlight boxes or keyboard shortcuts, so they will be restored the next time this presentation is started.</dd>
- 
-@@ -568,6 +573,16 @@
- 
- <p>The following list describes all actions supported by Impressive, together with the conditions under which they will match. Note that most actions will not match in overview mode and during video playback, unless mentioned otherwise in the description.</p><dl>
- 
-+<dt><code>auto-start</code></dt>
-+<dd>(Re-)enable automatic presentation mode. If the current page has no <code>timeout</code> PageProp and no <code>-a</code>/<code>--auto</code> option has been specified, an automatic presentation is started with a 30-second page interval.</dd>
-+
-+<dt><code>auto-stop</code></dt>
-+<dd>Disable automatic presentation mode. If the current page has a <code>timeout</code> PageProp or an <code>-a</code>/<code>--auto</code> option has been specified, the timeout for the current page is stopped.<br />
-+The automatic presentation stays disabled after changing pages, unless a <code>timeout</code> PageProp is specified for the target page, which will take precedence over the otherwise disabled automatic presentation mode.</dd>
-+
-+<dt><code>auto-toggle</code></dt>
-+<dd>Disables or (re-)enables automatic presentations, depending on the current state.</dd>
-+
- <dt><code>box-add</code></dt>
- <dd>Draw a highlight box if the mouse has been moved since the button has been pressed down. This action must only be bound to a mouse button event, otherwise it will not function properly.</dd>
- 
-diff -u Impressive-0.12.0/impressive.py Impressive-0.12.1-WIP/impressive.py
---- Impressive-0.12.0/impressive.py	2018-02-04 21:31:39.000000000 +0100
-+++ Impressive-0.12.1-WIP/impressive.py	2019-08-18 16:27:33.439233087 +0200
-@@ -2,7 +2,7 @@
- # -*- coding: iso-8859-1 -*-
- #
- # Impressive, a fancy presentation tool
--# Copyright (C) 2005-2014 Martin J. Fiedler <martin.fiedler@gmx.net>
-+# Copyright (C) 2005-2018 Martin J. Fiedler <martin.fiedler@gmx.net>
- #
- # This program is free software; you can redistribute it and/or modify
- # it under the terms of the GNU General Public License, version 2, as
-@@ -18,8 +18,8 @@
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
- __title__   = "Impressive"
--__version__ = "0.12.0"
--__rev__     = 235
-+__version__ = "0.12.1-WIP"
-+__rev__     = 245
- __author__  = "Martin J. Fiedler"
- __email__   = "martin.fiedler@gmx.net"
- __website__ = "http://impressive.sourceforge.net/"
-@@ -72,7 +72,8 @@
- EnableOverview = True
- InitialPage = None
- Wrap = False
--AutoAdvance = None
-+AutoAdvanceTime = 30000
-+AutoAdvanceEnabled = False
- AutoAutoAdvance = False
- RenderToDirectory = None
- Rotation = 0
-@@ -376,7 +377,15 @@
-         pygame.quit()
- 
-     def SetWindowTitle(self, text):
--        pygame.display.set_caption(text, __title__)
-+        if not isinstance(text, unicode):
-+            try:
-+                text = unicode(text, 'utf-8')
-+            except UnicodeDecodeError:
-+                text = unicode(text, 'windows-1252', 'replace')
-+        try:
-+            pygame.display.set_caption(text, __title__)
-+        except UnicodeEncodeError:
-+            pygame.display.set_caption(text.encode('utf-8'), __title__)
-     def GetWindowID(self):
-         return pygame.display.get_wm_info()['window']
- 
-@@ -2544,6 +2553,12 @@
-                 raise PDFError, "object does not match the intended type"
-         return data
- 
-+    def resolve(self, obj):
-+        if isinstance(obj, PDFref):
-+            return self.getobj(obj)
-+        else:
-+            return obj
-+
-     def parse_xref_section(self, start, count):
-         xref = {}
-         for obj in xrange(start, start + count):
-@@ -2600,7 +2615,7 @@
-                 self.page_count = page
-                 self.obj2page[obj] = page
-                 self.page2obj[page] = obj
--                self.box[page] = node.get('CropBox', cbox) or node.get('MediaBox', mbox)
-+                self.box[page] = self.resolve(node.get('CropBox', cbox) or node.get('MediaBox', mbox))
-                 self.rotate[page] = node.get('Rotate', rotate)
-                 self.annots[page] = [a.ref for a in anode]
-         except (KeyError, TypeError, ValueError):
-@@ -3267,6 +3282,11 @@
-     print >>sys.stderr, "       Display of PDF files will not be supported."
- 
- 
-+def ApplyRotation(img, rot):
-+    rot = (rot or 0) & 3
-+    if not rot: return img
-+    return img.transpose({1:Image.ROTATE_270, 2:Image.ROTATE_180, 3:Image.ROTATE_90}[rot])
-+
- # generate a dummy image
- def DummyPage():
-     img = Image.new('RGB', (ScreenWidth, ScreenHeight))
-@@ -3325,7 +3345,7 @@
-         return DummyPage()
- 
-     # apply rotation
--    if rot: img = img.rotate(90 * (4 - rot))
-+    img = ApplyRotation(img, rot)
- 
-     # compute final output image size based on PAR
-     if not parscale:
-@@ -3410,11 +3430,7 @@
-             return DummyPage()
- 
-     # apply rotation
--    rot = GetPageProp(page, 'rotate')
--    if rot is None:
--        rot = Rotation
--    if rot:
--        img = img.rotate(90 * (4 - rot))
-+    img = ApplyRotation(img, GetPageProp(page, 'rotate', Rotation))
- 
-     # determine destination size
-     newsize = ZoomToFit((img.size[0], int(img.size[1] * PAR + 0.5)),
-@@ -4307,7 +4323,7 @@
-         PageEnterTime = Platform.GetTicks() - StartTime
-     IsZoomed = 0  # no, we don't have a pre-zoomed image right now
-     WantStatus = False  # don't show status unless it's changed interactively
--    PageTimeout = AutoAdvance
-+    PageTimeout = AutoAdvanceTime if AutoAdvanceEnabled else 0
-     shown = GetPageProp(Pcurrent, '_shown', 0)
-     try:
-         os.chdir(os.path.dirname(GetPageProp(Pcurrent, '_file')))
-@@ -4940,6 +4956,7 @@
-     f = fullscreen
-     tab = overview-enter, overview-exit
-     s = save
-+    a = auto-toggle
-     t = time-toggle
-     r = time-reset
-     c = box-clear
-@@ -5650,6 +5667,33 @@
-         "fade to a white screen"
-         FadeMode(1.0)
- 
-+    def _auto_stop(self):
-+        "stop automatic slideshow"
-+        global AutoAdvanceEnabled, PageTimeout
-+        AutoAdvanceEnabled = False
-+        PageTimeout = 0
-+        Platform.ScheduleEvent('$page-timeout', 0)
-+        if AutoAdvanceProgress:
-+            DrawCurrentPage()
-+    def _auto_start(self):
-+        "start or resume automatic slideshow"
-+        global AutoAdvanceEnabled, PageTimeout
-+        AutoAdvanceEnabled = True
-+        PageTimeout = AutoAdvanceTime
-+        if (GetPageProp(Pcurrent, '_shown') == 1) or Wrap:
-+            PageTimeout = GetPageProp(Pcurrent, 'timeout', PageTimeout)
-+        dt = PageTimeout - (Platform.GetTicks() - PageEnterTime)
-+        if dt > 0:
-+            Platform.ScheduleEvent('$page-timeout', dt)
-+        else:
-+            TransitionTo(GetNextPage(Pcurrent, 1))
-+    def _auto_toggle(self):
-+        "toggle automatic slideshow"
-+        if AutoAdvanceEnabled:
-+            self._auto_stop()
-+        else:
-+            self._auto_start()
-+
-     def _time_toggle(self):
-         "toggle time display and/or time tracking mode"
-         global TimeDisplay
-@@ -5807,7 +5851,7 @@
-             print >>sys.stderr, "Warning: input file `%s' has unrecognized file type" % name
- 
-     elif os.path.isdir(name):
--        images = [os.path.join(name, f) for f in os.listdir(name) if IsImageFileName(f)]
-+        images = [os.path.join(name, f) for f in os.listdir(name) if IsImageFile(f)]
-         images.sort(lambda a, b: cmp(a.lower(), b.lower()))
-         if not images:
-             print >>sys.stderr, "Warning: no image files in directory `%s'" % name
-@@ -5838,7 +5882,7 @@
-     global PAR, DAR, TempFileName, Bare, MaxZoomFactor
-     global BackgroundRendering, FileStats, RTrunning, RTrestart, StartTime
-     global CursorImage, CursorVisible, InfoScriptPath
--    global HalfScreen, AutoAdvance, WindowPos
-+    global HalfScreen, AutoAdvanceTime, AutoAdvanceEnabled, WindowPos
-     global BoxFadeDarknessBase, BoxZoomDarknessBase, SpotRadiusBase
-     global BoxIndexBuffer, UseBlurShader
- 
-@@ -6189,8 +6233,9 @@
-                 time_left -= GetPageProp(p, 'transtime', TransitionDuration)
-             p = pnext
-         if pages and (time_left >= pages):
--            AutoAdvance = time_left / pages
--            print >>sys.stderr, "Setting auto-advance timeout to %.1f seconds." % (0.001 * AutoAdvance)
-+            AutoAdvanceTime = time_left / pages
-+            AutoAdvanceEnabled = True
-+            print >>sys.stderr, "Setting auto-advance timeout to %.1f seconds." % (0.001 * AutoAdvanceTime)
-         else:
-             print >>sys.stderr, "Warning: Could not determine auto-advance timeout automatically."
- 
-@@ -6235,7 +6280,8 @@
-     # prebuffer current and next page
-     Pnext = 0
-     RenderPage(Pcurrent, Tcurrent)
--    DrawCurrentPage()
-+    if not FadeInOut:
-+        DrawCurrentPage()
-     PageEntered(update_time=False)
-     PreloadNextPage(GetNextPage(Pcurrent, 1))
- 
-@@ -6332,7 +6378,14 @@
-             print >>sys.stderr, "Impressive version:", __version__
-             print >>sys.stderr, "Python version:", sys.version
-             print >>sys.stderr, "PyGame version:", pygame.__version__
--            print >>sys.stderr, "PIL version:", Image.VERSION
-+            if hasattr(Image, "__version__"):  # Pillow >= 5.2
-+                print >>sys.stderr, "PIL version: Pillow", Image.__version__
-+            elif hasattr(Image, "PILLOW_VERSION"):  # Pillow < 7.0
-+                print >>sys.stderr, "PIL version: Pillow", Image.PILLOW_VERSION
-+            elif hasattr(Image, "VERSION"):  # classic PIL or Pillow 1.x
-+                print >>sys.stderr, "PIL version: classic", Image.VERSION
-+            else:
-+                print >>sys.stderr, "PIL version: unknown"            
-             if PDFRenderer:
-                 print >>sys.stderr, "PDF renderer:", PDFRenderer.name
-             else:
-@@ -6396,28 +6449,28 @@
- 
- Usage: """+os.path.basename(sys.argv[0])+""" [OPTION...] <INPUT(S)...>
- 
--You may either play a PDF file, a directory containing image files or
--individual image files.
-+Inputs may be PDF files, image files, video files or directories
-+containing image files.
- 
- Input options:
-+  -h,  --help             show this help text and exit
-   -r,  --rotate <n>       rotate pages clockwise in 90-degree steps
-        --scale            scale images to fit screen (not used in PDF mode)
-        --supersample      use supersampling (only used in PDF mode)
-   -s                      --supersample for PDF files, --scale for image files
-   -I,  --script <path>    set the path of the info script
--  -u,  --poll <seconds>   check periodically if the source file has been
--                          updated and reload it if it did
-+  -u,  --poll <seconds>   check periodically if the source files have been
-+                          updated and reload them if they did
-   -X,  --shuffle          put input files into random order
--  -h,  --help             show this help text and exit
- 
- Output options:
--  -o,  --output <dir>     don't display the presentation, only render to .png
-        --fullscreen       start in fullscreen mode
-   -ff, --fake-fullscreen  start in "fake fullscreen" mode
-   -f,  --windowed         start in windowed mode
-   -g,  --geometry <WxH>   set window size or fullscreen resolution
-   -A,  --aspect <X:Y>     adjust for a specific display aspect ratio (e.g. 5:4)
-   -G,  --gamma <G[:BL]>   specify startup gamma and black level
-+  -o,  --output <dir>     don't display the presentation, only render to .png
- 
- Page options:
-   -i,  --initialpage <n>  start with page <n>
-@@ -6442,33 +6495,33 @@
-   -z,  --zoom <factor>    set zoom factor (default: 2.0)
-        --maxzoom <factor> maximum factor to render high-resolution zoom
-   -x,  --fade             fade in at start and fade out at end
--       --spot-radius <px> set the initial radius of the spotlight, in pixels
-        --invert           display slides in inverted colors
-+       --noblur           use legacy blur implementation
-+       --spot-radius <px> set the initial radius of the spotlight, in pixels
-        --min-box-size <x> set minimum size of a highlight box, in pixels
-        --box-edge <px>    size of highlight box borders, in pixels
-        --zbox-edge <px>   size of zoom box borders, in pixels
-        --darkness <p>     set highlight box mode darkness to <p> percent
-        --zoomdarkness <p> set box-zoom mode darkness to <p> percent
--       --noblur           use legacy blur implementation
- 
- Timing options:
--  -M,  --minutes          display time in minutes, not seconds
--       --clock            show current time instead of time elapsed
--       --tracking         enable time tracking mode
--       --time-display     enable time display (implies --tracking)
-   -a,  --auto <seconds>   automatically advance to next page after some seconds
-   -d,  --duration <time>  set the desired duration of the presentation and show
-                           a progress bar at the bottom of the screen
-   -y,  --auto-auto        if a duration is set, set the default time-out so
-                           that it will be reached exactly
-+  -q,  --page-progress    shows a progress bar based on the position in the
-+                          presentation (based on pages, not time)
-   -k,  --auto-progress    shows a progress bar for each page for auto-advance
-+       --time-display     enable time display (implies --tracking)
-+       --tracking         enable time tracking mode
-+       --clock            show current time instead of time elapsed
-+  -M,  --minutes          display time in minutes, not seconds
-   -T,  --transtime <ms>   set transition duration in milliseconds
-   -D,  --mousedelay <ms>  set mouse hide delay for fullscreen mode (in ms)
-                           (0 = show permanently, 1 = don't show at all)
-   -B,  --boxfade <ms>     set highlight box fade duration in milliseconds
-   -Z,  --zoomtime <ms>    set zoom animation duration in milliseconds
--  -q,  --page-progress    shows a progress bar based on the position in the
--                          presentation (based on pages, not time)
- 
- Control options:
-        --control-help     display help about control configuration and exit
-@@ -6478,9 +6531,9 @@
-   -W,  --nowheel          disable page navigation via mouse wheel, zoom instead
-        --noquit           disable single-key shortcuts that quit the program
-        --evtest           run Impressive in event test mode
--       --bare             don't use any special features (hyperlinks etc.)
- 
- Advanced options:
-+       --bare             don't use any special features (hyperlinks etc.)
-   -c,  --cache <mode>     set page cache mode:
-                             -c none       = disable caching completely
-                             -c memory     = store cache in RAM, uncompressed
-@@ -6492,8 +6545,8 @@
-   -P,  --renderer <path>  set path to PDF renderer executable (GhostScript,
-                           Xpdf/Poppler pdftoppm, or MuPDF mudraw/pdfdraw)
-   -V,  --overscan <px>    render PDF files <px> pixels larger than the screen
--       --nologo           disable startup logo and version number display
-   -H,  --half-screen      show OSD on right half of the screen only
-+       --nologo           disable startup logo and version number display
-   -v,  --verbose          (slightly) more verbose operation
- 
- For detailed information, visit""", __website__
-@@ -6625,14 +6678,15 @@
-     global FileName, FileList, Fullscreen, Scaling, Supersample, CacheMode
-     global TransitionDuration, MouseHideDelay, BoxFadeDuration, ZoomDuration
-     global ScreenWidth, ScreenHeight, InitialPage, Wrap, TimeTracking
--    global AutoAdvance, RenderToDirectory, Rotation, DAR, Verbose
-+    global AutoAdvanceTime, AutoAdvanceEnabled, AutoAutoAdvance
-+    global RenderToDirectory, Rotation, DAR, Verbose
-     global BackgroundRendering, UseAutoScreenSize, PollInterval, CacheFileName
-     global PageRangeStart, PageRangeEnd, FontList, FontSize, Gamma, BlackLevel
-     global EstimatedDuration, CursorImage, CursorHotspot, MinutesOnly, Overscan
-     global PDFRendererPath, InfoScriptPath, EventTestMode, EnableCursor
-     global AutoOverview, DefaultZoomFactor, FadeInOut, ShowLogo, Shuffle
-     global QuitAtEnd, ShowClock, HalfScreen, SpotRadius, InvertPages
--    global MinBoxSize, AutoAutoAdvance, AutoAdvanceProgress, BoxFadeDarkness
-+    global MinBoxSize, AutoAdvanceProgress, BoxFadeDarkness
-     global WindowPos, FakeFullscreen, UseBlurShader, Bare, EnableOverview
-     global PageProgress, BoxZoomDarkness, MaxZoomFactor, BoxEdgeSize
-     global TimeDisplay, MouseWheelZoom, ZoomBoxEdgeSize
-@@ -6784,8 +6838,12 @@
-                 opterr("invalid parameter for --duration")
-         if opt in ("-a", "--auto"):
-             try:
--                AutoAdvance = int(float(arg) * 1000)
--                assert (AutoAdvance > 0) and (AutoAdvance <= 86400000)
-+                if arg.lower().strip('.') in ("0", "00", "off", "none", "false"):
-+                    AutoAdvanceEnabled = False
-+                else:
-+                    AutoAdvanceTime = int(float(arg) * 1000)
-+                    assert (AutoAdvanceTime > 0) and (AutoAdvanceTime <= 86400000)
-+                    AutoAdvanceEnabled = True
-             except:
-                 opterr("invalid parameter for --auto")
-         if opt in ("-T", "--transtime"):
diff --git a/Impressive-0.12.0-245-py3.patch b/Impressive-0.12.0-245-py3.patch
deleted file mode 100644
index 3b0529b..0000000
--- a/Impressive-0.12.0-245-py3.patch
+++ /dev/null
@@ -1,2015 +0,0 @@
-diff -u Impressive-0.12.1-WIP-py2/impressive.py Impressive-0.12.1-WIP-py3-v2/impressive.py
---- Impressive-0.12.1-WIP-py2/impressive.py	2019-08-18 16:27:33.439233087 +0200
-+++ Impressive-0.12.1-WIP-py3-v2/impressive.py	2019-08-19 15:23:28.801130609 +0200
-@@ -17,6 +17,8 @@
- # along with this program; if not, write to the Free Software
- # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- 
-+from __future__ import print_function
-+
- __title__   = "Impressive"
- __version__ = "0.12.1-WIP"
- __rev__     = 245
-@@ -28,10 +30,14 @@
- if __rev__ and (("WIP" in __version__) or ("rc" in __version__) or ("alpha" in __version__) or ("beta" in __version__)):
-     __version__ += " (SVN r%s)" % __rev__
- def greet():
--    print >>sys.stderr, "Welcome to", __title__, "version", __version__
-+    print("Welcome to", __title__, "version", __version__, file=sys.stderr)
- if __name__ == "__main__":
-     greet()
- 
-+def execfile(f, c):
-+    with open(f) as h:
-+        code = compile(h.read(), f, 'exec')
-+        exec(code, c)
- 
- TopLeft, BottomLeft, TopRight, BottomRight, TopCenter, BottomCenter = range(6)
- NoCache, MemCache, CompressedCache, FileCache, PersistentCache = range(5)  # for CacheMode
-@@ -132,10 +138,11 @@
- 
- 
- # import basic modules
--import random, getopt, os, types, re, codecs, tempfile, glob, cStringIO, re
-+import random, getopt, os, re, codecs, tempfile, glob, io, re
- import traceback, subprocess, time, itertools, ctypes.util, zlib, urllib
- from math import *
- from ctypes import *
-+from builtins import bytes
- 
- # import hashlib for MD5 generation, but fall back to old md5 lib if unavailable
- # (this is the case for Python versions older than 2.5)
-@@ -149,7 +156,7 @@
- # initialize some platform-specific settings
- if os.name == "nt":
-     root = os.path.split(sys.argv[0])[0] or "."
--    _find_paths = [root, os.path.join(root, "win32"), os.path.join(root, "gs")] + filter(None, os.getenv("PATH").split(';'))
-+    _find_paths = [root, os.path.join(root, "win32"), os.path.join(root, "gs")] + list(filter(None, os.getenv("PATH").split(';')))
-     def FindBinary(binary):
-         if not binary.lower().endswith(".exe"):
-             binary += ".exe"
-@@ -171,7 +178,7 @@
-     except ImportError:
-         HaveWin32API = False
-         MPlayerPath = ""
--        def RunURL(url): print "Error: cannot run URL `%s'" % url
-+        def RunURL(url): print("Error: cannot run URL `%s'" % url)
-     if getattr(sys, "frozen", False):
-         sys.path.append(root)
-     FontPath = []
-@@ -191,7 +198,7 @@
-         try:
-             subprocess.Popen(["xdg-open", url])
-         except OSError:
--            print >>sys.stderr, "Error: cannot open URL `%s'" % url
-+            print("Error: cannot open URL `%s'" % url, file=sys.stderr)
- 
- # import special modules
- try:
-@@ -199,19 +206,22 @@
-     from pygame.locals import *
-     from PIL import Image, ImageDraw, ImageFont, ImageFilter, ImageChops, ImageOps
-     from PIL import TiffImagePlugin, BmpImagePlugin, JpegImagePlugin, PngImagePlugin, PpmImagePlugin
--except (ValueError, ImportError), err:
--    print >>sys.stderr, "Oops! Cannot load necessary modules:", err
--    print >>sys.stderr, """To use Impressive, you need to install the following Python modules:
-+except (ValueError, ImportError) as err:
-+    print("Oops! Cannot load necessary modules:", err, file=sys.stderr)
-+    print("""To use Impressive, you need to install the following Python modules:
-  - PyGame   [python-pygame]   http://www.pygame.org/
-  - PIL      [python-imaging]  http://www.pythonware.com/products/pil/
-    or Pillow                  http://pypi.python.org/pypi/Pillow/
-  - PyWin32  (OPTIONAL, Win32) http://sourceforge.net/projects/pywin32/
- Additionally, please be sure to have pdftoppm or GhostScript installed if you
--intend to use PDF input."""
-+intend to use PDF input.""", file=sys.stderr)
-     sys.exit(1)
- 
- try:
--    import thread
-+    try:
-+        import thread
-+    except ImportError:
-+        import _thread as thread
-     HaveThreads = True
-     def create_lock(): return thread.allocate_lock()
-     def get_thread_id(): return thread.get_ident()
-@@ -339,7 +349,7 @@
-         flags = OPENGL | DOUBLEBUF
-         if Fullscreen:
-             if FakeFullscreen:
--                print >>sys.stderr, "Using \"fake-fullscreen\" mode."
-+                print("Using \"fake-fullscreen\" mode.", file=sys.stderr)
-                 flags |= NOFRAME
-                 if not WindowPos:
-                     WindowPos = (0,0)
-@@ -360,7 +370,7 @@
-             raise ImportError("failed to load SDL_GL_GetProcAddress from the SDL library")
-         def loadsym(name, prototype):
-             try:
--                addr = get_proc_address(name)
-+                addr = get_proc_address(name.encode())
-             except EnvironmentError:
-                 return None
-             if not addr:
-@@ -377,11 +387,12 @@
-         pygame.quit()
- 
-     def SetWindowTitle(self, text):
--        if not isinstance(text, unicode):
--            try:
--                text = unicode(text, 'utf-8')
--            except UnicodeDecodeError:
--                text = unicode(text, 'windows-1252', 'replace')
-+        try:
-+            text = text.decode('utf-8')
-+        except UnicodeDecodeError:
-+            text = text.decode('windows-1252', 'replace')
-+        except AttributeError:
-+            pass # nothing to decode
-         try:
-             pygame.display.set_caption(text, __title__)
-         except UnicodeEncodeError:
-@@ -536,7 +547,7 @@
-         try:
-             xrandr = subprocess.Popen(["xrandr"], stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-             for line in xrandr.stdout:
--                m = re_res.match(line)
-+                m = re_res.match(line.decode())
-                 if m:
-                     res = tuple(map(int, m.groups()))
-             xrandr.wait()
-@@ -690,8 +701,8 @@
-         if WindowPos:
-             x0, y0 = WindowPos
-         else:
--            x0 = (self.screen_size[0] - width)  / 2
--            y0 = (self.screen_size[1] - height) / 2
-+            x0 = int((self.screen_size[0] - width)  / 2)
-+            y0 = int((self.screen_size[1] - height) / 2)
-         x0 = max(min(x0, self.screen_size[0] - width),  0)
-         y0 = max(min(y0, self.screen_size[1] - height), 0)
- 
-@@ -710,7 +721,7 @@
- 
-         # finally, tell PyGame what just happened
-         pygame.display.set_mode((width, height), 0)
--        pygame.mouse.set_pos((width / 2, height / 2))
-+        pygame.mouse.set_pos((int(width / 2), int(height / 2)))
- 
- 
- libbcm_host = ctypes.util.find_library("bcm_host")
-@@ -727,7 +738,7 @@
- # read and write the PageProps and FileProps meta-dictionaries
- def GetProp(prop_dict, key, prop, default=None):
-     if not key in prop_dict: return default
--    if type(prop) == types.StringType:
-+    if isinstance(prop, str):
-         return prop_dict[key].get(prop, default)
-     for subprop in prop:
-         try:
-@@ -768,7 +779,7 @@
-     SetProp(FileProps, page, prop, value)
- 
- # the Impressive logo (256x64 pixels grayscale PNG)
--LOGO = """iVBORw0KGgoAAAANSUhEUgAAAQAAAABACAAAAADQNvZiAAAL8ElEQVR4Xu2Ze1hVVfrHv+cc7siAEiF4AW1QEkmD8pJUWlkaaSWWk9pk5ZT5szKvPydvoVhqKuWY9jhkmjZpmZmO9wwzLwhiCImAeEFEkJtyk/se17tZ66yz9zlp+IcPD3z++Z79ujxrne963/XupWjytNCCy5QtuXm/vueAxmBAk8dnWyhpWkhFszTA7VR7qMy
-+LOGO = b"""iVBORw0KGgoAAAANSUhEUgAAAQAAAABACAAAAADQNvZiAAAL8ElEQVR4Xu2Ze1hVVfrHv+cc7siAEiF4AW1QEkmD8pJUWlkaaSWWk9pk5ZT5szKvPydvoVhqKuWY9jhkmjZpmZmO9wwzLwhiCImAeEFEkJtyk/se17tZ66yz9zlp+IcPD3z++Z79ujxrne963/XupWjytNCCy5QtuXm/vueAxmBAk8dnWyhpWkhFszTA7VR7qMy
- ajz+PEUS/RXO7omnyDP/9eBKNNuCdg1Pn/PYUmiQR4HRutAEeiwyA0yo0RVwGg1PYaAO6OQKAfys0Qbq6gHO60QacVQCgoAxNkPa4PQPsmOQumQIoU9BI5gYCyHy/CRuAqb8Pq4jZi0byakcA36MpG4Avv0SjcaQ1ZNxxA5S0xnWB26YTfccZ3Bl8wMmquEMG/BV3MgPcwTmJZmnAX8D55U4ZcA+T8hwArd3xJ3H0gnU8nGENVzfbGRCLW8Xe2
- 2BpQN/+NwgE0ZV9DgMRPGHp11Gj3SGwD5+8KubtMKM+AwrHLNmdU3S1Mml2F+0K+zPaAHAY/fH6mY+D4/X2ocLKK3nb5z4CS3quPphXXJaxZf6TkPH75KeLpSUXdix+wWQtA0pOMAljk3WChAvN30GMf3Xflarcor0LnobAWKncYAmIbexzOgDD6CMKkTOczzX1okLs84FEhmJB3edekImgaAjw6Dn24Te+rsU1CifaHmY8V9YpnKNmC5znVoh
- w2kixBSYR/C8Yx9nDRkjMoEXdC8JuernC+aYVz4AOjtIxHsAkDfDf91UfED7fqg4MOL2oPYjHk7pBYOevKao3knvoj4h0dP1BHtgneYodOO8eaA+O76lxRnB67z74CAjnuDnO4HTZkCw2RVMBR+ivwYzbFCbfpKrpHf+RCzgj4oPIAFqiMMDUSTXgheTHIFh5N2CKlPbdaykEHe2gwTu2j9aAnDLP7R4wE7a3MyT6Jt4NFcOX9EkQ9imIRcGQ6
-@@ -786,7 +797,7 @@
- FvZWrsysTOv6/z1EIkoc+dAAqB3qNPCfqen5wGu9hTz9xgoeVmMBYqOzqlUQl+uY/9NeB4mjo+DxoGwTnxwRvVgCDowFArWqlgxFAvWyTE5OaOghM9mQx38ACT/ZUCVQVFOSn7oyrgwVGBz5aT/CQMF/vwtTU06lJ9ZAwdA65PyQoJzllRzpk2oWEhPQoSkn5OR5mTPf39oiPuwYNfV/Bgf/AGp2eHdCubUXqDU7UqNPhdvAoZjIzCk0XIxqLn
- OLN3IAzzduAFgMKrzZXA8R7cTPOgGZugNvdzdoA0QWbtQEtGdBiQEl+MzagqSdAiwEttPA/JcotzChXXBQAAAAASUVORK5CYII="""
- # the default cursor (19x23 pixel RGBA PNG)
--DEFAULT_CURSOR = """iVBORw0KGgoAAAANSUhEUgAAABMAAAAXCAYAAADpwXTaAAADCklEQVR42qWUXWwMURTH787MznbWbm1VtdWP0KBN+pFWlQRVQlJBQkR4lGqioY0IibSprAchHgQhoh76hAQPJB4IRdBobdFstbZ4oJLup9au3c5Md3fmjnPHdE2qZVsn+c3snDv3v/9zzt2lEcRbx90rnAk/d7x2xdF/BAWwFmv6jm1bal4db95Xp
-+DEFAULT_CURSOR = b"""iVBORw0KGgoAAAANSUhEUgAAABMAAAAXCAYAAADpwXTaAAADCklEQVR42qWUXWwMURTH787MznbWbm1VtdWP0KBN+pFWlQRVQlJBQkR4lGqioY0IibSprAchHgQhoh76hAQPJB4IRdBobdFstbZ4oJLup9au3c5Md3fmjnPHdE2qZVsn+c3snDv3v/9zzt2lEcRbx90rnAk/d7x2xdF/BAWwFmv6jm1bal4db95Xp
- uVmLcbEJfQ9Y0Fu8YZ1yzsvnTu6G3LG2YopPM+HbfMWohTObC0pWXLjWrv9DOS52YjJAi8EKJpBqbZMxNAMlZeXdeTOzdP36/duzYF1w4yciSI/gmUJxLIQw7CIomiUZrOu37m9puukvW51sn0kL2FBEN0Yy2qClGswUIiijYjjUvJXrijuaLt4uCGZPv7qmTAWIGIKMMeajliTGQQNqkOGYbiCxTmXr7e3XC0tXmT5mxhNLtVrq3KWLS3YQxw
- RjCyHBD6IFPUVclUMHGeqWFVVWJuXm/Gku2cwNK0zr9fvJc5UdwqGqVoRZ56rOjMAFMWon1NTLZU11WXdZ0/Vb56qj2ri0eOXwzAAnBDEGKWl56oCk2FZNqOoMP9e24XG5sl9VMv0+0eM9XW7mhijkSXPpF+M0YRkOY7iMVFfbsKE1cJtrN1UXmrmUjr6XUMi0lmVYKKj5Hjo3dnSshENU9WXS75IxgoOhfmxWEwurSwvaIX96mCYCbFoNBrEW
- MqnMK0JSurx6HcNhxwOR8TnHx33eALjXt+o4A8EBUVReNjnBgaALGBoQkwWRRGOB1ZFDJhSBV90OoIHmuxOWZZ98E4Q4HVEgDDgAUiZyoQYjsbiI2SSMpRKynrv+jR2sKmlF4TewLpD20RExrXNMY24dpcTYvBj94F1RHC7vdH9Dcf6eF5wwtpDwKk5wZMnoY/fzqIxH3EWiQhS46ETAz7/t3eQfwqQe2g6gT/OGYkfobBHisfkVvv5vg8fP/d
-@@ -820,9 +831,9 @@
- # extract a number at the beginning of a string
- def num(s):
-     s = s.strip()
--    r = ""
--    while s[0] in "0123456789":
--        r += s[0]
-+    r = b""
-+    while s[0:1] in b"0123456789":
-+        r += s[0:1]
-         s = s[1:]
-     try:
-         return int(r)
-@@ -843,11 +854,11 @@
- 
- # determine (pagecount,width,height) of a PDF file
- def analyze_pdf(filename):
--    f = file(filename,"rb")
-+    f = open(filename,"rb")
-     pdf = f.read()
-     f.close()
--    box = map(float, pdf.split("/MediaBox",1)[1].split("]",1)[0].split("[",1)[1].strip().split())
--    return (max(map(num, pdf.split("/Count")[1:])), box[2]-box[0], box[3]-box[1])
-+    box = tuple(map(float, pdf.split(b"/MediaBox",1)[1].split(b"]",1)[0].split(b"[",1)[1].strip().split()))
-+    return (max(map(num, pdf.split(b"/Count")[1:])), box[2]-box[0], box[3]-box[1])
- 
- # unescape &#123; literals in PDF files
- re_unescape = re.compile(r'&#[0-9]+;')
-@@ -865,7 +876,7 @@
- 
- # parse pdftk output
- def pdftkParse(filename, page_offset=0):
--    f = file(filename, "r")
-+    f = open(filename, "r")
-     InfoKey = None
-     BookmarkTitle = None
-     Title = None
-@@ -896,7 +907,7 @@
-     f.close()
-     if AutoOverview:
-         SetPageProp(page_offset + 1, '_overview', True)
--        for page in xrange(page_offset + 2, page_offset + Pages):
-+        for page in range(page_offset + 2, page_offset + Pages):
-             SetPageProp(page, '_overview', \
-                         not(not(GetPageProp(page + AutoOverview - 1, '_title'))))
-         SetPageProp(page_offset + Pages, '_overview', True)
-@@ -907,6 +918,7 @@
-     title = None
-     pages = 0
-     for line in f:
-+        line = line.decode()
-         m = re.match("pages:\s*(\d+)", line, re.I)
-         if m and not(pages):
-             pages = int(m.group(1))
-@@ -928,7 +940,7 @@
- def InsideBox(x, y, box):
-     return (x >= box[0]) and (y >= box[1]) and (x < box[2]) and (y < box[3])
- def FindBox(x, y, boxes):
--    for i in xrange(len(boxes)):
-+    for i in range(len(boxes)):
-         if InsideBox(x, y, boxes[i]):
-             return i
-     raise ValueError
-@@ -962,7 +974,7 @@
-         else:
-             MPlayerProcess.stdin.write('quit\n')
-         MPlayerProcess.stdin.flush()
--        for i in xrange(10):
-+        for i in range(10):
-             if MPlayerProcess.poll() is None:
-                 time.sleep(0.1)
-             else:
-@@ -972,7 +984,7 @@
- 
-     # if that didn't work, be rude
-     if MPlayerProcess.poll() is None:
--        print >>sys.stderr, "Audio/video player didn't exit properly, killing PID", MPlayerProcess.pid
-+        print("Audio/video player didn't exit properly, killing PID", MPlayerProcess.pid, file=sys.stderr)
-         try:
-             if os.name == 'nt':
-                 win32api.TerminateProcess(win32api.OpenProcess(1, False, MPlayerProcess.pid), 0)
-@@ -998,24 +1010,25 @@
-         return time.strftime("%H:%M:%S")
- 
- def FormatTime(t, minutes=False):
-+    t = int(t)
-     if minutes and (t < 3600):
--        return "%d min" % (t / 60)
-+        return "%d min" % int(t / 60)
-     elif minutes:
--        return "%d:%02d" % (t / 3600, (t / 60) % 60)
-+        return "%d:%02d" % (int(t / 3600), int(t / 60) % 60)
-     elif t < 3600:
--        return "%d:%02d" % (t / 60, t % 60)
-+        return "%d:%02d" % (int(t / 60), t % 60)
-     else:
-         ms = t % 3600
--        return "%d:%02d:%02d" % (t / 3600, ms / 60, ms % 60)
-+        return "%d:%02d:%02d" % (int(t / 3600), int(ms / 60), ms % 60)
- 
- def SafeCall(func, args=[], kwargs={}):
-     if not func: return None
-     try:
-         return func(*args, **kwargs)
-     except:
--        print >>sys.stderr, "----- Unhandled Exception ----"
-+        print("----- Unhandled Exception ----", file=sys.stderr)
-         traceback.print_exc(file=sys.stderr)
--        print >>sys.stderr, "----- End of traceback -----"
-+        print("----- End of traceback -----", file=sys.stderr)
- 
- def Quit(code=0):
-     global CleanExit
-@@ -1023,8 +1036,8 @@
-         CleanExit = True
-     StopMPlayer()
-     Platform.Done()
--    print >>sys.stderr, "Total presentation time: %s." % \
--                        FormatTime((Platform.GetTicks() - StartTime) / 1000)
-+    print("Total presentation time: %s." % \
-+                        FormatTime((Platform.GetTicks() - StartTime) / 1000), file=sys.stderr)
-     sys.exit(code)
- 
- 
-@@ -1193,9 +1206,9 @@
-             else:
-                 setattr(self, func.name, funcptr)
-             if func.name == "GetString":
--                GLVendor = self.GetString(self.VENDOR) or ""
--                GLRenderer = self.GetString(self.RENDERER) or ""
--                GLVersion = self.GetString(self.VERSION) or ""
-+                GLVendor = self.GetString(self.VENDOR).decode() or ""
-+                GLRenderer = self.GetString(self.RENDERER).decode() or ""
-+                GLVersion = self.GetString(self.VERSION).decode() or ""
-         self._init()
- 
-     def GenTextures(self, n=1):
-@@ -1230,7 +1243,7 @@
-         self._BufferData(target, cast(size, c_void_p), cast(data, c_void_p), usage)
- 
-     def ShaderSource(self, shader, source):
--        source = c_char_p(source)
-+        source = c_char_p(source.encode())
-         self._ShaderSource(shader, 1, pointer(source), None)
- 
-     def GetShaderi(self, shader, pname):
-@@ -1344,7 +1357,7 @@
-             uniforms = self.uniforms
-         if isinstance(uniforms, dict):
-             uniforms = uniforms.items()
--        uniforms = [((u, None) if isinstance(u, basestring) else u) for u in uniforms]
-+        uniforms = [((u, None) if isinstance(u, str) else u) for u in uniforms]
-         if (loglevel is None) and hasattr(self, 'loglevel'):
-             loglevel = self.loglevel
-         if loglevel is None:
-@@ -1359,11 +1372,11 @@
-                 log = "" 
-             if force_log or ((loglevel >= self.LOG_IF_NOT_EMPTY) and log):
-                 if status:
--                    print >>sys.stderr, "Info: log for %s %s:" % (self.__class__.__name__, action)
-+                    print("Info: log for %s %s:" % (self.__class__.__name__, action), file=sys.stderr)
-                 else:
--                    print >>sys.stderr, "Error: %s %s failed - log information follows:" % (self.__class__.__name__, action)
-+                    print("Error: %s %s failed - log information follows:" % (self.__class__.__name__, action), file=sys.stderr)
-                 for line in log.split('\n'):
--                    print >>sys.stderr, '>', line.rstrip()
-+                    print('>', line.rstrip(), file=sys.stderr)
-             if not status:
-                 raise GLShaderCompileError("failure during %s %s" % (self.__class__.__name__, action))
-         def handle_shader(type_enum, type_name, src):
-@@ -1381,25 +1394,25 @@
-         handle_shader(gl.VERTEX_SHADER, "vertex", vs)
-         handle_shader(gl.FRAGMENT_SHADER, "fragment", fs)
-         for attr in attributes:
--            if not isinstance(attr, basestring):
-+            if not isinstance(attr, str):
-                 loc, name = attr
--                if isinstance(loc, basestring):
-+                if isinstance(loc, str):
-                     loc, name = name, loc
-                 setattr(self, name, loc)
-             elif hasattr(self, attr):
-                 name = attr
-                 loc = getattr(self, name)
--            gl.BindAttribLocation(self.program, loc, name)
-+            gl.BindAttribLocation(self.program, loc, name.encode())
-         gl.LinkProgram(self.program)
-         handle_shader_log(gl.GetProgrami(self.program, gl.LINK_STATUS),
-                           lambda: gl.GetProgramInfoLog(self.program),
-                           "linking")
-         gl.UseProgram(self.program)
-         for name in attributes:
--            if isinstance(name, basestring) and not(hasattr(self, attr)):
-+            if isinstance(name, str) and not(hasattr(self, attr)):
-                 setattr(self, name, int(gl.GetAttribLocation(self.program, name)))
-         for u in uniforms:
--            loc = int(gl.GetUniformLocation(self.program, u[0]))
-+            loc = int(gl.GetUniformLocation(self.program, u[0].encode()))
-             setattr(self, u[0], loc)
-             if u[1] is not None:
-                 gl.Uniform(loc, *u[1:])
-@@ -1419,7 +1432,7 @@
-         except AttributeError:
-             try:
-                 self._instance = self()
--            except GLShaderCompileError, e:
-+            except GLShaderCompileError as e:
-                 self._instance = None
-                 raise
-             return self._instance
-@@ -1620,7 +1633,7 @@
-         else:
-             self.buf = reuse_buf
-         data = []
--        for i in xrange(npoints):
-+        for i in range(npoints):
-             if i:
-                 b0 = 2 * i - 1
-             else:
-@@ -1654,7 +1667,7 @@
-     SpotIndices = HighlightIndexBuffer(slices, reuse_buf=SpotIndices, dynamic=True)
- 
-     vertices = [0.0, 0.0, 1.0]
--    for i in xrange(slices):
-+    for i in range(slices):
-         a = i * 2.0 * pi / slices
-         vertices.extend([
-             rx0 * sin(a), ry0 * cos(a), 1.0,
-@@ -1874,14 +1887,14 @@
-         SimpleQuad.draw()
-     def prepare_mask(self):
-         scale = 1.0 / (self.rx - 1)
--        xx = [i * scale for i in xrange((self.rx + 3) & (~3))]
-+        xx = [i * scale for i in range((self.rx + 3) & (~3))]
-         scale = 1.0 / (self.ry - 1)
--        yy = [i * scale for i in xrange(self.ry)]
-+        yy = [i * scale for i in range(self.ry)]
-         def iter2d():
-             for y in yy:
-                 for x in xx:
-                     yield (x, y)
--        return ''.join(chr(max(0, min(255, int(self.f(x, y) * 255.0 + 0.5)))) for x, y in iter2d())
-+        return bytes([max(0, min(255, int(self.f(x, y) * 255.0 + 0.5))) for x, y in iter2d()])
-     def f(self, x, y):
-         return 0.5
- class WipeLeft(Wipe):
-@@ -1954,7 +1967,7 @@
-     blur = 5
-     def prepare_mask(self):
-         assert self.rx == self.ry
--        noise = str2img('L', (self.rx * 4, self.ry * 2), ''.join(map(chr, (random.randrange(256) for i in xrange(self.rx * self.ry * 8)))))
-+        noise = str2img('L', (self.rx * 4, self.ry * 2), ''.join(map(chr, (random.randrange(256) for i in range(self.rx * self.ry * 8)))))
-         img = Image.new('L', (1, 1), random.randrange(256))
-         alpha = 1.0
-         npos = 0
-@@ -1969,7 +1982,7 @@
-                 alpha)
-             npos += next
-         img = ImageOps.equalize(ImageOps.autocontrast(img))
--        for i in xrange(self.blur):
-+        for i in range(self.blur):
-             img = img.filter(ImageFilter.BLUR)
-         img = img.crop((border, border, img.size[0] - 2 * border, img.size[1] - 2 * border)).resize((self.rx, self.ry), Image.ANTIALIAS)
-         return img2str(img)
-@@ -2085,15 +2098,22 @@
- 
- ##### OSD FONT RENDERER ########################################################
- 
-+typesUnicodeType = type(u'unicode')
-+typesStringType = type(b'bytestring')
-+
- # force a string or sequence of ordinals into a unicode string
- def ForceUnicode(s, charset='iso8859-15'):
--    if type(s) == types.UnicodeType:
-+    if type(s) == typesUnicodeType:
-         return s
--    if type(s) == types.StringType:
--        return unicode(s, charset, 'ignore')
--    if type(s) in (types.TupleType, types.ListType):
-+    if type(s) == typesStringType:
-+        return s.decode(charset, 'ignore')
-+    if isinstance(s, (tuple, list, range)):
-+        try:
-+            unichr
-+        except NameError:
-+            unichr = chr
-         return u''.join(map(unichr, s))
--    raise TypeError, "string argument not convertible to Unicode"
-+    raise TypeError("string argument not convertible to Unicode")
- 
- # search a system font path for a font file
- def SearchFont(root, name):
-@@ -2102,7 +2122,7 @@
-     infix = ""
-     fontfile = []
-     while (len(infix) < 10) and not(fontfile):
--        fontfile = filter(os.path.isfile, glob.glob(root + infix + name))
-+        fontfile = list(filter(os.path.isfile, glob.glob(root + infix + name)))
-         infix += "*/"
-     if not fontfile:
-         return None
-@@ -2152,14 +2172,14 @@
-         self.widths = {}
-         self.line_height = 0
-         self.default_charset = default_charset
--        if isinstance(name, basestring):
-+        if isinstance(name, str):
-             self.font = LoadFont(search_path, name, size)
-         else:
-             for check_name in name:
-                 self.font = LoadFont(search_path, check_name, size)
-                 if self.font: break
-         if not self.font:
--            raise IOError, "font file not found"
-+            raise IOError("font file not found")
-         self.img = Image.new('LA', (width, height))
-         self.alpha = Image.new('L', (width, height))
-         self.extend = ImageFilter.MaxFilter()
-@@ -2219,7 +2239,7 @@
-             self.current_y += self.max_height
-             self.max_height = 0
-         if self.current_y + h > self.height:
--            raise ValueError, "bitmap too small for all the glyphs"
-+            raise ValueError("bitmap too small for all the glyphs")
-         box = self.GlyphBox()
-         box.orig_x = self.current_x
-         box.orig_y = self.current_y
-@@ -2264,7 +2284,7 @@
- 
-     def AlignTextEx(self, x, u, align=Left):
-         if not align: return x
--        return x - (self.GetTextWidthEx(u) / align)
-+        return x - int(self.GetTextWidthEx(u) / align)
- 
-     class FontShader(GLShader):
-         vs = """
-@@ -2293,16 +2313,16 @@
-         if not self.vertices:
-             self.vertices = None
-             return
--        char_count = len(self.vertices) / 16
-+        char_count = int(len(self.vertices) / 16)
-         if char_count > 16383:
--            print >>sys.stderr, "Internal Error: too many characters (%d) to display in one go, truncating." % char_count
-+            print("Internal Error: too many characters (%d) to display in one go, truncating." % char_count, file=sys.stderr)
-             char_count = 16383
- 
-         # create an index buffer large enough for the text
-         if not(self.index_buffer) or (self.index_buffer_capacity < char_count):
-             self.index_buffer_capacity = (char_count + 63) & (~63)
-             data = []
--            for b in xrange(0, self.index_buffer_capacity * 4, 4):
-+            for b in range(0, self.index_buffer_capacity * 4, 4):
-                 data.extend([b+0, b+2, b+1, b+1, b+2, b+3])
-             if not self.index_buffer:
-                 self.index_buffer = gl.GenBuffers()
-@@ -2371,7 +2391,7 @@
-         else:
-             halign = Left
-     if HalfScreen and (halign == Left):
--        x += ScreenWidth / 2
-+        x += int(ScreenWidth / 2)
-     if valign == Auto:
-         if y < 0:
-             y += ScreenHeight
-@@ -2379,7 +2399,7 @@
-         else:
-             valign = Down
-         if valign != Down:
--            y -= OSDFont.GetLineHeight() / valign
-+            y -= int(OSDFont.GetLineHeight() / valign)
-     OSDFont.Draw((x, y), text, align=halign, alpha=alpha)
- 
- # very high-level draw function
-@@ -2390,7 +2410,7 @@
-         x = (1 - 2 * xpos) * OSDMargin
-         halign = Auto
-     else:
--        x = ScreenWidth / 2
-+        x = int(ScreenWidth / 2)
-         halign = Center
-     DrawOSD(x, y, text, halign, alpha = OSDAlpha * alpha_factor)
- 
-@@ -2399,6 +2419,9 @@
- 
- ##### PDF PARSER ###############################################################
- 
-+typesUnicodeType = type(u'unicode')
-+typesStringType = type(b'bytestring')
-+
- class PDFError(Exception):
-     pass
- 
-@@ -2418,25 +2441,25 @@
- def pdf_mask_all_strings(s):
-     return re_pdfstring.sub(lambda x: pdf_maskstring(x.group(0)), s)
- def pdf_unmaskstring(s):
--    return "".join([chr(int(s[i:i+2], 16)) for i in xrange(1, len(s)-1, 2)])
-+    return "".join([chr(int(s[i:i+2], 16)) for i in range(1, len(s)-1, 2)])
- 
- class PDFParser:
-     def __init__(self, filename):
--        self.f = file(filename, "rb")
-+        self.f = open(filename, "rb")
-         self.errors = 0
- 
-         # find the first cross-reference table
-         self.f.seek(0, 2)
-         filesize = self.f.tell()
-         self.f.seek(filesize - 128)
--        trailer = self.f.read()
-+        trailer = self.f.read().decode()
-         i = trailer.rfind("startxref")
-         if i < 0:
--            raise PDFError, "cross-reference table offset missing"
-+            raise PDFError("cross-reference table offset missing")
-         try:
-             offset = int(trailer[i:].split("\n")[1].strip())
-         except (IndexError, ValueError):
--            raise PDFError, "malformed cross-reference table offset"
-+            raise PDFError("malformed cross-reference table offset")
- 
-         # follow the trailer chain
-         self.xref = {}
-@@ -2457,7 +2480,7 @@
-         try:
-             self.scan_page_tree(root['Pages'].ref)
-         except KeyError:
--            raise PDFError, "root page tree node missing"
-+            raise PDFError("root page tree node missing")
-         try:
-             self.scan_names_tree(root['Names'].ref)
-         except KeyError:
-@@ -2470,7 +2493,7 @@
- 
-     def find_length(self, tokens, begin, end):
-         level = 1
--        for i in xrange(1, len(tokens)):
-+        for i in range(1, len(tokens)):
-             if tokens[i] == begin:  level += 1
-             if tokens[i] == end:    level -= 1
-             if not level: break
-@@ -2521,26 +2544,26 @@
-         data = data.replace("<<", " << ").replace("[", " [ ").replace("(", " (")
-         data = data.replace(">>", " >> ").replace("]", " ] ").replace(")", ") ")
-         data = data.replace("/", " /").replace("><", "> <")
--        return self.parse_tokens(filter(None, data.split()))
-+        return self.parse_tokens(list(filter(None, data.split())))
- 
-     def getobj(self, obj, force_type=None):
-         if isinstance(obj, PDFref):
-             obj = obj.ref
--        if type(obj) != types.IntType:
--            raise PDFError, "object is not a valid reference"
-+        if type(obj) != int:
-+            raise PDFError("object is not a valid reference")
-         offset = self.xref.get(obj, 0)
-         if not offset:
--            raise PDFError, "referenced non-existing PDF object"
-+            raise PDFError("referenced non-existing PDF object")
-         self.f.seek(offset)
--        header = self.getline().split(None, 3)
-+        header = self.getline().decode().split(None, 3)
-         if (len(header) < 3) or (header[2] != "obj") or (header[0] != str(obj)):
--            raise PDFError, "object does not start where it's supposed to"
-+            raise PDFError("object does not start where it's supposed to")
-         if len(header) == 4:
-             data = [header[3]]
-         else:
-             data = []
-         while True:
--            line = self.getline()
-+            line = self.getline().decode()
-             if line in ("endobj", "stream"): break
-             data.append(line)
-         data = self.parse(" ".join(data))
-@@ -2550,7 +2573,7 @@
-             except (KeyError, IndexError, ValueError):
-                 t = None
-             if t != force_type:
--                raise PDFError, "object does not match the intended type"
-+                raise PDFError("object does not match the intended type")
-         return data
- 
-     def resolve(self, obj):
-@@ -2561,7 +2584,7 @@
- 
-     def parse_xref_section(self, start, count):
-         xref = {}
--        for obj in xrange(start, start + count):
-+        for obj in range(start, start + count):
-             line = self.getline()
-             if line[-1] == 'f':
-                 xref[obj] = 0
-@@ -2574,28 +2597,28 @@
-         xref = {}
-         rootref = 0
-         offset = 0
--        if self.getline() != "xref":
--            raise PDFError, "cross-reference table does not start where it's supposed to"
-+        if self.getline() != b"xref":
-+            raise PDFError("cross-reference table does not start where it's supposed to")
-             return (xref, rootref, offset)   # no xref table found, abort
-         # parse xref sections
-         while True:
-             line = self.getline()
--            if line == "trailer": break
-+            if line == b"trailer": break
-             start, count = map(int, line.split())
-             xref.update(self.parse_xref_section(start, count))
-         # parse trailer
-         trailer = ""
-         while True:
--            line = self.getline()
--            if line in ("startxref", "%%EOF"): break
-+            line = self.getline().decode()
-+            if line in ("startxref", "b%%EOF"): break
-             trailer += line
-         trailer = self.parse(trailer)
-         try:
-             rootref = trailer['Root'].ref
-         except KeyError:
--            raise PDFError, "root catalog entry missing"
-+            raise PDFError("root catalog entry missing")
-         except AttributeError:
--            raise PDFError, "root catalog entry is not a reference"
-+            raise PDFError("root catalog entry is not a reference")
-         return (xref, rootref, trailer.get('Prev', 0))
- 
-     def scan_page_tree(self, obj, mbox=None, cbox=None, rotate=0):
-@@ -2636,7 +2659,7 @@
-                 elif 'Names' in node:
-                     nlist = node['Names']
-                     while (len(nlist) >= 2) \
--                    and (type(nlist[0]) == types.StringType) \
-+                    and (type(nlist[0]) == str) \
-                     and (nlist[1].__class__ == PDFref):
-                         self.scan_names_tree(nlist[1], come_from, nlist[0])
-                         del nlist[:2]
-@@ -2649,9 +2672,9 @@
-             self.errors += 1
- 
-     def dest2page(self, dest):
--        if type(dest) in (types.StringType, types.UnicodeType):
-+        if type(dest) in (typesStringType, typesUnicodeType):
-             return self.names.get(dest, None)
--        if type(dest) != types.ListType:
-+        if not isinstance(dest, list):
-             return dest
-         elif dest[0].__class__ == PDFref:
-             return self.obj2page.get(dest[0].ref, None)
-@@ -2682,7 +2705,7 @@
-                         dest = self.getobj(dest)
-                     if isinstance(dest, dict):
-                         dest = dest.get('F', None) or dest.get('Unix', None)
--                    if not isinstance(dest, basestring):
-+                    if not isinstance(dest, str):
-                         dest = None  # still an unknown type -> ignore it
-                 elif action == 'GoTo':
-                     dest = self.dest2page(a.get('D', None))
-@@ -2695,7 +2718,7 @@
-         res = {}
-         for page in self.annots:
-             try:
--                a = filter(None, map(self.get_href, self.annots[page]))
-+                a = list(filter(None, map(self.get_href, self.annots[page])))
-             except (PDFError, TypeError, ValueError):
-                 self.errors += 1
-                 a = None
-@@ -2712,7 +2735,7 @@
- 
- def AddHyperlink(page_offset, page, target, linkbox, pagebox, rotate):
-     page += page_offset
--    if type(target) == types.IntType:
-+    if isinstance(target, int):
-         target += page_offset
- 
-     # compute relative position of the link on the page
-@@ -2724,7 +2747,7 @@
-     y1 = (pagebox[3] - linkbox[1]) * h
- 
-     # get effective rotation
--    rotate /= 90
-+    rotate = int(rotate / 90)
-     page_rot = GetPageProp(page, 'rotate')
-     if page_rot is None:
-         page_rot = Rotation
-@@ -2792,31 +2815,31 @@
-     if ok:
-         pass
-     elif err:
--        print >>sys.stderr, "Note: error while unpacking the PDF file, hyperlinks disabled."
-+        print("Note: error while unpacking the PDF file, hyperlinks disabled.", file=sys.stderr)
-         return
-     else:
--        print >>sys.stderr, "Note: neither mutool nor pdftk found, hyperlinks disabled."
-+        print("Note: neither mutool nor pdftk found, hyperlinks disabled.", file=sys.stderr)
-         return
- 
-     count = 0
-     try:
-         try:
-             pdf = PDFParser(analyze)
--            for page, annots in pdf.GetHyperlinks().iteritems():
-+            for page, annots in pdf.GetHyperlinks().items():
-                 for page_offset in FileProps[filename]['offsets']:
-                     for a in annots:
-                         AddHyperlink(page_offset, page, a[4], a[:4], pdf.box[page], pdf.rotate[page])
-                     FixHyperlinks(page + page_offset)
-                 count += len(annots)
-             if pdf.errors:
--                print >>sys.stderr, "Note: failed to parse the PDF file, hyperlinks might not work properly"
-+                print("Note: failed to parse the PDF file, hyperlinks might not work properly", file=sys.stderr)
-             del pdf
-             return count
-         except IOError:
--            print >>sys.stderr, "Note: intermediate PDF file not readable, hyperlinks disabled."
--        except PDFError, e:
--            print >>sys.stderr, "Note: error in PDF file, hyperlinks disabled."
--            print >>sys.stderr, "      PDF parser error message:", e
-+            print("Note: intermediate PDF file not readable, hyperlinks disabled.", file=sys.stderr)
-+        except PDFError as e:
-+            print("Note: error in PDF file, hyperlinks disabled.", file=sys.stderr)
-+            print("      PDF parser error message:", e, file=sys.stderr)
-     finally:
-         try:
-             os.remove(uncompressed)
-@@ -2960,20 +2983,20 @@
- 
-     # try to open the pre-existing cache file
-     try:
--        CacheFile = file(CacheFileName, "rb+")
-+        CacheFile = open(CacheFileName, "rb+")
-     except IOError:
-         CacheFile = None
- 
-     # check the cache magic
-     UpdateCacheMagic()
-     if CacheFile and (CacheFile.read(32) != CacheMagic):
--        print >>sys.stderr, "Cache file mismatch, recreating cache."
-+        print("Cache file mismatch, recreating cache.", file=sys.stderr)
-         CacheFile.close()
-         CacheFile = None
- 
-     if CacheFile:
-         # if the magic was valid, import cache data
--        print >>sys.stderr, "Using already existing persistent cache file."
-+        print("Using already existing persistent cache file.", file=sys.stderr)
-         for page in range(1, PageCount+1):
-             offset = int(CacheFile.read(8), 16)
-             if offset:
-@@ -2982,10 +3005,10 @@
-     else:
-         # if the magic was invalid or the file didn't exist, (re-)create it
-         try:
--            CacheFile = file(CacheFileName, "wb+")
-+            CacheFile = open(CacheFileName, "wb+")
-         except IOError:
--            print >>sys.stderr, "Error: cannot write the persistent cache file (`%s')" % CacheFileName
--            print >>sys.stderr, "Falling back to temporary file cache."
-+            print("Error: cannot write the persistent cache file (`%s')" % CacheFileName, file=sys.stderr)
-+            print("Falling back to temporary file cache.", file=sys.stderr)
-             CacheMode = FileCache
-         WritePCacheHeader()
- 
-@@ -3024,7 +3047,7 @@
-             test_binary = FindBinary(program_spec[0])
-             try:
-                 p = subprocess.Popen([test_binary] + program_spec[1:] + self.test_run_args, stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
--                data = p.stdout.read()
-+                data = p.stdout.read().decode()
-                 p.wait()
-             except OSError:
-                 continue
-@@ -3055,7 +3078,7 @@
-                 return process
-             if process.wait() != 0:
-                 raise RenderError("rendering failed")
--        except OSError, e:
-+        except OSError as e:
-             raise RenderError("could not start renderer - %s" % e)
- 
-     def load(self, imgfile, autoremove=False):
-@@ -3064,7 +3087,7 @@
-             img.load()
-         except (KeyboardInterrupt, SystemExit):
-             raise
--        except IOError, e:
-+        except IOError as e:
-             raise RenderError("could not read image file - %s" % e)
-         if autoremove:
-             self.remove(imgfile)
-@@ -3100,11 +3123,11 @@
-         if pipe:
-             try:
-                 out, err = proc.communicate()
--            except EnvironmentError, e:
-+            except EnvironmentError as e:
-                 raise RenderError("could not run renderer - %s" % e)
-             if not out:
-                 raise RenderError("renderer returned empty image")
--            return self.load(cStringIO.StringIO(out))
-+            return self.load(io.BytesIO(out))
-         else:
-             return self.load(imgfile, autoremove=True)
- AvailableRenderers.append(MuPDFRenderer)
-@@ -3128,7 +3151,7 @@
-             if self.buffer:
-                 return self.buffer
-             # the reader thread might still be busy reading the last
--            # chunks of the data and converting them into a StringIO;
-+            # chunks of the data and converting them into a BytesIO;
-             # let's give it some time
-             maxwait = time.time() + (0.1 if self.error else 0.5)
-             while not(self.buffer) and (time.time() < maxwait):
-@@ -3139,9 +3162,9 @@
-     def ReaderThread(comm):
-         try:
-             f = open(comm.imgfile, 'rb')
--            comm.buffer = cStringIO.StringIO(f.read())
-+            comm.buffer = io.BytesIO(f.read())
-             f.close()
--        except IOError, e:
-+        except IOError as e:
-             comm.error = "could not open FIFO for reading - %s" % e
- 
-     def render(self, filename, page, res, antialias=True):
-@@ -3269,17 +3292,17 @@
-             continue
-         try:
-             PDFRenderer = r_class(PDFRendererPath)
--            print >>sys.stderr, "PDF renderer:", PDFRenderer.name
-+            print("PDF renderer:", PDFRenderer.name, file=sys.stderr)
-             return PDFRenderer
--        except RendererUnavailable, e:
-+        except RendererUnavailable as e:
-             if Verbose:
--                print >>sys.stderr, "Not using %s for PDF rendering:" % r_class.name, e
-+                print("Not using %s for PDF rendering:" % r_class.name, e, file=sys.stderr)
-             else:
-                 fail_reasons.append((r_class.name, str(e)))
--    print >>sys.stderr, "ERROR: PDF renderer initialization failed."
-+    print("ERROR: PDF renderer initialization failed.", file=sys.stderr)
-     for item in fail_reasons:
--        print >>sys.stderr, "       - %s: %s" % item
--    print >>sys.stderr, "       Display of PDF files will not be supported."
-+        print("       - %s: %s" % item, file=sys.stderr)
-+    print("       Display of PDF files will not be supported.", file=sys.stderr)
- 
- 
- def ApplyRotation(img, rot):
-@@ -3290,8 +3313,8 @@
- # generate a dummy image
- def DummyPage():
-     img = Image.new('RGB', (ScreenWidth, ScreenHeight))
--    img.paste(LogoImage, ((ScreenWidth  - LogoImage.size[0]) / 2,
--                          (ScreenHeight - LogoImage.size[1]) / 2))
-+    img.paste(LogoImage, (int((ScreenWidth  - LogoImage.size[0]) / 2),
-+                          int((ScreenHeight - LogoImage.size[1]) / 2)))
-     return img
- 
- # load a page from a PDF file
-@@ -3340,8 +3363,8 @@
-     # call the renderer
-     try:
-         img = PDFRenderer.render(SourceFile, RealPage, useres, use_aa)
--    except RenderError, e:
--        print >>sys.stderr, "ERROR: failed to render page %d:" % page, e
-+    except RenderError as e:
-+        print("ERROR: failed to render page %d:" % page, e, file=sys.stderr)
-         return DummyPage()
- 
-     # apply rotation
-@@ -3426,7 +3449,7 @@
-         except (KeyboardInterrupt, SystemExit):
-             raise
-         except:
--            print >>sys.stderr, "Image file `%s' is broken." % GetPageProp(page, '_file')
-+            print("Image file `%s' is broken." % GetPageProp(page, '_file'), file=sys.stderr)
-             return DummyPage()
- 
-     # apply rotation
-@@ -3470,7 +3493,7 @@
-                             stdout=subprocess.PIPE).communicate()
-             ffmpegWorks = True
-             reason = "FFmpeg output is not valid"
--            out = cStringIO.StringIO(out)
-+            out = io.BytesIO(out)
-             img = Image.open(out)
-             img.load()
-         except (KeyboardInterrupt, SystemExit):
-@@ -3506,7 +3529,7 @@
-     if img:
-         return LoadImage(page, zoom, img)
-     else:
--        print >>sys.stderr, "Can not generate preview image for video file `%s' (%s)." % (GetPageProp(page, '_file'), reason)
-+        print("Can not generate preview image for video file `%s' (%s)." % (GetPageProp(page, '_file'), reason), file=sys.stderr)
-         return DummyPage()
- ffmpegWorks = True
- mplayerWorks = True
-@@ -3552,12 +3575,12 @@
-         # create black background image to paste real image onto
-         if ZoomMode:
-             TextureImage = Image.new('RGB', (int(ResZoomFactor * TexWidth), int(ResZoomFactor * TexHeight)))
--            TextureImage.paste(img, ((int(ResZoomFactor * ScreenWidth)  - img.size[0]) / 2, \
--                                     (int(ResZoomFactor * ScreenHeight) - img.size[1]) / 2))
-+            TextureImage.paste(img, (int((ResZoomFactor * ScreenWidth  - img.size[0]) / 2), \
-+                                     int((ResZoomFactor * ScreenHeight - img.size[1]) / 2)))
-         else:
-             TextureImage = Image.new('RGB', (TexWidth, TexHeight))
--            x0 = (ScreenWidth  - img.size[0]) / 2
--            y0 = (ScreenHeight - img.size[1]) / 2
-+            x0 = int((ScreenWidth  - img.size[0]) / 2)
-+            y0 = int((ScreenHeight - img.size[1]) / 2)
-             TextureImage.paste(img, (x0, y0))
-             SetPageProp(page, '_box', (x0, y0, x0 + img.size[0], y0 + img.size[1]))
-             FixHyperlinks(page)
-@@ -3574,27 +3597,27 @@
-                 # first, fill the underlying area with black (i.e. remove the dummy logo)
-                 blackness = Image.new('RGB', (OverviewCellX - OverviewBorder, \
-                                               OverviewCellY - OverviewBorder))
--                OverviewImage.paste(blackness, (pos[0] + OverviewBorder / 2, \
-+                OverviewImage.paste(blackness, (pos[0] + int(OverviewBorder / 2), \
-                                                 pos[1] + OverviewBorder))
-                 del blackness
-                 # then, scale down the original image and paste it
-                 if HalfScreen:
--                    img = img.crop((0, 0, img.size[0] / 2, img.size[1]))
-+                    img = img.crop((0, 0, int(img.size[0] / 2), img.size[1]))
-                 sx = OverviewCellX - 2 * OverviewBorder
-                 sy = OverviewCellY - 2 * OverviewBorder
-                 if HighQualityOverview:
-                     t0 = time.time()
-                     img.thumbnail((sx, sy), Image.ANTIALIAS)
-                     if (time.time() - t0) > 0.5:
--                        print >>sys.stderr, "Note: Your system seems to be quite slow; falling back to a faster,"
--                        print >>sys.stderr, "      but slightly lower-quality overview page rendering mode"
-+                        print("Note: Your system seems to be quite slow; falling back to a faster,", file=sys.stderr)
-+                        print("      but slightly lower-quality overview page rendering mode", file=sys.stderr)
-                         HighQualityOverview = False
-                 else:
-                     img.thumbnail((sx * 2, sy * 2), Image.NEAREST)
-                     img.thumbnail((sx, sy), Image.BILINEAR)
-                 OverviewImage.paste(img, \
--                   (pos[0] + (OverviewCellX - img.size[0]) / 2, \
--                    pos[1] + (OverviewCellY - img.size[1]) / 2))
-+                   (pos[0] + int((OverviewCellX - img.size[0]) / 2), \
-+                    pos[1] + int((OverviewCellY - img.size[1]) / 2)))
-             finally:
-                 Loverview.release()
-             SetPageProp(page, '_overview_rendered', True)
-@@ -3621,10 +3644,10 @@
-         pass  # clear all OpenGL errors
-     gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RGB, TexWidth, TexHeight, 0, gl.RGB, gl.UNSIGNED_BYTE, PageImage(page))
-     if gl.GetError():
--        print >>sys.stderr, "I'm sorry, but your graphics card is not capable of rendering presentations"
--        print >>sys.stderr, "in this resolution. Either the texture memory is exhausted, or there is no"
--        print >>sys.stderr, "support for large textures (%dx%d). Please try to run Impressive in a" % (TexWidth, TexHeight)
--        print >>sys.stderr, "smaller resolution using the -g command-line option."
-+        print("I'm sorry, but your graphics card is not capable of rendering presentations", file=sys.stderr)
-+        print("in this resolution. Either the texture memory is exhausted, or there is no", file=sys.stderr)
-+        print("support for large textures (%dx%d). Please try to run Impressive in a" % (TexWidth, TexHeight), file=sys.stderr)
-+        print("smaller resolution using the -g command-line option.", file=sys.stderr)
-         sys.exit(1)
- 
- # background rendering thread
-@@ -3639,18 +3662,18 @@
-             if RTrestart: break
-             SafeCall(ParsePDF, [pdf])
-         if RTrestart: continue
--        for page in xrange(1, PageCount + 1):
-+        for page in range(1, PageCount + 1):
-             if RTrestart: break
-             if (page != p1) and (page != p2) \
-             and (page >= PageRangeStart) and (page <= PageRangeEnd):
-                 SafeCall(PageImage, [page])
-     RTrunning = False
-     if CacheMode >= FileCache:
--        print >>sys.stderr, "Background rendering finished, used %.1f MiB of disk space." %\
--              (CacheFilePos / 1048576.0)
-+        print("Background rendering finished, used %.1f MiB of disk space." %\
-+              (CacheFilePos / 1048576.0), file=sys.stderr)
-     elif CacheMode >= MemCache:
--        print >>sys.stderr, "Background rendering finished, using %.1f MiB of memory." %\
--              (sum(map(len, PageCache.itervalues())) / 1048576.0)
-+        print("Background rendering finished, using %.1f MiB of memory." %\
-+              (sum(map(len, PageCache.values())) / 1048576.0), file=sys.stderr)
- 
- 
- ##### RENDER MODE ##############################################################
-@@ -3660,22 +3683,22 @@
-     TexWidth = ScreenWidth
-     TexHeight = ScreenHeight
-     if os.path.exists(RenderToDirectory):
--        print >>sys.stderr, "Destination directory `%s' already exists," % RenderToDirectory
--        print >>sys.stderr, "refusing to overwrite anything."
-+        print("Destination directory `%s' already exists," % RenderToDirectory, file=sys.stderr)
-+        print("refusing to overwrite anything.", file=sys.stderr)
-         return 1
-     try:
-         os.mkdir(RenderToDirectory)
--    except OSError, e:
--        print >>sys.stderr, "Cannot create destination directory `%s':" % RenderToDirectory
--        print >>sys.stderr, e.strerror
-+    except OSError as e:
-+        print("Cannot create destination directory `%s':" % RenderToDirectory, file=sys.stderr)
-+        print(e.strerror, file=sys.stderr)
-         return 1
--    print >>sys.stderr, "Rendering presentation into `%s'" % RenderToDirectory
--    for page in xrange(1, PageCount + 1):
-+    print("Rendering presentation into `%s'" % RenderToDirectory, file=sys.stderr)
-+    for page in range(1, PageCount + 1):
-         PageImage(page, RenderMode=True).save("%s/page%04d.png" % (RenderToDirectory, page))
-         sys.stdout.write("[%d] " % page)
-         sys.stdout.flush()
--    print >>sys.stderr
--    print >>sys.stderr, "Done."
-+    print(file=sys.stderr)
-+    print("Done.", file=sys.stderr)
-     return 0
- 
- 
-@@ -3694,9 +3717,9 @@
-     except IOError:
-         pass
-     except:
--        print >>sys.stderr, "----- Exception in info script ----"
-+        print("----- Exception in info script ----", file=sys.stderr)
-         traceback.print_exc(file=sys.stderr)
--        print >>sys.stderr, "----- End of traceback -----"
-+        print("----- End of traceback -----", file=sys.stderr)
-     NewPageProps = PageProps
-     PageProps = OldPageProps
-     del OldPageProps
-@@ -3712,8 +3735,8 @@
- def here_was_a_lambda_expression_that_could_not_be_saved():
-     global LambdaWarning
-     if not LambdaWarning:
--        print >>sys.stderr, "WARNING: The info script for the current file contained lambda expressions that"
--        print >>sys.stderr, "         were removed during the a save operation."
-+        print("WARNING: The info script for the current file contained lambda expressions that", file=sys.stderr)
-+        print("         were removed during the a save operation.", file=sys.stderr)
-         LambdaWarning = True
- 
- # "clean" a PageProps entry so that only 'public' properties are left
-@@ -3734,22 +3757,29 @@
- 
- # Generate a string representation of a property value. Mainly this converts
- # classes or instances to the name of the class.
-+class dummyClass:
-+    pass
-+
-+typesClassType = type(dummyClass)
-+typesInstanceType = type(dummyClass())
-+typesFunctionType = type(GetPublicProps)
-+
- def PropValueRepr(value):
-     global ScriptTainted
--    if type(value) == types.FunctionType:
-+    if type(value) == typesFunctionType:
-         if value.__name__ != "<lambda>":
-             return value.__name__
-         if not ScriptTainted:
--            print >>sys.stderr, "WARNING: The info script contains lambda expressions, which cannot be saved"
--            print >>sys.stderr, "         back. The modifed script will be written into a separate file to"
--            print >>sys.stderr, "         minimize data loss."
-+            print("WARNING: The info script contains lambda expressions, which cannot be saved", file=sys.stderr)
-+            print("         back. The modifed script will be written into a separate file to", file=sys.stderr)
-+            print("         minimize data loss.", file=sys.stderr)
-             ScriptTainted = True
-         return "here_was_a_lambda_expression_that_could_not_be_saved"
--    elif type(value) == types.ClassType:
-+    elif isinstance(value, typesClassType):
-         return value.__name__
--    elif type(value) == types.InstanceType:
-+    elif isinstance(value, typesInstanceType):
-         return value.__class__.__name__
--    elif type(value) == types.DictType:
-+    elif type(value) == dict:
-         return "{ " + ", ".join([PropValueRepr(k) + ": " + PropValueRepr(value[k]) for k in value]) + " }"
-     else:
-         return repr(value)
-@@ -3763,7 +3793,7 @@
- 
- # generate a nicely formatted string representation of all page properties
- def PagePropRepr():
--    pages = PageProps.keys()
-+    pages = list(PageProps.keys())
-     pages.sort()
-     return "PageProps = {%s\n}" % (",".join(filter(None, map(SinglePagePropRepr, pages))))
- 
-@@ -3772,7 +3802,7 @@
- def CountDictChars(s, start=0):
-     context = None
-     level = 0
--    for i in xrange(start, len(s)):
-+    for i in range(start, len(s)):
-         c = s[i]
-         if context is None:
-             if c == '{': level += 1
-@@ -3791,13 +3821,13 @@
-             if c == "\\": context = "\\'"
-             if c == "'": context = None
-         if level < 0: return i
--    raise ValueError, "the dictionary never ends"
-+    raise ValueError("the dictionary never ends")
- 
- # modify and save a file's info script
- def SaveInfoScript(filename):
-     # read the old info script
-     try:
--        f = file(filename, "r")
-+        f = open(filename, "r")
-         script = f.read()
-         f.close()
-     except IOError:
-@@ -3821,11 +3851,11 @@
- 
-     # write the script back
-     try:
--        f = file(filename, "w")
-+        f = open(filename, "w")
-         f.write(script)
-         f.close()
-     except:
--        print >>sys.stderr, "Oops! Could not write info script!"
-+        print("Oops! Could not write info script!", file=sys.stderr)
- 
- 
- ##### OPENGL RENDERING #########################################################
-@@ -4055,7 +4085,7 @@
-     )
-     if OSDFont:
-         gl.Enable(gl.BLEND)
--        OSDFont.Draw((int(ScreenWidth * x0), ScreenHeight / 2 + 48), \
-+        OSDFont.Draw((int(ScreenWidth * x0), int(ScreenHeight / 2) + 48), \
-                      __version__.split()[0], align=Center, alpha=0.25, beveled=False)
-         gl.Disable(gl.BLEND)
- 
-@@ -4151,11 +4181,11 @@
-     global CursorTexture, CursorHotspot, CursorSX, CursorSY, CursorTX, CursorTY
-     if not cimg:
-         CursorHotspot = (1,0)
--        cimg = Image.open(cStringIO.StringIO(DEFAULT_CURSOR.decode('base64')))
-+        cimg = Image.open(io.BytesIO(codecs.decode(DEFAULT_CURSOR, 'base64')))
-     w, h = cimg.size
-     tw, th = map(npot, cimg.size)
-     if (tw > 256) or (th > 256):
--        print >>sys.stderr, "Custom cursor is ridiculously large, reverting to normal one."
-+        print("Custom cursor is ridiculously large, reverting to normal one.", file=sys.stderr)
-         return False
-     img = Image.new('RGBA', (tw, th))
-     img.paste(cimg, (0, 0))
-@@ -4247,7 +4277,7 @@
- def ResetTimer():
-     global StartTime, PageEnterTime
-     if TimeTracking and not(FirstPage):
--        print "--- timer was reset here ---"
-+        print("--- timer was reset here ---")
-     StartTime = Platform.GetTicks()
-     PageEnterTime = 0
- 
-@@ -4269,8 +4299,8 @@
-             if Fullscreen:
-                 opts.append("-fs")
-             else:
--                print >>sys.stderr, "Sorry, but Impressive only supports video on your operating system if fullscreen"
--                print >>sys.stderr, "mode is used."
-+                print("Sorry, but Impressive only supports video on your operating system if fullscreen", file=sys.stderr)
-+                print("mode is used.", file=sys.stderr)
-                 VideoPlaying = False
-                 MPlayerProcess = None
-                 return
-@@ -4372,9 +4402,9 @@
-             p = "over"
-         else:
-             p = "%4d" % Pcurrent
--        print "%s%9s%9s%9s" % (p, FormatTime(dt), \
-+        print("%s%9s%9s%9s" % (p, FormatTime(dt), \
-                                   FormatTime(PageEnterTime / 1000), \
--                                  FormatTime(t1 / 1000))
-+                                  FormatTime(t1 / 1000)))
- 
- # create an instance of a transition class
- def InstantiateTransition(trans_class):
-@@ -4383,7 +4413,7 @@
-     except GLInvalidShaderError:
-         return None
-     except GLShaderCompileError:
--        print >>sys.stderr, "Note: all %s transitions will be disabled" % trans_class.__name__
-+        print("Note: all %s transitions will be disabled" % trans_class.__name__, file=sys.stderr)
-         return None
- 
- # perform a transition to a specified page
-@@ -4525,10 +4555,10 @@
-         pass  # clear all OpenGL errors
-     gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RGB, int(ResZoomFactor * TexWidth), int(ResZoomFactor * TexHeight), 0, gl.RGB, gl.UNSIGNED_BYTE, PageImage(Pcurrent, True))
-     if gl.GetError():
--        print >>sys.stderr, "I'm sorry, but your graphics card is not capable of rendering presentations"
--        print >>sys.stderr, "in this resolution. Either the texture memory is exhausted, or there is no"
--        print >>sys.stderr, "support for large textures (%dx%d). Please try to run Impressive in a" % (TexWidth, TexHeight)
--        print >>sys.stderr, "smaller resolution using the -g command-line option."
-+        print("I'm sorry, but your graphics card is not capable of rendering presentations", file=sys.stderr)
-+        print("in this resolution. Either the texture memory is exhausted, or there is no", file=sys.stderr)
-+        print("support for large textures (%dx%d). Please try to run Impressive in a" % (TexWidth, TexHeight), file=sys.stderr)
-+        print("smaller resolution using the -g command-line option.", file=sys.stderr)
-         HighResZoomFailed = True
-         return
-     DrawCurrentPage()
-@@ -4595,11 +4625,11 @@
- def PrepareTransitions():
-     Unspecified = 0xAFFED00F
-     # STEP 1: randomly assign transitions where the user didn't specify them
--    cnt = sum([1 for page in xrange(1, PageCount + 1) \
-+    cnt = sum([1 for page in range(1, PageCount + 1) \
-                if GetPageProp(page, 'transition', Unspecified) == Unspecified])
--    newtrans = ((cnt / len(AvailableTransitions) + 1) * AvailableTransitions)[:cnt]
-+    newtrans = (int(cnt / len(AvailableTransitions) + 1) * AvailableTransitions)[:cnt]
-     random.shuffle(newtrans)
--    for page in xrange(1, PageCount + 1):
-+    for page in range(1, PageCount + 1):
-         if GetPageProp(page, 'transition', Unspecified) == Unspecified:
-             SetPageProp(page, '_transition', newtrans.pop())
-     # STEP 2: instantiate transitions
-@@ -4633,10 +4663,10 @@
- def EnableTimeTracking(force=False):
-     global TimeTracking
-     if force or (TimeDisplay and not(TimeTracking) and not(ShowClock) and FirstPage):
--        print >>sys.stderr, "Time tracking mode enabled."
-+        print("Time tracking mode enabled.", file=sys.stderr)
-         TimeTracking = True
--        print "page duration    enter    leave"
--        print "---- -------- -------- --------"
-+        print("page duration    enter    leave")
-+        print("---- -------- -------- --------")
- 
- # set cursor visibility
- def SetCursor(visible):
-@@ -4658,7 +4688,7 @@
-     if (len(key) == 1) or ((key >= "f1") and (key <= "f9")):
-         # Note: F10..F12 are implicitly included due to lexicographic sorting
-         page = None
--        for check_page, props in PageProps.iteritems():
-+        for check_page, props in PageProps.items():
-             if props.get('shortcut') == key:
-                 page = check_page
-                 break
-@@ -4673,7 +4703,7 @@
- 
- ##### EVENT-TO-ACTION BINDING CODE #############################################
- 
--SpecialKeyNames = set(filter(None, """
-+SpecialKeyNames = set("""
- ampersand asterisk at backquote backslash backspace break capslock caret clear
- comma down escape euro end exclaim greater hash help home insert kp_divide
- kp_enter kp_equals kp_minus kp_multiply kp_plus lalt last lctrl left leftbracket
-@@ -4681,12 +4711,12 @@
- period plus power print question quote quotedbl ralt rctrl return right
- rightbracket rightparen rmeta rshift rsuper scrollock semicolon slash space
- sysreq tab underscore up
--""".split()))
--KnownEvents = set(list(SpecialKeyNames) + filter(None, """
-+""".split())
-+KnownEvents = set(list(SpecialKeyNames) + """
- a b c d e f g h i j k l m n o p q r s t u v w x y z 0 1 2 3 4 5 6 7 8 9
- kp0 kp1 kp2 kp3 kp4 kp5 kp6 kp7 kp8 kp9 f1 f2 f3 f4 f5 f6 f7 f8 f9 f10 f11 f12
- lmb mmb rmb wheeldown wheelup
--""".split()) + ["btn%d" % i for i in xrange(1, 20)])
-+""".split() + ["btn%d" % i for i in range(1, 20)])
- 
- # event handling model:
- # - Platform.GetEvent() generates platform-neutral event (= string) that
-@@ -4787,7 +4817,7 @@
-         error_prefix += ": "
-     else:
-         error_prefix = ""
--    print >>sys.stderr, "ERROR: %signoring unknown event '%s'" % (error_prefix, ev)
-+    print("ERROR: %signoring unknown event '%s'" % (error_prefix, ev), file=sys.stderr)
-     return False
- 
- def ValidateAction(ev, error_prefix=None):
-@@ -4797,7 +4827,7 @@
-         error_prefix += ": "
-     else:
-         error_prefix = ""
--    print >>sys.stderr, "ERROR: %signoring unknown action '%s'" % (error_prefix, ev)
-+    print("ERROR: %signoring unknown action '%s'" % (error_prefix, ev), file=sys.stderr)
-     return False
- 
- def BindEvent(events, actions=None, clear=False, remove=False, error_prefix=None):
-@@ -4820,7 +4850,7 @@
-         (that's what the basedirs option is for)
-     """
-     global EventMap
--    if isinstance(events, basestring):
-+    if isinstance(events, str):
-         if not actions:
-             if (';' in events) or ('\n' in events):
-                 for cmd in events.replace('\n', ';').split(';'):
-@@ -4841,7 +4871,7 @@
-         events = events.split(',')
-     if actions is None:
-         actions = []
--    elif isinstance(actions, basestring):
-+    elif isinstance(actions, str):
-         actions = actions.split(',')
-     actions = [b.replace('_', '-').strip(' \t$+-').lower() for b in actions]
-     actions = [a for a in actions if ValidateAction(a, error_prefix)]
-@@ -4893,25 +4923,25 @@
-             if line:
-                 BindEvent(line, error_prefix="%s:%d" % (filename, n))
-         f.close()
--    except IOError, e:
--        print >>sys.stderr, "ERROR: failed to read the input configuration file '%s' -" % filename, e
-+    except IOError as e:
-+        print("ERROR: failed to read the input configuration file '%s' -" % filename, e, file=sys.stderr)
- 
- def EventHelp():
-     evlist = ["a-z", "0-9", "kp0-kp9", "f1-f12"] + sorted(list(SpecialKeyNames))
--    print "Event-to-action binding syntax:"
--    print "  <event> [,<event2...>] = <action> [,<action2...>]"
--    print "  By default, this will *add* actions to an event."
--    print "  To *overwrite* the current binding for an event, use ':=' instead of '='."
--    print "  To remove actions from an event, use '-=' instead of '='."
--    print "  Join multiple bindings with a semi-colon (';')."
--    print "Special commands:"
--    print "  clearall       = clear all bindings"
--    print "  defaults       = load default bindings"
--    print "  include <file> = load bindings from a file"
--    print "Binding files use the same syntax with one binding per line;"
--    print "comments start with a '#' symbol."
--    print
--    print "Recognized keyboard event names:"
-+    print("Event-to-action binding syntax:")
-+    print("  <event> [,<event2...>] = <action> [,<action2...>]")
-+    print("  By default, this will *add* actions to an event.")
-+    print("  To *overwrite* the current binding for an event, use ':=' instead of '='.")
-+    print("  To remove actions from an event, use '-=' instead of '='.")
-+    print("  Join multiple bindings with a semi-colon (';').")
-+    print("Special commands:")
-+    print("  clearall       = clear all bindings")
-+    print("  defaults       = load default bindings")
-+    print("  include <file> = load bindings from a file")
-+    print("Binding files use the same syntax with one binding per line;")
-+    print("comments start with a '#' symbol.")
-+    print()
-+    print("Recognized keyboard event names:")
-     while evlist:
-         line = "  "
-         while evlist and ((len(line) + len(evlist[0])) < 78):
-@@ -4919,27 +4949,27 @@
-         line = line.rstrip()
-         if not evlist:
-             line = line.rstrip(',')
--        print line
--    print "Recognized mouse event names:"
--    print "  lmb, mmb, rmb (= left, middle and right mouse buttons),"
--    print "  wheelup, wheeldown,"
--    print "  btnX (additional buttons, use --evtest to check their mapping)"
--    print
--    print "Recognized actions:"
-+        print(line)
-+    print("Recognized mouse event names:")
-+    print("  lmb, mmb, rmb (= left, middle and right mouse buttons),")
-+    print("  wheelup, wheeldown,")
-+    print("  btnX (additional buttons, use --evtest to check their mapping)")
-+    print()
-+    print("Recognized actions:")
-     maxalen = max(map(len, KnownActions))
-     for action in sorted(KnownActions):
-         doc = KnownActions[action]
-         if doc:
--            print "  %s - %s" % (action.ljust(maxalen), doc)
-+            print("  %s - %s" % (action.ljust(maxalen), doc))
-         else:
--            print "  %s" % action
--    print
-+            print("  %s" % action)
-+    print()
-     if not EventMap: return
--    print "Current bindings:"
-+    print("Current bindings:")
-     maxelen = max(map(len, EventMap))
-     for event in sorted(EventMap):
-         if EventMap[event]:
--            print "  %s = %s" % (event.ljust(maxelen), ", ".join(EventMap[event]))
-+            print("  %s = %s" % (event.ljust(maxelen), ", ".join(EventMap[event])))
- 
- def LoadDefaultBindings():
-     BindEvent("""clearall
-@@ -5136,7 +5166,7 @@
-         return
-     OverviewSelection = dest
-     x, y = OverviewPos(OverviewSelection)
--    Platform.SetMousePos((x + (OverviewCellX / 2), y + (OverviewCellY / 2)))
-+    Platform.SetMousePos((x + int(OverviewCellX / 2), y + int(OverviewCellY / 2)))
- 
- # overview mode PageProp toggle
- def OverviewTogglePageProp(prop, default):
-@@ -5266,8 +5296,8 @@
-                 if page:
-                     OverviewSelection = OverviewPageMapInv[page]
-                     x, y = OverviewPos(OverviewSelection)
--                    Platform.SetMousePos((x + (OverviewCellX / 2), \
--                                          y + (OverviewCellY / 2)))
-+                    Platform.SetMousePos((x + int(OverviewCellX / 2), \
-+                                          y + int(OverviewCellY / 2)))
-                     DrawOverview()
-     except ExitOverview:
-         PageLeft(overview=True)
-@@ -5355,7 +5385,7 @@
-                 return
-             # invalidate everything we used to know about the input files
-             InvalidateCache()
--            for props in PageProps.itervalues():
-+            for props in PageProps.values():
-                 for prop in ('_overview_rendered', '_box', '_href'):
-                     if prop in props: del props[prop]
-             LoadInfoScript()
-@@ -5434,6 +5464,7 @@
-         if PanValid and ZoomMode:
-             if not(Panning) and (abs(x - PanBaseX) > 1) and (abs(y - PanBaseY) > 1):
-                 Panning = True
-+            # ZoomArea is guaranteed to be float
-             ZoomX0 = PanAnchorX + (PanBaseX - x) * ZoomArea / ScreenWidth
-             ZoomY0 = PanAnchorY + (PanBaseY - y) * ZoomArea / ScreenHeight
-             ZoomX0 = min(max(ZoomX0, 0.0), 1.0 - ZoomArea)
-@@ -5553,7 +5584,7 @@
-         x, y = Platform.GetMousePos()
-         for valid, target, x0, y0, x1, y1 in GetPageProp(Pcurrent, '_href', []):
-             if valid and (x >= x0) and (x < x1) and (y >= y0) and (y < y1):
--                if type(target) == types.IntType:
-+                if isinstance(target, int):
-                     TransitionTo(target, allow_transition=allow_transition)
-                 elif target:
-                     RunURL(target)
-@@ -5645,6 +5676,7 @@
-     def _zoom_out(self):
-         "zoom out a small bit"
-         ActionValidIf((MouseWheelZoom or ZoomMode) and not(BoxZoom))
-+        # ZoomStep is guaranteed to be float
-         ChangeZoom(ViewZoomFactor / ZoomStep, Platform.GetMousePos())
- 
-     def _zoom_update(self):
-@@ -5738,6 +5770,7 @@
- 
-     def _gamma_decrease(self):
-         "decrease gamma"
-+        # GammaStep is guaranteed to be float
-         SetGamma(new_gamma=Gamma / GammaStep)
-     def _gamma_increase(self):
-         "increase gamma"
-@@ -5814,7 +5847,7 @@
-         name = name[1:]
-         dirname = os.path.dirname(name)
-         try:
--            f = file(name, "r")
-+            f = open(name, "r")
-             next_title = None
-             for line in f:
-                 line = [part.strip() for part in line.split('#', 1)]
-@@ -5827,7 +5860,7 @@
-                     AddFile(os.path.normpath(os.path.join(dirname, subfile)), title, implicit=True)
-             f.close()
-         except IOError:
--            print >>sys.stderr, "Error: cannot read list file `%s'" % name
-+            print("Error: cannot read list file `%s'" % name, file=sys.stderr)
-         return
- 
-     # generate absolute path
-@@ -5848,13 +5881,13 @@
-             FileList.append(name)
-             if title: SetFileProp(name, 'title', title)
-         else:
--            print >>sys.stderr, "Warning: input file `%s' has unrecognized file type" % name
-+            print("Warning: input file `%s' has unrecognized file type" % name, file=sys.stderr)
- 
-     elif os.path.isdir(name):
-         images = [os.path.join(name, f) for f in os.listdir(name) if IsImageFile(f)]
-         images.sort(lambda a, b: cmp(a.lower(), b.lower()))
-         if not images:
--            print >>sys.stderr, "Warning: no image files in directory `%s'" % name
-+            print("Warning: no image files in directory `%s'" % name, file=sys.stderr)
-         for img in images:
-             AddFile(img, implicit=True)
- 
-@@ -5863,7 +5896,7 @@
-         if files:
-             for f in files: AddFile(f, implicit=True)
-         else:
--            print >>sys.stderr, "Error: input file `%s' not found" % name
-+            print("Error: input file `%s' not found" % name, file=sys.stderr)
- 
- 
- ##### INITIALIZATION ###########################################################
-@@ -5892,7 +5925,7 @@
-         TempFileName = tempfile.mktemp(prefix="impressive-", suffix="_tmp")
-     except EnvironmentError:
-         if not Bare:
--            print >>sys.stderr, "Could not allocate temporary file, reverting to --bare mode."
-+            print("Could not allocate temporary file, reverting to --bare mode.", file=sys.stderr)
-         Bare = True
- 
-     # some input guesswork
-@@ -5912,7 +5945,7 @@
-         size = Platform.GetScreenSize()
-         if size:
-             ScreenWidth, ScreenHeight = size
--            print >>sys.stderr, "Detected screen size: %dx%d pixels" % (ScreenWidth, ScreenHeight)
-+            print("Detected screen size: %dx%d pixels" % (ScreenWidth, ScreenHeight), file=sys.stderr)
-     if DAR is None:
-         PAR = 1.0
-         DAR = float(ScreenWidth) / float(ScreenHeight)
-@@ -5936,7 +5969,7 @@
-         if ispdf:
-             # PDF input -> initialize renderers and if none available, reject
-             if not InitPDFRenderer():
--                print >>sys.stderr, "Ignoring unrenderable input file '%s'." % name
-+                print("Ignoring unrenderable input file '%s'." % name, file=sys.stderr)
-                 continue
- 
-             # try to pre-parse the PDF file
-@@ -5990,7 +6023,7 @@
- 
-         # validity check
-         if not pages:
--            print >>sys.stderr, "WARNING: The input file `%s' could not be analyzed." % name
-+            print("WARNING: The input file `%s' could not be analyzed." % name, file=sys.stderr)
-             continue
- 
-         # add pages and files into PageProps and FileProps
-@@ -6010,7 +6043,7 @@
- 
-     # no pages? strange ...
-     if not PageCount:
--        print >>sys.stderr, "The presentation doesn't have any pages, quitting."
-+        print("The presentation doesn't have any pages, quitting.", file=sys.stderr)
-         sys.exit(1)
- 
-     # if rendering is wanted, do it NOW
-@@ -6032,26 +6065,26 @@
-         InitialPage = GetNextPage(0, 1)
-     Pcurrent = InitialPage
-     if (Pcurrent <= 0) or (Pcurrent > PageCount):
--        print >>sys.stderr, "Attempt to start the presentation at an invalid page (%d of %d), quitting." % (InitialPage, PageCount)
-+        print("Attempt to start the presentation at an invalid page (%d of %d), quitting." % (InitialPage, PageCount), file=sys.stderr)
-         sys.exit(1)
- 
-     # initialize graphics
-     try:
-         Platform.StartDisplay()
--    except Exception, e:
--        print >>sys.stderr, "FATAL: failed to create rendering surface in the desired resolution (%dx%d)" % (ScreenWidth, ScreenHeight)
--        print >>sys.stderr, "       detailed error message:", e
-+    except Exception as e:
-+        print("FATAL: failed to create rendering surface in the desired resolution (%dx%d)" % (ScreenWidth, ScreenHeight), file=sys.stderr)
-+        print("       detailed error message:", e, file=sys.stderr)
-         sys.exit(1)
-     if Fullscreen:
-         Platform.SetMouseVisible(False)
-         CursorVisible = False
--    if (Gamma <> 1.0) or (BlackLevel <> 0):
-+    if (Gamma != 1.0) or (BlackLevel != 0):
-         SetGamma(force=True)
- 
-     # initialize OpenGL
-     try:
-         gl = Platform.LoadOpenGL()
--        print >>sys.stderr, "OpenGL renderer:", GLRenderer
-+        print("OpenGL renderer:", GLRenderer, file=sys.stderr)
- 
-         # check if graphics are unaccelerated
-         renderer = GLRenderer.lower().replace(' ', '').replace('(r)', '')
-@@ -6059,8 +6092,8 @@
-         or (renderer in ("mesaglxindirect", "gdigeneric")) \
-         or renderer.startswith("software") \
-         or ("llvmpipe" in renderer):
--            print >>sys.stderr, "WARNING: Using an OpenGL software renderer. Impressive will work, but it will"
--            print >>sys.stderr, "         very likely be too slow to be usable."
-+            print("WARNING: Using an OpenGL software renderer. Impressive will work, but it will", file=sys.stderr)
-+            print("         very likely be too slow to be usable.", file=sys.stderr)
- 
-         # check for old hardware that can't deal with the blur shader
-         for substr in ("i915", "intel915", "intel945", "intelq3", "intelg3", "inteligd", "gma900", "gma950", "gma3000", "gma3100", "gma3150"):
-@@ -6071,12 +6104,12 @@
-         extensions = set((gl.GetString(gl.EXTENSIONS) or "").split())
-         if (GLVersion < "2") and (not("GL_ARB_shader_objects" in extensions) or not("GL_ARB_texture_non_power_of_two" in extensions)):
-             raise ImportError("OpenGL version %r is below 2.0 and the necessary extensions are unavailable" % GLVersion)
--    except ImportError, e:
--        if GLVendor: print >>sys.stderr, "OpenGL vendor:", GLVendor
--        if GLRenderer: print >>sys.stderr, "OpenGL renderer:", GLRenderer
--        if GLVersion: print >>sys.stderr, "OpenGL version:", GLVersion
--        print >>sys.stderr, "FATAL:", e
--        print >>sys.stderr, "This likely means that your graphics driver or hardware is too old."
-+    except ImportError as e:
-+        if GLVendor: print("OpenGL vendor:", GLVendor, file=sys.stderr)
-+        if GLRenderer: print("OpenGL renderer:", GLRenderer, file=sys.stderr)
-+        if GLVersion: print("OpenGL version:", GLVersion, file=sys.stderr)
-+        print("FATAL:", e, file=sys.stderr)
-+        print("This likely means that your graphics driver or hardware is too old.", file=sys.stderr)
-         sys.exit(1)
- 
-     # some further OpenGL configuration
-@@ -6091,9 +6124,9 @@
-             UseBlurShader = False
-     if Verbose:
-         if UseBlurShader:
--            print >>sys.stderr, "Using blur-and-desaturate shader for highlight box and spotlight mode."
-+            print("Using blur-and-desaturate shader for highlight box and spotlight mode.", file=sys.stderr)
-         else:
--            print >>sys.stderr, "Using legacy multi-pass blur for highlight box and spotlight mode."
-+            print("Using legacy multi-pass blur for highlight box and spotlight mode.", file=sys.stderr)
-     gl.BlendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA)
-     BoxIndexBuffer = HighlightIndexBuffer(4)
- 
-@@ -6113,7 +6146,7 @@
-     if (maxsize > ScreenWidth) and (maxsize <= 65536):
-         MaxZoomFactor = min(MaxZoomFactor, maxsize / ScreenWidth, maxsize / ScreenHeight)
-     if Verbose:
--        print >>sys.stderr, "Maximum texture size is %.0f pixels, using maximum zoom level of %.1f." % (maxsize, MaxZoomFactor)
-+        print("Maximum texture size is %.0f pixels, using maximum zoom level of %.1f." % (maxsize, MaxZoomFactor), file=sys.stderr)
- 
-     # set up some variables
-     PixelX = 1.0 / ScreenWidth
-@@ -6121,7 +6154,7 @@
-     ScreenAspect = float(ScreenWidth) / float(ScreenHeight)
- 
-     # prepare logo image
--    LogoImage = Image.open(cStringIO.StringIO(LOGO.decode('base64')))
-+    LogoImage = Image.open(io.BytesIO(codecs.decode(LOGO, 'base64')))
-     LogoTexture = gl.make_texture(gl.TEXTURE_2D, filter=gl.NEAREST, img=LogoImage)
-     DrawLogo()
-     Platform.SwapBuffers()
-@@ -6132,15 +6165,15 @@
-         DrawLogo()
-         titles = []
-         for key in ('title', '_title'):
--            titles.extend([p[key] for p in PageProps.itervalues() if key in p])
-+            titles.extend([p[key] for p in PageProps.values() if key in p])
-         if titles:
-             OSDFont.AddString("".join(titles))
-     except ValueError:
--        print >>sys.stderr, "The OSD font size is too large, the OSD will be rendered incompletely."
-+        print("The OSD font size is too large, the OSD will be rendered incompletely.", file=sys.stderr)
-     except IOError:
--        print >>sys.stderr, "Could not open OSD font file, disabling OSD."
-+        print("Could not open OSD font file, disabling OSD.", file=sys.stderr)
-     except (NameError, AttributeError, TypeError):
--        print >>sys.stderr, "Your version of PIL is too old or incomplete, disabling OSD."
-+        print("Your version of PIL is too old or incomplete, disabling OSD.", file=sys.stderr)
- 
-     # handle event test mode
-     if EventTestMode:
-@@ -6154,7 +6187,7 @@
-                 img = Image.open(CursorImage).convert('RGBA')
-                 img.load()
-             except:
--                print >>sys.stderr, "Could not open the mouse cursor image, using standard cursor."
-+                print("Could not open the mouse cursor image, using standard cursor.", file=sys.stderr)
-                 img = None
-         CursorImage = PrepareCustomCursor(img)
-     else:
-@@ -6171,14 +6204,14 @@
-     # overview preparations
-     if EnableOverview:
-         # initialize overview metadata
--        OverviewPageMap=[i for i in xrange(1, PageCount + 1) \
-+        OverviewPageMap=[i for i in range(1, PageCount + 1) \
-             if GetPageProp(i, ('overview', '_overview'), True) \
-             and (i >= PageRangeStart) and (i <= PageRangeEnd)]
-         OverviewPageCount = max(len(OverviewPageMap), 1)
-         OverviewPageMapInv = {}
--        for page in xrange(1, PageCount + 1):
-+        for page in range(1, PageCount + 1):
-             OverviewPageMapInv[page] = len(OverviewPageMap) - 1
--            for i in xrange(len(OverviewPageMap)):
-+            for i in range(len(OverviewPageMap)):
-                 if OverviewPageMap[i] >= page:
-                     OverviewPageMapInv[page] = i
-                     break
-@@ -6233,15 +6266,15 @@
-                 time_left -= GetPageProp(p, 'transtime', TransitionDuration)
-             p = pnext
-         if pages and (time_left >= pages):
--            AutoAdvanceTime = time_left / pages
-+            AutoAdvanceTime = int(time_left / pages)
-             AutoAdvanceEnabled = True
--            print >>sys.stderr, "Setting auto-advance timeout to %.1f seconds." % (0.001 * AutoAdvanceTime)
-+            print("Setting auto-advance timeout to %.1f seconds." % (0.001 * AutoAdvanceTime), file=sys.stderr)
-         else:
--            print >>sys.stderr, "Warning: Could not determine auto-advance timeout automatically."
-+            print("Warning: Could not determine auto-advance timeout automatically.", file=sys.stderr)
- 
-     # set up background rendering
-     if not HaveThreads:
--        print >>sys.stderr, "Note: Background rendering isn't available on this platform."
-+        print("Note: Background rendering isn't available on this platform.", file=sys.stderr)
-         BackgroundRendering = False
- 
-     # if caching is enabled, pre-render all pages
-@@ -6257,7 +6290,7 @@
-         def prerender_action_handler(action):
-             if action in ("$quit", "*quit"):
-                 Quit()
--        for page in range(InitialPage, PageCount + 1) + range(1, InitialPage):
-+        for page in list(range(InitialPage, PageCount + 1)) + list(range(1, InitialPage)):
-             while True:
-                 ev = Platform.GetEvent(poll=True)
-                 if not ev: break
-@@ -6321,14 +6354,14 @@
- def DoEventTestMode():
-     last_event = "(None)"
-     need_redraw = True
--    cx = ScreenWidth / 2
--    y1 = ScreenHeight / 5
--    y2 = (ScreenHeight * 4) / 5
-+    cx = int(ScreenWidth / 2)
-+    y1 = int(ScreenHeight / 5)
-+    y2 = int((ScreenHeight * 4) / 5)
-     if OSDFont:
-         dy = OSDFont.GetLineHeight()
-     Platform.ScheduleEvent('$dummy', 1000)  # required to ensure that time measurement works :(
--    print >>sys.stderr, "Entering Event Test Mode."
--    print " timestamp | delta-time | event"
-+    print("Entering Event Test Mode.", file=sys.stderr)
-+    print(" timestamp | delta-time | event")
-     t0 = Platform.GetTicks()
-     while True:
-         if need_redraw:
-@@ -6351,7 +6384,7 @@
-             Quit()
-         elif ev and ev.startswith('*'):
-             now = Platform.GetTicks()
--            print "%7d ms | %7d ms | %s" % (int(now), int(now - t0), ev[1:])
-+            print("%7d ms | %7d ms | %s" % (int(now), int(now - t0), ev[1:]))
-             t0 = now
-             last_event = ev[1:]
-             need_redraw = True
-@@ -6368,41 +6401,41 @@
-         except KeyboardInterrupt:
-             pass
-         except:
--            print >>sys.stderr
--            print >>sys.stderr, 79 * "="
--            print >>sys.stderr, "OOPS! Impressive crashed!"
--            print >>sys.stderr, "This shouldn't happen. Please report this incident to the author, including the"
--            print >>sys.stderr, "full output of the program, particularly the following lines. If possible,"
--            print >>sys.stderr, "please also send the input files you used."
--            print >>sys.stderr
--            print >>sys.stderr, "Impressive version:", __version__
--            print >>sys.stderr, "Python version:", sys.version
--            print >>sys.stderr, "PyGame version:", pygame.__version__
-+            print(file=sys.stderr)
-+            print(79 * "=", file=sys.stderr)
-+            print("OOPS! Impressive crashed!", file=sys.stderr)
-+            print("This shouldn't happen. Please report this incident to the author, including the", file=sys.stderr)
-+            print("full output of the program, particularly the following lines. If possible,", file=sys.stderr)
-+            print("please also send the input files you used.", file=sys.stderr)
-+            print(file=sys.stderr)
-+            print("Impressive version:", __version__, file=sys.stderr)
-+            print("Python version:", sys.version, file=sys.stderr)
-+            print("PyGame version:", pygame.__version__, file=sys.stderr)
-             if hasattr(Image, "__version__"):  # Pillow >= 5.2
--                print >>sys.stderr, "PIL version: Pillow", Image.__version__
-+                print("PIL version: Pillow", Image.__version__, file=sys.stderr)
-             elif hasattr(Image, "PILLOW_VERSION"):  # Pillow < 7.0
--                print >>sys.stderr, "PIL version: Pillow", Image.PILLOW_VERSION
-+                print("PIL version: Pillow", Image.PILLOW_VERSION, file=sys.stderr)
-             elif hasattr(Image, "VERSION"):  # classic PIL or Pillow 1.x
--                print >>sys.stderr, "PIL version: classic", Image.VERSION
-+                print("PIL version: classic", Image.VERSION, file=sys.stderr)
-             else:
--                print >>sys.stderr, "PIL version: unknown"            
-+                print("PIL version: unknown", file=sys.stderr)            
-             if PDFRenderer:
--                print >>sys.stderr, "PDF renderer:", PDFRenderer.name
-+                print("PDF renderer:", PDFRenderer.name, file=sys.stderr)
-             else:
--                print >>sys.stderr, "PDF renderer: None"
--            if GLVendor: print >>sys.stderr, "OpenGL vendor:", GLVendor
--            if GLRenderer: print >>sys.stderr, "OpenGL renderer:", GLRenderer
--            if GLVersion: print >>sys.stderr, "OpenGL version:", GLVersion
-+                print("PDF renderer: None", file=sys.stderr)
-+            if GLVendor: print("OpenGL vendor:", GLVendor, file=sys.stderr)
-+            if GLRenderer: print("OpenGL renderer:", GLRenderer, file=sys.stderr)
-+            if GLVersion: print("OpenGL version:", GLVersion, file=sys.stderr)
-             if hasattr(os, 'uname'):
-                 uname = os.uname()
--                print >>sys.stderr, "Operating system: %s %s (%s)" % (uname[0], uname[2], uname[4])
-+                print("Operating system: %s %s (%s)" % (uname[0], uname[2], uname[4]), file=sys.stderr)
-             else:
--                print >>sys.stderr, "Python platform:", sys.platform
-+                print("Python platform:", sys.platform, file=sys.stderr)
-             if os.path.isfile("/usr/bin/lsb_release"):
-                 lsb_release = subprocess.Popen(["/usr/bin/lsb_release", "-sd"], stdout=subprocess.PIPE)
--                print >>sys.stderr, "Linux distribution:", lsb_release.stdout.read().strip()
-+                print("Linux distribution:", lsb_release.stdout.read().decode().strip(), file=sys.stderr)
-                 lsb_release.wait()
--            print >>sys.stderr, "Command line:", ' '.join(('"%s"'%arg if (' ' in arg) else arg) for arg in sys.argv)
-+            print("Command line:", ' '.join(('"%s"'%arg if (' ' in arg) else arg) for arg in sys.argv), file=sys.stderr)
-             traceback.print_exc(file=sys.stderr)
-     finally:
-         StopMPlayer()
-@@ -6445,7 +6478,7 @@
-     else:    return res_else
- 
- def HelpExit(code=0):
--    print """A nice presentation tool.
-+    print("""A nice presentation tool.
- 
- Usage: """+os.path.basename(sys.argv[0])+""" [OPTION...] <INPUT(S)...>
- 
-@@ -6549,11 +6582,11 @@
-        --nologo           disable startup logo and version number display
-   -v,  --verbose          (slightly) more verbose operation
- 
--For detailed information, visit""", __website__
-+For detailed information, visit""", __website__)
-     sys.exit(code)
- 
- def ListTransitions():
--    print "Available transitions:"
-+    print("Available transitions:")
-     standard = dict([(tc.__name__, None) for tc in AvailableTransitions])
-     trans = [(tc.__name__, tc.__doc__) for tc in AllTransitions]
-     trans.append(('None', "no transition"))
-@@ -6564,14 +6597,14 @@
-             star = '*'
-         else:
-             star = ' '
--        print star, name.ljust(maxlen), '-', desc
--    print "(transitions with * are enabled by default)"
-+        print(star, name.ljust(maxlen), '-', desc)
-+    print("(transitions with * are enabled by default)")
-     sys.exit(0)
- 
- def TryTime(s, regexp, func):
-     m = re.match(regexp, s, re.I)
-     if not m: return 0
--    return func(map(int, m.groups()))
-+    return func(list(map(int, m.groups())))
- def ParseTime(s):
-     return TryTime(s, r'([0-9]+)s?$', lambda m: m[0]) \
-         or TryTime(s, r'([0-9]+)m$', lambda m: m[0] * 60) \
-@@ -6580,11 +6613,11 @@
-         or TryTime(s, r'([0-9]+)[h:]([0-9]+)[m:]([0-9]+)s?$', lambda m: m[0] * 3600 + m[1] * 60 + m[2])
- 
- def opterr(msg, extra_lines=[]):
--    print >>sys.stderr, "command line parse error:", msg
-+    print("command line parse error:", msg, file=sys.stderr)
-     for line in extra_lines:
--        print >>sys.stderr, line
--    print >>sys.stderr, "use `%s -h' to get help" % sys.argv[0]
--    print >>sys.stderr, "or visit", __website__, "for full documentation"
-+        print(line, file=sys.stderr)
-+    print("use `%s -h' to get help" % sys.argv[0], file=sys.stderr)
-+    print("or visit", __website__, "for full documentation", file=sys.stderr)
-     sys.exit(2)
- 
- def SetTransitions(list):
-@@ -6711,7 +6744,7 @@
-             "nocursor", "zoomdarkness=", "zoom-darkness=", "box-edge=",
-             "maxzoom=", "max-zoom=", "time-display", "zbox-edge=",
-             "vht0=", "vht1="])
--    except getopt.GetoptError, message:
-+    except getopt.GetoptError as message:
-         opterr(message)
- 
-     for opt, arg in opts:
-@@ -6741,10 +6774,10 @@
-         if opt in ("-c", "--cache"):
-             CacheMode = ParseCacheMode(arg)
-         if opt == "--nocache":
--            print >>sys.stderr, "Note: The `--nocache' option is deprecated, use `--cache none' instead."
-+            print("Note: The `--nocache' option is deprecated, use `--cache none' instead.", file=sys.stderr)
-             CacheMode = NoCache
-         if opt in ("-m", "--memcache"):
--            print >>sys.stderr, "Note: The `--memcache' option is deprecated, use `--cache memory' instead."
-+            print("Note: The `--memcache' option is deprecated, use `--cache memory' instead.", file=sys.stderr)
-             CacheMode = MemCache
-         if opt == "--cachefile":
-             CacheFileName = arg
-@@ -6767,16 +6800,16 @@
-             ShowLogo = not(ShowLogo)
-         if opt in ("--noclicks", "--no-clicks"):
-             if not DefaultControls:
--                print >>sys.stderr, "Note: The default control settings have been modified, the `--noclicks' option might not work as expected."
-+                print("Note: The default control settings have been modified, the `--noclicks' option might not work as expected.", file=sys.stderr)
-             BindEvent("lmb, rmb, ctrl+lmb, ctrl+rmb -= goto-next, goto-prev, goto-next-notrans, goto-prev-notrans")
-         if opt in ("-W", "--nowheel", "--no-wheel"):
-             if not DefaultControls:
--                print >>sys.stderr, "Note: The default control settings have been modified, the `--nowheel' option might not work as expected."
-+                print("Note: The default control settings have been modified, the `--nowheel' option might not work as expected.", file=sys.stderr)
-             BindEvent("wheelup, wheeldown, ctrl+wheelup, ctrl+wheeldown -= goto-next, goto-prev, goto-next-notrans, goto-prev-notrans, overview-next, overview-prev")
-             MouseWheelZoom = True
-         if opt in ("--noquit", "--no-quit"):
-             if not DefaultControls:
--                print >>sys.stderr, "Note: The default control settings have been modified, the `--noquit' option might not work as expected."
-+                print("Note: The default control settings have been modified, the `--noquit' option might not work as expected.", file=sys.stderr)
-             BindEvent("q,escape -= quit")            
-         if opt in ("-e", "--bind"):
-             BindEvent(arg, error_prefix="--bind")
-@@ -6951,7 +6984,7 @@
-                     arg = arg.split(':')
-                     assert len(arg) > 1
-                     CursorImage = ':'.join(arg[:-1])
--                    CursorHotspot = map(int, arg[-1].split(','))
-+                    CursorHotspot = tuple(map(int, arg[-1].split(',')))
-                 else:
-                     CursorImage = arg
-                 assert (BlackLevel >= 0) and (BlackLevel < 255)
-@@ -7005,7 +7038,7 @@
- def run():
-     try:
-         run_main()
--    except SystemExit, e:
-+    except SystemExit as e:
-         return e.code
- 
- # use this function if you use Impressive as a library and want to call any
-@@ -7021,5 +7054,5 @@
-         run_main()
-     finally:
-         if not(CleanExit) and (os.name == 'nt') and getattr(sys, "frozen", False):
--            print
-+            print()
-             raw_input("<-- press ENTER to quit the program --> ")
diff --git a/impressive.spec b/impressive.spec
index 7364ebc..d5a2d32 100644
--- a/impressive.spec
+++ b/impressive.spec
@@ -1,18 +1,19 @@
+%global	timestamp	20190902
+%global	svnversion	275
 Name:           impressive
-Version:        0.12.0
-Release:        12%{?dist}
+Version:        0.13.0
+Release:        0.1.%{timestamp}svn%{svnversion}%{?dist}
 Summary:        A program that displays presentation slides
 
 License:        GPLv2
 URL:            http://impressive.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz
+#Source0:        http://downloads.sourceforge.net/%{name}/Impressive-%{version}.tar.gz
+# svn export -r %{svnversion} http://svn.emphy.de/impressive/branches/python3/impressive Impressive-%{version}
+# make -C Impressive-%{version} release
+# mv Impressive-%{version}_releases/Impressive-%{version}-WIP.tar.gz Impressive-%{version}-WIP-%{timestamp}svn%{svnversion}
+Source0:        %{name}/Impressive-%{version}-WIP-%{timestamp}svn%{svnversion}.tar.gz
 # Wrapper script for making sure hardware acceleration is available
 Source1:        %{name}.sh
-# diff between 0.12.0 and current svn version r245
-Patch0:		Impressive-0.12.0-235-245.patch
-# py3-compatible conversion of r245 (https://github.com/mjg/Impressive/tree/py3k)
-# version v0.11.1-74-gc504a64
-Patch1:		Impressive-0.12.0-245-py3.patch
 
 BuildArch:      noarch
 BuildRequires:  python3-devel
@@ -40,8 +41,8 @@ that are really useful for presentations.
 
 
 %prep
-%autosetup -n Impressive-%{version} -p1
-sed -ie '1s#/usr/bin/env python2#/usr/bin/python3#' impressive.py
+%autosetup -n Impressive-%{version}-WIP -p1
+sed -ie '1s#/usr/bin/env python#/usr/bin/python3#' impressive.py
 
 %build
 sed -e "s|@PYTHON_SITELIB@|%{python3_sitelib}|" %{SOURCE1} > impressive.sh
@@ -64,6 +65,10 @@ install -D -p -m 755 impressive.sh %{buildroot}%{_bindir}/impressive
 %{_mandir}/man1/impressive.1*
 
 %changelog
+* Mon Sep 02 2019 Michael J Gruber <mjg@fedoraproject.org> - 0.13.0-0.1.20190902svn275
+- build from upstream python3 branch
+- previous py3k patches have been upstreamed
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.12.0-12
 - Rebuilt for Python 3.8
 
diff --git a/sources b/sources
index 3ce36b9..a96a12a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Impressive-0.12.0.tar.gz) = 3425d9d53c8c3ff6d5de0a3466bbf5c94f257390b4929ba12547ba930099de67db4f4d77d4ef4e3e10f8f723478569a74042553f64cf95e236931c7aabb70f0a
+SHA512 (Impressive-0.13.0-WIP-20190902svn275.tar.gz) = 66ad9fc5657a25c9f0e3071940b060d914add03077c268a15a1d7ffbfe886320fbc28017d7e0ad35cfdd34bc6c5ba4564fe22e500560facde80d855671f89313