1.1 --- a/exports.cpp	Mon Dec 14 10:17:55 2009 +0000
     1.2 +++ b/exports.cpp	Tue Dec 15 09:14:59 2009 +0000
     1.3 @@ -185,9 +185,10 @@
     1.4  					case 2: // Main heading
     1.5  						ts << "\n";
     1.6  						ts << underline ( cur->getHeading(), QString("=") );
     1.7 -						ts << "\n\n";
     1.8 +						ts << "\n";
     1.9  						break;
    1.10  					case 3: // Achievement, Bonus, Objective ...
    1.11 +						ts << "\n\n";
    1.12  						ts << underline ( cur->getHeading(), "-");
    1.13  						ts << "\n\n";
    1.14  						break;
    1.15 @@ -201,8 +202,8 @@
    1.16  						else	if (cur->isActiveStandardFlag ("cross-red"))
    1.17  							ts << " [NOT STARTED] ";
    1.18  						ts << "\n";
    1.19 +						break;
    1.20  					default:
    1.21 -						break;
    1.22  						ts << (curIndent + "- " + cur->getHeading());
    1.23  						ts << "\n";
    1.24  						break;

     2.1 --- a/mainwindow.cpp	Mon Dec 14 10:17:55 2009 +0000
     2.2 +++ b/mainwindow.cpp	Tue Dec 15 09:14:59 2009 +0000
     2.3 @@ -1598,6 +1598,8 @@
     2.4  
     2.5  	branchContextMenu->addSeparator();	
     2.6  	branchContextMenu->addAction ( actionLoadImage);
     2.7 +	if (settings.value( "/mainwindow/showTestMenu",false).toBool() )
     2.8 +		branchContextMenu->addAction ( actionAddAttribute);
     2.9  
    2.10  	// Submenu for Links (URLs, vymLinks)
    2.11  	branchLinksContextMenu =new QMenu (this);

     3.1 --- a/mapeditor.cpp	Mon Dec 14 10:17:55 2009 +0000
     3.2 +++ b/mapeditor.cpp	Tue Dec 15 09:14:59 2009 +0000
     3.3 @@ -403,13 +403,15 @@
     3.4  	}
     3.5  }
     3.6  
     3.7 -QRectF MapEditor::getTotalBBox()	//FIXME-2 needed e.g. for image export
     3.8 +QRectF MapEditor::getTotalBBox()	
     3.9  {
    3.10  	QRectF r;
    3.11 -/*
    3.12 -	for (int i=0;i<rootItem->branchCount(); i++)
    3.13 -		r=addBBox (rootItem->getBranchNum(i)->getTotalBBox(), r);
    3.14 -*/ 
    3.15 +	BranchObj *bo;
    3.16 +	for (int i=0;i<model->getRootItem()->branchCount(); i++)
    3.17 +	{
    3.18 +		bo=(BranchObj*)(model->getRootItem()->getBranchNum(i)->getLMO());
    3.19 +		if (bo) r=addBBox (bo->getTotalBBox(), r);
    3.20 +	}
    3.21  	return r;	
    3.22  }
    3.23  
    3.24 @@ -417,7 +419,7 @@
    3.25  QPixmap MapEditor::getPixmap()
    3.26  {
    3.27  	QRectF mapRect=getTotalBBox();
    3.28 -	QPixmap pix((int)mapRect.width()+2,(int)mapRect.height()+1);
    3.29 +	QPixmap pix((int)mapRect.width()+2,(int)mapRect.height()+2);
    3.30  	QPainter pp (&pix);
    3.31  	
    3.32  	pp.setRenderHints(renderHints());

     4.1 --- a/tex/vym.changelog	Mon Dec 14 10:17:55 2009 +0000
     4.2 +++ b/tex/vym.changelog	Tue Dec 15 09:14:59 2009 +0000
     4.3 @@ -1,7 +1,13 @@
     4.4 +-------------------------------------------------------------------
     4.5 +Tue Dec 15 10:14:11 CET 2009 - vym@insilmaril.de
     4.6 +
     4.7 +- Bugfix: A&O report didn't show subitems
     4.8 +
     4.9  -------------------------------------------------------------------
    4.10  Mon Dec 14 11:16:57 CET 2009 - vym@insilmaril.de
    4.11  
    4.12  - Bugfix: Wrong tmp position when relinking a mainbranch
    4.13 +- Bugfix: Image export, also used in HTML export
    4.14  
    4.15  -------------------------------------------------------------------
    4.16  Thu Dec  7 23:17:57 CET 2009 - vym@insilmaril.de

     5.1 --- a/version.h	Mon Dec 14 10:17:55 2009 +0000
     5.2 +++ b/version.h	Tue Dec 15 09:14:59 2009 +0000
     5.3 @@ -7,7 +7,7 @@
     5.4  #define __VYM_VERSION "1.13.0"
     5.5  //#define __VYM_CODENAME "Codename: RC-1"
     5.6  #define __VYM_CODENAME "Codename: development version, not for production!"
     5.7 -#define __VYM_BUILD_DATE "2009-12-14"
     5.8 +#define __VYM_BUILD_DATE "2009-12-15"
     5.9  
    5.10  
    5.11  bool checkVersion(const QString &);