John's patches (except for [PATCH] fix quit etc. from inset about which I

cannot comment).

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

diff --git a/src/ChangeLog b/src/ChangeLog
index aa6d9b67f58188fa46c446874f4a768758dcdc20..9be7853f672d94c9b0223ae705da61cc28ff4041 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2001-08-31  John Levon  <moz@compsoc.man.ac.uk>
+
+       * lyxrc.C: add help for view_dvi_paper_option, default to safe
+         case.
+ 
 2001-09-02  Dekel Tsur  <dekelts@tau.ac.il>
 
        * iterators.[Ch]: New files. Provide paragraph iterators.

diff --git a/src/lyxrc.C b/src/lyxrc.C
index 80e1a99c1d50e83112f01642cded5c47dfa4d1ea..1a4aa619dd73f3a052d1d17ec8e0f151ae3e3049 100644 (file)
--- a/src/lyxrc.C
+++ b/src/lyxrc.C
@@ -179,7 +179,7 @@ void LyXRC::setDefaults() {
        tempdir_path = "/tmp";
        use_tempdir = true;
        ps_command = "gs";
-       view_dvi_paper_option = "-paper";
+       view_dvi_paper_option = "";
        default_papersize = BufferParams::PAPER_USLETTER;
        custom_export_format = "ps";
        chktex_command = "chktex -n1 -n3 -n6 -n9 -n22 -n25 -n30 -n38";
@@ -1031,7 +1031,7 @@ void LyXRC::output(ostream & os) const
                if (view_dvi_paper_option 
                    != system_lyxrc.view_dvi_paper_option) {
                        os << "# Options used to specify paper size to the\n"
-                          << "# view_dvi_command\n"
+                          << "# view_dvi_command (e.g. -paper)\n"
                           << "\\view_dvi_paper_option \""
                           << view_dvi_paper_option << "\"\n";
                }
@@ -1805,6 +1805,7 @@ string const LyXRC::getDescription(LyXRCTags tag)
                break;
                
        case RC_VIEWDVI_PAPEROPTION:
+               str = N_("Specify the paper command to DVI viewer (leave empty or use \"-paper\")");
                break;
                
        case RC_DEFAULT_PAPERSIZE: