Michael's UI patch v2

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

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 28c472a589bed8803e14d2e5464ec73034c8760a..46ca3ac6e10c7c4abff679bc7ce1ff3d9e04a6b7 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,21 @@
+2003-08-12  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * configure.m4: replace "PDF" by "PDF (ps2pdf)"
+
+       * bind/math.bind: rename "valign-center" to "valign-middle"
+
+       * ui/classic.ui: Consistent capitalization of menu items;
+       introduce submenu "alignment" in "Edit/Tabular" (shared with 
+       "Edit/Math"); fix shortcuts for "Flalign Environment" and
+       "Font Change" and "Table of Contents"
+
+       * ui/stdmenus.ui: Consistent capitalization of menu items;
+       introduce submenu "alignment" in "Edit/Tabular" (shared with
+       "Edit/Math")
+
+       * ui/stdtoolbars.ui: De-capitalize names for consistency;
+       use imperative style for consistency: "XXX aligned" => "Align XXX" 
+ 
 2003-08-09  Juergen Spitzmueller  <j.spitzmueller@gmx.de>
 
        * templates/koma-letter2.lyx: fix typo.

diff --git a/lib/bind/math.bind b/lib/bind/math.bind
index 32059841b408d68cb6bfff14efb2a6823e793b63..fd10d0922ce1a4458c7c9c426c2628a249678689 100644 (file)
--- a/lib/bind/math.bind
+++ b/lib/bind/math.bind
@@ -78,7 +78,7 @@
 \bind "M-m w s"   "tabular-feature swap-row"
 
 \bind "M-m w t"   "tabular-feature valign-top"
-\bind "M-m w m"   "tabular-feature valign-center"
+\bind "M-m w m"   "tabular-feature valign-middle"
 \bind "M-m w b"   "tabular-feature valign-bottom"
 \bind "M-m c l"   "tabular-feature align-left"
 \bind "M-m c m"   "tabular-feature align-center"

diff --git a/lib/configure.m4 b/lib/configure.m4
index 2ad6325e8260dfb62d8a58aef250c5cc3ca57738..f86f09c02f93bf919fbd3e8786d92a46ba45e6fb 100644 (file)
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -462,7 +462,7 @@ cat >$outfile <<EOF
 \\Format lyxpreview    lyxpreview      "LyX Preview"           ""
 \\Format literate nw   NoWeb           N
 \\Format pbm     pbm   PBM             ""
-\\Format pdf     pdf   PDF             P
+\\Format pdf     pdf  "PDF (ps2pdf)"   P
 \\Format pdf2    pdf  "PDF (pdflatex)" F
 \\Format pdf3    pdf  "PDF (dvipdfm)"  m
 \\Format pdftex   pdftex_t PDFTEX       ""

diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui
index 2d76211653bfeb8c56055330c6b2bf20362202a8..b7b6bdd6d6c821f3687d32906ddc386478ab0df0 100644 (file)
--- a/lib/ui/classic.ui
+++ b/lib/ui/classic.ui
@@ -78,8 +78,8 @@ Menuset
                Item "Spellchecker...|S" "dialog-show spellchecker"
                Item "Thesaurus..." "thesaurus-entry"
                Item "Check TeX|h" "buffer-chktex"
-               Item "Open/Close float|l" "inset-toggle"
-               Submenu "Change tracking|g" "edit_change"
+               Item "Open/Close Float|l" "inset-toggle"
+               Submenu "Change Tracking|g" "edit_change"
                Separator
                Item "Preferences...|P" "dialog-show preferences"
                Item "Reconfigure|R" "reconfigure"
@@ -98,13 +98,7 @@ Menuset
                Item "Line Left|L" "tabular-feature toggle-line-left"
                Item "Line Right|R" "tabular-feature toggle-line-right"
                Separator
-               Item "Align Left|e" "tabular-feature align-left"
-               Item "Align Center|C" "tabular-feature align-center"
-               Item "Align Right|i" "tabular-feature align-right"
-               Separator
-               Item "V.Align Top|o" "tabular-feature valign-top"
-               Item "V.Align Center|n" "tabular-feature valign-center"
-               Item "V.Align Bottom|V" "tabular-feature valign-bottom"
+               Submenu "Alignment|i" "edit_align"
                Separator
                Item "Add Row|A" "tabular-feature append-row"
                Item "Delete Row|w" "tabular-feature delete-row"
@@ -117,6 +111,16 @@ Menuset
                Item "Swap Columns" "tabular-feature swap-column"
        End
 
+       Menu "edit_align"
+               Item "Left|L" "tabular-feature align-left"
+               Item "Center|C" "tabular-feature align-center"
+               Item "Right|R" "tabular-feature align-right"
+               Separator
+               Item "Top|T" "tabular-feature valign-top"
+               Item "Middle|M" "tabular-feature valign-middle"
+               Item "Bottom|B" "tabular-feature valign-bottom"
+       End
+
        Menu "edit_math"
 #      Item "Make eqnarray|e" "break-line e"
 #      Item "Make multline|m" "break-line m"
@@ -135,7 +139,7 @@ Menuset
                Separator
                Submenu "Use Computer Algebra System|S" "edit_math_extern"
                Separator
-               Submenu "Alignment|A" "edit_math_align"
+               Submenu "Alignment|A" "edit_align"
                Separator
                Item "Add Row|R" "tabular-feature append-row"
                Item "Delete Row|D" "tabular-feature delete-row"
@@ -171,22 +175,12 @@ Menuset
                Item "Eqnarray Environment|q" "math-mutate eqnarray"
                Item "Align Environment|A" "math-mutate align"
                Item "AlignAt Environment" "math-mutate alignat"
-               Item "Flalign Environment|f" "math-mutate flalign"
+               Item "Flalign Environment|F" "math-mutate flalign"
                #Item "XAlignAt Environment" "math-mutate xalignat"
                #Item "XXAlignAt Environment" "math-mutate xxalignat"
                Item "Gather Environment" "math-mutate gather"
                Item "Multline Environment" "math-mutate multline"
        End
-
-       Menu "edit_math_align"
-               Item "Align Left|L" "tabular-feature align-left"
-               Item "Align Center|C" "tabular-feature align-center"
-               Item "Align Right|R" "tabular-feature align-right"
-               Separator
-               Item "V.Align Top|T" "tabular-feature valign-top"
-               Item "V.Align Center|e" "tabular-feature valign-center"
-               Item "V.Align Bottom|B" "tabular-feature valign-bottom"
-       End
 #
 # INSERT MENU
 #
@@ -237,7 +231,7 @@ Menuset
                Item "Inline Formula|I" "math-mode"
                Item "Display Formula|D" "math-display"
                Item "Eqnarray Environment|E" "command-sequence math-mode; math-mutate eqnarray;"
-               Item "AMS align Environment|A" "command-sequence math-mode; math-mutate align;"
+               Item "AMS align Environment|a" "command-sequence math-mode; math-mutate align;"
                Item "AMS alignat Environment|t" "command-sequence math-mode; math-mutate alignat;"
                Item "AMS flalign Environment|f" "command-sequence math-mode; math-mutate flalign;"
                #Item "AMS xalignat Environment|x" "command-sequence math-mode; math-mutate xalignat;"
@@ -249,34 +243,34 @@ Menuset
                Item "Cases Environment|C" "math-insert \cases"
                Item "Split Environment|S" "math-insert \split"
        Separator
-               Submenu "Font Change|f" "insert_math_font"
+               Submenu "Font Change|o" "insert_math_font"
                Item "Math Panel|l" "dialog-show mathpanel"
        End
 
        Menu "insert_math_font"
-               Item "Math normal font" "math-insert \mathnormal"
+               Item "Math Normal Font" "math-insert \mathnormal"
                Separator
-               Item "Math calligraphic family" "math-insert \mathcal"
-               Item "Math fraktur family" "math-insert \mathfrak"
-               Item "Math roman family" "math-insert \mathrm"
-               Item "Math sans serif family" "math-insert \mathsf"
+               Item "Math Calligraphic Family" "math-insert \mathcal"
+               Item "Math Fraktur Family" "math-insert \mathfrak"
+               Item "Math Roman Family" "math-insert \mathrm"
+               Item "Math Sans Serif Family" "math-insert \mathsf"
                Separator
-               Item "Math bold series" "math-insert \mathbf"
+               Item "Math Bold Series" "math-insert \mathbf"
                Separator
-               Item "Text normal font" "math-insert \textnormal"
+               Item "Text Normal Font" "math-insert \textnormal"
                Separator
-               Item "Text roman family" "math-insert \textrm"
-               Item "Text sans serif family" "math-insert \textsf"
-               Item "Text typewriter family" "math-insert \texttt"
+               Item "Text Roman Family" "math-insert \textrm"
+               Item "Text Sans Serif Family" "math-insert \textsf"
+               Item "Text Typewriter Family" "math-insert \texttt"
                Separator
-               Item "Text bold series" "math-insert \textbf"
-               Item "Text medium series" "math-insert \textmd"
+               Item "Text Bold Series" "math-insert \textbf"
+               Item "Text Medium Series" "math-insert \textmd"
                Separator
-               Item "Text italic shape" "math-insert \textit"
-               Item "Text small caps shape" "math-insert \textsc"
-               Item "Text slanted shape" "math-insert \textsl"
-               Item "Text upright shape" "math-insert \textup"
-                       End
+               Item "Text Italic Shape" "math-insert \textit"
+               Item "Text Small Caps Shape" "math-insert \textsc"
+               Item "Text Slanted Shape" "math-insert \textsl"
+               Item "Text Upright Shape" "math-insert \textup"
+       End
 
        Menu "insert_floats"
                FloatInsert
@@ -297,10 +291,10 @@ Menuset
        End
 
        Menu "edit_change"
-               Item "Track changes|T" "track-changes"
-               Item "Merge changes ...|M" "merge-changes"
-               Item "Accept all changes|A" "accept-all-changes"
-               Item "Reject all changes|R" "reject-all-changes"
+               Item "Track Changes|T" "track-changes"
+               Item "Merge Changes ...|M" "merge-changes"
+               Item "Accept All Changes|A" "accept-all-changes"
+               Item "Reject All Changes|R" "reject-all-changes"
        End
 #
 # LAYOUT MENU
@@ -332,8 +326,8 @@ Menuset
                Submenu "Update|U" "update"
                Separator
                Item "LaTeX Logfile|L" "dialog-show latexlog"
-               Item "Table of Contents|T" "toc-view"
-               Item "Child Processes|C" "dialog-show forks"
+               Item "Table of Contents|C" "toc-view"
+               Item "Child Processes|o" "dialog-show forks"
                Item "TeX Information|X" "dialog-show texinfo"
        End
 

diff --git a/lib/ui/stdmenus.ui b/lib/ui/stdmenus.ui
index 4e7cd2f163239cb0b606a1ecc0ae53ba6c93449c..d6e530d4ea84f3eb3cb92dcad1933906f7dc937c 100644 (file)
--- a/lib/ui/stdmenus.ui
+++ b/lib/ui/stdmenus.ui
@@ -118,12 +118,17 @@ Menuset
                Item "Left Line|L" "tabular-feature toggle-line-left"
                Item "Right Line|R" "tabular-feature toggle-line-right"
                Separator
-               Item "Left aligned|e" "tabular-feature align-left"
-               Item "Centered|C" "tabular-feature align-center"
-               Item "Right aligned|i" "tabular-feature align-right"
-               Item "Top aligned|o" "tabular-feature valign-top"
-               Item "Vertically Centered|V" "tabular-feature valign-center"
-               Item "Bottom aligned|g" "tabular-feature valign-bottom"
+               Submenu "Alignment|i" "edit_align"
+       End
+
+       Menu "edit_align"
+               Item "Left|L" "tabular-feature align-left"
+               Item "Center|C" "tabular-feature align-center"
+               Item "Right|R" "tabular-feature align-right"
+               Separator
+               Item "Top|T" "tabular-feature valign-top"
+               Item "Middle|M" "tabular-feature valign-middle"
+               Item "Bottom|B" "tabular-feature valign-bottom"
        End
 
        Menu "edit_math"
@@ -135,7 +140,7 @@ Menuset
                Separator
                Submenu "Use Computer Algebra System|S" "edit_math_extern"
                Separator
-               Submenu "Alignment|A" "edit_math_align"
+               Submenu "Alignment|A" "edit_align"
                Separator
                Item "Add Row|R" "tabular-feature append-row"
                Item "Delete Row|D" "tabular-feature delete-row"
@@ -176,16 +181,6 @@ Menuset
                Item "AMS multline Environment|m" "math-mutate multline"
        End
 
-       Menu "edit_math_align"
-               Item "Left-aligned|L" "tabular-feature align-left"
-               Item "Centered|C" "tabular-feature align-center"
-               Item "Right-aligned|R" "tabular-feature align-right"
-               Separator
-               Item "Top-aligned|T" "tabular-feature valign-top"
-               Item "Centered Vertically|e" "tabular-feature valign-center"
-               Item "Bottom-aligned|B" "tabular-feature valign-bottom"
-       End
-
 #
 # VIEW MENU
 #
@@ -279,28 +274,28 @@ Menuset
        End
 
        Menu "insert_math_font"
-               Item "Math normal font" "math-insert \mathnormal"
+               Item "Math Normal Font" "math-insert \mathnormal"
                Separator
-               Item "Math calligraphic family" "math-insert \mathcal"
-               Item "Math fraktur family" "math-insert \mathfrak"
-               Item "Math roman family" "math-insert \mathrm"
-               Item "Math sans serif family" "math-insert \mathsf"
+               Item "Math Calligraphic Family" "math-insert \mathcal"
+               Item "Math Fraktur Family" "math-insert \mathfrak"
+               Item "Math Roman Family" "math-insert \mathrm"
+               Item "Math Sans Serif Family" "math-insert \mathsf"
                Separator
-               Item "Math bold series" "math-insert \mathbf"
+               Item "Math Bold Series" "math-insert \mathbf"
                Separator
-               Item "Text normal font" "math-insert \textnormal"
+               Item "Text Normal Font" "math-insert \textnormal"
                Separator
-               Item "Text roman family" "math-insert \textrm"
-               Item "Text sans serif family" "math-insert \textsf"
-               Item "Text typewriter family" "math-insert \texttt"
+               Item "Text Roman Family" "math-insert \textrm"
+               Item "Text Sans Serif Family" "math-insert \textsf"
+               Item "Text Typewriter Family" "math-insert \texttt"
                Separator
-               Item "Text bold series" "math-insert \textbf"
-               Item "Text medium series" "math-insert \textmd"
+               Item "Text Bold Series" "math-insert \textbf"
+               Item "Text Medium Series" "math-insert \textmd"
                Separator
-               Item "Text italic shape" "math-insert \textit"
-               Item "Text small caps shape" "math-insert \textsc"
-               Item "Text slanted shape" "math-insert \textsl"
-               Item "Text upright shape" "math-insert \textup"
+               Item "Text Italic Shape" "math-insert \textit"
+               Item "Text Small Caps Shape" "math-insert \textsc"
+               Item "Text Slanted Shape" "math-insert \textsl"
+               Item "Text Upright Shape" "math-insert \textup"
                        End
 
        Menu "insert_float"
@@ -336,7 +331,7 @@ Menuset
 #
  
        Menu "document"
-               Submenu "Change tracking|C" "edit_change"
+               Submenu "Change Tracking|C" "edit_change"
                OptItem "Build Program|B" "build-program"
                Item "LaTeX Log File...|L" "dialog-show latexlog"
                Item "Table of Contents...|T" "toc-view"
@@ -347,10 +342,10 @@ Menuset
        End
  
        Menu "edit_change"
-               Item "Track changes|T" "track-changes"
-               Item "Merge changes...|M" "merge-changes"
-               Item "Accept all changes|A" "accept-all-changes"
-               Item "Reject all changes|R" "reject-all-changes"
+               Item "Track Changes|T" "track-changes"
+               Item "Merge Changes...|M" "merge-changes"
+               Item "Accept All Changes|A" "accept-all-changes"
+               Item "Reject All Changes|R" "reject-all-changes"
        End
 
 #

diff --git a/lib/ui/stdtoolbars.ui b/lib/ui/stdtoolbars.ui
index 7fa922ef46dc923ac10620040acd64bf9c3e87e0..3965eef855c0689500fb7c5dd33d43b00ebd0680 100644 (file)
--- a/lib/ui/stdtoolbars.ui
+++ b/lib/ui/stdtoolbars.ui
@@ -70,8 +70,8 @@ Toolbar "Extra"
        Item "Insert TeX" "ert-insert"
        Item "Include file" "dialog-show-new-inset include"
        Separator
-       Item "Text Style" "dialog-show character"
-       Item "Paragraph Settings" "layout-paragraph"
+       Item "Text style" "dialog-show character"
+       Item "Paragraph settings" "layout-paragraph"
        Item "Table of contents" "toc-view"
        Item "Check spelling" "dialog-show spellchecker"
        Item "Thesaurus" "thesaurus-entry"
@@ -90,12 +90,13 @@ Toolbar "Table"
        Item "Set all lines" "tabular-feature set-all-lines"
        Item "Unset all lines" "tabular-feature unset-all-lines"
        Separator
-       Item "Left aligned" "tabular-feature align-left"
-       Item "Centered" "tabular-feature align-center"
-       Item "Right aligned" "tabular-feature align-right"
-       Item "Top aligned" "tabular-feature valign-top"
-       Item "Vertically centered" "tabular-feature valign-center"
-       Item "Bottom aligned" "tabular-feature valign-bottom"
+       Item "Align left" "tabular-feature align-left"
+       Item "Align center" "tabular-feature align-center"
+       Item "Align right" "tabular-feature align-right"
+       Separator
+       Item "Align top" "tabular-feature valign-top"
+       Item "Align middle" "tabular-feature valign-middle"
+       Item "Align bottom" "tabular-feature valign-bottom"
        Separator
        Item "Rotate cell" "tabular-feature set-rotate-cell"
        Item "Rotate table" "tabular-feature set-rotate-tabular"

diff --git a/src/ChangeLog b/src/ChangeLog
index e7b24aa1da2ce3b3f3963240ca044a186f8dcf05..093f37b23de4164445165daab7c3cc6a445d244e 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-12  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * bufferlist.C: beautify two alerts (shorter text of buttons)
+       * buffer.C: Remove redundant ' ' from message
+       * tabular.h:
+       * tabular.C: rename LYX_VALIGN_CENTER" to LYX_VALIGN_MIDDLE";
+       rename M_VALIGN_CENTER to M_VALIGN_MIDDLE;
+       rename VALIGN_CENTER to VALIGN_MIDDLE
 
 2003-08-11  André Pönitz  <poenitz@gmx.net>
 

diff --git a/src/buffer.C b/src/buffer.C
index 12f4c75b1526ce9c9efa89c2a52f76d4a414d107..9c19e1bb73aaa589a8759f82a67af12122afe2ac 100644 (file)
--- a/src/buffer.C
+++ b/src/buffer.C
@@ -246,7 +246,7 @@ void unknownClass(string const & unknown)
 {
        Alert::warning(_("Unknown document class"),
                bformat(_("Using the default document class, because the "
-                       " class %1$s is unknown."), unknown));
+                       "class %1$s is unknown."), unknown));
 }
 
 } // anon

diff --git a/src/bufferlist.C b/src/bufferlist.C
index 5b8c6d58dfdee7e780f841dd094954818b5a49ca..135749e13f851a9d0365f8a44168c4d9d140d72c 100644 (file)
--- a/src/bufferlist.C
+++ b/src/bufferlist.C
@@ -70,9 +70,9 @@ bool BufferList::quitWriteBuffer(Buffer * buf)
                file = MakeDisplayPath(buf->fileName(), 30);
 
        string text = bformat(_("The document %1$s has unsaved changes.\n\n"
-               "Do you want to save the document?"), file);
+               "Do you want to save the document or discard the changes?"), file);
        int const ret = Alert::prompt(_("Save changed document?"),
-               text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel"));
+               text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
 
        if (ret == 0) {
                // FIXME: WriteAs can be asynch !
@@ -174,9 +174,9 @@ bool BufferList::close(Buffer * buf, bool ask)
                fname = MakeDisplayPath(buf->fileName(), 30);
 
        string text = bformat(_("The document %1$s has unsaved changes.\n\n"
-               "Do you want to save the document?"), fname);
+               "Do you want to save the document or discard the changes?"), fname);
        int const ret = Alert::prompt(_("Save changed document?"),
-               text, 0, 2, _("&Save Changes"), _("&Discard Changes"), _("&Cancel"));
+               text, 0, 2, _("&Save"), _("&Discard"), _("&Cancel"));
 
        if (ret == 0) {
                if (buf->isUnnamed()) {

diff --git a/src/frontends/controllers/ChangeLog b/src/frontends/controllers/ChangeLog
index 8f0c6875e71cdd401b0f216c6ca4832f136eb11b..a58c70605d8dfd88b2ded06b49321a785e164f68 100644 (file)
--- a/src/frontends/controllers/ChangeLog
+++ b/src/frontends/controllers/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-12  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * ControlGraphics.C: rename "XXX baseline" to "Baseline XXX"
+       for consistency
+       * ControlTabular.h:
+       * ControlTabular.C: rename VALIGN_CENTER to VALIGN_MIDDLE;
+       rename M_VALIGN_CENTER to M_VALIGN_MIDDLE;
+       rename VCENTER to MIDDLE
 
 2003-08-04  André Pönitz  <poenitz@gmx.net>
 

diff --git a/src/frontends/controllers/ControlGraphics.C b/src/frontends/controllers/ControlGraphics.C
index ef667050d32822e59515de8653b7e17f47e0b09c..ddd33c8b2320c718a95a963d8b932c3d334be494 100644 (file)
--- a/src/frontends/controllers/ControlGraphics.C
+++ b/src/frontends/controllers/ControlGraphics.C
@@ -144,9 +144,9 @@ char const * const rorigin_lyx_strs[] = {
 // use. Note that they can/should be translated.
 char const * const rorigin_gui_strs[] = {
        N_("Default"),
-       N_("Top left"), N_("Bottom left"), N_("Left baseline"),
-       N_("Center"), N_("Top center"), N_("Bottom center"), N_("Center baseline"),
-       N_("Top right"), N_("Bottom right"), N_("Right baseline") };
+       N_("Top left"), N_("Bottom left"), N_("Baseline left"),
+       N_("Center"), N_("Top center"), N_("Bottom center"), N_("Baseline center"),
+       N_("Top right"), N_("Bottom right"), N_("Baseline right") };
 
 size_t const rorigin_size = sizeof(rorigin_lyx_strs) / sizeof(char *);
 

diff --git a/src/frontends/controllers/ControlTabular.C b/src/frontends/controllers/ControlTabular.C
index 40d4854fb023517e56064861d9bd64e39becf5d0..1d83d6ff31caf3896fba1b427e4a7ee4e1caa665 100644 (file)
--- a/src/frontends/controllers/ControlTabular.C
+++ b/src/frontends/controllers/ControlTabular.C
@@ -188,17 +188,17 @@ void ControlTabular::halign(ControlTabular::HALIGN h)
 
 void ControlTabular::valign(ControlTabular::VALIGN v)
 {
-       LyXTabular::Feature num = LyXTabular::VALIGN_CENTER;
-       LyXTabular::Feature multi_num = LyXTabular::M_VALIGN_CENTER;
+       LyXTabular::Feature num = LyXTabular::VALIGN_MIDDLE;
+       LyXTabular::Feature multi_num = LyXTabular::M_VALIGN_MIDDLE;
 
        switch (v) {
                case TOP:
                        num = LyXTabular::VALIGN_TOP;
                        multi_num = LyXTabular::M_VALIGN_TOP;
                        break;
-               case VCENTER:
-                       num = LyXTabular::VALIGN_CENTER;
-                       multi_num = LyXTabular::M_VALIGN_CENTER;
+               case MIDDLE:
+                       num = LyXTabular::VALIGN_MIDDLE;
+                       multi_num = LyXTabular::M_VALIGN_MIDDLE;
                        break;
                case BOTTOM:
                        num = LyXTabular::VALIGN_BOTTOM;

diff --git a/src/frontends/controllers/ControlTabular.h b/src/frontends/controllers/ControlTabular.h
index 76a059fc04c9f82cbab0c39e45cadcce4f670714..da85d26958abe10bc3b5feca3d70a2f13d47c570 100644 (file)
--- a/src/frontends/controllers/ControlTabular.h
+++ b/src/frontends/controllers/ControlTabular.h
@@ -61,7 +61,7 @@ public:
 
        void halign(HALIGN h);
 
-       enum VALIGN { TOP, VCENTER, BOTTOM };
+       enum VALIGN { TOP, MIDDLE, BOTTOM };
 
        void valign(VALIGN h);
 

diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog
index 0cf15a15a6ea6210093b746bc3f930efbdeadffe..179c9922e80c2c56c6403424b615d23e29f80cbd 100644 (file)
--- a/src/frontends/qt2/ChangeLog
+++ b/src/frontends/qt2/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-12  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * QTabularDialog.C:
+       * QTabular.C: rename LYX_VALIGN_CENTER to LYX_VALIGN_MIDDLE;
+       rename VCENTER to MIDDLE;
+       * ui/QTabularDialogBase.ui:
+       * ui/QMathMatrixDialogBase.ui: replace "Center" by "Middle"
+       * ui/QBibtexDialogBase.ui: rename "Bibtex" to "BibTeX"
+       * ui/QDocumentDialogBase.ui: Remove redundant ' ' from message
+
 2003-08-05  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * QWorkArea.C (QWorkArea): 

diff --git a/src/frontends/qt2/QTabular.C b/src/frontends/qt2/QTabular.C
index 4dc7e50750803d637fc41fef93ea4d3cc2056f40..a11d96a98a8e9c03e76b111a0ca463dffaad7322 100644 (file)
--- a/src/frontends/qt2/QTabular.C
+++ b/src/frontends/qt2/QTabular.C
@@ -207,7 +207,7 @@ void QTabular::update_contents()
        case LyXTabular::LYX_VALIGN_TOP:
                valign = 0;
                break;
-       case LyXTabular::LYX_VALIGN_CENTER:
+       case LyXTabular::LYX_VALIGN_MIDDLE:
                valign = 1;
                break;
        case LyXTabular::LYX_VALIGN_BOTTOM:

diff --git a/src/frontends/qt2/QTabularDialog.C b/src/frontends/qt2/QTabularDialog.C
index 8f3f668b7d5f71f1c095038c5aea45c9aa36aa58..26d5f61960148109241910745e1dd63ff8e322cf 100644 (file)
--- a/src/frontends/qt2/QTabularDialog.C
+++ b/src/frontends/qt2/QTabularDialog.C
@@ -159,7 +159,7 @@ void QTabularDialog::vAlign_changed(int align)
 
        switch (align) {
                case 0: v = ControlTabular::TOP; break;
-               case 1: v = ControlTabular::VCENTER; break;
+               case 1: v = ControlTabular::MIDDLE; break;
                case 2: v = ControlTabular::BOTTOM; break;
        }
 

diff --git a/src/frontends/qt2/ui/QBibtexDialogBase.ui b/src/frontends/qt2/ui/QBibtexDialogBase.ui
index 06305e600580c510042f27eac73882788e5b6f0a..38a077332b59402d30b588d57ec67fc9ff7836d8 100644 (file)
--- a/src/frontends/qt2/ui/QBibtexDialogBase.ui
+++ b/src/frontends/qt2/ui/QBibtexDialogBase.ui
@@ -19,7 +19,7 @@
     </property>
     <property stdset="1">
         <name>caption</name>
-        <string>Bibtex</string>
+        <string>BibTeX</string>
     </property>
     <property stdset="1">
         <name>sizeGripEnabled</name>

diff --git a/src/frontends/qt2/ui/QDocumentDialogBase.ui b/src/frontends/qt2/ui/QDocumentDialogBase.ui
index 8477acf4245bb2dd7b87f71142a450cbc60260e5..227b65ae61b4b3c837a7eceda5cd044e173e00ff 100644 (file)
--- a/src/frontends/qt2/ui/QDocumentDialogBase.ui
+++ b/src/frontends/qt2/ui/QDocumentDialogBase.ui
@@ -82,7 +82,7 @@
                     </property>
                     <property>
                         <name>toolTip</name>
-                        <string>Reset to  the default settings for the document class</string>
+                        <string>Reset to the default settings for the document class</string>
                     </property>
                 </widget>
                 <widget>

diff --git a/src/frontends/qt2/ui/QMathMatrixDialogBase.ui b/src/frontends/qt2/ui/QMathMatrixDialogBase.ui
index c27ed15df6581e381cf31b3626cde0bdb6e3e30e..f9a7ae05a3890e384be20f92d0c87d9bae12fef5 100644 (file)
--- a/src/frontends/qt2/ui/QMathMatrixDialogBase.ui
+++ b/src/frontends/qt2/ui/QMathMatrixDialogBase.ui
@@ -314,7 +314,7 @@
                     <item>
                         <property>
                             <name>text</name>
-                            <string>Center</string>
+                            <string>Middle</string>
                         </property>
                     </item>
                     <item>

diff --git a/src/frontends/qt2/ui/QTabularDialogBase.ui b/src/frontends/qt2/ui/QTabularDialogBase.ui
index a8724f59bffe2e28eea5d70f75095671f7924ecf..80e54ef6037fa074118b572717669a3c1e8337c6 100644 (file)
--- a/src/frontends/qt2/ui/QTabularDialogBase.ui
+++ b/src/frontends/qt2/ui/QTabularDialogBase.ui
@@ -343,7 +343,7 @@
                                 <item>
                                     <property>
                                         <name>text</name>
-                                        <string>Center</string>
+                                        <string>Middle</string>
                                     </property>
                                 </item>
                                 <item>

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 360264f2bc5866e9a0d3609d031a8d8e5876993e..3c42fd35d989aaf07b784e0a1eb0950cc528a32e 100644 (file)
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,11 @@
+2003-08-12  Michael Schmitt  <michael.schmitt@teststep.org>
+
+       * FormMathsMatrix.C: rename "Center" to "Middle"
+       * FormTabular.C: replace radio_valign_center by radio_valign_middle;
+       rename LyXTabular::LYX_VALIGN_CENTER to LyXTabular::LYX_VALIGN_MIDDLE;
+       * form/form_paragraph.fd: rename "Centered" to "Center"
+       * forms/form_tabular.fd: rename "Center" to "Middle"
+
 2003-08-06  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * .cvsignore: add lyx_forms.h-tmp, stamp-forms, lyx_xpm.h-tmp,

diff --git a/src/frontends/xforms/FormMathsMatrix.C b/src/frontends/xforms/FormMathsMatrix.C
index b071274b90e90e5a61bf5240cc86be45f2c75e34..3a0b117c54d5ad74d0a98c0a17d041ba25816c0d 100644 (file)
--- a/src/frontends/xforms/FormMathsMatrix.C
+++ b/src/frontends/xforms/FormMathsMatrix.C
@@ -68,7 +68,7 @@ void FormMathsMatrix::build()
        dialog_.reset(build_maths_matrix(this));
 
        fl_addto_choice(dialog_->choice_valign,
-                       _("Top | Center | Bottom").c_str());
+                       _("Top | Middle | Bottom").c_str());
        fl_set_choice(dialog_->choice_valign, 2);
        fl_set_input(dialog_->input_halign, h_align_str);
        dialog_->input_halign->u_vdata = this;

diff --git a/src/frontends/xforms/FormTabular.C b/src/frontends/xforms/FormTabular.C
index 0be76f3ff4f3376d96d6fa1e278af3b07a0b02cc..892ba96624b463adf1fa9b906f1e058519a17a85 100644 (file)
--- a/src/frontends/xforms/FormTabular.C
+++ b/src/frontends/xforms/FormTabular.C
@@ -213,9 +213,9 @@ void FormTabular::update()
                align = tabular.getVAlignment(cell);
                fl_set_button(cell_options_->radio_valign_top, 0);
                fl_set_button(cell_options_->radio_valign_bottom, 0);
-               fl_set_button(cell_options_->radio_valign_center, 0);
-               if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_CENTER))
-                       fl_set_button(cell_options_->radio_valign_center, 1);
+               fl_set_button(cell_options_->radio_valign_middle, 0);
+               if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_MIDDLE))
+                       fl_set_button(cell_options_->radio_valign_middle, 1);
                else if (align == LyXTabular::LYX_VALIGN_BOTTOM)
                        fl_set_button(cell_options_->radio_valign_bottom, 1);
                else
@@ -237,7 +237,7 @@ void FormTabular::update()
 
                setEnabled(cell_options_->radio_valign_top,    !pwidth.zero());
                setEnabled(cell_options_->radio_valign_bottom, !pwidth.zero());
-               setEnabled(cell_options_->radio_valign_center, !pwidth.zero());
+               setEnabled(cell_options_->radio_valign_middle, !pwidth.zero());
 
                setEnabled(cell_options_->radio_align_left,   true);
                setEnabled(cell_options_->radio_align_right,  true);
@@ -272,8 +272,8 @@ void FormTabular::update()
                fl_set_button(cell_options_->radio_valign_bottom, 0);
                setEnabled(cell_options_->radio_valign_bottom, false);
 
-               fl_set_button(cell_options_->radio_valign_center, 0);
-               setEnabled(cell_options_->radio_valign_center, false);
+               fl_set_button(cell_options_->radio_valign_middle, 0);
+               setEnabled(cell_options_->radio_valign_middle, false);
 
                fl_set_input(cell_options_->input_special_multialign, "");
                setEnabled(cell_options_->input_special_multialign, false);
@@ -342,9 +342,9 @@ void FormTabular::update()
        align = tabular.getVAlignment(cell, true);
        fl_set_button(column_options_->radio_valign_top, 0);
        fl_set_button(column_options_->radio_valign_bottom, 0);
-       fl_set_button(column_options_->radio_valign_center, 0);
-       if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_CENTER))
-               fl_set_button(column_options_->radio_valign_center, 1);
+       fl_set_button(column_options_->radio_valign_middle, 0);
+       if (pwidth.zero() || (align == LyXTabular::LYX_VALIGN_MIDDLE))
+               fl_set_button(column_options_->radio_valign_middle, 1);
        else if (align == LyXTabular::LYX_VALIGN_BOTTOM)
                fl_set_button(column_options_->radio_valign_bottom, 1);
        else
@@ -356,7 +356,7 @@ void FormTabular::update()
        setEnabled(column_options_->radio_align_block,   !pwidth.zero());
        setEnabled(column_options_->radio_valign_top,    !pwidth.zero());
        setEnabled(column_options_->radio_valign_bottom, !pwidth.zero());
-       setEnabled(column_options_->radio_valign_center, !pwidth.zero());
+       setEnabled(column_options_->radio_valign_middle, !pwidth.zero());
 
        fl_set_button(tabular_options_->check_longtable,
                      tabular.isLongTabular());
@@ -610,8 +610,8 @@ ButtonPolicy::SMInput FormTabular::input(FL_OBJECT * ob, long)
                num = LyXTabular::VALIGN_TOP;
        else if (ob == column_options_->radio_valign_bottom)
                num = LyXTabular::VALIGN_BOTTOM;
-       else if (ob == column_options_->radio_valign_center)
-               num = LyXTabular::VALIGN_CENTER;
+       else if (ob == column_options_->radio_valign_middle)
+               num = LyXTabular::VALIGN_MIDDLE;
        else if (ob == cell_options_->check_multicolumn)
                num = LyXTabular::MULTICOLUMN;
        else if (ob == tabular_options_->check_longtable) {
@@ -675,8 +675,8 @@ ButtonPolicy::SMInput FormTabular::input(FL_OBJECT * ob, long)
                num = LyXTabular::M_VALIGN_TOP;
        else if (ob == cell_options_->radio_valign_bottom)
                num = LyXTabular::M_VALIGN_BOTTOM;
-       else if (ob == cell_options_->radio_valign_center)
-               num = LyXTabular::M_VALIGN_CENTER;
+       else if (ob == cell_options_->radio_valign_middle)
+               num = LyXTabular::M_VALIGN_MIDDLE;
        else
                return ButtonPolicy::SMI_VALID;
 

diff --git a/src/frontends/xforms/forms/form_paragraph.fd b/src/frontends/xforms/forms/form_paragraph.fd
index ffc9ad98d4664c5c5cc36c6fd564cbf976f821a9..3bf6b6aeb8c25d11c61bde1bc5699417673cd8d5 100644 (file)
--- a/src/frontends/xforms/forms/form_paragraph.fd
+++ b/src/frontends/xforms/forms/form_paragraph.fd
@@ -545,7 +545,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Centered|#C
+label: Center|#C
 shortcut: 
 resize: FL_RESIZE_NONE
 gravity: FL_East FL_East

diff --git a/src/frontends/xforms/forms/form_tabular.fd b/src/frontends/xforms/forms/form_tabular.fd
index d50daa0eb7d97cda440508f8e0127065749dd2fc..8b70fd0fdc168224e03c401932679650e1750f60 100644 (file)
--- a/src/frontends/xforms/forms/form_tabular.fd
+++ b/src/frontends/xforms/forms/form_tabular.fd
@@ -558,7 +558,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Center|#c
+label: Center|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -631,11 +631,11 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Center|#n
+label: Middle|#m
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_valign_center
+name: radio_valign_middle
 callback: C_FormDialogView_InputCB
 argument: 0
 
@@ -998,7 +998,7 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Center|#c
+label: Center|#C
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
@@ -1071,11 +1071,11 @@ alignment: FL_ALIGN_CENTER
 style: FL_NORMAL_STYLE
 size: FL_NORMAL_SIZE
 lcol: FL_BLACK
-label: Center|#n
+label: Middle|#d
 shortcut: 
 resize: FL_RESIZE_ALL
 gravity: FL_NoGravity FL_NoGravity
-name: radio_valign_center
+name: radio_valign_middle
 callback: C_FormDialogView_InputCB
 argument: 0
 

diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog
index 2b716025f74aa30f0e20621021d080fa9d8bb372..8ef13761795ab02c624e9a3dc61128cb220bb6af 100644 (file)
--- a/src/insets/ChangeLog
+++ b/src/insets/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-12  Michael Schmitt  <michael.schmitt@teststep.org>
+
+        * insettabular.C: rename M_VALIGN_CENTER to M_VALIGN_MIDDLE;
+        rename valign-center to valign-middle;
+        rename VALIGN_CENTER to VALIGN_MIDDLE
 
 2003-08-11  André Pönitz  <poenitz@gmx.net>
 

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 3847968f66eae8c915e7b5b971a3a19612503404..f5ca11fc7e20aa7729b3407f9cc7d76a15621b11 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -91,7 +91,7 @@ TabularFeature tabularFeature[] =
        { LyXTabular::ALIGN_BLOCK, "align-block" },
        { LyXTabular::VALIGN_TOP, "valign-top" },
        { LyXTabular::VALIGN_BOTTOM, "valign-bottom" },
-       { LyXTabular::VALIGN_CENTER, "valign-center" },
+       { LyXTabular::VALIGN_MIDDLE, "valign-middle" },
        { LyXTabular::M_TOGGLE_LINE_TOP, "m-toggle-line-top" },
        { LyXTabular::M_TOGGLE_LINE_BOTTOM, "m-toggle-line-bottom" },
        { LyXTabular::M_TOGGLE_LINE_LEFT, "m-toggle-line-left" },
@@ -101,7 +101,7 @@ TabularFeature tabularFeature[] =
        { LyXTabular::M_ALIGN_CENTER, "m-align-center" },
        { LyXTabular::M_VALIGN_TOP, "m-valign-top" },
        { LyXTabular::M_VALIGN_BOTTOM, "m-valign-bottom" },
-       { LyXTabular::M_VALIGN_CENTER, "m-valign-center" },
+       { LyXTabular::M_VALIGN_MIDDLE, "m-valign-middle" },
        { LyXTabular::MULTICOLUMN, "multicolumn" },
        { LyXTabular::SET_ALL_LINES, "set-all-lines" },
        { LyXTabular::UNSET_ALL_LINES, "unset-all-lines" },
@@ -1613,9 +1613,9 @@ void InsetTabular::tabularFeatures(BufferView * bv,
                setVAlign = LyXTabular::LYX_VALIGN_BOTTOM;
                break;
 
-       case LyXTabular::M_VALIGN_CENTER:
-       case LyXTabular::VALIGN_CENTER:
-               setVAlign = LyXTabular::LYX_VALIGN_CENTER;
+       case LyXTabular::M_VALIGN_MIDDLE:
+       case LyXTabular::VALIGN_MIDDLE:
+               setVAlign = LyXTabular::LYX_VALIGN_MIDDLE;
                break;
 
        default:
@@ -1795,11 +1795,11 @@ void InsetTabular::tabularFeatures(BufferView * bv,
 
        case LyXTabular::M_VALIGN_TOP:
        case LyXTabular::M_VALIGN_BOTTOM:
-       case LyXTabular::M_VALIGN_CENTER:
+       case LyXTabular::M_VALIGN_MIDDLE:
                flag = false;
        case LyXTabular::VALIGN_TOP:
        case LyXTabular::VALIGN_BOTTOM:
-       case LyXTabular::VALIGN_CENTER:
+       case LyXTabular::VALIGN_MIDDLE:
                for (int i = sel_row_start; i <= sel_row_end; ++i)
                        for (int j = sel_col_start; j <= sel_col_end; ++j)
                                tabular.setVAlignment(
@@ -2130,10 +2130,10 @@ FuncStatus InsetTabular::getStatus(string const & what) const
                status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_BOTTOM);
                break;
 
-       case LyXTabular::M_VALIGN_CENTER:
+       case LyXTabular::M_VALIGN_MIDDLE:
                flag = false;
-       case LyXTabular::VALIGN_CENTER:
-               status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_CENTER);
+       case LyXTabular::VALIGN_MIDDLE:
+               status.setOnOff(tabular.getVAlignment(actcell, flag) == LyXTabular::LYX_VALIGN_MIDDLE);
                break;
 
        case LyXTabular::SET_LONGTABULAR:

diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog
index c6793d156662202e829c5d0890220f8ccdfcd5d7..2f3efa8bda756732c197995788ce47f172f4e985 100644 (file)
--- a/src/mathed/ChangeLog
+++ b/src/mathed/ChangeLog
@@ -1,3 +1,7 @@
+2003-08-12  Michael Schmitt  <michael.schmitt@teststep.org>
+
+        * math_gridinset.C: rename valign-center to valign-middle
+
 2003-08-02  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * always use std::endl with lyxerr, and <config.h> in some places.

diff --git a/src/mathed/math_gridinset.C b/src/mathed/math_gridinset.C
index e80458db6b63be2892a60af79ce2479ea6fb9536..50d4fef3ed0e0a88a4ed3cc250b7b1660aa18c70 100644 (file)
--- a/src/mathed/math_gridinset.C
+++ b/src/mathed/math_gridinset.C
@@ -1087,7 +1087,7 @@ dispatch_result MathGridInset::dispatch
                        is >> s;
                        if (s == "valign-top")
                                valign('t');
-                       else if (s == "valign-center")
+                       else if (s == "valign-middle")
                                valign('c');
                        else if (s == "valign-bottom")
                                valign('b');

diff --git a/src/tabular.C b/src/tabular.C
index 334b2978c69d9389bbafb6143c1214700043410b..f5d9ee2f7d09c2527d5bece4ead784e9aceefcd2 100644 (file)
--- a/src/tabular.C
+++ b/src/tabular.C
@@ -117,8 +117,8 @@ string const tostr(LyXTabular::VAlignment const & num)
        switch (num) {
        case LyXTabular::LYX_VALIGN_TOP:
                return "top";
-       case LyXTabular::LYX_VALIGN_CENTER:
-               return "center";
+       case LyXTabular::LYX_VALIGN_MIDDLE:
+               return "middle";
        case LyXTabular::LYX_VALIGN_BOTTOM:
                return "bottom";
        }
@@ -162,8 +162,8 @@ bool string2type(string const str, LyXTabular::VAlignment & num)
 {
        if (str == "top")
                num = LyXTabular::LYX_VALIGN_TOP;
-       else if (str == "center")
-               num = LyXTabular::LYX_VALIGN_CENTER;
+       else if (str == "middle" )
+               num = LyXTabular::LYX_VALIGN_MIDDLE;
        else if (str == "bottom")
                num = LyXTabular::LYX_VALIGN_BOTTOM;
        else
@@ -1869,7 +1869,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
                                case LYX_VALIGN_TOP:
                                        os << 'p';
                                        break;
-                               case LYX_VALIGN_CENTER:
+                               case LYX_VALIGN_MIDDLE:
                                        os << 'm';
                                        break;
                                case LYX_VALIGN_BOTTOM:
@@ -1906,7 +1906,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
                case LYX_VALIGN_TOP:
                        os << 't';
                        break;
-               case LYX_VALIGN_CENTER:
+               case LYX_VALIGN_MIDDLE:
                        os << 'c';
                        break;
                case LYX_VALIGN_BOTTOM:
@@ -1920,7 +1920,7 @@ int LyXTabular::TeXCellPreamble(ostream & os, int cell) const
                case LYX_VALIGN_TOP:
                        os << 't';
                        break;
-               case LYX_VALIGN_CENTER:
+               case LYX_VALIGN_MIDDLE:
                        os << 'm';
                        break;
                case LYX_VALIGN_BOTTOM:
@@ -2137,7 +2137,7 @@ int LyXTabular::latex(Buffer const * buf, ostream & os,
                                case LYX_VALIGN_TOP:
                                        os << 'p';
                                        break;
-                               case LYX_VALIGN_CENTER:
+                               case LYX_VALIGN_MIDDLE:
                                        os << 'm';
                                        break;
                                case LYX_VALIGN_BOTTOM:
@@ -2272,7 +2272,7 @@ int LyXTabular::docbookRow(Buffer const * buf, ostream & os, int row) const
                case LYX_VALIGN_BOTTOM:
                        os << "bottom";
                        break;
-               case LYX_VALIGN_CENTER:
+               case LYX_VALIGN_MIDDLE:
                        os << "middle";
                }
                os << '"';

diff --git a/src/tabular.h b/src/tabular.h
index a26244cc945798eeae8565ef9a9dd4f160a7dd95..0033e28511c79dd27a57fa3fb8a963ec5aec1352 100644 (file)
--- a/src/tabular.h
+++ b/src/tabular.h
@@ -57,7 +57,7 @@ public:
                ///
                VALIGN_BOTTOM,
                ///
-               VALIGN_CENTER,
+               VALIGN_MIDDLE,
                ///
                M_TOGGLE_LINE_TOP,
                ///
@@ -77,7 +77,7 @@ public:
                ///
                M_VALIGN_BOTTOM,
                ///
-               M_VALIGN_CENTER,
+               M_VALIGN_MIDDLE,
                ///
                MULTICOLUMN,
                ///
@@ -140,7 +140,7 @@ public:
                ///
                LYX_VALIGN_BOTTOM = 1,
                ///
-               LYX_VALIGN_CENTER = 2
+               LYX_VALIGN_MIDDLE = 2
        };
 
        enum BoxType {