Change the meaning of the $$s placeholder to <lyx support dir>.

(It was <lyx support dir>/scripts.)

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 55c77fa91bb26afaea5092bcddf5fd0bb9348565..932111e6c841e8d06fda834cb0d91aef2095925f 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2005-01-20  Angus Leeming  <leeming@lyx.org>
+
+       * configure.m4: replace all occurences of '$$s/' with '$$s/scripts'.
+
 2005-01-15  Georg Baum  <Georg.Baum@post.rwth-aachen.de>
 
        * ui/classic.ui, ui/stdmenus.ui: Increase number of bookmarks to 5

diff --git a/lib/configure.m4 b/lib/configure.m4
index 0f34a7f385cbc4e0b3a5293b65597dcde661feb3..b83c86117649df7c53b7af47838f8f7a24abef04 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -322,7 +322,7 @@ SEARCH_PROG([for a DVI to PDF converter],dvi_to_pdf_command,dvipdfm)
 test $dvi_to_pdf_command = "dvipdfm" && dvi_to_pdf_command="dvipdfm \$\$i"
 
 # We have a script to convert previewlyx to ppm or to png
-lyxpreview_to_bitmap_command='python $$s/lyxpreview2bitmap.py'
+lyxpreview_to_bitmap_command='python $$s/scripts/lyxpreview2bitmap.py'
 
 # Search for 'dvipng'. Only enable the conversion from lyxpreview -> png
 # if dvipng is found.
@@ -584,9 +584,9 @@ cat >$outfile <<EOF
 \\converter docbook    html       "$docbook_to_html_command"   ""
 \\converter dvi        pdf3       "$dvi_to_pdf_command"        ""
 \\converter dvi        ps         "$dvi_to_ps_command" ""
-\\converter fen        asciichess "python \$\$s/fen2ascii.py \$\$i \$\$o"      ""
-\\converter fig        pdftex     "sh \$\$s/fig2pdftex.sh \$\$i \$\$o" ""
-\\converter fig        pstex      "sh \$\$s/fig2pstex.sh \$\$i \$\$o"  ""
+\\converter fen        asciichess "python \$\$s/scripts/fen2ascii.py \$\$i \$\$o"      ""
+\\converter fig        pdftex     "sh \$\$s/scripts/fig2pdftex.sh \$\$i \$\$o" ""
+\\converter fig        pstex      "sh \$\$s/scripts/fig2pstex.sh \$\$i \$\$o"  ""
 \\converter html       latex      "$html_to_latex_command"     ""
 \\converter latex      html       "$latex_to_html_command"     "originaldir,needaux"
 \\converter latex      dvi        "$latex_to_dvi"      "latex"
@@ -654,9 +654,9 @@ fi
 
 cat >>$outfile <<EOF
 
-\\copier    fig        "sh \$\$s/fig_copy.sh \$\$i \$\$o"
-\\copier    pstex      "python \$\$s/tex_copy.py \$\$i \$\$o \$\$l"
-\\copier    pdftex     "python \$\$s/tex_copy.py \$\$i \$\$o \$\$l"
+\\copier    fig        "sh \$\$s/scripts/fig_copy.sh \$\$i \$\$o"
+\\copier    pstex      "python \$\$s/scripts/tex_copy.py \$\$i \$\$o \$\$l"
+\\copier    pdftex     "python \$\$s/scripts/tex_copy.py \$\$i \$\$o \$\$l"
 
 $rc_entries
 \\font_encoding "$chk_fontenc"

diff --git a/src/ChangeLog b/src/ChangeLog
index 2aa080a3f4821ed347b6ea7db1e6d4a50b3caa3a..a80bf153a681c51ee7fa05c0b451bceda4261d0c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-20  Angus Leeming  <leeming@lyx.org>
+
+       * mover.h: change commentary to reflect the changed meaning of
+       the $$s placeholder.
+
 2005-01-20  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * output_linuxdoc.C (linuxdocParagraphs): silence warning

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 4efdf27f25a8f512de7f66704a965c20abed5aa6..6300ff4ca1b4a3efa493fe306884b3c90986aa24 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-20  Angus Leeming  <leeming@lyx.org>
+
+       * FormPreferences.C: change the tooltip messages to reflect the
+       changed meaning of the $$s placeholder.
+
 2005-01-15  Angus Leeming  <leeming@lyx.org>
 
        * FormPreferences.C, forms/form_preferences.fd: add an interface

diff --git a/src/frontends/xforms/FormPreferences.C b/src/frontends/xforms/FormPreferences.C
index d05f4a4e959c07a413d0fc9872f8fd5512f06594..042af27d8d18c9106454646cf06cb9538f30ca98 100644 (file)
--- a/src/frontends/xforms/FormPreferences.C
+++ b/src/frontends/xforms/FormPreferences.C
@@ -763,9 +763,9 @@ FormPreferences::Converters::feedback(FL_OBJECT const * const ob) const
 
        if (ob == dialog_->input_converter)
                return _("The conversion command. $$i is the input file name, "
-                        "$$b is the file name without its extension and $$o is "
-                        "the name of the output file. $$s can be used as path to "
-                        "LyX's own collection of conversion scripts.");
+                        "$$b is the file name without its extension and $$o "
+                        "is the name of the output file. $$s can be used "
+                        "as the path to LyX's support directory.");
 
        if (ob == dialog_->input_flags)
                return _("Extra information for the Converter class, whether and "
@@ -1024,8 +1024,8 @@ FormPreferences::Copiers::feedback(FL_OBJECT const * const ob) const
                return _("The command used to copy the file. "
                         "$$i is the \"from\" file name and "
                         "$$o is the \"to\" file name.\n"
-                        "$$s can be used as path to "
-                        "LyX's own collection of scripts.");
+                        "$$s can be used as the path to LyX's support "
+                        "directory.");
 
        if (ob == dialog_->button_delete)
                return _("Remove the current copier from the list of available "

diff --git a/src/mover.h b/src/mover.h
index 159545b56e61a5b933809462f21c0a85ad966366..0b74e00fdc068206f0298f4edadf025c33d82cd7 100644 (file)
--- a/src/mover.h
+++ b/src/mover.h
@@ -105,9 +105,9 @@ public:
 
        /** @c command should be of the form
         *  <code>
-        *      sh $$s/copy_fig.sh $$i $$o $$l
+        *      sh $$s/scripts/fig_copy.sh $$i $$o $$l
         *  </code>
-        *  where $$s is a placeholder for the lyx script directory,
+        *  where $$s is a placeholder for the lyx support directory,
         *        $$i is a placeholder for the name of the file to be moved,
         *        $$o is a placeholder for the name of the file after moving,
         *        $$l is a placeholder for the name of the file after moving,

diff --git a/src/support/ChangeLog b/src/support/ChangeLog
index 8b544f7d072b952d7ed01efcaf69e2a8ee4b1b0e..b410f0eb7319d91cebf2688c8e1248e2c7d23690 100644 (file)
--- a/src/support/ChangeLog
+++ b/src/support/ChangeLog
@@ -1,3 +1,9 @@
+2005-01-20  Angus Leeming  <leeming@lyx.org>
+
+       * filetools.[Ch] (LibScriptSearch): modify the code that replaces
+       the $$s placeholder with a path, so that it now inserts the path
+       of the lyx support directory, not the scripts subdirectory.
+       
 2005-01-19  Asger Ottar Alstrup  <aalstrup@laerdal.dk>
 
        * lyxsum.C, socktools.C, tempname.C, userinfo.C: use the

diff --git a/src/support/filetools.C b/src/support/filetools.C
index eea9dc46e04152cbc14c0bf50f1b262819ec00b2..af376e4bf5315c2e1ce644489fde7a2ede33ea7b 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -362,7 +362,8 @@ string const LibScriptSearch(string const & command_in)
        string::size_type const pos1 = command.find(token_scriptpath);
        if (pos1 == string::npos)
                return command;
-       // Find the end of the "$$s/some_script" word within command
+       // Find the end of the "$$s/some_script" word within command.
+       // Assumes that the script name does not contain spaces.
        string::size_type const start_script = pos1 + 4;
        string::size_type const pos2 = command.find(' ', start_script);
        string::size_type const size_script = pos2 == string::npos?
@@ -370,13 +371,13 @@ string const LibScriptSearch(string const & command_in)
 
        // Does this script file exist?
        string const script =
-               LibFileSearch("scripts", command.substr(start_script, size_script));
+               LibFileSearch(".", command.substr(start_script, size_script));
 
        if (script.empty()) {
                // Replace "$$s/" with ""
                command.erase(pos1, 4);
        } else {
-               // Replace "$$s/some_script" with "$LYX_SCRIPT_PATH/some_script"
+               // Replace "$$s/foo/some_script" with "<path to>/some_script".
                string::size_type const size_replace = size_script + 4;
                command.replace(pos1, size_replace, QuoteName(script));
        }

diff --git a/src/support/filetools.h b/src/support/filetools.h
index 69b5fb64084531c68c089658443d49b52dcbf745..1f3fe1fd59f9c8b565fb1c394bd22bff6b30c50f 100644 (file)
--- a/src/support/filetools.h
+++ b/src/support/filetools.h
@@ -104,11 +104,11 @@ std::string const
 i18nLibFileSearch(std::string const & dir, std::string const & name,
                  std::string const & ext = std::string());
 
-/** Takes a command such as "sh $$s/convertDefault.sh file.in file.out"
- *  and replaces "$$s/" with the path to the "most important" of LyX's
- *  script directories containing this script. If the script is not found,
- *  "$$s/" is removed. Executing the command will still fail, but the
- *  error message will make some sort of sense ;-)
+/** Takes a command such as "sh $$s/scripts/convertDefault.sh file.in file.out"
+ *  and replaces "$$s/" with the path to the LyX support directory containing
+ *  this script. If the script is not found, "$$s/" is removed. Executing the
+ *  command will still fail, but the error message will make some sort of
+ *  sense ;-)
  */
 std::string const LibScriptSearch(std::string const & command);