Author: laplace Date: 2010-07-26 20:30:36 +0200 (Mon, 26 Jul 2010) New Revision: 37761 Changeset: http://dev.haiku-os.org/changeset/37761 Ticket: http://dev.haiku-os.org/ticket/6380 Modified: haiku/trunk/build/jam/HaikuImage haiku/trunk/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp Log: * Added files used by PDF Writer to the image (closed ticket #6380). * Changed path to /boot/common/settings. Someone feel free to change the implementation to get the path from find_directory(...). Modified: haiku/trunk/build/jam/HaikuImage =================================================================== --- haiku/trunk/build/jam/HaikuImage 2010-07-26 15:13:00 UTC (rev 37760) +++ haiku/trunk/build/jam/HaikuImage 2010-07-26 18:30:36 UTC (rev 37761) @@ -595,6 +595,11 @@ AddDirectoryToHaikuImage home config settings printers "Save as PDF" : home-config-settings-printers-save-as-pdf.rdef ; +# PDF Writer enconding files +CopyDirectoryToHaikuImage common settings + : [ FDirName $(HAIKU_TOP) src add-ons print drivers pdf encoding ] + : "PDF Writer" : -x .svn -x Jamfile ; + # licenses CopyDirectoryToHaikuImage system data : [ FDirName $(HAIKU_TOP) data system data licenses ] Modified: haiku/trunk/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp =================================================================== --- haiku/trunk/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp 2010-07-26 15:13:00 UTC (rev 37760) +++ haiku/trunk/src/add-ons/print/drivers/pdf/source/PDFWriter.cpp 2010-07-26 18:30:36 UTC (rev 37761) @@ -347,26 +347,26 @@ REPORT(kDebug, 0, "Start of fonts declaration:"); PDF_set_parameter(fPdf, "Encoding", - "t1enc0==/boot/home/config/settings/PDF Writer/t1enc0.enc"); + "t1enc0==/boot/common/settings/PDF Writer/t1enc0.enc"); PDF_set_parameter(fPdf, "Encoding", - "t1enc1==/boot/home/config/settings/PDF Writer/t1enc1.enc"); + "t1enc1==/boot/common/settings/PDF Writer/t1enc1.enc"); PDF_set_parameter(fPdf, "Encoding", - "t1enc2==/boot/home/config/settings/PDF Writer/t1enc2.enc"); + "t1enc2==/boot/common/settings/PDF Writer/t1enc2.enc"); PDF_set_parameter(fPdf, "Encoding", - "t1enc3==/boot/home/config/settings/PDF Writer/t1enc3.enc"); + "t1enc3==/boot/common/settings/PDF Writer/t1enc3.enc"); PDF_set_parameter(fPdf, "Encoding", - "t1enc4==/boot/home/config/settings/PDF Writer/t1enc4.enc"); + "t1enc4==/boot/common/settings/PDF Writer/t1enc4.enc"); PDF_set_parameter(fPdf, "Encoding", - "ttenc0==/boot/home/config/settings/PDF Writer/ttenc0.cpg"); + "ttenc0==/boot/common/settings/PDF Writer/ttenc0.cpg"); PDF_set_parameter(fPdf, "Encoding", - "ttenc1==/boot/home/config/settings/PDF Writer/ttenc1.cpg"); + "ttenc1==/boot/common/settings/PDF Writer/ttenc1.cpg"); PDF_set_parameter(fPdf, "Encoding", - "ttenc2==/boot/home/config/settings/PDF Writer/ttenc2.cpg"); + "ttenc2==/boot/common/settings/PDF Writer/ttenc2.cpg"); PDF_set_parameter(fPdf, "Encoding", - "ttenc3==/boot/home/config/settings/PDF Writer/ttenc3.cpg"); + "ttenc3==/boot/common/settings/PDF Writer/ttenc3.cpg"); PDF_set_parameter(fPdf, "Encoding", - "ttenc4==/boot/home/config/settings/PDF Writer/ttenc4.cpg"); + "ttenc4==/boot/common/settings/PDF Writer/ttenc4.cpg"); DeclareFonts(); @@ -482,8 +482,8 @@ ASSERT(fState == NULL); fState = new State(height, printRect.left, printRect.top); - if (MakesPDF()) - PDF_begin_page(fPdf, width, height); + if (MakesPDF()) + PDF_begin_page(fPdf, width, height); REPORT(kDebug, fPage, ">>>> PDF_begin_page [%f, %f]", width, height); @@ -509,8 +509,8 @@ while (fState->prev != NULL) PopState(); - if (MakesPDF()) - PDF_end_page(fPdf); + if (MakesPDF()) + PDF_end_page(fPdf); REPORT(kDebug, fPage, ">>>> PDF_end_page"); delete fState; fState = NULL;