Merge branch 'develop' into feature/JAL-3364splitFrameImage

diff --cc src/jalview/gui/AlignmentPanel.java
index 912cb8a,ea8fcdc..5c0d3a1
--- 1/src/jalview/gui/AlignmentPanel.java
--- 2/src/jalview/gui/AlignmentPanel.java
+++ b/src/jalview/gui/AlignmentPanel.java
@@@ -1058,15 -1042,18 +1058,17 @@@ public class AlignmentPanel extends GAl
     * @param pageWidth
     * @param pageHeight
     * @param pageNumber
 -   *          (0, 1, ...)
 +   *                     (0, 1, ...)
     * @param g
 +   * @param clipToPage
     * 
     * @return
 -   * 
 -   * @throws PrinterException
     */
    public int printWrappedAlignment(int pageWidth, int pageHeight, int pageNumber,
 -          Graphics g) throws PrinterException
 +          Graphics g, boolean clipToPage)
    {
+     getSeqPanel().seqCanvas.calculateWrappedGeometry(getWidth(),
+             getHeight());
      int annotationHeight = 0;
      if (av.isShowAnnotation())
      {

diff --cc src/jalview/gui/SeqCanvas.java
Simple merge