Merge branch 'master' of git://github.com/openlibrary/bookreader
[bookreader.git] / GnuBook / GnuBook.js
index ccc205c..434883b 100644 (file)
@@ -1,5 +1,5 @@
 /*
-Copyright(c)2008 Internet Archive. Software license AGPL version 3.
+Copyright(c)2008-2009 Internet Archive. Software license AGPL version 3.
 
 This file is part of GnuBook.
 
@@ -16,7 +16,9 @@ This file is part of GnuBook.
     You should have received a copy of the GNU Affero General Public License
     along with GnuBook.  If not, see <http://www.gnu.org/licenses/>.
     
-archive.org cvs $Revision: 1.57 $ $Date: 2008-10-27 05:47:40 $
+    The GnuBook source is hosted at http://github.com/openlibrary/bookreader/
+
+    archive.org cvs $Revision: 1.2 $ $Date: 2009-06-22 18:42:51 $
 */
 
 // GnuBook()
@@ -32,11 +34,12 @@ function GnuBook() {
     this.reduce  = 4;
     this.padding = 10;
     this.mode    = 1; //1 or 2
+    this.ui = 'full'; // UI mode
     
-    this.displayedLeafs = [];  
-    //this.leafsToDisplay = [];
+    this.displayedIndices = [];        
+    //this.indicesToDisplay = [];
     this.imgs = {};
-    this.prefetchedImgs = {}; //an object with numeric keys cooresponding to leafNum
+    this.prefetchedImgs = {}; //an object with numeric keys cooresponding to page index
     
     this.timer     = null;
     this.animating = false;
@@ -46,24 +49,61 @@ function GnuBook() {
 
     this.twoPagePopUp = null;
     this.leafEdgeTmp  = null;
+    this.embedPopup = null;
     
     this.searchResults = {};
     
     this.firstIndex = null;
     
+    this.lastDisplayableIndex2up = null;
+    
+    // We link to index.php to avoid redirect which breaks back button
+    this.logoURL = 'http://www.archive.org/index.php';
+    
+    // Base URL for images
+    this.imagesBaseURL = '/bookreader/images/';
+    
+    // Mode constants
+    this.constMode1up = 1;
+    this.constMode2up = 2;
+    
 };
 
 // init()
 //______________________________________________________________________________
 GnuBook.prototype.init = function() {
 
-    var startLeaf = window.location.hash;
-    var title = this.bookTitle.substr(0,50);
-    if (this.bookTitle.length>50) title += '...';
+    var startIndex = undefined;
+    
+    // Find start index and mode if set in location hash
+    var params = this.paramsFromFragment(window.location.hash);
+        
+    if ('undefined' != typeof(params.index)) {
+        startIndex = params.index;
+    } else if ('undefined' != typeof(params.page)) {
+        startIndex = this.getPageIndex(params.page);
+    }
+    
+    if ('undefined' == typeof(startIndex)) {
+        if ('undefined' != typeof(this.titleLeaf)) {
+            startIndex = this.leafNumToIndex(this.titleLeaf);
+        }
+    }
+    
+    if ('undefined' == typeof(startIndex)) {
+        startIndex = 0;
+    }
+    
+    if ('undefined' != typeof(params.mode)) {
+        this.mode = params.mode;
+    }
+    
+    // Set document title -- may have already been set in enclosing html for
+    // search engine visibility
+    document.title = this.shortTitle(50);
     
     $("#GnuBook").empty();
-    $("#GnuBook").append("<div id='GBtoolbar'><span style='float:left;'><img class='GBicon' src='http://www.us.archive.org/GnuBook/images/zoom_out.png' onclick='gb.zoom1up(-1); return false;'> <img class='GBicon' src='http://www.us.archive.org/GnuBook/images/zoom_in.png' onclick='gb.zoom1up(1); return false;'> zoom: <span id='GBzoom'>25</span>% <img class='GBicon' src='http://www.us.archive.org/GnuBook/images/script.png' onclick='gb.switchMode(1); return false;'> <img class='GBicon' src='http://www.us.archive.org/GnuBook/images/book_open.png' onclick='gb.switchMode(2); return false;'>  &nbsp;&nbsp; <a href='"+this.bookUrl+"' target='_blank'>"+title+"</a></span></div>");
-    $("#GBtoolbar").append("<form class='GBpageform' action='javascript:' onsubmit='gb.jumpToPage(this.elements[0].value)'><img class='GBicon' src='http://www.us.archive.org/GnuBook/images/page_code.png' onclick='gb.showEmbedCode(); return false;'> page:<input id='GBpagenum' type='text' size='3' onfocus='gb.autoStop();'></input> <img class='GBicon' src='http://www.us.archive.org/GnuBook/images/book_previous.png' onclick='gb.prev(); return false;'> <img class='GBicon' src='http://www.us.archive.org/GnuBook/images/book_next.png' onclick='gb.next(); return false;'> <img class='GBicon' id='autoImg' src='http://www.us.archive.org/GnuBook/images/control_play_blue.png' onclick='gb.autoToggle(); return false;'></form>");
+    this.initToolbar(this.mode, this.ui); // Build inside of toolbar div
     $("#GnuBook").append("<div id='GBcontainer'></div>");
     $("#GBcontainer").append("<div id='GBpageview'></div>");
 
@@ -71,13 +111,16 @@ GnuBook.prototype.init = function() {
         e.data.loadLeafs();
     });
 
+    this.setupKeyListeners();
+    this.startLocationPolling();
+
     $(window).bind('resize', this, function(e) {
         //console.log('resize!');
         if (1 == e.data.mode) {
             //console.log('centering 1page view');
             e.data.centerPageView();
             $('#GBpageview').empty()
-            e.data.displayedLeafs = [];
+            e.data.displayedIndices = [];
             e.data.updateSearchHilites(); //deletes hilights but does not call remove()            
             e.data.loadLeafs();
         } else {
@@ -85,19 +128,86 @@ GnuBook.prototype.init = function() {
             e.data.prepareTwoPageView();
         }
     });
+    
+    $('.GBpagediv1up').bind('mousedown', this, function(e) {
+        //console.log('mousedown!');
+    });
 
     if (1 == this.mode) {
         this.resizePageView();
-    
-        if ('' != startLeaf) {
-            this.jumpToIndex(parseInt(startLeaf.substr(1)));
-            //alert('jump to ' + startLeaf);
-        }
+        this.firstIndex = startIndex;
+        this.jumpToIndex(startIndex);
     } else {
-        this.displayedLeafs=[0];
+        //this.resizePageView();
+        
+        this.displayedIndices=[0];
+        this.firstIndex = startIndex;
+        this.displayedIndices = [this.firstIndex];
+        //console.log('titleLeaf: %d', this.titleLeaf);
+        //console.log('displayedIndices: %s', this.displayedIndices);
         this.prepareTwoPageView();
         //if (this.auto) this.nextPage();
     }
+    
+    // Enact other parts of initial params
+    this.updateFromParams(params);
+}
+
+GnuBook.prototype.setupKeyListeners = function() {
+    var self = this;
+
+    var KEY_PGUP = 33;
+    var KEY_PGDOWN = 34;
+    var KEY_END = 35;
+    var KEY_HOME = 36;
+
+    var KEY_LEFT = 37;
+    var KEY_UP = 38;
+    var KEY_RIGHT = 39;
+    var KEY_DOWN = 40;
+
+    // We use document here instead of window to avoid a bug in jQuery on IE7
+    $(document).keydown(function(e) {
+        
+        // Keyboard navigation        
+        switch(e.keyCode) {
+            case KEY_PGUP:
+            case KEY_UP:            
+                // In 1up mode page scrolling is handled by browser
+                if (2 == self.mode) {
+                    self.prev();
+                }
+                break;
+            case KEY_DOWN:
+            case KEY_PGDOWN:
+                if (2 == self.mode) {
+                    self.next();
+                }
+                break;
+            case KEY_END:
+                self.last();
+                break;
+            case KEY_HOME:
+                self.first();
+                break;
+            case KEY_LEFT:
+                if (self.keyboardNavigationIsDisabled(e)) {
+                    break;
+                }
+                if (2 == self.mode) {
+                    self.left();
+                }
+                break;
+            case KEY_RIGHT:
+                if (self.keyboardNavigationIsDisabled(e)) {
+                    break;
+                }
+                if (2 == self.mode) {
+                    self.right();
+                }
+                break;
+        }
+    });
 }
 
 // drawLeafs()
@@ -110,6 +220,58 @@ GnuBook.prototype.drawLeafs = function() {
     }
 }
 
+// setDragHandler1up()
+//______________________________________________________________________________
+GnuBook.prototype.setDragHandler1up = function(div) {
+    div.dragging = false;
+
+    $(div).bind('mousedown', function(e) {
+        //console.log('mousedown at ' + e.pageY);
+
+        this.dragging = true;
+        this.prevMouseX = e.pageX;
+        this.prevMouseY = e.pageY;
+    
+        var startX    = e.pageX;
+        var startY    = e.pageY;
+        var startTop  = $('#GBcontainer').attr('scrollTop');
+        var startLeft =  $('#GBcontainer').attr('scrollLeft');
+
+        return false;
+    });
+        
+    $(div).bind('mousemove', function(ee) {
+        //console.log('mousemove ' + startY);
+        
+        var offsetX = ee.pageX - this.prevMouseX;
+        var offsetY = ee.pageY - this.prevMouseY;
+        
+        if (this.dragging) {
+            $('#GBcontainer').attr('scrollTop', $('#GBcontainer').attr('scrollTop') - offsetY);
+            $('#GBcontainer').attr('scrollLeft', $('#GBcontainer').attr('scrollLeft') - offsetX);
+        }
+        
+        this.prevMouseX = ee.pageX;
+        this.prevMouseY = ee.pageY;
+        
+        return false;
+    });
+    
+    $(div).bind('mouseup', function(ee) {
+        //console.log('mouseup');
+
+        this.dragging = false;
+        return false;
+    });
+    
+    $(div).bind('mouseleave', function(e) {
+        //console.log('mouseleave');
+
+        //$(this).unbind('mousemove mouseup');
+        this.dragging = false;
+        
+    });
+}
 
 // drawLeafsOnePage()
 //______________________________________________________________________________
@@ -122,7 +284,7 @@ GnuBook.prototype.drawLeafsOnePage = function() {
     var scrollBottom = scrollTop + $('#GBcontainer').height();
     //console.log('top=' + scrollTop + ' bottom='+scrollBottom);
     
-    var leafsToDisplay = [];
+    var indicesToDisplay = [];
     
     var i;
     var leafTop = 0;
@@ -136,30 +298,36 @@ GnuBook.prototype.drawLeafsOnePage = function() {
         var bottomInView = (leafBottom >= scrollTop) && (leafBottom <= scrollBottom);
         var middleInView = (leafTop <=scrollTop) && (leafBottom>=scrollBottom);
         if (topInView | bottomInView | middleInView) {
+            //console.log('displayed: ' + this.displayedIndices);
             //console.log('to display: ' + i);
-            leafsToDisplay.push(i);
+            indicesToDisplay.push(i);
         }
         leafTop += height +10;      
         leafBottom += 10;
     }
 
-    var firstLeafToDraw  = leafsToDisplay[0];
-    window.location.hash = firstLeafToDraw;    
-    this.firstIndex      = firstLeafToDraw;
+    var firstIndexToDraw  = indicesToDisplay[0];
+    this.firstIndex      = firstIndexToDraw;
+    
+    // Update hash, but only if we're currently displaying a leaf
+    // Hack that fixes #365790
+    if (this.displayedIndices.length > 0) {
+        this.updateLocationHash();
+    }
 
-    if ((0 != firstLeafToDraw) && (1 < this.reduce)) {
-        firstLeafToDraw--;
-        leafsToDisplay.unshift(firstLeafToDraw);
+    if ((0 != firstIndexToDraw) && (1 < this.reduce)) {
+        firstIndexToDraw--;
+        indicesToDisplay.unshift(firstIndexToDraw);
     }
     
-    var lastLeafToDraw = leafsToDisplay[leafsToDisplay.length-1];
-    if ( ((this.numLeafs-1) != lastLeafToDraw) && (1 < this.reduce) ) {
-        leafsToDisplay.push(lastLeafToDraw+1);
+    var lastIndexToDraw = indicesToDisplay[indicesToDisplay.length-1];
+    if ( ((this.numLeafs-1) != lastIndexToDraw) && (1 < this.reduce) ) {
+        indicesToDisplay.push(lastIndexToDraw+1);
     }
     
     leafTop = 0;
     var i;
-    for (i=0; i<firstLeafToDraw; i++) {
+    for (i=0; i<firstIndexToDraw; i++) {
         leafTop += parseInt(this.getPageHeight(i)/this.reduce) +10;
     }
 
@@ -167,16 +335,16 @@ GnuBook.prototype.drawLeafsOnePage = function() {
     var viewWidth = $('#GBcontainer').attr('scrollWidth');
 
 
-    for (i=0; i<leafsToDisplay.length; i++) {
-        var leafNum = leafsToDisplay[i];    
-        var height  = parseInt(this.getPageHeight(leafNum)/this.reduce); 
+    for (i=0; i<indicesToDisplay.length; i++) {
+        var index = indicesToDisplay[i];    
+        var height  = parseInt(this.getPageHeight(index)/this.reduce); 
 
-        if(-1 == jQuery.inArray(leafsToDisplay[i], this.displayedLeafs)) {            
-            var width   = parseInt(this.getPageWidth(leafNum)/this.reduce); 
-            //console.log("displaying leaf " + leafsToDisplay[i] + ' leafTop=' +leafTop);
+        if(-1 == jQuery.inArray(indicesToDisplay[i], this.displayedIndices)) {            
+            var width   = parseInt(this.getPageWidth(index)/this.reduce); 
+            //console.log("displaying leaf " + indicesToDisplay[i] + ' leafTop=' +leafTop);
             var div = document.createElement("div");
             div.className = 'GBpagediv1up';
-            div.id = 'pagediv'+leafNum;
+            div.id = 'pagediv'+index;
             div.style.position = "absolute";
             $(div).css('top', leafTop + 'px');
             var left = (viewWidth-width)>>1;
@@ -186,38 +354,40 @@ GnuBook.prototype.drawLeafsOnePage = function() {
             $(div).css('height', height+'px');
             //$(div).text('loading...');
             
+            this.setDragHandler1up(div);
+            
             $('#GBpageview').append(div);
 
             var img = document.createElement("img");
-            img.src = this.getPageURI(leafNum);
+            img.src = this.getPageURI(index);
             $(img).css('width', width+'px');
             $(img).css('height', height+'px');
             $(div).append(img);
 
         } else {
-            //console.log("not displaying " + leafsToDisplay[i] + ' score=' + jQuery.inArray(leafsToDisplay[i], this.displayedLeafs));            
+            //console.log("not displaying " + indicesToDisplay[i] + ' score=' + jQuery.inArray(indicesToDisplay[i], this.displayedIndices));            
         }
 
         leafTop += height +10;
 
     }
     
-    for (i=0; i<this.displayedLeafs.length; i++) {
-        if (-1 == jQuery.inArray(this.displayedLeafs[i], leafsToDisplay)) {
-            var leafNum = this.displayedLeafs[i];
-            //console.log('Removing leaf ' + leafNum);
-            //console.log('id='+'#pagediv'+leafNum+ ' top = ' +$('#pagediv'+leafNum).css('top'));
-            $('#pagediv'+leafNum).remove();
+    for (i=0; i<this.displayedIndices.length; i++) {
+        if (-1 == jQuery.inArray(this.displayedIndices[i], indicesToDisplay)) {
+            var index = this.displayedIndices[i];
+            //console.log('Removing leaf ' + index);
+            //console.log('id='+'#pagediv'+index+ ' top = ' +$('#pagediv'+index).css('top'));
+            $('#pagediv'+index).remove();
         } else {
-            //console.log('NOT Removing leaf ' + this.displayedLeafs[i]);
+            //console.log('NOT Removing leaf ' + this.displayedIndices[i]);
         }
     }
     
-    this.displayedLeafs = leafsToDisplay.slice();
+    this.displayedIndices = indicesToDisplay.slice();
     this.updateSearchHilites();
     
-    if (null != this.getPageNum(firstLeafToDraw))  {
-        $("#GBpagenum").val(this.getPageNum(firstLeafToDraw));
+    if (null != this.getPageNum(firstIndexToDraw))  {
+        $("#GBpagenum").val(this.getPageNum(this.currentIndex()));
     } else {
         $("#GBpagenum").val('');
     }
@@ -230,15 +400,18 @@ GnuBook.prototype.drawLeafsTwoPage = function() {
 
     var scrollTop = $('#GBcontainer').attr('scrollTop');
     var scrollBottom = scrollTop + $('#GBcontainer').height();
-    var leafNum = this.currentLeafL;
-    var height  = this.getPageHeight(leafNum); 
-    var width   = this.getPageWidth(leafNum);
-    var handSide= this.getPageSide(leafNum);
+    
+    //console.log('drawLeafsTwoPage: this.currrentLeafL ' + this.currentIndexL);
+    
+    var index = this.currentIndexL;
+    var height  = this.getPageHeight(index); 
+    var width   = this.getPageWidth(index);
+    var handSide= this.getPageSide(index);
 
-    var leafEdgeWidthL = parseInt( (leafNum/this.numLeafs)*this.twoPageEdgeW );
+    var leafEdgeWidthL = this.leafEdgeWidth(index);
     var leafEdgeWidthR = this.twoPageEdgeW - leafEdgeWidthL;
-    var divWidth = this.twoPageW*2+20 + this.twoPageEdgeW;
-    var divLeft = ($('#GBcontainer').width() - divWidth) >> 1;
+    var bookCoverDivWidth = this.twoPageW*2+20 + this.twoPageEdgeW;
+    var bookCoverDivLeft = ($('#GBcontainer').width() - bookCoverDivWidth) >> 1;
     //console.log(leafEdgeWidthL);
 
     var middle = ($('#GBcontainer').width() >> 1);            
@@ -250,14 +423,14 @@ GnuBook.prototype.drawLeafsTwoPage = function() {
     //var right = left+scaledW;
     var right = $(this.twoPageDiv).width()-11-$(this.leafEdgeL).width()-scaledW;
 
-    var gutter = middle+parseInt((2*this.currentLeafL - this.numLeafs)*this.twoPageEdgeW/this.numLeafs/2);
-    
+    var gutter = middle + this.gutterOffsetForIndex(this.currentIndexL);
     
-    this.prefetchImg(leafNum);
-    $(this.prefetchedImgs[leafNum]).css({
+    this.prefetchImg(index);
+    $(this.prefetchedImgs[index]).css({
         position: 'absolute',
         /*right:   gutter+'px',*/
         left: gutter-scaledW+'px',
+        right: '',
         top:    top+'px',
         backgroundColor: 'rgb(234, 226, 205)',
         height: this.twoPageH +'px',
@@ -265,20 +438,21 @@ GnuBook.prototype.drawLeafsTwoPage = function() {
         borderRight: '1px solid black',
         zIndex: 2
     }).appendTo('#GBcontainer');
-    //$('#GBcontainer').append(this.prefetchedImgs[leafNum]);
+    //$('#GBcontainer').append(this.prefetchedImgs[index]);
 
 
-    var leafNum = this.currentLeafR;
-    var height  = this.getPageHeight(leafNum); 
-    var width   = this.getPageWidth(leafNum);
+    var index = this.currentIndexR;
+    var height  = this.getPageHeight(index); 
+    var width   = this.getPageWidth(index);
     //    var left = ($('#GBcontainer').width() >> 1);
     left += scaledW;
 
     var scaledW = this.twoPageH*width/height;
-    this.prefetchImg(leafNum);
-    $(this.prefetchedImgs[leafNum]).css({
+    this.prefetchImg(index);
+    $(this.prefetchedImgs[index]).css({
         position: 'absolute',
         left:   gutter+'px',
+        right: '',
         top:    top+'px',
         backgroundColor: 'rgb(234, 226, 205)',
         height: this.twoPageH + 'px',
@@ -286,10 +460,10 @@ GnuBook.prototype.drawLeafsTwoPage = function() {
         borderLeft: '1px solid black',
         zIndex: 2
     }).appendTo('#GBcontainer');
-    //$('#GBcontainer').append(this.prefetchedImgs[leafNum]);
+    //$('#GBcontainer').append(this.prefetchedImgs[index]);
         
 
-    this.displayedLeafs = [this.currentLeafL, this.currentLeafR];
+    this.displayedIndices = [this.currentIndexL, this.currentIndexR];
     this.setClickHandlers();
 
     this.updatePageNumBox2UP();
@@ -298,12 +472,12 @@ GnuBook.prototype.drawLeafsTwoPage = function() {
 // updatePageNumBox2UP
 //______________________________________________________________________________
 GnuBook.prototype.updatePageNumBox2UP = function() {
-    if (null != this.getPageNum(this.currentLeafL))  {
-        $("#GBpagenum").val(this.getPageNum(this.currentLeafL));
+    if (null != this.getPageNum(this.currentIndexL))  {
+        $("#GBpagenum").val(this.getPageNum(this.currentIndexL));
     } else {
         $("#GBpagenum").val('');
     }
-    window.location.hash = this.currentLeafL; 
+    this.updateLocationHash();
 }
 
 // loadLeafs()
@@ -340,13 +514,12 @@ GnuBook.prototype.zoom1up = function(dir) {
     this.resizePageView();
 
     $('#GBpageview').empty()
-    this.displayedLeafs = [];
+    this.displayedIndices = [];
     this.loadLeafs();
     
     $('#GBzoom').text(100/this.reduce);
 }
 
-
 // resizePageView()
 //______________________________________________________________________________
 GnuBook.prototype.resizePageView = function() {
@@ -393,47 +566,36 @@ GnuBook.prototype.centerPageView = function() {
 
 // jumpToPage()
 //______________________________________________________________________________
+// Attempts to jump to page.  Returns true if page could be found, false otherwise.
 GnuBook.prototype.jumpToPage = function(pageNum) {
-    //if (2 == this.mode) return;
-    
-    var i;
-    var foundPage = false;
-    var foundLeaf = null;
-    for (i=0; i<this.numLeafs; i++) {
-        if (this.getPageNum(i) == pageNum) {
-            foundPage = true;
-            foundLeaf = i;
-            break;
-        }
-    }
-    
-    if (foundPage) {
+
+    var pageIndex = this.getPageIndex(pageNum);
+
+    if ('undefined' != typeof(pageIndex)) {
         var leafTop = 0;
         var h;
-        this.jumpToIndex(foundLeaf);
+        this.jumpToIndex(pageIndex);
         $('#GBcontainer').attr('scrollTop', leafTop);
-    } else {
-        alert('Page not found. This book might not have pageNumbers in scandata.');
+        return true;
     }
+    
+    // Page not found
+    return false;
 }
 
 // jumpToIndex()
 //______________________________________________________________________________
 GnuBook.prototype.jumpToIndex = function(index) {
+
     if (2 == this.mode) {
         this.autoStop();
-        if (index<this.currentLeafL) {
-            if ('L' == this.getPageSide(index)) {
-                this.flipBackToIndex(index);
-            } else {
-                this.flipBackToIndex(index-1);
-            }
-        } else if (index>this.currentLeafR) {
-            if ('R' == this.getPageSide(index)) {
-                this.flipFwdToIndex(index);
-            } else {
-                this.flipFwdToIndex(index+1);
-            }        
+        
+        // By checking against min/max we do nothing if requested index
+        // is current
+        if (index < Math.min(this.currentIndexL, this.currentIndexR)) {
+            this.flipBackToIndex(index);
+        } else if (index > Math.max(this.currentIndexL, this.currentIndexR)) {
+            this.flipFwdToIndex(index);
         }
 
     } else {        
@@ -445,7 +607,7 @@ GnuBook.prototype.jumpToIndex = function(index) {
             leafTop += h + this.padding;
         }
         //$('#GBcontainer').attr('scrollTop', leafTop);
-        $('#GBcontainer').animate({scrollTop: leafTop}, 'fast');    
+        $('#GBcontainer').animate({scrollTop: leafTop },'fast');
     }
 }
 
@@ -454,12 +616,18 @@ GnuBook.prototype.jumpToIndex = function(index) {
 // switchMode()
 //______________________________________________________________________________
 GnuBook.prototype.switchMode = function(mode) {
+
+    //console.log('  asked to switch to mode ' + mode + ' from ' + this.mode);
+    
     if (mode == this.mode) return;
 
     this.autoStop();
     this.removeSearchHilites();
 
     this.mode = mode;
+    
+    this.switchToolbarMode(mode);
+    
     if (1 == mode) {
         this.prepareOnePageView();
     } else {
@@ -472,7 +640,8 @@ GnuBook.prototype.switchMode = function(mode) {
 //______________________________________________________________________________
 GnuBook.prototype.prepareOnePageView = function() {
 
-    var startLeaf = this.displayedLeafs[0];
+    // var startLeaf = this.displayedIndices[0];
+    var startLeaf = this.currentIndex();
     
     $('#GBcontainer').empty();
     $('#GBcontainer').css({
@@ -480,12 +649,22 @@ GnuBook.prototype.prepareOnePageView = function() {
         overflowX: 'auto'
     });
     
-    $("#GBcontainer").append("<div id='GBpageview'></div>");
+    var gbPageView = $("#GBcontainer").append("<div id='GBpageview'></div>");
     this.resizePageView();
+    
     this.jumpToIndex(startLeaf);
-    this.displayedLeafs = [];    
+    this.displayedIndices = [];
+    
     this.drawLeafsOnePage();
-    $('#GBzoom').text(100/this.reduce);    
+    $('#GBzoom').text(100/this.reduce);
+        
+    // Bind mouse handlers
+    // Disable mouse click to avoid selected/highlighted page images - bug 354239
+    gbPageView.bind('mousedown', function(e) {
+        return false;
+    })
+    // Special hack for IE7
+    gbPageView[0].onselectstart = function(e) { return false; };
 }
 
 // prepareTwoPageView()
@@ -493,127 +672,157 @@ GnuBook.prototype.prepareOnePageView = function() {
 GnuBook.prototype.prepareTwoPageView = function() {
     $('#GBcontainer').empty();
 
-    var firstLeaf = this.displayedLeafs[0];
-    if ('R' == this.getPageSide(firstLeaf)) {
-        if (0 == firstLeaf) {
-            firstLeaf++;
-        } else {
-            firstLeaf--;
-        }
-    }
+    // We want to display two facing pages.  We may be missing
+    // one side of the spread because it is the first/last leaf,
+    // foldouts, missing pages, etc
 
-    this.currentLeafL = null;
-    this.currentLeafR = null;
+    //var targetLeaf = this.displayedIndices[0];
+    var targetLeaf = this.firstIndex;
+
+    if (targetLeaf < this.firstDisplayableIndex()) {
+        targetLeaf = this.firstDisplayableIndex();
+    }
+    
+    if (targetLeaf > this.lastDisplayableIndex()) {
+        targetLeaf = this.lastDisplayableIndex();
+    }
+    
+    this.currentIndexL = null;
+    this.currentIndexR = null;
     this.pruneUnusedImgs();
     
-    this.currentLeafL = firstLeaf;
-    this.currentLeafR = firstLeaf + 1;
+    var currentSpreadIndices = this.getSpreadIndices(targetLeaf);
+    this.currentIndexL = currentSpreadIndices[0];
+    this.currentIndexR = currentSpreadIndices[1];
+    this.firstIndex = this.currentIndexL;
     
     this.calculateSpreadSize(); //sets this.twoPageW, twoPageH, and twoPageRatio
 
-    var middle = ($('#GBcontainer').width() >> 1);
-    var gutter = middle+parseInt((2*this.currentLeafL - this.numLeafs)*this.twoPageEdgeW/this.numLeafs/2);
-    var scaledWL = this.getPageWidth2UP(this.currentLeafL);
-    var scaledWR = this.getPageWidth2UP(this.currentLeafR);
-    var leafEdgeWidthL = parseInt( (firstLeaf/this.numLeafs)*this.twoPageEdgeW );
+    // We want to minimize the unused space in two-up mode (maximize the amount of page
+    // shown).  We give width to the leaf edges and these widths change (though the sum
+    // of the two remains constant) as we flip through the book.  With the book
+    // cover centered and fixed in the GBcontainer div the page images will meet
+    // at the "gutter" which is generally offset from the center.
+    var middle = ($('#GBcontainer').width() >> 1); // Middle of the GBcontainer div
+    //var gutter = middle+parseInt((2*this.currentIndexL - this.numLeafs)*this.twoPageEdgeW/this.numLeafs/2);
+    
+    var gutter = middle + this.gutterOffsetForIndex(this.currentIndexL);
+    
+    var scaledWL = this.getPageWidth2UP(this.currentIndexL);
+    var scaledWR = this.getPageWidth2UP(this.currentIndexR);
+    var leafEdgeWidthL = this.leafEdgeWidth(this.currentIndexL);
     var leafEdgeWidthR = this.twoPageEdgeW - leafEdgeWidthL;
 
     //console.log('idealWidth='+idealWidth+' idealHeight='+idealHeight);
-    //var divWidth = this.twoPageW*2+20 + this.twoPageEdgeW;
-    var divWidth = scaledWL + scaledWR + 20 + this.twoPageEdgeW;
-    var divHeight = this.twoPageH+20;
-    //var divLeft = ($('#GBcontainer').width() - divWidth) >> 1;
-    var divLeft = gutter-scaledWL-leafEdgeWidthL-10;
-    var divTop = ($('#GBcontainer').height() - divHeight) >> 1;
-    //console.log('divWidth='+divWidth+' divHeight='+divHeight+ ' divLeft='+divLeft+' divTop='+divTop);
+    //var bookCoverDivWidth = this.twoPageW*2+20 + this.twoPageEdgeW;
+    
+    // The width of the book cover div.  The combined width of both pages, twice the width
+    // of the book cover internal padding (2*10) and the page edges
+    var bookCoverDivWidth = scaledWL + scaledWR + 20 + this.twoPageEdgeW;
+    
+    // The height of the book cover div
+    var bookCoverDivHeight = this.twoPageH+20;
+    
+    //var bookCoverDivLeft = ($('#GBcontainer').width() - bookCoverDivWidth) >> 1;
+    var bookCoverDivLeft = gutter-scaledWL-leafEdgeWidthL-10;
+    var bookCoverDivTop = ($('#GBcontainer').height() - bookCoverDivHeight) >> 1;
+    //console.log('bookCoverDivWidth='+bookCoverDivWidth+' bookCoverDivHeight='+bookCoverDivHeight+ ' bookCoverDivLeft='+bookCoverDivLeft+' bookCoverDivTop='+bookCoverDivTop);
 
     this.twoPageDiv = document.createElement('div');
     $(this.twoPageDiv).attr('id', 'book_div_1').css({
         border: '1px solid rgb(68, 25, 17)',
-        width:  divWidth + 'px',
-        height: divHeight+'px',
+        width:  bookCoverDivWidth + 'px',
+        height: bookCoverDivHeight+'px',
         visibility: 'visible',
         position: 'absolute',
-        backgroundColor: 'rgb(136, 51, 34)',
-        left: divLeft + 'px',
-        top: divTop+'px',
+        backgroundColor: '#663929',
+        left: bookCoverDivLeft + 'px',
+        top: bookCoverDivTop+'px',
         MozBorderRadiusTopleft: '7px',
         MozBorderRadiusTopright: '7px',
         MozBorderRadiusBottomright: '7px',
         MozBorderRadiusBottomleft: '7px'
     }).appendTo('#GBcontainer');
-    //$('#GBcontainer').append('<div id="book_div_1" style="border: 1px solid rgb(68, 25, 17); width: ' + divWidth + 'px; height: '+divHeight+'px; visibility: visible; position: absolute; background-color: rgb(136, 51, 34); left: ' + divLeft + 'px; top: '+divTop+'px; -moz-border-radius-topleft: 7px; -moz-border-radius-topright: 7px; -moz-border-radius-bottomright: 7px; -moz-border-radius-bottomleft: 7px;"/>');
+    //$('#GBcontainer').append('<div id="book_div_1" style="border: 1px solid rgb(68, 25, 17); width: ' + bookCoverDivWidth + 'px; height: '+bookCoverDivHeight+'px; visibility: visible; position: absolute; background-color: rgb(136, 51, 34); left: ' + bookCoverDivLeft + 'px; top: '+bookCoverDivTop+'px; -moz-border-radius-topleft: 7px; -moz-border-radius-topright: 7px; -moz-border-radius-bottomright: 7px; -moz-border-radius-bottomleft: 7px;"/>');
 
 
-    var height  = this.getPageHeight(this.currentLeafR); 
-    var width   = this.getPageWidth(this.currentLeafR);    
+    var height  = this.getPageHeight(this.currentIndexR); 
+    var width   = this.getPageWidth(this.currentIndexR);    
     var scaledW = this.twoPageH*width/height;
     
     this.leafEdgeR = document.createElement('div');
+    this.leafEdgeR.className = 'leafEdgeR';
     $(this.leafEdgeR).css({
         borderStyle: 'solid solid solid none',
         borderColor: 'rgb(51, 51, 34)',
         borderWidth: '1px 1px 1px 0px',
-        background: 'transparent url(http://www.us.archive.org/GnuBook/images/right-edges.png) repeat scroll 0% 0%',
+        background: 'transparent url(' + this.imagesBaseURL + 'right_edges.png) repeat scroll 0% 0%',
         width: leafEdgeWidthR + 'px',
         height: this.twoPageH-1 + 'px',
         /*right: '10px',*/
         left: gutter+scaledW+'px',
-        top: divTop+10+'px',
+        top: bookCoverDivTop+10+'px',
         position: 'absolute'
     }).appendTo('#GBcontainer');
     
     this.leafEdgeL = document.createElement('div');
+    this.leafEdgeL.className = 'leafEdgeL';
     $(this.leafEdgeL).css({
         borderStyle: 'solid none solid solid',
         borderColor: 'rgb(51, 51, 34)',
         borderWidth: '1px 0px 1px 1px',
-        background: 'transparent url(http://www.us.archive.org/GnuBook/images/left-edges.png) repeat scroll 0% 0%',
+        background: 'transparent url(' + this.imagesBaseURL + 'left_edges.png) repeat scroll 0% 0%',
         width: leafEdgeWidthL + 'px',
         height: this.twoPageH-1 + 'px',
-        left: divLeft+10+'px',
-        top: divTop+10+'px',    
+        left: bookCoverDivLeft+10+'px',
+        top: bookCoverDivTop+10+'px',    
         position: 'absolute'
     }).appendTo('#GBcontainer');
 
 
 
-    divWidth = 30;
-    divHeight = this.twoPageH+20;
-    divLeft = ($('#GBcontainer').width() - divWidth) >> 1;
-    divTop = ($('#GBcontainer').height() - divHeight) >> 1;
+    bookCoverDivWidth = 30;
+    bookCoverDivHeight = this.twoPageH+20;
+    bookCoverDivLeft = ($('#GBcontainer').width() - bookCoverDivWidth) >> 1;
+    bookCoverDivTop = ($('#GBcontainer').height() - bookCoverDivHeight) >> 1;
 
     div = document.createElement('div');
     $(div).attr('id', 'book_div_2').css({
         border:          '1px solid rgb(68, 25, 17)',
-        width:           divWidth+'px',
-        height:          divHeight+'px',
+        width:           bookCoverDivWidth+'px',
+        height:          bookCoverDivHeight+'px',
         position:        'absolute',
         backgroundColor: 'rgb(68, 25, 17)',
-        left:            divLeft+'px',
-        top:             divTop+'px'
+        left:            bookCoverDivLeft+'px',
+        top:             bookCoverDivTop+'px'
     }).appendTo('#GBcontainer');
-    //$('#GBcontainer').append('<div id="book_div_2" style="border: 1px solid rgb(68, 25, 17); width: '+divWidth+'px; height: '+divHeight+'px; visibility: visible; position: absolute; background-color: rgb(68, 25, 17); left: '+divLeft+'px; top: '+divTop+'px;"/>');
+    //$('#GBcontainer').append('<div id="book_div_2" style="border: 1px solid rgb(68, 25, 17); width: '+bookCoverDivWidth+'px; height: '+bookCoverDivHeight+'px; visibility: visible; position: absolute; background-color: rgb(68, 25, 17); left: '+bookCoverDivLeft+'px; top: '+bookCoverDivTop+'px;"/>');
 
-    divWidth = this.twoPageW*2;
-    divHeight = this.twoPageH;
-    divLeft = ($('#GBcontainer').width() - divWidth) >> 1;
-    divTop = ($('#GBcontainer').height() - divHeight) >> 1;
+    bookCoverDivWidth = this.twoPageW*2;
+    bookCoverDivHeight = this.twoPageH;
+    bookCoverDivLeft = ($('#GBcontainer').width() - bookCoverDivWidth) >> 1;
+    bookCoverDivTop = ($('#GBcontainer').height() - bookCoverDivHeight) >> 1;
 
 
     this.prepareTwoPagePopUp();
 
-    this.displayedLeafs = [];
-    //this.leafsToDisplay=[firstLeaf, firstLeaf+1];
-    //console.log('leafsToDisplay: ' + this.leafsToDisplay[0] + ' ' + this.leafsToDisplay[1]);
+    this.displayedIndices = [];
+    
+    //this.indicesToDisplay=[firstLeaf, firstLeaf+1];
+    //console.log('indicesToDisplay: ' + this.indicesToDisplay[0] + ' ' + this.indicesToDisplay[1]);
+    
     this.drawLeafsTwoPage();
     this.updateSearchHilites2UP();
     
     this.prefetch();
-    $('#GBzoom').text((100*this.twoPageH/this.getPageHeight(firstLeaf)).toString().substr(0,4));
+    $('#GBzoom').text((100*this.twoPageH/this.getPageHeight(this.currentIndexL)).toString().substr(0,4));
 }
 
 // prepareTwoPagePopUp()
+//
+// This function prepares the "View Page n" popup that shows while the mouse is
+// over the left/right "stack of sheets" edges.  It also binds the mouse
+// events for these divs.
 //______________________________________________________________________________
 GnuBook.prototype.prepareTwoPagePopUp = function() {
     this.twoPagePopUp = document.createElement('div');
@@ -639,25 +848,20 @@ GnuBook.prototype.prepareTwoPagePopUp = function() {
 
     $(this.leafEdgeL).bind('click', this, function(e) { 
         e.data.autoStop();
-        var jumpIndex = e.data.currentLeafL - ($(e.data.leafEdgeL).offset().left + $(e.data.leafEdgeL).width() - e.pageX) * 10;
-        jumpIndex = Math.max(jumpIndex, 0);
-        e.data.flipBackToIndex(jumpIndex);
-    
+        var jumpIndex = e.data.jumpIndexForLeftEdgePageX(e.pageX);
+        e.data.jumpToIndex(jumpIndex);
     });
 
     $(this.leafEdgeR).bind('click', this, function(e) { 
         e.data.autoStop();
-        var jumpIndex = e.data.currentLeafR + (e.pageX - $(e.data.leafEdgeR).offset().left) * 10;
-        jumpIndex = Math.max(jumpIndex, 0);
-        e.data.flipFwdToIndex(jumpIndex);
-    
+        var jumpIndex = e.data.jumpIndexForRightEdgePageX(e.pageX);
+        e.data.jumpToIndex(jumpIndex);    
     });
 
     $(this.leafEdgeR).bind('mousemove', this, function(e) {
 
-        var jumpLeaf = e.data.currentLeafR + (e.pageX - $(e.data.leafEdgeR).offset().left) * 10;
-        jumpLeaf = Math.min(jumpLeaf, e.data.numLeafs-1);        
-        $(e.data.twoPagePopUp).text('View Leaf '+jumpLeaf);
+        var jumpIndex = e.data.jumpIndexForRightEdgePageX(e.pageX);
+        $(e.data.twoPagePopUp).text('View ' + e.data.getPageName(jumpIndex));
         
         $(e.data.twoPagePopUp).css({
             left: e.pageX +5+ 'px',
@@ -666,9 +870,9 @@ GnuBook.prototype.prepareTwoPagePopUp = function() {
     });
 
     $(this.leafEdgeL).bind('mousemove', this, function(e) {
-        var jumpLeaf = e.data.currentLeafL - ($(e.data.leafEdgeL).offset().left + $(e.data.leafEdgeL).width() - e.pageX) * 10;
-        jumpLeaf = Math.max(jumpLeaf, 0);
-        $(e.data.twoPagePopUp).text('View Leaf '+jumpLeaf);
+    
+        var jumpIndex = e.data.jumpIndexForLeftEdgePageX(e.pageX);
+        $(e.data.twoPagePopUp).text('View '+ e.data.getPageName(jumpIndex));
         
         $(e.data.twoPagePopUp).css({
             left: e.pageX - $(e.data.twoPagePopUp).width() - 30 + 'px',
@@ -679,28 +883,28 @@ GnuBook.prototype.prepareTwoPagePopUp = function() {
 
 // calculateSpreadSize()
 //______________________________________________________________________________
-// Calculates 2-page spread dimensions based on this.currentLeafL and
-// this.currentLeafR
+// Calculates 2-page spread dimensions based on this.currentIndexL and
+// this.currentIndexR
 // This function sets this.twoPageH, twoPageW, and twoPageRatio
 
 GnuBook.prototype.calculateSpreadSize = function() {
-    var firstLeaf  = this.currentLeafL;
-    var secondLeaf = this.currentLeafR;
-    //console.log('first page is ' + firstLeaf);
+    var firstIndex  = this.currentIndexL;
+    var secondIndex = this.currentIndexR;
+    //console.log('first page is ' + firstIndex);
 
     var canon5Dratio = 1.5;
     
-    var firstLeafRatio  = this.getPageHeight(firstLeaf) / this.getPageWidth(firstLeaf);
-    var secondLeafRatio = this.getPageHeight(secondLeaf) / this.getPageWidth(secondLeaf);
-    //console.log('firstLeafRatio = ' + firstLeafRatio + ' secondLeafRatio = ' + secondLeafRatio);
+    var firstIndexRatio  = this.getPageHeight(firstIndex) / this.getPageWidth(firstIndex);
+    var secondIndexRatio = this.getPageHeight(secondIndex) / this.getPageWidth(secondIndex);
+    //console.log('firstIndexRatio = ' + firstIndexRatio + ' secondIndexRatio = ' + secondIndexRatio);
 
     var ratio;
-    if (Math.abs(firstLeafRatio - canon5Dratio) < Math.abs(secondLeafRatio - canon5Dratio)) {
-        ratio = firstLeafRatio;
-        //console.log('using firstLeafRatio ' + ratio);
+    if (Math.abs(firstIndexRatio - canon5Dratio) < Math.abs(secondIndexRatio - canon5Dratio)) {
+        ratio = firstIndexRatio;
+        //console.log('using firstIndexRatio ' + ratio);
     } else {
-        ratio = secondLeafRatio;
-        //console.log('using secondLeafRatio ' + ratio);
+        ratio = secondIndexRatio;
+        //console.log('using secondIndexRatio ' + ratio);
     }
 
     var totalLeafEdgeWidth = parseInt(this.numLeafs * 0.1);
@@ -724,10 +928,70 @@ GnuBook.prototype.calculateSpreadSize = function() {
     this.twoPageH     = idealHeight;
     this.twoPageW     = idealWidth;
     this.twoPageRatio = ratio;
-    this.twoPageEdgeW = totalLeafEdgeWidth;    
+    this.twoPageEdgeW = totalLeafEdgeWidth; // The combined width of both edges
 
 }
 
+// currentIndex()
+//______________________________________________________________________________
+// Returns the currently active index.
+GnuBook.prototype.currentIndex = function() {
+    // $$$ we should be cleaner with our idea of which index is active in 1up/2up
+    if (this.mode == this.constMode1up || this.mode == this.constMode2up) {
+        return this.firstIndex;
+    } else {
+        throw 'currentIndex called for unimplemented mode ' + this.mode;
+    }
+}
+
+// right()
+//______________________________________________________________________________
+// Flip the right page over onto the left
+GnuBook.prototype.right = function() {
+    if ('rl' != this.pageProgression) {
+        // LTR
+        gb.next();
+    } else {
+        // RTL
+        gb.prev();
+    }
+}
+
+// rightmost()
+//______________________________________________________________________________
+// Flip to the rightmost page
+GnuBook.prototype.rightmost = function() {
+    if ('rl' != this.pageProgression) {
+        gb.last();
+    } else {
+        gb.first();
+    }
+}
+
+// left()
+//______________________________________________________________________________
+// Flip the left page over onto the right.
+GnuBook.prototype.left = function() {
+    if ('rl' != this.pageProgression) {
+        // LTR
+        gb.prev();
+    } else {
+        // RTL
+        gb.next();
+    }
+}
+
+// leftmost()
+//______________________________________________________________________________
+// Flip to the leftmost page
+GnuBook.prototype.leftmost = function() {
+    if ('rl' != this.pageProgression) {
+        gb.first();
+    } else {
+        gb.last();
+    }
+}
+
 // next()
 //______________________________________________________________________________
 GnuBook.prototype.next = function() {
@@ -735,7 +999,7 @@ GnuBook.prototype.next = function() {
         this.autoStop();
         this.flipFwdToIndex(null);
     } else {
-        if (this.firstIndex <= (this.numLeafs - 2)) {
+        if (this.firstIndex < this.lastDisplayableIndex()) {
             this.jumpToIndex(this.firstIndex+1);
         }
     }
@@ -754,6 +1018,23 @@ GnuBook.prototype.prev = function() {
     }
 }
 
+GnuBook.prototype.first = function() {
+    if (2 == this.mode) {
+        this.jumpToIndex(2);
+    }
+    else {
+        this.jumpToIndex(0);
+    }
+}
+
+GnuBook.prototype.last = function() {
+    if (2 == this.mode) {
+        this.jumpToIndex(this.lastDisplayableIndex());
+    }
+    else {
+        this.jumpToIndex(this.lastDisplayableIndex());
+    }
+}
 
 // flipBackToIndex()
 //______________________________________________________________________________
@@ -761,7 +1042,10 @@ GnuBook.prototype.prev = function() {
 GnuBook.prototype.flipBackToIndex = function(index) {
     if (1 == this.mode) return;
 
-    var leftIndex = this.currentLeafL;
+    var leftIndex = this.currentIndexL;
+    
+    // $$$ Need to change this to be able to see first spread.
+    //     See https://bugs.launchpad.net/gnubook/+bug/296788
     if (leftIndex <= 2) return;
     if (this.animating) return;
 
@@ -773,39 +1057,88 @@ GnuBook.prototype.flipBackToIndex = function(index) {
     if (null == index) {
         index = leftIndex-2;
     }
-    if (index<0) return;
-
-    if ('L' !=  this.getPageSide(index)) {
-        alert('img with index ' + index + ' is not a left-hand page');
+    //if (index<0) return;
+    
+    var previousIndices = this.getSpreadIndices(index);
+    
+    if (previousIndices[0] < 0 || previousIndices[1] < 0) {
         return;
     }
+    
+    //console.log("flipping back to " + previousIndices[0] + ',' + previousIndices[1]);
 
     this.animating = true;
     
-    var prevL = index;
-    var prevR = index+1;
-
-    var gutter= this.prepareFlipBack(prevL, prevR);
+    if ('rl' != this.pageProgression) {
+        // Assume LTR and we are going backward    
+        var gutter = this.prepareFlipLeftToRight(previousIndices[0], previousIndices[1]);        
+        this.flipLeftToRight(previousIndices[0], previousIndices[1], gutter);
+        
+    } else {
+        // RTL and going backward
+        var gutter = this.prepareFlipRightToLeft(previousIndices[0], previousIndices[1]);
+        this.flipRightToLeft(previousIndices[0], previousIndices[1], gutter);
+    }
+}
 
-    var leftLeaf = this.currentLeafL;
+// flipLeftToRight()
+//______________________________________________________________________________
+// Flips the page on the left towards the page on the right
+GnuBook.prototype.flipLeftToRight = function(newIndexL, newIndexR, gutter) {
 
-    var oldLeafEdgeWidthL = parseInt( (this.currentLeafL/this.numLeafs)*this.twoPageEdgeW );
-    var newLeafEdgeWidthL = parseInt( (index            /this.numLeafs)*this.twoPageEdgeW );    
+    var leftLeaf = this.currentIndexL;
+    
+    var oldLeafEdgeWidthL = this.leafEdgeWidth(this.currentIndexL);
+    var newLeafEdgeWidthL = this.leafEdgeWidth(newIndexL);    
     var leafEdgeTmpW = oldLeafEdgeWidthL - newLeafEdgeWidthL;
-
-    var scaledWL = this.getPageWidth2UP(prevL);
+    
+    var currWidthL   = this.getPageWidth2UP(leftLeaf);
+    var newWidthL    = this.getPageWidth2UP(newIndexL);
+    var newWidthR    = this.getPageWidth2UP(newIndexR);
 
     var top  = ($('#GBcontainer').height() - this.twoPageH) >> 1;                
 
+    //console.log('leftEdgeTmpW ' + leafEdgeTmpW);
+    //console.log('  gutter ' + gutter + ', scaledWL ' + scaledWL + ', newLeafEdgeWL ' + newLeafEdgeWidthL);
+    
+    //animation strategy:
+    // 0. remove search highlight, if any.
+    // 1. create a new div, called leafEdgeTmp to represent the leaf edge between the leftmost edge 
+    //    of the left leaf and where the user clicked in the leaf edge.
+    //    Note that if this function was triggered by left() and not a
+    //    mouse click, the width of leafEdgeTmp is very small (zero px).
+    // 2. animate both leafEdgeTmp to the gutter (without changing its width) and animate
+    //    leftLeaf to width=0.
+    // 3. When step 2 is finished, animate leafEdgeTmp to right-hand side of new right leaf
+    //    (left=gutter+newWidthR) while also animating the new right leaf from width=0 to
+    //    its new full width.
+    // 4. After step 3 is finished, do the following:
+    //      - remove leafEdgeTmp from the dom.
+    //      - resize and move the right leaf edge (leafEdgeR) to left=gutter+newWidthR
+    //          and width=twoPageEdgeW-newLeafEdgeWidthL.
+    //      - resize and move the left leaf edge (leafEdgeL) to left=gutter-newWidthL-newLeafEdgeWidthL
+    //          and width=newLeafEdgeWidthL.
+    //      - resize the back cover (twoPageDiv) to left=gutter-newWidthL-newLeafEdgeWidthL-10
+    //          and width=newWidthL+newWidthR+twoPageEdgeW+20
+    //      - move new left leaf (newIndexL) forward to zindex=2 so it can receive clicks.
+    //      - remove old left and right leafs from the dom [pruneUnusedImgs()].
+    //      - prefetch new adjacent leafs.
+    //      - set up click handlers for both new left and right leafs.
+    //      - redraw the search highlight.
+    //      - update the pagenum box and the url.
+    
+    
+    var leftEdgeTmpLeft = gutter - currWidthL - leafEdgeTmpW;
+
     this.leafEdgeTmp = document.createElement('div');
     $(this.leafEdgeTmp).css({
         borderStyle: 'solid none solid solid',
         borderColor: 'rgb(51, 51, 34)',
         borderWidth: '1px 0px 1px 1px',
-        background: 'transparent url(http://www.us.archive.org/GnuBook/images/left-edges.png) repeat scroll 0% 0%',
+        background: 'transparent url(' + this.imagesBaseURL + 'left_edges.png) repeat scroll 0% 0%',
         width: leafEdgeTmpW + 'px',
         height: this.twoPageH-1 + 'px',
-        left: gutter-scaledWL+10+newLeafEdgeWidthL+'px',
+        left: leftEdgeTmpLeft + 'px',
         top: top+'px',    
         position: 'absolute',
         zIndex:1000
@@ -814,57 +1147,79 @@ GnuBook.prototype.flipBackToIndex = function(index) {
     //$(this.leafEdgeL).css('width', newLeafEdgeWidthL+'px');
     $(this.leafEdgeL).css({
         width: newLeafEdgeWidthL+'px', 
-        left: gutter-scaledWL-newLeafEdgeWidthL+'px'
+        left: gutter-currWidthL-newLeafEdgeWidthL+'px'
     });   
 
+    // Left gets the offset of the current left leaf from the document
     var left = $(this.prefetchedImgs[leftLeaf]).offset().left;
+    // $$$ This seems very similar to the gutter.  May be able to consolidate the logic.
     var right = $('#GBcontainer').width()-left-$(this.prefetchedImgs[leftLeaf]).width()+$('#GBcontainer').offset().left-2+'px';
+    // We change the left leaf to right positioning
     $(this.prefetchedImgs[leftLeaf]).css({
         right: right,
-        left: null
+        left: ''
     });
 
      left = $(this.prefetchedImgs[leftLeaf]).offset().left - $('#book_div_1').offset().left;
+     
      right = left+$(this.prefetchedImgs[leftLeaf]).width()+'px';
 
     $(this.leafEdgeTmp).animate({left: gutter}, this.flipSpeed, 'easeInSine');    
     //$(this.prefetchedImgs[leftLeaf]).animate({width: '0px'}, 'slow', 'easeInSine');
-
-    var scaledWR = this.getPageWidth2UP(prevR);
     
     var self = this;
 
     this.removeSearchHilites();
 
+    //console.log('animating leafLeaf ' + leftLeaf + ' to 0px');
     $(this.prefetchedImgs[leftLeaf]).animate({width: '0px'}, self.flipSpeed, 'easeInSine', function() {
-        $(self.leafEdgeTmp).animate({left: gutter+scaledWR+'px'}, self.flipSpeed, 'easeOutSine');    
-        $(self.prefetchedImgs[prevR]).animate({width: scaledWR+'px'}, self.flipSpeed, 'easeOutSine', function() {
-            $(self.prefetchedImgs[prevL]).css('zIndex', 2);
+    
+        //console.log('     and now leafEdgeTmp to left: gutter+newWidthR ' + (gutter + newWidthR));
+        $(self.leafEdgeTmp).animate({left: gutter+newWidthR+'px'}, self.flipSpeed, 'easeOutSine');
+
+        //console.log('  animating newIndexR ' + newIndexR + ' to ' + newWidthR + ' from ' + $(self.prefetchedImgs[newIndexR]).width());
+        $(self.prefetchedImgs[newIndexR]).animate({width: newWidthR+'px'}, self.flipSpeed, 'easeOutSine', function() {
+            $(self.prefetchedImgs[newIndexL]).css('zIndex', 2);
 
             $(self.leafEdgeR).css({
+                // Moves the right leaf edge
                 width: self.twoPageEdgeW-newLeafEdgeWidthL+'px',
-                left:  gutter+scaledWR+'px'
+                left:  gutter+newWidthR+'px'
             });
+
+            $(self.leafEdgeL).css({
+                // Moves and resizes the left leaf edge
+                width: newLeafEdgeWidthL+'px',
+                left:  gutter-newWidthL-newLeafEdgeWidthL+'px'
+            });
+
             
             $(self.twoPageDiv).css({
-                width: scaledWL+scaledWR+self.twoPageEdgeW+20+'px',
-                left: gutter-scaledWL-newLeafEdgeWidthL-10+'px'
+                // Resizes the brown border div
+                width: newWidthL+newWidthR+self.twoPageEdgeW+20+'px',
+                left: gutter-newWidthL-newLeafEdgeWidthL-10+'px'
             });
             
             $(self.leafEdgeTmp).remove();
             self.leafEdgeTmp = null;
             
-            self.currentLeafL = prevL;
-            self.currentLeafR = prevR;
-            self.displayedLeafs = [prevL, prevR];
+            self.currentIndexL = newIndexL;
+            self.currentIndexR = newIndexR;
+            self.firstIndex = self.currentIndexL;
+            self.displayedIndices = [newIndexL, newIndexR];
             self.setClickHandlers();
             self.pruneUnusedImgs();
-            self.prefetch();
+            self.prefetch();            
             self.animating = false;
             
             self.updateSearchHilites2UP();
             self.updatePageNumBox2UP();
-            //$('#GBzoom').text((self.twoPageH/self.getPageHeight(prevL)).toString().substr(0,4));            
+            //$('#GBzoom').text((self.twoPageH/self.getPageHeight(newIndexL)).toString().substr(0,4));            
+            
+            if (self.animationFinishedCallback) {
+                self.animationFinishedCallback();
+                self.animationFinishedCallback = null;
+            }
         });
     });        
     
@@ -872,10 +1227,9 @@ GnuBook.prototype.flipBackToIndex = function(index) {
 
 // flipFwdToIndex()
 //______________________________________________________________________________
+// Whether we flip left or right is dependent on the page progression
 // to flip forward one spread, pass index=null
 GnuBook.prototype.flipFwdToIndex = function(index) {
-    var rightLeaf = this.currentLeafR;
-    if (rightLeaf >= this.numLeafs-3) return;
 
     if (this.animating) return;
 
@@ -884,46 +1238,53 @@ GnuBook.prototype.flipFwdToIndex = function(index) {
         return;
     }
 
-    
     if (null == index) {
-        index = rightLeaf+2;
-    }
-    if (index>=this.numLeafs-3) return;
-
-    if ('R' !=  this.getPageSide(index)) {
-        alert('img with index ' + index + ' is not a right-hand page');
-        return;
+        index = this.currentIndexR+2; // $$$ assumes indices are continuous
     }
+    if (index > this.lastDisplayableIndex()) return;
 
     this.animating = true;
+    
+    var nextIndices = this.getSpreadIndices(index);
+    
+    //console.log('flipfwd to indices ' + nextIndices[0] + ',' + nextIndices[1]);
 
-    var nextL = index-1;
-    var nextR = index;
-
-    var gutter= this.prepareFlipFwd(nextL, nextR);
+    if ('rl' != this.pageProgression) {
+        // We did not specify RTL
+        var gutter = this.prepareFlipRightToLeft(nextIndices[0], nextIndices[1]);
+        this.flipRightToLeft(nextIndices[0], nextIndices[1], gutter);
+    } else {
+        // RTL
+        var gutter = this.prepareFlipLeftToRight(nextIndices[0], nextIndices[1]);
+        this.flipLeftToRight(nextIndices[0], nextIndices[1], gutter);
+    }
+}
 
-    var oldLeafEdgeWidthL = parseInt( (this.currentLeafL/this.numLeafs)*this.twoPageEdgeW );
+// flipRightToLeft(nextL, nextR, gutter)
+// $$$ better not to have to pass gutter in
+//______________________________________________________________________________
+// Flip from left to right and show the nextL and nextR indices on those sides
+GnuBook.prototype.flipRightToLeft = function(newIndexL, newIndexR, gutter) {
+    var oldLeafEdgeWidthL = this.leafEdgeWidth(this.currentIndexL);
     var oldLeafEdgeWidthR = this.twoPageEdgeW-oldLeafEdgeWidthL;
-    var newLeafEdgeWidthL = parseInt( (nextL            /this.numLeafs)*this.twoPageEdgeW );    
+    var newLeafEdgeWidthL = this.leafEdgeWidth(newIndexL);  
     var newLeafEdgeWidthR = this.twoPageEdgeW-newLeafEdgeWidthL;
 
     var leafEdgeTmpW = oldLeafEdgeWidthR - newLeafEdgeWidthR;
 
     var top  = ($('#GBcontainer').height() - this.twoPageH) >> 1;                
 
-    var height  = this.getPageHeight(rightLeaf); 
-    var width   = this.getPageWidth(rightLeaf);    
-    var scaledW = this.twoPageH*width/height;
+    var scaledW = this.getPageWidth2UP(this.currentIndexR);
 
     var middle     = ($('#GBcontainer').width() >> 1);
-    var currGutter = middle+parseInt((2*this.currentLeafL - this.numLeafs)*this.twoPageEdgeW/this.numLeafs/2);    
+    var currGutter = middle + this.gutterOffsetForIndex(this.currentIndexL);
 
     this.leafEdgeTmp = document.createElement('div');
     $(this.leafEdgeTmp).css({
         borderStyle: 'solid none solid solid',
         borderColor: 'rgb(51, 51, 34)',
         borderWidth: '1px 0px 1px 1px',
-        background: 'transparent url(http://www.us.archive.org/GnuBook/images/left-edges.png) repeat scroll 0% 0%',
+        background: 'transparent url(' + this.imagesBaseURL + 'left_edges.png) repeat scroll 0% 0%',
         width: leafEdgeTmpW + 'px',
         height: this.twoPageH-1 + 'px',
         left: currGutter+scaledW+'px',
@@ -932,82 +1293,100 @@ GnuBook.prototype.flipFwdToIndex = function(index) {
         zIndex:1000
     }).appendTo('#GBcontainer');
 
-    var scaledWR = this.getPageWidth2UP(nextR);
-    $(this.leafEdgeR).css({width: newLeafEdgeWidthR+'px', left: gutter+scaledWR+'px' });
-
-    var scaledWL = this.getPageWidth2UP(nextL);
+    //var scaledWR = this.getPageWidth2UP(newIndexR); // $$$ should be current instead?
+    //var scaledWL = this.getPageWidth2UP(newIndexL); // $$$ should be current instead?
     
-    var self = this;
+    var currWidthL = this.getPageWidth2UP(this.currentIndexL);
+    var currWidthR = this.getPageWidth2UP(this.currentIndexR);
+    var newWidthL = this.getPageWidth2UP(newIndexL);
+    var newWidthR = this.getPageWidth2UP(newIndexR);
+
+    $(this.leafEdgeR).css({width: newLeafEdgeWidthR+'px', left: gutter+newWidthR+'px' });
+
+    var self = this; // closure-tastic!
 
     var speed = this.flipSpeed;
 
     this.removeSearchHilites();
     
     $(this.leafEdgeTmp).animate({left: gutter}, speed, 'easeInSine');    
-    $(this.prefetchedImgs[rightLeaf]).animate({width: '0px'}, speed, 'easeInSine', function() {
-        $(self.leafEdgeTmp).animate({left: gutter-scaledWL-leafEdgeTmpW+'px'}, speed, 'easeOutSine');    
-        $(self.prefetchedImgs[nextL]).animate({width: scaledWL+'px'}, speed, 'easeOutSine', function() {
-            $(self.prefetchedImgs[nextR]).css('zIndex', 2);
+    $(this.prefetchedImgs[this.currentIndexR]).animate({width: '0px'}, speed, 'easeInSine', function() {
+        $(self.leafEdgeTmp).animate({left: gutter-newWidthL-leafEdgeTmpW+'px'}, speed, 'easeOutSine');    
+        $(self.prefetchedImgs[newIndexL]).animate({width: newWidthL+'px'}, speed, 'easeOutSine', function() {
+            $(self.prefetchedImgs[newIndexR]).css('zIndex', 2);
 
             $(self.leafEdgeL).css({
                 width: newLeafEdgeWidthL+'px', 
-                left: gutter-scaledWL-newLeafEdgeWidthL+'px'
+                left: gutter-newWidthL-newLeafEdgeWidthL+'px'
             });
             
             $(self.twoPageDiv).css({
-                width: scaledWL+scaledWR+self.twoPageEdgeW+20+'px',
-                left: gutter-scaledWL-newLeafEdgeWidthL-10+'px'
+                width: newWidthL+newWidthR+self.twoPageEdgeW+20+'px',
+                left: gutter-newWidthL-newLeafEdgeWidthL-10+'px'
             });
             
             $(self.leafEdgeTmp).remove();
             self.leafEdgeTmp = null;
             
-            self.currentLeafL = nextL;
-            self.currentLeafR = nextR;
-            self.displayedLeafs = [nextL, nextR];
+            self.currentIndexL = newIndexL;
+            self.currentIndexR = newIndexR;
+            self.firstIndex = self.currentIndexL;
+            self.displayedIndices = [newIndexL, newIndexR];
             self.setClickHandlers();            
             self.pruneUnusedImgs();
             self.prefetch();
             self.animating = false;
 
+
             self.updateSearchHilites2UP();
             self.updatePageNumBox2UP();
-            //$('#GBzoom').text((self.twoPageH/self.getPageHeight(nextL)).toString().substr(0,4));
+            //$('#GBzoom').text((self.twoPageH/self.getPageHeight(newIndexL)).toString().substr(0,4));
+            
+            if (self.animationFinishedCallback) {
+                self.animationFinishedCallback();
+                self.animationFinishedCallback = null;
+            }
         });
-    });
-    
+    });    
 }
 
 // setClickHandlers
 //______________________________________________________________________________
 GnuBook.prototype.setClickHandlers = function() {
     var self = this;
-    $(this.prefetchedImgs[this.currentLeafL]).click(function() {
+    $(this.prefetchedImgs[this.currentIndexL]).click(function() {
         //self.prevPage();
         self.autoStop();
-        self.flipBackToIndex(null);
+        self.left();
     });
-    $(this.prefetchedImgs[this.currentLeafR]).click(function() {
+    $(this.prefetchedImgs[this.currentIndexR]).click(function() {
         //self.nextPage();'
         self.autoStop();
-        self.flipFwdToIndex(null);        
+        self.right();        
     });
 }
 
 // prefetchImg()
 //______________________________________________________________________________
-GnuBook.prototype.prefetchImg = function(leafNum) {
-    if (undefined == this.prefetchedImgs[leafNum]) {        
+GnuBook.prototype.prefetchImg = function(index) {
+    if (undefined == this.prefetchedImgs[index]) {    
+        //console.log('prefetching ' + index);
         var img = document.createElement("img");
-        img.src = this.getPageURI(leafNum);
-        this.prefetchedImgs[leafNum] = img;
+        img.src = this.getPageURI(index);
+        this.prefetchedImgs[index] = img;
     }
 }
 
 
-// prepareFlipBack()
+// prepareFlipLeftToRight()
+//
 //______________________________________________________________________________
-GnuBook.prototype.prepareFlipBack = function(prevL, prevR) {
+//
+// Prepare to flip the left page towards the right.  This corresponds to moving
+// backward when the page progression is left to right.
+GnuBook.prototype.prepareFlipLeftToRight = function(prevL, prevR) {
+
+    //console.log('  preparing left->right for ' + prevL + ',' + prevR);
 
     this.prefetchImg(prevL);
     this.prefetchImg(prevR);
@@ -1018,12 +1397,19 @@ GnuBook.prototype.prepareFlipBack = function(prevL, prevR) {
     var top  = ($('#GBcontainer').height() - this.twoPageH) >> 1;                
     var scaledW = this.twoPageH*width/height;
 
-    var gutter = middle+parseInt((2*prevL - this.numLeafs)*this.twoPageEdgeW/this.numLeafs/2);    
-
+    // The gutter is the dividing line between the left and right pages.
+    // It is offset from the middle to create the illusion of thickness to the pages
+    var gutter = middle + this.gutterOffsetForIndex(prevL);
+    
+    //console.log('    gutter for ' + prevL + ' is ' + gutter);
+    //console.log('    prevL.left: ' + (gutter - scaledW) + 'px');
+    //console.log('    changing prevL ' + prevL + ' to left: ' + (gutter-scaledW) + ' width: ' + scaledW);
+    
     $(this.prefetchedImgs[prevL]).css({
         position: 'absolute',
         /*right:   middle+'px',*/
         left: gutter-scaledW+'px',
+        right: '',
         top:    top+'px',
         backgroundColor: 'rgb(234, 226, 205)',
         height: this.twoPageH,
@@ -1034,9 +1420,12 @@ GnuBook.prototype.prepareFlipBack = function(prevL, prevR) {
 
     $('#GBcontainer').append(this.prefetchedImgs[prevL]);
 
+    //console.log('    changing prevR ' + prevR + ' to left: ' + gutter + ' width: 0');
+
     $(this.prefetchedImgs[prevR]).css({
         position: 'absolute',
         left:   gutter+'px',
+        right: '',
         top:    top+'px',
         backgroundColor: 'rgb(234, 226, 205)',
         height: this.twoPageH,
@@ -1052,9 +1441,11 @@ GnuBook.prototype.prepareFlipBack = function(prevL, prevR) {
             
 }
 
-// prepareFlipFwd()
+// prepareFlipRightToLeft()
 //______________________________________________________________________________
-GnuBook.prototype.prepareFlipFwd = function(nextL, nextR) {
+GnuBook.prototype.prepareFlipRightToLeft = function(nextL, nextR) {
+
+    //console.log('  preparing left<-right for ' + nextL + ',' + nextR);
 
     this.prefetchImg(nextL);
     this.prefetchImg(nextR);
@@ -1065,8 +1456,11 @@ GnuBook.prototype.prepareFlipFwd = function(nextL, nextR) {
     var top  = ($('#GBcontainer').height() - this.twoPageH) >> 1;                
     var scaledW = this.twoPageH*width/height;
 
-    var gutter = middle+parseInt((2*nextL - this.numLeafs)*this.twoPageEdgeW/this.numLeafs/2);    
+    var gutter = middle + this.gutterOffsetForIndex(nextL);
     
+    //console.log('right to left to %d gutter is %d', nextL, gutter);
+    
+    //console.log(' prepareRTL changing nextR ' + nextR + ' to left: ' + gutter);
     $(this.prefetchedImgs[nextR]).css({
         position: 'absolute',
         left:   gutter+'px',
@@ -1084,6 +1478,7 @@ GnuBook.prototype.prepareFlipFwd = function(nextL, nextR) {
     width   = this.getPageWidth(nextL);      
     scaledW = this.twoPageH*width/height;
 
+    //console.log(' prepareRTL changing nextL ' + nextL + ' to right: ' + $('#GBcontainer').width()-gutter);
     $(this.prefetchedImgs[nextL]).css({
         position: 'absolute',
         right:   $('#GBcontainer').width()-gutter+'px',
@@ -1101,39 +1496,39 @@ GnuBook.prototype.prepareFlipFwd = function(nextL, nextR) {
             
 }
 
-// getNextLeafs()
+// getNextLeafs() -- NOT RTL AWARE
 //______________________________________________________________________________
-GnuBook.prototype.getNextLeafs = function(o) {
-    //TODO: we might have two left or two right leafs in a row (damaged book)
-    //For now, assume that leafs are contiguous.
-    
-    //return [this.currentLeafL+2, this.currentLeafL+3];
-    o.L = this.currentLeafL+2;
-    o.R = this.currentLeafL+3;
-}
-
-// getprevLeafs()
+// GnuBook.prototype.getNextLeafs = function(o) {
+//     //TODO: we might have two left or two right leafs in a row (damaged book)
+//     //For now, assume that leafs are contiguous.
+//     
+//     //return [this.currentIndexL+2, this.currentIndexL+3];
+//     o.L = this.currentIndexL+2;
+//     o.R = this.currentIndexL+3;
+// }
+
+// getprevLeafs() -- NOT RTL AWARE
 //______________________________________________________________________________
-GnuBook.prototype.getPrevLeafs = function(o) {
-    //TODO: we might have two left or two right leafs in a row (damaged book)
-    //For now, assume that leafs are contiguous.
-    
-    //return [this.currentLeafL-2, this.currentLeafL-1];
-    o.L = this.currentLeafL-2;
-    o.R = this.currentLeafL-1;
-}
+// GnuBook.prototype.getPrevLeafs = function(o) {
+//     //TODO: we might have two left or two right leafs in a row (damaged book)
+//     //For now, assume that leafs are contiguous.
+//     
+//     //return [this.currentIndexL-2, this.currentIndexL-1];
+//     o.L = this.currentIndexL-2;
+//     o.R = this.currentIndexL-1;
+// }
 
 // pruneUnusedImgs()
 //______________________________________________________________________________
 GnuBook.prototype.pruneUnusedImgs = function() {
-    //console.log('current: ' + this.currentLeafL + ' ' + this.currentLeafR);
+    //console.log('current: ' + this.currentIndexL + ' ' + this.currentIndexR);
     for (var key in this.prefetchedImgs) {
         //console.log('key is ' + key);
-        if ((key != this.currentLeafL) && (key != this.currentLeafR)) {
+        if ((key != this.currentIndexL) && (key != this.currentIndexR)) {
             //console.log('removing key '+ key);
             $(this.prefetchedImgs[key]).remove();
         }
-        if ((key < this.currentLeafL-4) || (key > this.currentLeafR+4)) {
+        if ((key < this.currentIndexL-4) || (key > this.currentIndexR+4)) {
             //console.log('deleting key '+ key);
             delete this.prefetchedImgs[key];
         }
@@ -1143,16 +1538,17 @@ GnuBook.prototype.pruneUnusedImgs = function() {
 // prefetch()
 //______________________________________________________________________________
 GnuBook.prototype.prefetch = function() {
-    var lim = this.currentLeafL-4;
+
+    var lim = this.currentIndexL-4;
     var i;
     lim = Math.max(lim, 0);
-    for (i = lim; i < this.currentLeafL; i++) {
+    for (i = lim; i < this.currentIndexL; i++) {
         this.prefetchImg(i);
     }
     
-    if (this.numLeafs > (this.currentLeafR+1)) {
-        lim = Math.min(this.currentLeafR+4, this.numLeafs-1);
-        for (i=this.currentLeafR+1; i<=lim; i++) {
+    if (this.numLeafs > (this.currentIndexR+1)) {
+        lim = Math.min(this.currentIndexR+4, this.numLeafs-1);
+        for (i=this.currentIndexR+1; i<=lim; i++) {
             this.prefetchImg(i);
         }
     }
@@ -1175,6 +1571,7 @@ GnuBook.prototype.search = function(term) {
        script.setAttribute("type", "text/javascript");
        script.setAttribute("src", 'http://'+this.server+'/GnuBook/flipbook_search_gb.php?url='+escape(this.bookPath+'/'+this.bookId+'_djvu.xml')+'&term='+term+'&format=XML&callback=gb.GBSearchCallback');
        document.getElementsByTagName('head')[0].appendChild(script);
+       $('#GnuBookSearchResults').html('Searching...');
 }
 
 // GBSearchCallback()
@@ -1201,38 +1598,45 @@ GnuBook.prototype.GBSearchCallback = function(txt) {
     }
     
     var pages = dom.getElementsByTagName('PAGE');
-    for (var i = 0; i < pages.length; i++){
-        //console.log(pages[i].getAttribute('file').substr(1) +'-'+ parseInt(pages[i].getAttribute('file').substr(1), 10));
-
-        
-        var re = new RegExp (/_(\d{4})/);
-        var reMatch = re.exec(pages[i].getAttribute('file'));
-        var leafNum = parseInt(reMatch[1], 10);
-        //var leafNum = parseInt(pages[i].getAttribute('file').substr(1), 10);
-        
-        var children = pages[i].childNodes;
-        var context = '';
-        for (var j=0; j<children.length; j++) {
-            //console.log(j + ' - ' + children[j].nodeName);
-            //console.log(children[j].firstChild.nodeValue);
-            if ('CONTEXT' == children[j].nodeName) {
-                context += children[j].firstChild.nodeValue;
-            } else if ('WORD' == children[j].nodeName) {
-                context += '<b>'+children[j].firstChild.nodeValue+'</b>';
-                
-                var index = this.leafNumToIndex(leafNum);
-                if (null != index) {
-                    //coordinates are [left, bottom, right, top, [baseline]]
-                    //we'll skip baseline for now...
-                    var coords = children[j].getAttribute('coords').split(',',4);
-                    if (4 == coords.length) {
-                        this.searchResults[index] = {'l':coords[0], 'b':coords[1], 'r':coords[2], 't':coords[3], 'div':null};
+    
+    if (0 == pages.length) {
+        // $$$ it would be nice to echo the (sanitized) search result here
+        $('#GnuBookSearchResults').append('<li>No search results found</li>');
+    } else {    
+        for (var i = 0; i < pages.length; i++){
+            //console.log(pages[i].getAttribute('file').substr(1) +'-'+ parseInt(pages[i].getAttribute('file').substr(1), 10));
+    
+            
+            var re = new RegExp (/_(\d{4})/);
+            var reMatch = re.exec(pages[i].getAttribute('file'));
+            var index = parseInt(reMatch[1], 10);
+            //var index = parseInt(pages[i].getAttribute('file').substr(1), 10);
+            
+            var children = pages[i].childNodes;
+            var context = '';
+            for (var j=0; j<children.length; j++) {
+                //console.log(j + ' - ' + children[j].nodeName);
+                //console.log(children[j].firstChild.nodeValue);
+                if ('CONTEXT' == children[j].nodeName) {
+                    context += children[j].firstChild.nodeValue;
+                } else if ('WORD' == children[j].nodeName) {
+                    context += '<b>'+children[j].firstChild.nodeValue+'</b>';
+                    
+                    var index = this.leafNumToIndex(index);
+                    if (null != index) {
+                        //coordinates are [left, bottom, right, top, [baseline]]
+                        //we'll skip baseline for now...
+                        var coords = children[j].getAttribute('coords').split(',',4);
+                        if (4 == coords.length) {
+                            this.searchResults[index] = {'l':coords[0], 'b':coords[1], 'r':coords[2], 't':coords[3], 'div':null};
+                        }
                     }
                 }
             }
+            var pageName = this.getPageName(index);
+            //TODO: remove hardcoded instance name
+            $('#GnuBookSearchResults').append('<li><b><a href="javascript:gb.jumpToIndex('+index+');">' + pageName + '</a></b> - ' + context + '</li>');
         }
-        //TODO: remove hardcoded instance name
-        $('#GnuBookSearchResults').append('<li><b><a href="javascript:gb.jumpToIndex('+index+');">Leaf ' + leafNum + '</a></b> - ' + context+'</li>');
     }
     $('#GnuBookSearchResults').append('</ul>');
 
@@ -1255,7 +1659,7 @@ GnuBook.prototype.updateSearchHilites1UP = function() {
 
     for (var key in this.searchResults) {
         
-        if (-1 != jQuery.inArray(parseInt(key), this.displayedLeafs)) {
+        if (-1 != jQuery.inArray(parseInt(key), this.displayedIndices)) {
             var result = this.searchResults[key];
             if(null == result.div) {
                 result.div = document.createElement('div');
@@ -1284,7 +1688,7 @@ GnuBook.prototype.updateSearchHilites2UP = function() {
 
     for (var key in this.searchResults) {
         key = parseInt(key, 10);
-        if (-1 != jQuery.inArray(key, this.displayedLeafs)) {
+        if (-1 != jQuery.inArray(key, this.displayedIndices)) {
             var result = this.searchResults[key];
             if(null == result.div) {
                 result.div = document.createElement('div');
@@ -1297,7 +1701,7 @@ GnuBook.prototype.updateSearchHilites2UP = function() {
             var reduce = this.twoPageH/height;
             var scaledW = parseInt(width*reduce);
             
-            var gutter = middle+parseInt((2*this.currentLeafL - this.numLeafs)*this.twoPageEdgeW/this.numLeafs/2);
+            var gutter = middle + this.gutterOffsetForIndex(this.currentIndexL);
             
             if ('L' == this.getPageSide(key)) {
                 var pageL = gutter-scaledW;
@@ -1338,9 +1742,12 @@ GnuBook.prototype.removeSearchHilites = function() {
 // showEmbedCode()
 //______________________________________________________________________________
 GnuBook.prototype.showEmbedCode = function() {
+    if (null != this.embedPopup) { // check if already showing
+        return;
+    }
     this.autoStop();
-    var overlay = document.createElement("div");
-    $(overlay).css({
+    this.embedPopup = document.createElement("div");
+    $(this.embedPopup).css({
         position: 'absolute',
         top:      '20px',
         left:     ($('#GBcontainer').width()-400)/2 + 'px',
@@ -1348,37 +1755,53 @@ GnuBook.prototype.showEmbedCode = function() {
         padding:  "20px",
         border:   "3px double #999999",
         zIndex:   3,
-        backgroundColor: "#fff",
+        backgroundColor: "#fff"
     }).appendTo('#GnuBook');
 
     htmlStr =  '<p style="text-align:center;"><b>Embed Bookreader in your blog!</b></p>';
-    htmlStr += '<p><b>Note:</b> The bookreader is still in beta testing. URLs may change in the future, breaking embedded books. This feature is just for testing!</b></p>';
     htmlStr += '<p>The bookreader uses iframes for embedding. It will not work on web hosts that block iframes. The embed feature has been tested on blogspot.com blogs as well as self-hosted Wordpress blogs. This feature will NOT work on wordpress.com blogs.</p>';
-    htmlStr += '<p>Embed Code: <input type="text" size="40" value="<iframe src=\'http://www.us.archive.org/GnuBook/GnuBookEmbed.php?id='+this.bookId+'\' width=\'430px\' height=\'430px\'></iframe>"></p>';
-    htmlStr += '<p style="text-align:center;"><a href="" onclick="$(this.parentNode.parentNode).remove(); return false;">Close popup</a></p>';    
+    htmlStr += '<p>Embed Code: <input type="text" size="40" value="' + this.getEmbedCode() + '"></p>';
+    htmlStr += '<p style="text-align:center;"><a href="" onclick="gb.embedPopup = null; $(this.parentNode.parentNode).remove(); return false">Close popup</a></p>';    
 
-    overlay.innerHTML = htmlStr;    
+    this.embedPopup.innerHTML = htmlStr;
+    $(this.embedPopup).find('input').bind('click', function() {
+        this.select();
+    })
 }
 
 // autoToggle()
 //______________________________________________________________________________
 GnuBook.prototype.autoToggle = function() {
+
+    var bComingFrom1up = false;
     if (2 != this.mode) {
+        bComingFrom1up = true;
         this.switchMode(2);
     }
 
     var self = this;
     if (null == this.autoTimer) {
         this.flipSpeed = 2000;
-        this.flipFwdToIndex();
+        
+        // $$$ Draw events currently cause layout problems when they occur during animation.
+        //     There is a specific problem when changing from 1-up immediately to autoplay in RTL so
+        //     we workaround for now by not triggering immediate animation in that case.
+        //     See https://bugs.launchpad.net/gnubook/+bug/328327
+        if (('rl' == this.pageProgression) && bComingFrom1up) {
+            // don't flip immediately -- wait until timer fires
+        } else {
+            // flip immediately
+            this.flipFwdToIndex();        
+        }
 
-        $('#autoImg').attr('src', 'http://www.us.archive.org/GnuBook/images/control_pause_blue.png');
+        $('#GBtoolbar .play').hide();
+        $('#GBtoolbar .pause').show();
         this.autoTimer=setInterval(function(){
             if (self.animating) {return;}
-
-            if (self.currentLeafR >= self.numLeafs-5) {
-                self.flipBackToIndex(1);
-            } else {
+            
+            if (Math.max(self.currentIndexL, self.currentIndexR) >= self.lastDisplayableIndex()) {
+                self.flipBackToIndex(1); // $$$ really what we want?
+            } else {            
                 self.flipFwdToIndex();
             }
         },5000);
@@ -1393,7 +1816,531 @@ GnuBook.prototype.autoStop = function() {
     if (null != this.autoTimer) {
         clearInterval(this.autoTimer);
         this.flipSpeed = 'fast';
-        $('#autoImg').attr('src', 'http://www.us.archive.org/GnuBook/images/control_play_blue.png');
+        $('#GBtoolbar .pause').hide();
+        $('#GBtoolbar .play').show();
         this.autoTimer = null;
     }
 }
+
+// keyboardNavigationIsDisabled(event)
+//   - returns true if keyboard navigation should be disabled for the event
+//______________________________________________________________________________
+GnuBook.prototype.keyboardNavigationIsDisabled = function(event) {
+    if (event.target.tagName == "INPUT") {
+        return true;
+    }   
+    return false;
+}
+
+// gutterOffsetForIndex
+//______________________________________________________________________________
+//
+// Returns the gutter offset for the spread containing the given index.
+// This function supports RTL
+GnuBook.prototype.gutterOffsetForIndex = function(pindex) {
+
+    // To find the offset of the gutter from the middle we calculate our percentage distance
+    // through the book (0..1), remap to (-0.5..0.5) and multiply by the total page edge width
+    var offset = parseInt(((pindex / this.numLeafs) - 0.5) * this.twoPageEdgeW);
+    
+    // But then again for RTL it's the opposite
+    if ('rl' == this.pageProgression) {
+        offset = -offset;
+    }
+    
+    return offset;
+}
+
+// leafEdgeWidth
+//______________________________________________________________________________
+// Returns the width of the leaf edge div for the page with index given
+GnuBook.prototype.leafEdgeWidth = function(pindex) {
+    // $$$ could there be single pixel rounding errors for L vs R?
+    if ((this.getPageSide(pindex) == 'L') && (this.pageProgression != 'rl')) {
+        return parseInt( (pindex/this.numLeafs) * this.twoPageEdgeW + 0.5);
+    } else {
+        return parseInt( (1 - pindex/this.numLeafs) * this.twoPageEdgeW + 0.5);
+    }
+}
+
+// jumpIndexForLeftEdgePageX
+//______________________________________________________________________________
+// Returns the target jump leaf given a page coordinate (inside the left page edge div)
+GnuBook.prototype.jumpIndexForLeftEdgePageX = function(pageX) {
+    if ('rl' != this.pageProgression) {
+        // LTR - flipping backward
+        var jumpIndex = this.currentIndexL - ($(this.leafEdgeL).offset().left + $(this.leafEdgeL).width() - pageX) * 10;
+
+        // browser may have resized the div due to font size change -- see https://bugs.launchpad.net/gnubook/+bug/333570        
+        jumpIndex = GnuBook.util.clamp(Math.round(jumpIndex), this.firstDisplayableIndex(), this.currentIndexL - 2);
+        return jumpIndex;
+
+    } else {
+        var jumpIndex = this.currentIndexL + ($(this.leafEdgeL).offset().left + $(this.leafEdgeL).width() - pageX) * 10;
+        jumpIndex = GnuBook.util.clamp(Math.round(jumpIndex), this.currentIndexL + 2, this.lastDisplayableIndex());
+        return jumpIndex;
+    }
+}
+
+// jumpIndexForRightEdgePageX
+//______________________________________________________________________________
+// Returns the target jump leaf given a page coordinate (inside the right page edge div)
+GnuBook.prototype.jumpIndexForRightEdgePageX = function(pageX) {
+    if ('rl' != this.pageProgression) {
+        // LTR
+        var jumpIndex = this.currentIndexR + (pageX - $(this.leafEdgeR).offset().left) * 10;
+        jumpIndex = GnuBook.util.clamp(Math.round(jumpIndex), this.currentIndexR + 2, this.lastDisplayableIndex());
+        return jumpIndex;
+    } else {
+        var jumpIndex = this.currentIndexR - (pageX - $(this.leafEdgeR).offset().left) * 10;
+        jumpIndex = GnuBook.util.clamp(Math.round(jumpIndex), this.firstDisplayableIndex(), this.currentIndexR - 2);
+        return jumpIndex;
+    }
+}
+
+GnuBook.prototype.initToolbar = function(mode, ui) {
+    $("#GnuBook").append("<div id='GBtoolbar'><span style='float:left;'>"
+        + "<a class='GBicon logo rollover' href='" + this.logoURL + "'>&nbsp;</a>"
+        + " <button class='GBicon rollover zoom_out' onclick='gb.zoom1up(-1); return false;'/>" 
+        + "<button class='GBicon rollover zoom_in' onclick='gb.zoom1up(1); return false;'/>"
+        + " <span class='label'>Zoom: <span id='GBzoom'>"+100/this.reduce+"</span>%</span>"
+        + " <button class='GBicon rollover one_page_mode' onclick='gb.switchMode(1); return false;'/>"
+        + " <button class='GBicon rollover two_page_mode' onclick='gb.switchMode(2); return false;'/>"
+        + "&nbsp;&nbsp;<a class='GBblack title' href='"+this.bookUrl+"' target='_blank'>"+this.shortTitle(50)+"</a>"
+        + "</span></div>");
+        
+    if (ui == "embed") {
+        $("#GnuBook a.logo").attr("target","_blank");
+    }
+
+    // $$$ turn this into a member variable
+    var jToolbar = $('#GBtoolbar'); // j prefix indicates jQuery object
+    
+    // We build in mode 2
+    jToolbar.append("<span id='GBtoolbarbuttons' style='float: right'>"
+        + "<button class='GBicon rollover embed' />"
+        + "<form class='GBpageform' action='javascript:' onsubmit='gb.jumpToPage(this.elements[0].value)'> <span class='label'>Page:<input id='GBpagenum' type='text' size='3' onfocus='gb.autoStop();'></input></span></form>"
+        + "<div class='GBtoolbarmode2' style='display: none'><button class='GBicon rollover book_leftmost' /><button class='GBicon rollover book_left' /><button class='GBicon rollover book_right' /><button class='GBicon rollover book_rightmost' /></div>"
+        + "<div class='GBtoolbarmode1' style='display: none'><button class='GBicon rollover book_top' /><button class='GBicon rollover book_up' /> <button class='GBicon rollover book_down' /><button class='GBicon rollover book_bottom' /></div>"
+        + "<button class='GBicon rollover play' /><button class='GBicon rollover pause' style='display: none' /></span>");
+
+    this.bindToolbarNavHandlers(jToolbar);
+    
+    // Setup tooltips -- later we could load these from a file for i18n
+    var titles = { '.logo': 'Go to Archive.org',
+                   '.zoom_in': 'Zoom in',
+                   '.zoom_out': 'Zoom out',
+                   '.one_page_mode': 'One-page view',
+                   '.two_page_mode': 'Two-page view',
+                   '.embed': 'Embed bookreader',
+                   '.book_left': 'Flip left',
+                   '.book_right': 'Flip right',
+                   '.book_up': 'Page up',
+                   '.book_down': 'Page down',
+                   '.play': 'Play',
+                   '.pause': 'Pause',
+                   '.book_top': 'First page',
+                   '.book_bottom': 'Last page'
+                  };
+    if ('rl' == this.pageProgression) {
+        titles['.book_leftmost'] = 'Last page';
+        titles['.book_rightmost'] = 'First page';
+    } else { // LTR
+        titles['.book_leftmost'] = 'First page';
+        titles['.book_rightmost'] = 'Last page';
+    }
+                  
+    for (var icon in titles) {
+        jToolbar.find(icon).attr('title', titles[icon]);
+    }
+
+    // Switch to requested mode -- binds other click handlers
+    this.switchToolbarMode(mode);
+
+}
+
+
+// switchToolbarMode
+//______________________________________________________________________________
+// Update the toolbar for the given mode (changes navigation buttons)
+// $$$ we should soon split the toolbar out into its own module
+GnuBook.prototype.switchToolbarMode = function(mode) {
+    if (1 == mode) {
+        // 1-up     
+        $('#GBtoolbar .GBtoolbarmode2').hide();
+        $('#GBtoolbar .GBtoolbarmode1').show().css('display', 'inline');
+    } else {
+        // 2-up
+        $('#GBtoolbar .GBtoolbarmode1').hide();
+        $('#GBtoolbar .GBtoolbarmode2').show().css('display', 'inline');
+    }
+}
+
+// bindToolbarNavHandlers
+//______________________________________________________________________________
+// Binds the toolbar handlers
+GnuBook.prototype.bindToolbarNavHandlers = function(jToolbar) {
+
+    jToolbar.find('.book_left').bind('click', function(e) {
+        gb.left();
+        return false;
+    });
+         
+    jToolbar.find('.book_right').bind('click', function(e) {
+        gb.right();
+        return false;
+    });
+        
+    jToolbar.find('.book_up').bind('click', function(e) {
+        gb.prev();
+        return false;
+    });        
+        
+    jToolbar.find('.book_down').bind('click', function(e) {
+        gb.next();
+        return false;
+    });
+        
+    jToolbar.find('.embed').bind('click', function(e) {
+        gb.showEmbedCode();
+        return false;
+    });
+
+    jToolbar.find('.play').bind('click', function(e) {
+        gb.autoToggle();
+        return false;
+    });
+
+    jToolbar.find('.pause').bind('click', function(e) {
+        gb.autoToggle();
+        return false;
+    });
+    
+    jToolbar.find('.book_top').bind('click', function(e) {
+        gb.first();
+        return false;
+    });
+
+    jToolbar.find('.book_bottom').bind('click', function(e) {
+        gb.last();
+        return false;
+    });
+    
+    jToolbar.find('.book_leftmost').bind('click', function(e) {
+        gb.leftmost();
+        return false;
+    });
+  
+    jToolbar.find('.book_rightmost').bind('click', function(e) {
+        gb.rightmost();
+        return false;
+    });
+}
+
+// firstDisplayableIndex
+//______________________________________________________________________________
+// Returns the index of the first visible page, dependent on the mode.
+// $$$ Currently we cannot display the front/back cover in 2-up and will need to update
+// this function when we can as part of https://bugs.launchpad.net/gnubook/+bug/296788
+GnuBook.prototype.firstDisplayableIndex = function() {
+    if (this.mode == 0) {
+        return 0;
+    } else {
+        return 1; // $$$ we assume there are enough pages... we need logic for very short books
+    }
+}
+
+// lastDisplayableIndex
+//______________________________________________________________________________
+// Returns the index of the last visible page, dependent on the mode.
+// $$$ Currently we cannot display the front/back cover in 2-up and will need to update
+// this function when we can as pa  rt of https://bugs.launchpad.net/gnubook/+bug/296788
+GnuBook.prototype.lastDisplayableIndex = function() {
+    if (this.mode == 2) {
+        if (this.lastDisplayableIndex2up === null) {
+            // Calculate and cache
+            var candidate = this.numLeafs - 1;
+            for ( ; candidate >= 0; candidate--) {
+                var spreadIndices = this.getSpreadIndices(candidate);
+                if (Math.max(spreadIndices[0], spreadIndices[1]) < (this.numLeafs - 1)) {
+                    break;
+                }
+            }
+            this.lastDisplayableIndex2up = candidate;
+        }
+        return this.lastDisplayableIndex2up;
+    } else {
+        return this.numLeafs - 1;
+    }
+}
+
+// shortTitle(maximumCharacters)
+//________
+// Returns a shortened version of the title with the maximum number of characters
+GnuBook.prototype.shortTitle = function(maximumCharacters) {
+    if (this.bookTitle.length < maximumCharacters) {
+        return this.bookTitle;
+    }
+    
+    var title = this.bookTitle.substr(0, maximumCharacters - 3);
+    title += '...';
+    return title;
+}
+
+
+
+// Parameter related functions
+
+// updateFromParams(params)
+//________
+// Update ourselves from the params object.
+//
+// e.g. this.updateFromParams(this.paramsFromFragment(window.location.hash))
+GnuBook.prototype.updateFromParams = function(params) {
+    if ('undefined' != typeof(params.mode)) {
+        this.switchMode(params.mode);
+    }
+
+    // $$$ process /search
+    // $$$ process /zoom
+    
+    // We only respect page if index is not set
+    if ('undefined' != typeof(params.index)) {
+        if (params.index != this.currentIndex()) {
+            this.jumpToIndex(params.index);
+        }
+    } else if ('undefined' != typeof(params.page)) {
+        // $$$ this assumes page numbers are unique
+        if (params.page != this.getPageNum(this.currentIndex())) {
+            this.jumpToPage(params.page);
+        }
+    }
+    
+    // $$$ process /region
+    // $$$ process /highlight
+}
+
+// paramsFromFragment(urlFragment)
+//________
+// Returns a object with configuration parametes from a URL fragment.
+//
+// E.g paramsFromFragment(window.location.hash)
+GnuBook.prototype.paramsFromFragment = function(urlFragment) {
+    // URL fragment syntax specification: http://openlibrary.org/dev/docs/bookurls
+    
+    var params = {};
+    
+    // For convenience we allow an initial # character (as from window.location.hash)
+    // but don't require it
+    if (urlFragment.substr(0,1) == '#') {
+        urlFragment = urlFragment.substr(1);
+    }
+    
+    // Simple #nn syntax
+    var oldStyleLeafNum = parseInt( /^\d+$/.exec(urlFragment) );
+    if ( !isNaN(oldStyleLeafNum) ) {
+        params.index = oldStyleLeafNum;
+        
+        // Done processing if using old-style syntax
+        return params;
+    }
+    
+    // Split into key-value pairs
+    var urlArray = urlFragment.split('/');
+    var urlHash = {};
+    for (var i = 0; i < urlArray.length; i += 2) {
+        urlHash[urlArray[i]] = urlArray[i+1];
+    }
+    
+    // Mode
+    if ('1up' == urlHash['mode']) {
+        params.mode = this.constMode1up;
+    } else if ('2up' == urlHash['mode']) {
+        params.mode = this.constMode2up;
+    }
+    
+    // Index and page
+    if ('undefined' != typeof(urlHash['page'])) {
+        // page was set -- may not be int
+        params.page = urlHash['page'];
+    }
+    
+    // $$$ process /region
+    // $$$ process /search
+    // $$$ process /highlight
+        
+    return params;
+}
+
+// paramsFromCurrent()
+//________
+// Create a params object from the current parameters.
+GnuBook.prototype.paramsFromCurrent = function() {
+
+    var params = {};
+
+    var pageNum = this.getPageNum(this.currentIndex());
+    if ((pageNum === 0) || pageNum) {
+        params.page = pageNum;
+    }
+    
+    params.index = this.currentIndex();
+    params.mode = this.mode;
+    
+    // $$$ highlight
+    // $$$ region
+    // $$$ search
+    
+    return params;
+}
+
+// fragmentFromParams(params)
+//________
+// Create a fragment string from the params object.
+// See http://openlibrary.org/dev/docs/bookurls for an explanation of the fragment syntax.
+GnuBook.prototype.fragmentFromParams = function(params) {
+    var separator = '/';
+    
+    var fragments = [];
+    
+    if ('undefined' != typeof(params.page)) {
+        fragments.push('page', params.page);
+    } else {
+        // Don't have page numbering -- use index instead
+        fragments.push('page', 'n' + params.index);
+    }
+    
+    // $$$ highlight
+    // $$$ region
+    // $$$ search
+    
+    // mode
+    if ('undefined' != typeof(params.mode)) {    
+        if (params.mode == this.constMode1up) {
+            fragments.push('mode', '1up');
+        } else if (params.mode == this.constMode2up) {
+            fragments.push('mode', '2up');
+        } else {
+            throw 'fragmentFromParams called with unknown mode ' + params.mode;
+        }
+    }
+    
+    return fragments.join(separator);
+}
+
+// getPageIndex(pageNum)
+//________
+// Returns the *highest* index the given page number, or undefined
+GnuBook.prototype.getPageIndex = function(pageNum) {
+    var pageIndices = this.getPageIndices(pageNum);
+    
+    if (pageIndices.length > 0) {
+        return pageIndices[pageIndices.length - 1];
+    }
+
+    return undefined;
+}
+
+// getPageIndices(pageNum)
+//________
+// Returns an array (possibly empty) of the indices with the given page number
+GnuBook.prototype.getPageIndices = function(pageNum) {
+    var indices = [];
+
+    // Check for special "nXX" page number
+    if (pageNum.slice(0,1) == 'n') {
+        try {
+            var pageIntStr = pageNum.slice(1, pageNum.length);
+            var pageIndex = parseInt(pageIntStr);
+            indices.append(pageIndex);
+            return indices;
+        } catch(err) {
+            // Do nothing... will run through page names and see if one matches
+        }
+    }
+
+    var i;
+    for (i=0; i<this.numLeafs; i++) {
+        if (this.getPageNum(i) == pageNum) {
+            indices.push(i);
+        }
+    }
+    
+    return indices;
+}
+
+// getPageName(index)
+//________
+// Returns the name of the page as it should be displayed in the user interface
+GnuBook.prototype.getPageName = function(index) {
+    return 'Page ' + this.getPageNum(index);
+}
+
+// updateLocationHash
+//________
+// Update the location hash from the current parameters.  Call this instead of manually
+// using window.location.replace
+GnuBook.prototype.updateLocationHash = function() {
+    var newHash = '#' + this.fragmentFromParams(this.paramsFromCurrent());
+    window.location.replace(newHash);
+    
+    // This is the variable checked in the timer.  Only user-generated changes
+    // to the URL will trigger the event.
+    this.oldLocationHash = newHash;
+}
+
+// startLocationPolling
+//________
+// Starts polling of window.location to see hash fragment changes
+GnuBook.prototype.startLocationPolling = function() {
+    var self = this; // remember who I am
+    self.oldLocationHash = window.location.hash;
+    
+    if (this.locationPollId) {
+        clearInterval(this.locationPollID);
+        this.locationPollId = null;
+    }
+    
+    this.locationPollId = setInterval(function() {
+        var newHash = window.location.hash;
+        if (newHash != self.oldLocationHash) {
+            if (newHash != self.oldUserHash) { // Only process new user hash once
+                //console.log('url change detected ' + self.oldLocationHash + " -> " + newHash);
+                
+                // Queue change if animating
+                if (self.animating) {
+                    self.autoStop();
+                    self.animationFinishedCallback = function() {
+                        self.updateFromParams(self.paramsFromFragment(newHash));
+                    }                        
+                } else { // update immediately
+                    self.updateFromParams(self.paramsFromFragment(newHash));
+                }
+                self.oldUserHash = newHash;
+            }
+        }
+    }, 500);
+}
+
+// getEmbedURL
+//________
+// Returns a URL for an embedded version of the current book
+GnuBook.prototype.getEmbedURL = function() {
+    // We could generate a URL hash fragment here but for now we just leave at defaults
+    return 'http://' + window.location.host + '/stream/'+this.bookId + '?ui=embed';
+}
+
+// getEmbedCode
+//________
+// Returns the embed code HTML fragment suitable for copy and paste
+GnuBook.prototype.getEmbedCode = function() {
+    return "<iframe src='" + this.getEmbedURL() + "' width='480px' height='430px'></iframe>";
+}
+
+
+// Library functions
+GnuBook.util = {
+    clamp: function(value, min, max) {
+        return Math.min(Math.max(value, min), max);
+    }
+}
\ No newline at end of file