Merge branch 'master' of git.ucc.asn.au:ipdf/code

diff --combined src/main.h
index 193206d,98bf9e2..43d195f
--- 1/src/main.h
--- 2/src/main.h
+++ b/src/main.h
@@@ -28,7 -28,7 +28,7 @@@ inline void MainLoop(Document & doc, co
        Screen scr;
        View view(doc,scr, bounds, c);
        scr.DebugFontInit("DejaVuSansMono.ttf");
-       scr.SetMouseHandler([&](int x, int y, int buttons, int wheel) // [?] wtf
+       scr.SetMouseHandler([&](int x, int y, int buttons, int wheel) // [?] seriously WTF
        {
                static bool oldButtonDown = false;
                static int oldx, oldy;
@@@ -57,7 -57,7 +57,7 @@@
                }
                if (buttons)
                {
 -                      #if REAL == REAL_RATIONAL
 +                      #if REAL >= REAL_RATIONAL
                                view.Translate(Real(oldx, scr.ViewportWidth()) -Real(x,scr.ViewportWidth()), Real(oldy, scr.ViewportHeight()) - Real(y,scr.ViewportHeight()));
                        #else                   
                                view.Translate(Real(oldx-x)/Real(scr.ViewportWidth()), Real(oldy-y)/Real(scr.ViewportHeight()));
@@@ -73,7 -73,7 +73,7 @@@
                
                if (wheel)
                {
 -                      #if REAL == REAL_RATIONAL
 +                      #if REAL >= REAL_RATIONAL
                                view.ScaleAroundPoint(Real(x,scr.ViewportWidth()), Real(y,scr.ViewportHeight()), Real(20-wheel, 20));
                        #else
                                view.ScaleAroundPoint(Real(x)/Real(scr.ViewportWidth()),Real(y)/Real(scr.ViewportHeight()), Real(expf(-wheel/20.f)));