SourceForge: dvisvgm/dvisvgm: changeset 360:1a7811edd130
added total number of pages to message text
authorMartin Gieseking <mgieseki@users.sourceforge.net>
Mon Nov 09 09:42:14 2009 +0100 (2 weeks ago)
changeset 3601a7811edd130
parent 359b27591bd60cc
child 361805502ba854a
added total number of pages to message text
src/DVIToSVG.cpp
src/dvisvgm.cpp
     1.1 --- a/src/DVIToSVG.cpp	Fri Nov 06 22:57:31 2009 +0100
     1.2 +++ b/src/DVIToSVG.cpp	Mon Nov 09 09:42:14 2009 +0100
     1.3 @@ -113,7 +113,7 @@
     1.4  
     1.5  
     1.6  /** Starts the conversion process.
     1.7 - *  @return number of processed pages */
     1.8 + *  @return total number of pages in DVI file */
     1.9  int DVIToSVG::convert (unsigned firstPage, unsigned lastPage) {
    1.10  	executePostamble();    // collect scaling and font information
    1.11  	if (firstPage > getTotalPages()) {
    1.12 @@ -159,7 +159,7 @@
    1.13  		_svg.reset();
    1.14  
    1.15  	}
    1.16 -	return 1; // @@
    1.17 +	return getTotalPages();
    1.18  }
    1.19  
    1.20  
     2.1 --- a/src/dvisvgm.cpp	Fri Nov 06 22:57:31 2009 +0100
     2.2 +++ b/src/dvisvgm.cpp	Mon Nov 09 09:42:14 2009 +0100
     2.3 @@ -269,13 +269,15 @@
     2.4  					out.release();       // force writing
     2.5  					const char *pstr = pages == 1 ? "" : "s";
     2.6  					UInt64 nbytes = args.stdout_given() ? sc.count() : FileSystem::filesize(svgfile);
     2.7 -					Message::mstream() << pages << " page" << pstr;
     2.8 -					Message::mstream() << " (" << nbytes << " bytes";
     2.9 +					Message::mstream() << "1 ";
    2.10 +					if (pages > 1)
    2.11 +						Message::mstream() << "of " << pages << " ";
    2.12 +					Message::mstream() << "page" << pstr << " written to "
    2.13 +						                << (args.stdout_given() ? "<stdout>" : svgfile)
    2.14 +					                   << " (" << nbytes << " bytes";
    2.15  					if (args.zip_given())
    2.16  						Message::mstream() << " = " << floor(double(nbytes)/sc.count()*100.0+0.5) << "%";
    2.17 -					Message::mstream() << ") written to "
    2.18 -						<< (args.stdout_given() ? "<stdout>" : svgfile)
    2.19 -						<< " in " << (get_time()-start_time) << " seconds\n";
    2.20 +					Message::mstream() << ") in " << (get_time()-start_time) << " seconds\n";
    2.21  				}
    2.22  			}
    2.23  			catch (DVIException &e) {