tumble / file diff

     1.1 diff -r d47b66e1722f -r 4b8c80d77f76 semantics.c
     1.2 --- a/semantics.c	Fri Mar 14 07:08:52 2003 +0000
     1.3 +++ b/semantics.c	Fri Mar 14 08:24:37 2003 +0000
     1.4 @@ -2,7 +2,7 @@
     1.5   * tumble: build a PDF file from image files
     1.6   *
     1.7   * Semantic routines for spec file parser
     1.8 - * $Id: semantics.c,v 1.20 2003/03/13 23:08:52 eric Exp $
     1.9 + * $Id: semantics.c,v 1.21 2003/03/14 00:24:37 eric Exp $
    1.10   * Copyright 2001, 2002, 2003 Eric Smith <eric@brouhaha.com>
    1.11   *
    1.12   * This program is free software; you can redistribute it and/or modify
    1.13 @@ -692,11 +692,6 @@
    1.14  	      fprintf (stderr, "error opening PDF file '%s'\n", output_fn);
    1.15  	      return (0);
    1.16  	    }
    1.17 -	  page_label = get_output_page_label (page->output_context);
    1.18 -	  process_page_numbers (page_index,
    1.19 -				range_count (page->range),
    1.20 -				page->range.first,
    1.21 -				page_label);
    1.22  	}
    1.23  
    1.24        parity = ((image->range.first + i) % 2) ? INPUT_MODIFIER_ODD : INPUT_MODIFIER_EVEN;
    1.25 @@ -714,9 +709,24 @@
    1.26  
    1.27        if (verbose)
    1.28  	fprintf (stderr, "processing image %d\n", image->range.first + i);
    1.29 +
    1.30 +      if (p)
    1.31 +	page_label = NULL;
    1.32 +      else
    1.33 +	{
    1.34 +	  page_label = get_output_page_label (page->output_context);
    1.35 +	  if (page_label)
    1.36 +	    {
    1.37 +	      page_label->page_index = page_index;
    1.38 +	      page_label->base = page->range.first;
    1.39 +	      page_label->count = range_count (page->range);
    1.40 +	    }
    1.41 +	}
    1.42 +
    1.43        if (! process_page (image->range.first + i,
    1.44  			  input_attributes,
    1.45 -			  p ? NULL : page->bookmark_list))
    1.46 +			  p ? NULL : page->bookmark_list,
    1.47 +			  page_label))
    1.48  	{
    1.49  	  fprintf (stderr, "error processing image %d\n", image->range.first + i);
    1.50  	  return (0);