diff --git a/Fltk/Callbacks.cpp b/Fltk/Callbacks.cpp
index 3f8a0ee1f3a3a553ff268b66ee5199cdd464d234..83e4f4d5422a26dd3f6e5ac8dc6b6934e9f75e49 100644
--- a/Fltk/Callbacks.cpp
+++ b/Fltk/Callbacks.cpp
@@ -1,4 +1,4 @@
-// $Id: Callbacks.cpp,v 1.376 2005-11-20 03:58:28 geuzaine Exp $
+// $Id: Callbacks.cpp,v 1.377 2005-11-26 16:01:10 geuzaine Exp $
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
@@ -1520,14 +1520,16 @@ void manip_update_cb(CALLBACK_ARGS)
// Help Menu (if you change the following, please also change the
// texinfo documentation in doc/texinfo/shortcuts.texi)
+#if defined(__APPLE__)
+# define CC(str) "Cmd+" str " "
+#else
+# define CC(str) "Ctrl+" str
+#endif
+
void help_short_cb(CALLBACK_ARGS)
{
Msg(DIRECT, " ");
-#if defined(__APPLE__)
- Msg(DIRECT, "Keyboard shortcuts (Ctrl and Command can be used interchangeably):");
-#else
Msg(DIRECT, "Keyboard shortcuts:");
-#endif
Msg(DIRECT, " ");
Msg(DIRECT, " Left arrow Go to previous time step");
Msg(DIRECT, " Right arrow Go to next time step");
@@ -1554,23 +1556,23 @@ void help_short_cb(CALLBACK_ARGS)
Msg(DIRECT, " Shift+s Show solver options");
Msg(DIRECT, " Shift+w Show post-processing view options");
Msg(DIRECT, " ");
- Msg(DIRECT, " Ctrl+i Show statistics window");
- Msg(DIRECT, " Ctrl+l Show message console");
+ Msg(DIRECT, " " CC("i") " Show statistics window");
+ Msg(DIRECT, " " CC("l") " Show message console");
#if defined(__APPLE__)
- Msg(DIRECT, " Ctrl+m Minimize window");
+ Msg(DIRECT, " " CC("m") " Minimize window");
#endif
- Msg(DIRECT, " Ctrl+n Create new project file");
- Msg(DIRECT, " Ctrl+o Open project file");
- Msg(DIRECT, " Ctrl+q Quit");
- Msg(DIRECT, " Ctrl+r Rename project file");
- Msg(DIRECT, " Ctrl+s Save file as");
+ Msg(DIRECT, " " CC("n") " Create new project file");
+ Msg(DIRECT, " " CC("o") " Open project file");
+ Msg(DIRECT, " " CC("q") " Quit");
+ Msg(DIRECT, " " CC("r") " Rename project file");
+ Msg(DIRECT, " " CC("s") " Save file as");
Msg(DIRECT, " ");
- Msg(DIRECT, " Shift+Ctrl+c Show clipping plane window");
- Msg(DIRECT, " Shift+Ctrl+m Show manipulator window");
- Msg(DIRECT, " Shift+Ctrl+n Show option window");
- Msg(DIRECT, " Shift+Ctrl+o Merge file(s)");
- Msg(DIRECT, " Shift+Ctrl+s Save mesh in default format");
- Msg(DIRECT, " Shift+Ctrl+v Show visibility window");
+ Msg(DIRECT, " Shift+" CC("c") " Show clipping plane window");
+ Msg(DIRECT, " Shift+" CC("m") " Show manipulator window");
+ Msg(DIRECT, " Shift+" CC("n") " Show option window");
+ Msg(DIRECT, " Shift+" CC("o") " Merge file(s)");
+ Msg(DIRECT, " Shift+" CC("s") " Save mesh in default format");
+ Msg(DIRECT, " Shift+" CC("v") " Show visibility window");
Msg(DIRECT, " ");
Msg(DIRECT, " Alt+a Loop through axes modes");
Msg(DIRECT, " Alt+b Hide/show bounding boxes");
diff --git a/Fltk/GUI.cpp b/Fltk/GUI.cpp
index 6c2c7d0189058f5e4c006af2ac625be4a642902e..f50cfd28c2e4cf2f06216f2f4a24950ddcf292fe 100644
--- a/Fltk/GUI.cpp
+++ b/Fltk/GUI.cpp
@@ -1,4 +1,4 @@
-// $Id: GUI.cpp,v 1.468 2005-11-20 03:58:28 geuzaine Exp $
+// $Id: GUI.cpp,v 1.469 2005-11-26 16:01:11 geuzaine Exp $
//
// Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
//
@@ -136,23 +136,23 @@ Fl_Menu_Item m_menubar_table[] = {
#if defined(__APPLE__) && defined(HAVE_FLTK_1_1_5_OR_ABOVE)
Fl_Menu_Item m_sys_menubar_table[] = {
{"File", 0, 0, 0, FL_SUBMENU},
- {"New...", FL_CTRL+'n', (Fl_Callback *)file_new_cb, 0},
- {"Open...", FL_CTRL+'o', (Fl_Callback *)file_open_cb, 0},
- {"Merge...", FL_CTRL+FL_SHIFT+'o', (Fl_Callback *)file_merge_cb, 0, FL_MENU_DIVIDER},
- {"Rename...", FL_CTRL+'r', (Fl_Callback *)file_rename_cb, 0},
- {"Save As...", FL_CTRL+'s', (Fl_Callback *)file_save_as_cb, 0},
- {"Save Mesh", FL_CTRL+FL_SHIFT+'s', (Fl_Callback *)mesh_save_cb, 0},
+ {"New...", FL_META+'n', (Fl_Callback *)file_new_cb, 0},
+ {"Open...", FL_META+'o', (Fl_Callback *)file_open_cb, 0},
+ {"Merge...", FL_META+FL_SHIFT+'o', (Fl_Callback *)file_merge_cb, 0, FL_MENU_DIVIDER},
+ {"Rename...", FL_META+'r', (Fl_Callback *)file_rename_cb, 0},
+ {"Save As...", FL_META+'s', (Fl_Callback *)file_save_as_cb, 0},
+ {"Save Mesh", FL_META+FL_SHIFT+'s', (Fl_Callback *)mesh_save_cb, 0},
{0},
{"Tools",0,0,0,FL_SUBMENU},
- {"Options...", FL_CTRL+FL_SHIFT+'n', (Fl_Callback *)options_cb, 0},
- {"Visibility", FL_CTRL+FL_SHIFT+'v', (Fl_Callback *)visibility_cb, 0},
- {"Clipping Planes", FL_CTRL+FL_SHIFT+'c', (Fl_Callback *)clip_cb, 0},
- {"Manipulator", FL_CTRL+FL_SHIFT+'m', (Fl_Callback *)manip_cb, 0, FL_MENU_DIVIDER},
- {"Statistics", FL_CTRL+'i', (Fl_Callback *)statistics_cb, 0},
- {"Message Console", FL_CTRL+'l', (Fl_Callback *)message_cb, 0},
+ {"Options...", FL_META+FL_SHIFT+'n', (Fl_Callback *)options_cb, 0},
+ {"Visibility", FL_META+FL_SHIFT+'v', (Fl_Callback *)visibility_cb, 0},
+ {"Clipping Planes", FL_META+FL_SHIFT+'c', (Fl_Callback *)clip_cb, 0},
+ {"Manipulator", FL_META+FL_SHIFT+'m', (Fl_Callback *)manip_cb, 0, FL_MENU_DIVIDER},
+ {"Statistics", FL_META+'i', (Fl_Callback *)statistics_cb, 0},
+ {"Message Console", FL_META+'l', (Fl_Callback *)message_cb, 0},
{0},
{"Window",0,0,0,FL_SUBMENU},
- {"Minimize", FL_CTRL+'m', (Fl_Callback *)window_cb, (void*)"minimize"},
+ {"Minimize", FL_META+'m', (Fl_Callback *)window_cb, (void*)"minimize"},
{"Zoom", 0, (Fl_Callback *)window_cb, (void*)"zoom", FL_MENU_DIVIDER},
{"Bring All to Front", 0, (Fl_Callback *)window_cb, (void*)"front"},
{0},
diff --git a/Makefile b/Makefile
index ccc5e1b158862d5350fa376e4bfd2550acfd7b14..7b4fcdd642e3e708ae0788e313dc74c10150c18d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.403 2005-11-26 00:08:58 geuzaine Exp $
+# $Id: Makefile,v 1.404 2005-11-26 16:01:10 geuzaine Exp $
#
# Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
#
@@ -23,7 +23,7 @@ include variables
GMSH_MAJOR_VERSION = 1
GMSH_MINOR_VERSION = 61
-GMSH_PATCH_VERSION = 1
+GMSH_PATCH_VERSION = 2
GMSH_EXTRA_VERSION = "-cvs"
GMSH_VERSION = ${GMSH_MAJOR_VERSION}.${GMSH_MINOR_VERSION}.${GMSH_PATCH_VERSION}${GMSH_EXTRA_VERSION}
diff --git a/configure b/configure
index d67bde66b165327b6e6907ac9913e34443046eff..998c97afe425bac63a8340e70256f97085ace5c8 100755
--- a/configure
+++ b/configure
@@ -3885,7 +3885,7 @@ fi
echo "You are building a version of Gmsh that contains METIS, the"
echo "Serial Graph Partitioner."
echo "Please note that by doing so, you agree with METIS's licensing"
- echo "requirements stated in ./contrib/Metis/Doc/manual.ps."
+ echo "requirements stated in ./contrib/Metis/README."
echo "To disable METIS, run configure again with the --disable-metis"
echo "option."
echo "********************************************************************"
diff --git a/configure.in b/configure.in
index a50e3927804822d7ca8a0f414c59a950876a41cd..4ab0cb243074c22c31f39f7a634d142ee7ec199e 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.82 2005-09-25 15:52:17 geuzaine Exp $
+dnl $Id: configure.in,v 1.83 2005-11-26 16:01:10 geuzaine Exp $
dnl
dnl Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
dnl
@@ -303,7 +303,7 @@ if test "x$enable_contrib" != "xno"; then
echo "You are building a version of Gmsh that contains METIS, the"
echo "Serial Graph Partitioner."
echo "Please note that by doing so, you agree with METIS's licensing"
- echo "requirements stated in ./contrib/Metis/Doc/manual.ps."
+ echo "requirements stated in ./contrib/Metis/README."
echo "To disable METIS, run configure again with the --disable-metis"
echo "option."
echo "********************************************************************"
diff --git a/contrib/Metis/README b/contrib/Metis/README
index 75a07d88a271baf6a66d640ce3ef5d2b8fa47241..d8cb6444b37d16be7e63c814a7372a07d1c87097 100644
--- a/contrib/Metis/README
+++ b/contrib/Metis/README
@@ -1,3 +1,21 @@
+/*
+ * Copyright 1997, Regents of the University of Minnesota
+ *
+ * metis.h
+ *
+ * This file includes all necessary header files
+ *
+ * Started 8/27/94
+ * George
+ *
+ * $Id: README,v 1.3 2005-11-26 16:01:11 geuzaine Exp $
+ */
+
+
+The original source code must be distributed.
+
+-------------------------------------------------------------------
+
Christophe,
You can do that but be aware that metis/parmetis is not being distributed
diff --git a/doc/CREDITS b/doc/CREDITS
index 02101afc0b86605abf6532d893b724787bdfbd2c..b80b4bc36e2a08f8602bed94506b23d7fc353af0 100644
--- a/doc/CREDITS
+++ b/doc/CREDITS
@@ -1,4 +1,4 @@
-$Id: CREDITS,v 1.32 2005-10-16 16:29:48 geuzaine Exp $
+$Id: CREDITS,v 1.33 2005-11-26 16:01:11 geuzaine Exp $
Gmsh is copyright (C) 1997-2005
@@ -80,6 +80,11 @@ This version of Gmsh may contain code (in the contrib/Tetgen
subdirectory) copyright (C) 2002, 2004 Hang Si: check the
configuration options.
+This version of Gmsh may contain code (in the contrib/Metis
+subdirectory) written by George Karypis (karypis at cs.umn.edu),
+copyright (C) 1998, Regents of the University of Minnesota: check the
+configuration options.
+
Special thanks to Bill Spitzak <spitzak at users.sourceforge.net>,
Michael Sweet <easysw at users.sourceforge.net>, Matthias Melcher <mm
at matthiasm.com> and others for the Fast Light Tool Kit on which
diff --git a/doc/texinfo/gmsh.texi b/doc/texinfo/gmsh.texi
index b35c1c35c833fcfaa45d25782610ce1d9a26a2cf..443aaf61670af5b87c374f8a1dcc2a01191c1631 100644
--- a/doc/texinfo/gmsh.texi
+++ b/doc/texinfo/gmsh.texi
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
-@c $Id: gmsh.texi,v 1.192 2005-11-20 01:39:40 geuzaine Exp $
+@c $Id: gmsh.texi,v 1.193 2005-11-26 16:01:11 geuzaine Exp $
@c
@c Copyright (C) 1997-2005 C. Geuzaine, J.-F. Remacle
@c
@@ -2749,6 +2749,9 @@ Pop up menu on post-processing view button
@cindex Shortcuts, keyboard
@cindex Bindings, keyboard
+(On Mac Ctrl is replaced by Cmd (the `Apple key') in the shortcuts
+below.)
+
@include shortcuts.texi
@c =========================================================================