@@ -1686,9 +1686,7 @@ function printTableWithHorizontalPageBreak(doc, table, startPos, cursor) {
16861686 doc . applyStyles ( doc . userStyles ) ;
16871687 // add page to print next columns in new page
16881688 if ( index > 0 ) {
1689- // When adding a page here, make sure not to print the footers
1690- // because they were already printed before on this same loop
1691- addPage ( doc , table , startPos , cursor , colsAndIndexes . columns , true ) ;
1689+ addPage ( doc , table , startPos , cursor , colsAndIndexes . columns ) ;
16921690 }
16931691 else {
16941692 // print head for selected columns
@@ -1707,26 +1705,21 @@ function printTableWithHorizontalPageBreak(doc, table, startPos, cursor) {
17071705 var lastPrintedRowIndex = lastRowIndexOfLastPage_1 ;
17081706 if ( firstColumnsToFitResult ) {
17091707 doc . applyStyles ( doc . userStyles ) ;
1710- var firstColumnsToFit = firstColumnsToFitResult . columns ;
17111708 if ( lastRowIndexOfLastPage_1 >= 0 ) {
1712- // When adding a page here, make sure not to print the footers
1713- // because they were already printed before on this same loop
1714- addPage ( doc , table , startPos , cursor , firstColumnsToFit , true ) ;
1709+ addPage ( doc , table , startPos , cursor , firstColumnsToFitResult . columns ) ;
17151710 }
17161711 else {
1717- printHead ( doc , table , cursor , firstColumnsToFit ) ;
1712+ printHead ( doc , table , cursor , firstColumnsToFitResult . columns ) ;
17181713 }
1719- lastPrintedRowIndex = printBodyWithoutPageBreaks ( doc , table , lastRowIndexOfLastPage_1 + 1 , cursor , firstColumnsToFit ) ;
1720- printFoot ( doc , table , cursor , firstColumnsToFit ) ;
1714+ lastPrintedRowIndex = printBodyWithoutPageBreaks ( doc , table , lastRowIndexOfLastPage_1 + 1 , cursor , firstColumnsToFitResult . columns ) ;
1715+ printFoot ( doc , table , cursor , firstColumnsToFitResult . columns ) ;
17211716 }
17221717 // Check how many rows were printed, so that the next columns would not print more rows than that
17231718 var maxNumberOfRows = lastPrintedRowIndex - lastRowIndexOfLastPage_1 ;
17241719 // Print the next columns, never exceding maxNumberOfRows
17251720 allColumnsCanFitResult . slice ( 1 ) . forEach ( function ( colsAndIndexes ) {
17261721 doc . applyStyles ( doc . userStyles ) ;
1727- // When adding a page here, make sure not to print the footers
1728- // because they were already printed before on this same loop
1729- addPage ( doc , table , startPos , cursor , colsAndIndexes . columns , true ) ;
1722+ addPage ( doc , table , startPos , cursor , colsAndIndexes . columns ) ;
17301723 printBodyWithoutPageBreaks ( doc , table , lastRowIndexOfLastPage_1 + 1 , cursor , colsAndIndexes . columns , maxNumberOfRows ) ;
17311724 printFoot ( doc , table , cursor , colsAndIndexes . columns ) ;
17321725 } ) ;
@@ -2013,11 +2006,10 @@ function getRemainingPageSpace(doc, table, isLastRow, cursor) {
20132006 }
20142007 return doc . pageSize ( ) . height - cursor . y - bottomContentHeight ;
20152008}
2016- function addPage ( doc , table , startPos , cursor , columns , suppressFooter ) {
2009+ function addPage ( doc , table , startPos , cursor , columns ) {
20172010 if ( columns === void 0 ) { columns = [ ] ; }
2018- if ( suppressFooter === void 0 ) { suppressFooter = false ; }
20192011 doc . applyStyles ( doc . userStyles ) ;
2020- if ( table . settings . showFoot === 'everyPage' && ! suppressFooter ) {
2012+ if ( table . settings . showFoot === 'everyPage' ) {
20212013 table . foot . forEach ( function ( row ) { return printRow ( doc , table , row , cursor , columns ) ; } ) ;
20222014 }
20232015 // Add user content just before adding new page ensure it will
0 commit comments