@@ -240,14 +240,16 @@ pager_rep::make_header (bool empty_flag) {
240240 int current_page= N (pages) + 1 + page_offset;
241241 if (current_page <= 0 ) env->write (PAGE_NR , " " );
242242 else env->write (PAGE_NR , as_string (current_page));
243- tree old = env->local_begin (PAR_COLUMNS , " 1" );
244- string which= (N (pages) & 1 ) == 0 ? PAGE_ODD_HEADER : PAGE_EVEN_HEADER ;
243+ tree old_col = env->local_begin (PAR_COLUMNS , " 1" );
244+ tree old_first= env->local_begin (PAR_FIRST , " 0cm" );
245+ string which = (N (pages) & 1 ) == 0 ? PAGE_ODD_HEADER : PAGE_EVEN_HEADER ;
245246 if (style[PAGE_THIS_HEADER ] != " " ) which= PAGE_THIS_HEADER ;
246247 tree header_tree= decode_images_in_tree (style[which]);
247248 box b = typeset_as_concat (
248249 env, attach_here (tree (PARA , header_tree), decorate ()));
249250 style (PAGE_THIS_HEADER )= " " ;
250- env->local_end (PAR_COLUMNS , old);
251+ env->local_end (PAR_FIRST , old_first);
252+ env->local_end (PAR_COLUMNS , old_col);
251253 return b;
252254}
253255
@@ -258,14 +260,16 @@ pager_rep::make_footer (bool empty_flag) {
258260 if (current_page <= 0 ) env->write (PAGE_NR , " " );
259261 else env->write (PAGE_NR , as_string (current_page));
260262 env->write (PAGE_THE_PAGE , style[PAGE_THE_PAGE ]);
261- tree old = env->local_begin (PAR_COLUMNS , " 1" );
262- string which= (N (pages) & 1 ) == 0 ? PAGE_ODD_FOOTER : PAGE_EVEN_FOOTER ;
263+ tree old_col = env->local_begin (PAR_COLUMNS , " 1" );
264+ tree old_first= env->local_begin (PAR_FIRST , " 0cm" );
265+ string which = (N (pages) & 1 ) == 0 ? PAGE_ODD_FOOTER : PAGE_EVEN_FOOTER ;
263266 if (style[PAGE_THIS_FOOTER ] != " " ) which= PAGE_THIS_FOOTER ;
264267 tree footer_tree= decode_images_in_tree (style[which]);
265268 box b = typeset_as_concat (
266269 env, attach_here (tree (PARA , footer_tree), decorate ()));
267270 style (PAGE_THIS_FOOTER )= " " ;
268- env->local_end (PAR_COLUMNS , old);
271+ env->local_end (PAR_FIRST , old_first);
272+ env->local_end (PAR_COLUMNS , old_col);
269273 return b;
270274}
271275
0 commit comments