thanks
john
--
"All this just amounts to more grist for the mill of the ill."
- Elizabeth Wurtzel
Index: po/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/ChangeLog,v
retrieving revision 1.78
diff -u -r1.78 ChangeLog
--- po/ChangeLog 2001/10/08 14:36:39 1.78
+++ po/ChangeLog 2001/11/04 02:19:27
@@ -1,3 +1,7 @@
+2001-11-04 John Levon <[EMAIL PROTECTED]>
+
+ * Makefile.in.in: consider Qt2 dialogs for translation
+
2001-10-08 gettextize <[EMAIL PROTECTED]>
* Makefile.in.in: Upgrade to gettext-0.10.40.
Index: po/Makefile.in.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/Makefile.in.in,v
retrieving revision 1.16
diff -u -r1.16 Makefile.in.in
--- po/Makefile.in.in 2001/09/09 22:02:10 1.16
+++ po/Makefile.in.in 2001/11/04 02:19:28
@@ -214,6 +214,8 @@
sed -n -e 's/^[sS]tyle[ ]*\([^ ]*\)$$/_("\1");/p' | \
sort | uniq >> $@
sed < $(top_srcdir)/lib/languages -e '/^#/d' -e
's/[^"]*\("[A-Za-z0-9][^"]*"\).*/_(\1);/' >> $@
+ cat $(top_srcdir)/src/frontends/qt2/ui/*.ui | grep '<string>..*</string>' | \
+ sed 's,&,\&,;s,^.*<string>,_(",;s,</string>,"),;' | uniq >> $@
# Tell versions [3.59,3.63) of GNU make not to export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
Index: src/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ChangeLog,v
retrieving revision 1.383
diff -u -r1.383 ChangeLog
--- src/ChangeLog 2001/11/03 17:15:43 1.383
+++ src/ChangeLog 2001/11/04 02:19:46
@@ -1,3 +1,21 @@
+2001-11-04 John Levon <[EMAIL PROTECTED]>
+
+ * LaTeXFeatures.h:
+ * LaTeXFeatures.C: fix typos
+
+ * Spacing.h:
+ * Spacing.C: move spacing_string into class
+
+ * ToolbarDefaults.C: move stuff into namespace anon
+
+ * WorkArea.C: remove annoying debug messages
+
+ * layout.h: update enum
+
+ * lyxfunc.C: use better debug
+
+ * minibuffer.h: fix typo
+
2001-11-03 Dekel Tsur <[EMAIL PROTECTED]>
* paragraph.C (TeXOnePar): Correct placement of \selectlanguage
Index: src/LaTeXFeatures.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LaTeXFeatures.C,v
retrieving revision 1.48
diff -u -r1.48 LaTeXFeatures.C
--- src/LaTeXFeatures.C 2001/10/31 15:19:49 1.48
+++ src/LaTeXFeatures.C 2001/11/04 02:19:46
@@ -472,8 +472,8 @@
<< name << "}\n";
// What missing here is to code to minimalize the code
- // outputted so that the same flotastyle will not be
- // used several times. when the same style is still in
+ // outputted so that the same floatstyle will not be
+ // used several times, when the same style is still in
// effect. (Lgb)
}
}
Index: src/LaTeXFeatures.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/LaTeXFeatures.h,v
retrieving revision 1.34
diff -u -r1.34 LaTeXFeatures.h
--- src/LaTeXFeatures.h 2001/10/31 15:19:49 1.34
+++ src/LaTeXFeatures.h 2001/11/04 02:19:47
@@ -35,7 +35,7 @@
struct LaTeXFeatures {
///
LaTeXFeatures(BufferParams const &, LyXTextClass::size_type n) ;
- /// The packaes needed by the document
+ /// The packages needed by the document
string const getPackages() const;
/// The macros definitions needed by the document
string const getMacros() const;
Index: src/Spacing.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Spacing.C,v
retrieving revision 1.21
diff -u -r1.21 Spacing.C
--- src/Spacing.C 2001/08/18 10:54:33 1.21
+++ src/Spacing.C 2001/11/04 02:19:47
@@ -21,14 +21,9 @@
using std::ios;
using std::ostream;
-/// how can I put this inside of Spacing (class)
-namespace {
-
-char const * const spacing_string[] = {"single", "onehalf", "double", "other"};
-
-} // namespace anon
-
-
+string const Spacing::spacing_string[]
+ = {"single", "onehalf", "double", "other"};
+
float Spacing::getValue() const
{
switch (space) {
Index: src/Spacing.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/Spacing.h,v
retrieving revision 1.19
diff -u -r1.19 Spacing.h
--- src/Spacing.h 2001/08/20 19:08:46 1.19
+++ src/Spacing.h 2001/11/04 02:19:47
@@ -63,11 +63,14 @@
string const writeEnvirBegin() const;
///
string const writeEnvirEnd() const;
+
private:
///
Space space;
///
float value;
+ /// names of line spacing
+ static string const spacing_string[];
};
Index: src/ToolbarDefaults.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/ToolbarDefaults.C,v
retrieving revision 1.24
diff -u -r1.24 ToolbarDefaults.C
--- src/ToolbarDefaults.C 2001/08/06 19:12:44 1.24
+++ src/ToolbarDefaults.C 2001/11/04 02:19:47
@@ -27,7 +27,29 @@
extern LyXAction lyxaction;
ToolbarDefaults toolbardefaults;
+namespace {
+enum _tooltags {
+ TO_ADD = 1,
+ TO_ENDTOOLBAR,
+ TO_SEPARATOR,
+ TO_LAYOUTS,
+ TO_NEWLINE,
+ TO_LAST
+};
+
+
+struct keyword_item toolTags[TO_LAST - 1] = {
+ { "end", TO_ENDTOOLBAR },
+ { "icon", TO_ADD },
+ { "layouts", TO_LAYOUTS },
+ { "newline", TO_NEWLINE },
+ { "separator", TO_SEPARATOR }
+};
+
+}; // end of anon namespace
+
+
ToolbarDefaults::ToolbarDefaults()
{
init();
@@ -73,25 +95,6 @@
}
-enum _tooltags {
- TO_ADD = 1,
- TO_ENDTOOLBAR,
- TO_SEPARATOR,
- TO_LAYOUTS,
- TO_NEWLINE,
- TO_LAST
-};
-
-
-struct keyword_item toolTags[TO_LAST - 1] = {
- { "end", TO_ENDTOOLBAR },
- { "icon", TO_ADD },
- { "layouts", TO_LAYOUTS },
- { "newline", TO_NEWLINE },
- { "separator", TO_SEPARATOR }
-};
-
-
void ToolbarDefaults::read(LyXLex & lex)
{
//consistency check
@@ -134,8 +137,6 @@
break;
case TO_ENDTOOLBAR:
- // should not set automatically
- //set();
quit = true;
break;
default:
Index: src/WorkArea.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/WorkArea.C,v
retrieving revision 1.53
diff -u -r1.53 WorkArea.C
--- src/WorkArea.C 2001/10/03 15:49:31 1.53
+++ src/WorkArea.C 2001/11/04 02:19:49
@@ -504,19 +504,15 @@
#endif
case FL_FOCUS:
- lyxerr[Debug::GUI] << "Workarea event: FOCUS" << endl;
area->workAreaFocus();
break;
case FL_UNFOCUS:
- lyxerr[Debug::GUI] << "Workarea event: UNFOCUS" << endl;
area->workAreaUnfocus();
break;
case FL_ENTER:
- lyxerr[Debug::GUI] << "Workarea event: ENTER" << endl;
area->workAreaEnter();
break;
case FL_LEAVE:
- lyxerr[Debug::GUI] << "Workarea event: LEAVE" << endl;
area->workAreaLeave();
break;
case FL_DBLCLICK:
@@ -581,8 +577,10 @@
while (!clipboard_read) {
if (fl_check_forms() == FL_EVENT) {
- lyxerr << "LyX: This shouldn't happen..." << endl;
fl_XNextEvent(&ev);
+ lyxerr << "Received unhandled X11 event" << endl;
+ lyxerr << "Type: 0x" << std::hex << ev.xany.type <<
+ "Target: 0x" << std::hex << ev.xany.window << endl;
}
}
return clipboard_selection;
Index: src/layout.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/layout.h,v
retrieving revision 1.34
diff -u -r1.34 layout.h
--- src/layout.h 2001/10/01 15:31:59 1.34
+++ src/layout.h 2001/11/04 02:19:50
@@ -26,14 +26,10 @@
/// Reads the style files
extern void LyXSetStyle();
-///
-enum no_good_name_for_this {
+enum layout_default {
///
- LYX_ENVIRONMENT_DEFAULT = 97,
- ///
LYX_LAYOUT_DEFAULT = 99
};
-
// Could this cause confusion that both DUMMY_LAYOUT and LAYOUT_DEFAULT has
// the same value? (Lgb)
Index: src/lyxfunc.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/lyxfunc.C,v
retrieving revision 1.262
diff -u -r1.262 lyxfunc.C
--- src/lyxfunc.C 2001/10/11 10:29:41 1.262
+++ src/lyxfunc.C 2001/11/04 02:19:56
@@ -807,7 +807,7 @@
// We cannot use this function here
if (getStatus(ac, do_not_use_this_arg) & func_status::Disabled) {
- lyxerr << "LyXFunc::Dispatch: "
+ lyxerr[Debug::ACTION] << "LyXFunc::Dispatch: "
<< lyxaction.getActionName(ac)
<< " [" << ac << "] is disabled at this location"
<< endl;
Index: src/minibuffer.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/minibuffer.h,v
retrieving revision 1.19
diff -u -r1.19 minibuffer.h
--- src/minibuffer.h 2001/08/04 10:26:01 1.19
+++ src/minibuffer.h 2001/11/04 02:19:56
@@ -40,7 +40,7 @@
/** Makes the minibuffer wait for a string to be inserted.
Waits for a string to be inserted into the minibuffer, when
- the string has been insterted the signal stringReady is
+ the string has been inserted the signal stringReady is
emitted.
*/
void getString(State space,
Index: src/vspace.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/vspace.h,v
retrieving revision 1.17
diff -u -r1.17 vspace.h
--- src/vspace.h 2001/05/30 13:53:36 1.17
+++ src/vspace.h 2001/11/04 02:20:04
@@ -52,6 +52,7 @@
MU,
/// Percent of columnwidth both "%" or "%c"
PW,
+ ///
PE,
/// Percent of pagewidth
PP,
Index: src/frontends/controllers/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ChangeLog,v
retrieving revision 1.102
diff -u -r1.102 ChangeLog
--- src/frontends/controllers/ChangeLog 2001/10/23 16:32:16 1.102
+++ src/frontends/controllers/ChangeLog 2001/11/04 02:20:06
@@ -1,3 +1,7 @@
+2001-11-04 John Levon <[EMAIL PROTECTED]>
+
+ * ControlVCLog.C: use _()
+
2001-10-23 Jean-Marc Lasgouttes <[EMAIL PROTECTED]>
* ControlSpellchecker.C: include <sys/types.h> since FreeBSD needs
Index: src/frontends/controllers/ControlVCLog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/controllers/ControlVCLog.C,v
retrieving revision 1.11
diff -u -r1.11 ControlVCLog.C
--- src/frontends/controllers/ControlVCLog.C 2001/07/29 15:34:15 1.11
+++ src/frontends/controllers/ControlVCLog.C 2001/11/04 02:20:06
@@ -29,6 +29,7 @@
#include "Dialogs.h"
#include "lyxrc.h"
#include "support/lyxlib.h"
+#include "gettext.h"
using SigC::slot;
using std::endl;
@@ -61,7 +62,7 @@
}
if (!found)
- ss << "No version control log file found." << endl;
+ ss << _("No version control log file found.") << endl;
lyx::unlink(name);
Index: src/insets/insetbutton.h
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/insets/insetbutton.h,v
retrieving revision 1.9
diff -u -r1.9 insetbutton.h
--- src/insets/insetbutton.h 2001/07/28 12:24:15 1.9
+++ src/insets/insetbutton.h 2001/11/04 02:20:14
@@ -38,4 +38,3 @@
};
#endif
-
Index: src/support/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/ChangeLog,v
retrieving revision 1.43
diff -u -r1.43 ChangeLog
--- src/support/ChangeLog 2001/10/24 13:21:19 1.43
+++ src/support/ChangeLog 2001/11/04 02:20:18
@@ -1,3 +1,9 @@
+2001-11-04 John Levon <[EMAIL PROTECTED]>
+
+ * filetools.C: remove dead code
+
+ * syscall.C: show prog in fail case
+
2001-10-24 Andre Poenitz <[EMAIL PROTECTED]>
* filetools.C: code style cleanup
Index: src/support/filetools.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/filetools.C,v
retrieving revision 1.87
diff -u -r1.87 filetools.C
--- src/support/filetools.C 2001/10/24 13:21:20 1.87
+++ src/support/filetools.C 2001/11/04 02:20:21
@@ -134,8 +134,7 @@
int IsFileWriteable (string const & path)
{
FileInfo fi(path);
- //lyxerr << "fi : " << fi << endl;
- //lyxerr << "fi.exists" << fi.exist() << endl;
+
if (fi.access(FileInfo::wperm|FileInfo::rperm)) // read-write
return 1;
if (fi.readable()) // read-only
Index: src/support/syscall.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/syscall.C,v
retrieving revision 1.23
diff -u -r1.23 syscall.C
--- src/support/syscall.C 2001/06/27 14:10:35 1.23
+++ src/support/syscall.C 2001/11/04 02:20:21
@@ -181,7 +181,7 @@
#ifndef __EMX__
execvp(syscmd, argv);
// If something goes wrong, we end up here:
- lyxerr << "LyX: execvp failed: "
+ lyxerr << "LyX: execvp(" << syscmd << ") failed: "
<< strerror(errno) << endl;
} else if (cpid < 0) { // error
#else
