fix print bug & compilation problem

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1813 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b864e7206ac40d919630c045d5039e63cc05fd45..7b50b589dc7039560c68e52506ff18aaa816c03c 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -82,67 +82,67 @@ src/frontends/qt2/paragraphdlgimpl.C
 src/frontends/qt2/tabularcreatedlgimpl.C
 src/frontends/xforms/combox.C
 src/frontends/xforms/FileDialog.C
-src/frontends/xforms/form_bibitem.C
 src/frontends/xforms/FormBibitem.C
-src/frontends/xforms/form_bibtex.C
+src/frontends/xforms/form_bibitem.C
 src/frontends/xforms/FormBibtex.C
+src/frontends/xforms/form_bibtex.C
 src/frontends/xforms/form_browser.C
-src/frontends/xforms/form_character.C
 src/frontends/xforms/FormCharacter.C
-src/frontends/xforms/form_citation.C
+src/frontends/xforms/form_character.C
 src/frontends/xforms/FormCitation.C
-src/frontends/xforms/form_copyright.C
+src/frontends/xforms/form_citation.C
 src/frontends/xforms/FormCopyright.C
-src/frontends/xforms/form_credits.C
+src/frontends/xforms/form_copyright.C
 src/frontends/xforms/FormCredits.C
-src/frontends/xforms/form_document.C
+src/frontends/xforms/form_credits.C
 src/frontends/xforms/FormDocument.C
-src/frontends/xforms/form_error.C
+src/frontends/xforms/form_document.C
 src/frontends/xforms/FormError.C
-src/frontends/xforms/form_external.C
+src/frontends/xforms/form_error.C
 src/frontends/xforms/FormExternal.C
-src/frontends/xforms/form_filedialog.C
+src/frontends/xforms/form_external.C
 src/frontends/xforms/FormFiledialog.C
-src/frontends/xforms/form_graphics.C
+src/frontends/xforms/form_filedialog.C
 src/frontends/xforms/FormGraphics.C
-src/frontends/xforms/form_include.C
+src/frontends/xforms/form_graphics.C
 src/frontends/xforms/FormInclude.C
-src/frontends/xforms/form_index.C
+src/frontends/xforms/form_include.C
 src/frontends/xforms/FormIndex.C
+src/frontends/xforms/form_index.C
 src/frontends/xforms/FormLog.C
 src/frontends/xforms/FormMathsBitmap.C
-src/frontends/xforms/form_maths_deco.C
 src/frontends/xforms/FormMathsDeco.C
-src/frontends/xforms/form_maths_delim.C
+src/frontends/xforms/form_maths_deco.C
 src/frontends/xforms/FormMathsDelim.C
-src/frontends/xforms/form_maths_matrix.C
+src/frontends/xforms/form_maths_delim.C
 src/frontends/xforms/FormMathsMatrix.C
-src/frontends/xforms/form_maths_panel.C
+src/frontends/xforms/form_maths_matrix.C
 src/frontends/xforms/FormMathsPanel.C
-src/frontends/xforms/form_maths_space.C
+src/frontends/xforms/form_maths_panel.C
 src/frontends/xforms/FormMathsSpace.C
-src/frontends/xforms/form_minipage.C
+src/frontends/xforms/form_maths_space.C
 src/frontends/xforms/FormMinipage.C
-src/frontends/xforms/form_paragraph.C
+src/frontends/xforms/form_minipage.C
 src/frontends/xforms/FormParagraph.C
-src/frontends/xforms/form_preamble.C
+src/frontends/xforms/form_paragraph.C
 src/frontends/xforms/FormPreamble.C
-src/frontends/xforms/form_preferences.C
+src/frontends/xforms/form_preamble.C
 src/frontends/xforms/FormPreferences.C
-src/frontends/xforms/form_print.C
+src/frontends/xforms/form_preferences.C
 src/frontends/xforms/FormPrint.C
-src/frontends/xforms/form_ref.C
+src/frontends/xforms/form_print.C
 src/frontends/xforms/FormRef.C
-src/frontends/xforms/form_search.C
+src/frontends/xforms/form_ref.C
 src/frontends/xforms/FormSearch.C
-src/frontends/xforms/form_tabular.C
+src/frontends/xforms/form_search.C
 src/frontends/xforms/FormTabular.C
-src/frontends/xforms/form_tabular_create.C
+src/frontends/xforms/form_tabular.C
 src/frontends/xforms/FormTabularCreate.C
-src/frontends/xforms/form_toc.C
+src/frontends/xforms/form_tabular_create.C
 src/frontends/xforms/FormToc.C
-src/frontends/xforms/form_url.C
+src/frontends/xforms/form_toc.C
 src/frontends/xforms/FormUrl.C
+src/frontends/xforms/form_url.C
 src/frontends/xforms/FormVCLog.C
 src/frontends/xforms/input_validators.C
 src/frontends/xforms/Menubar_pimpl.C

diff --git a/src/ChangeLog b/src/ChangeLog
index 06064a5292152ae244386a3b68c7ff2a286f0e38..98154035de4b2635524846931cee1a66dbc49a34 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2001-03-23  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * LString.h: add "using std::getline" when using the real <string>.
+
 2001-03-23  José Abílio Matos  <jamatos@fep.up.pt>
 
        * buffer.C: removed bitset usage.

diff --git a/src/LString.h b/src/LString.h
index 3a684322a10d24dadfdd399265e85646732a232a..7a4779d727ca846a412a94d8ae15a873993577a9 100644 (file)
--- a/src/LString.h
+++ b/src/LString.h
@@ -15,6 +15,7 @@
 #ifndef USE_INCLUDED_STRING
 #include <string>
 using std::string;
+using std::getline
 #else
 #ifdef __STRING__
 #error The <string> header has been included before LString.h

diff --git a/src/frontends/ChangeLog b/src/frontends/ChangeLog
index a76f3d3d008380fbe980bf5a594771003a79318b..942fd02a2c45764a7912b6c4a6348cd2612fbbee 100644 (file)
--- a/src/frontends/ChangeLog
+++ b/src/frontends/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-22  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * Liason.C (printBuffer): do not forget file name
+       when printing with empty print_spool_command.
+
 2001-03-20  Angus Leeming  <a.leeming@ic.ac.uk>
 
        * ButtonPolicies.[Ch]: removed (thought I did this before?). The files

diff --git a/src/frontends/Liason.C b/src/frontends/Liason.C
index 3b17230a6c20da4a20a39edab59367d9f7397e5c..5b66b8a94dab74b1178b0c01028cffe2d8127687 100644 (file)
--- a/src/frontends/Liason.C
+++ b/src/frontends/Liason.C
@@ -140,7 +140,8 @@ bool printBuffer(Buffer * buffer, PrinterParams const & pp)
                                                      command2);
                } else
                        // case 2
-                       res = one.startscript(Systemcalls::SystemDontWait, command);
+                       res = one.startscript(Systemcalls::SystemDontWait,
+                                             command + QuoteName(dviname));
                break;
 
        case PrinterParams::FILE:

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 60c6350541776aef0c434e6f2a0d04ce2b223429..0e4d7f4bcdb897580351a6d4cf9b45b8a311b248 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-23  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * ControlCredits.C (getCredits): remove std:: qualifier for
+       getline(). 
+
 2001-03-23  Lars Gullik Bjønnes  <larsbj@trylle.birdstep.com>
 
        * ControlCredits.C (getCredits): add std:: on vector

diff --git a/src/frontends/controllers/ControlCredits.C b/src/frontends/controllers/ControlCredits.C
index 25fdb388b963073f14dc44a94e1eb88b02dcf47d..35f2c5bc33b5f9ae36f1ece7de8fc493fdf60b74 100644 (file)
--- a/src/frontends/controllers/ControlCredits.C
+++ b/src/frontends/controllers/ControlCredits.C
@@ -54,7 +54,7 @@ std::vector<string> const ControlCredits::getCredits() const
 
                        for(;;) {
                                string line;
-                               std::getline(in, line);
+                               getline(in, line);
                                if (!in.good()) break;
                                data.push_back(line);
                        }