Unified · Split
| @@ -36,7 +36,7 @@ and uri = string · 35 unmodified lines | ||
| 36 | 36 | and caption = string |
| 37 | 37 | and tilex = int |
| 38 | 38 | and tiley = int |
| 39 | −and tileparams = (x * y * width * height * tilex * tiley) | |
| 39 | +and tileparams = (x * y * w * h * tilex * tiley) | |
| 40 | 40 | and under = |
| 41 | 41 | | Unone |
| 42 | 42 | | Ulinkuri of string |
| @@ -166,14 +166,14 @@ type page = · 123 unmodified lines | ||
| 166 | 166 | type tile = opaque * pixmapsize * elapsed |
| 167 | 167 | and elapsed = float |
| 168 | 168 | and pagemapkey = pageno * gen |
| 169 | −and tilemapkey = pageno * gen * colorspace * angle * width * height * col * row | |
| 169 | +and tilemapkey = pageno * gen * colorspace * angle * w * h * col * row | |
| 170 | 170 | and row = int |
| 171 | 171 | and col = int |
| 172 | 172 | and currently = |
| 173 | 173 | | Idle |
| 174 | 174 | | Loading of (page * gen) |
| 175 | 175 | | Tiling |
| 176 | − of (page * opaque * colorspace * angle * gen * col * row * width * height) | |
| 176 | + of (page * opaque * colorspace * angle * gen * col * row * w * h) | |
| 177 | 177 | | Outlining of outline list |
| 178 | 178 | and mpos = int * int |
| 179 | 179 | and mstate = |
| @@ -328,7 +328,7 @@ module S = struct · 148 unmodified lines | ||
| 328 | 328 | let layout : page list ref = ref [] |
| 329 | 329 | let pagemap : (pagemapkey, opaque) Hashtbl.t = Hashtbl.create 0 |
| 330 | 330 | let tilemap : (tilemapkey, tile) Hashtbl.t = Hashtbl.create 0 |
| 331 | − let pdims : (pageno * width * height * leftx) list ref = ref [] | |
| 331 | + let pdims : (pageno * w * h * leftx) list ref = ref [] | |
| 332 | 332 | let pagecount = ref max_int |
| 333 | 333 | let currently = ref Idle |
| 334 | 334 | let mstate = ref Mnone |
| @@ -25,13 +25,12 @@ and mark = · 24 unmodified lines | ||
| 25 | 25 | and multicolumns = (multicol * pagegeom) |
| 26 | 26 | and singlecolumn = pagegeom |
| 27 | 27 | and splitcolumns = (columncount * pagegeom) |
| 28 | −and pagegeom = (pdimno * x * y * (pageno * width * height * leftx)) array | |
| 28 | +and pagegeom = (pdimno * x * y * (pageno * w * h * leftx)) array | |
| 29 | 29 | and multicol = (columncount * covercount * covercount) |
| 30 | 30 | and columncount = int |
| 31 | 31 | and pdimno = int and pageno = int |
| 32 | −and x = int and y = int and leftx = int | |
| 32 | +and x = int and y = int and leftx = int and w = int and h = int | |
| 33 | 33 | and covercount = int |
| 34 | −and width = int and height = int | |
| 35 | 34 | and memsize = int and texcount = int |
| 36 | 35 | and sliceheight = int |
| 37 | 36 | and zoom = float |
| @@ -86,7 +85,7 @@ g trimfuzz irect "(0,0,0,0)" · 48 unmodified lines | ||
| 86 | 85 | g memlimit memsize "128 lsl 20" |
| 87 | 86 | g texcount texcount 256 |
| 88 | 87 | g sliceheight sliceheight 24 |
| 89 | −g thumbw width 76 | |
| 88 | +g thumbw w 76 | |
| 90 | 89 | g bgcolor rgb "(0.5, 0.5, 0.5)" |
| 91 | 90 | g papercolor rgba "(1.0, 1.0, 1.0, 0.0)" |
| 92 | 91 | g sbarcolor rgba "(0.64, 0.64, 0.64, 0.7)" |