From 72a642e5fb4d6a7c93bd9719e766650285afb201 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Thu, 17 May 2001 07:11:50 +0000
Subject: [PATCH] typos
---
Common/GetOptions.cpp | 42 +++++------
Geo/CAD.cpp | 10 +--
Makefile | 6 +-
Mesh/Create.cpp | 6 +-
doc/.globalrc | 165 ++++++++++++++++++++++++++++++++++++++++++
doc/VERSIONS | 4 +-
6 files changed, 202 insertions(+), 31 deletions(-)
create mode 100644 doc/.globalrc
diff --git a/Common/GetOptions.cpp b/Common/GetOptions.cpp
index 6f045e7310..994599d5e3 100644
--- a/Common/GetOptions.cpp
+++ b/Common/GetOptions.cpp
@@ -1,4 +1,4 @@
-// $Id: GetOptions.cpp,v 1.18 2001-05-07 06:25:25 geuzaine Exp $
+// $Id: GetOptions.cpp,v 1.19 2001-05-17 07:11:49 geuzaine Exp $
#include "Gmsh.h"
#include "GmshUI.h"
@@ -123,7 +123,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
i++;
if(argv[i] != NULL) TheBgmFileName = argv[i++];
else {
- fprintf(stderr, ERROR_STR "Missing File Name\n");
+ fprintf(stderr, ERROR_STR "Missing file name\n");
exit(1);
}
}
@@ -148,7 +148,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
i++;
if(argv[i]!=NULL) CTX.mesh.quality = atof(argv[i++]);
else {
- fprintf(stderr, ERROR_STR "Missing Number\n");
+ fprintf(stderr, ERROR_STR "Missing number\n");
exit(1);
}
}
@@ -156,7 +156,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
i++;
if(argv[i]!=NULL) CTX.geom.scaling_factor = atof(argv[i++]);
else {
- fprintf(stderr, ERROR_STR "Missing Number\n");
+ fprintf(stderr, ERROR_STR "Missing number\n");
exit(1);
}
}
@@ -164,7 +164,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
i++;
if(argv[i]!=NULL) CTX.mesh.scaling_factor = atof(argv[i++]);
else {
- fprintf(stderr, ERROR_STR "Missing Number\n");
+ fprintf(stderr, ERROR_STR "Missing number\n");
exit(1);
}
}
@@ -172,7 +172,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
i++;
if(argv[i]!=NULL) CTX.mesh.rand_factor = atof(argv[i++]);
else {
- fprintf(stderr, ERROR_STR "Missing Number\n");
+ fprintf(stderr, ERROR_STR "Missing number\n");
exit(1);
}
}
@@ -182,12 +182,12 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
CTX.mesh.lc_factor = atof(argv[i++]);
if(CTX.mesh.lc_factor <= 0.0){
fprintf(stderr, ERROR_STR
- "Characteristic Length Factor Must be > 0\n");
+ "Characteristic length factor must be > 0\n");
exit(1);
}
}
else {
- fprintf(stderr, ERROR_STR "Missing Number\n");
+ fprintf(stderr, ERROR_STR "Missing number\n");
exit(1);
}
}
@@ -195,7 +195,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
i++;
if(argv[i]!=NULL) CTX.mesh.nb_smoothing = atoi(argv[i++]);
else{
- fprintf(stderr, ERROR_STR "Missing Number\n");
+ fprintf(stderr, ERROR_STR "Missing number\n");
exit(1);
}
}
@@ -204,12 +204,12 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
if(argv[i]!=NULL){
CTX.mesh.degree = atoi(argv[i++]);
if(CTX.mesh.degree != 1 && CTX.mesh.degree != 2){
- fprintf(stderr, ERROR_STR "Wrong Degree\n");
+ fprintf(stderr, ERROR_STR "Wrong degree\n");
exit(1);
}
}
else {
- fprintf(stderr, ERROR_STR "Missing Number\n");
+ fprintf(stderr, ERROR_STR "Missing number\n");
exit(1);
}
}
@@ -233,13 +233,13 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
CTX.mesh.format = FORMAT_GREF ;
}
else{
- fprintf(stderr, ERROR_STR "Unknown Mesh Format\n");
+ fprintf(stderr, ERROR_STR "Unknown mesh format\n");
exit(1);
}
i++;
}
else {
- fprintf(stderr, ERROR_STR "Missing Format\n");
+ fprintf(stderr, ERROR_STR "Missing format\n");
exit(1);
}
}
@@ -251,13 +251,13 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
else if(!strcmp(argv[i],"aniso"))
CTX.mesh.algo = DELAUNAY_NEWALGO ;
else{
- fprintf(stderr, ERROR_STR "Unknown Mesh Algorithm\n");
+ fprintf(stderr, ERROR_STR "Unknown mesh algorithm\n");
exit(1);
}
i++;
}
else {
- fprintf(stderr, ERROR_STR "Missing Algorithm\n");
+ fprintf(stderr, ERROR_STR "Missing algorithm\n");
exit(1);
}
}
@@ -297,7 +297,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
i++;
if(argv[i]!=NULL) CTX.verbosity = atoi(argv[i++]);
else {
- fprintf(stderr, ERROR_STR "Missing Number\n");
+ fprintf(stderr, ERROR_STR "Missing number\n");
exit(1);
}
}
@@ -340,7 +340,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
if(argv[i]!=NULL)
opt_view_nb_iso(0, GMSH_SET, atoi(argv[i++]));
else{
- fprintf(stderr, ERROR_STR "Missing Number\n");
+ fprintf(stderr, ERROR_STR "Missing number\n");
exit(1);
}
}
@@ -396,7 +396,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
i++;
}
else {
- fprintf(stderr, ERROR_STR "Missing Number\n");
+ fprintf(stderr, ERROR_STR "Missing number\n");
exit(1);
}
}
@@ -407,7 +407,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
i++;
}
else {
- fprintf(stderr, ERROR_STR "Missing Argument\n");
+ fprintf(stderr, ERROR_STR "Missing argument\n");
exit(1);
}
}
@@ -415,7 +415,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
else{
- fprintf(stderr, "Unknown Option '%s'\n", argv[i]);
+ fprintf(stderr, "Unknown option '%s'\n", argv[i]);
CTX.terminal = 1 ;
Print_Usage(argv[0]);
exit(1);
@@ -426,7 +426,7 @@ void Get_Options (int argc, char *argv[], int *nbfiles) {
if(*nbfiles < MAX_OPEN_FILES)
TheFileNameTab[(*nbfiles)++] = argv[i++];
else{
- fprintf(stderr, ERROR_STR "Too Many Input Files\n");
+ fprintf(stderr, ERROR_STR "Too many input files\n");
exit(1);
}
}
diff --git a/Geo/CAD.cpp b/Geo/CAD.cpp
index 9928aff819..c7f3c3c50a 100644
--- a/Geo/CAD.cpp
+++ b/Geo/CAD.cpp
@@ -1,4 +1,4 @@
-// $Id: CAD.cpp,v 1.19 2001-04-08 20:36:49 geuzaine Exp $
+// $Id: CAD.cpp,v 1.20 2001-05-17 07:11:49 geuzaine Exp $
#include "Gmsh.h"
#include "Geo.h"
@@ -1277,7 +1277,7 @@ void ReplaceAllDuplicates ( Mesh *m ){
end = Tree_Nbr(m->Points);
- if(start-end) Msg(DEBUG, "Removed %d Duplicate Points", start-end);
+ if(start-end) Msg(DEBUG, "Removed %d duplicate points", start-end);
/* Replace old points in curves */
@@ -1343,7 +1343,7 @@ void ReplaceAllDuplicates ( Mesh *m ){
end = Tree_Nbr(m->Curves);
- if(start-end) Msg(DEBUG, "Removed %d Duplicate Curves", start-end);
+ if(start-end) Msg(DEBUG, "Removed %d duplicate curves", start-end);
/* Replace old curves in surfaces */
@@ -1382,7 +1382,7 @@ void ReplaceAllDuplicates ( Mesh *m ){
end = Tree_Nbr(m->Surfaces);
- if(start-end) Msg(DEBUG, "Removed %d Duplicate Surfaces", start-end);
+ if(start-end) Msg(DEBUG, "Removed %d duplicate surfaces", start-end);
/* Replace old surfaces in volumes */
@@ -1443,7 +1443,7 @@ void ApplicationOnShapes(double matrix[4][4], List_T *ListShapes){
ApplicationOnSurface(O.Num,matrix);
break;
default:
- Msg(GERROR, "Impossible to Translate Entity %d (of Type %d)",
+ Msg(GERROR, "Impossible to apply transformation on entity %d (of type %d)",
O.Num, O.Type);
break;
}
diff --git a/Makefile b/Makefile
index 160cf2b64a..3dd8045d85 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.100 2001-05-09 15:03:39 geuzaine Exp $
+# $Id: Makefile,v 1.101 2001-05-17 07:11:49 geuzaine Exp $
# ----------------------------------------------------------------------
# Makefile for Gmsh
# ----------------------------------------------------------------------
@@ -192,6 +192,10 @@ initialtag:
$(MAKE) tag ; \
fi
+tags:
+ gtags
+ htags
+
tgz:
if (test -f $(GMSH_ARCHIVE).tar.gz); \
then mv -f $(GMSH_ARCHIVE).tar.gz $(GMSH_ARCHIVE).tar.gz~; \
diff --git a/Mesh/Create.cpp b/Mesh/Create.cpp
index a3c4be4bb9..882106f786 100644
--- a/Mesh/Create.cpp
+++ b/Mesh/Create.cpp
@@ -1,4 +1,4 @@
-// $Id: Create.cpp,v 1.12 2001-04-08 20:36:50 geuzaine Exp $
+// $Id: Create.cpp,v 1.13 2001-05-17 07:11:50 geuzaine Exp $
#include "Gmsh.h"
#include "Const.h"
@@ -494,7 +494,7 @@ Curve *Create_Curve (int Num, int Typ, int Order, List_T * Liste,
}
else{
List_Read (pC->Control_Points, 0, &pC->beg);
- Msg(FATAL, "Unknown control point %d in Curve %d", p1, pC->Num);
+ Msg(GERROR, "Unknown control point %d in Curve %d", p1, pC->Num);
}
if ((v = FindPoint (p2, THEM))){
pC->end = v;
@@ -502,7 +502,7 @@ Curve *Create_Curve (int Num, int Typ, int Order, List_T * Liste,
}
else{
List_Read (pC->Control_Points, List_Nbr (pC->Control_Points) - 1, &pC->end);
- Msg(FATAL, "Unknown control point %d in Curve %d", p2, pC->Num);
+ Msg(GERROR, "Unknown control point %d in Curve %d", p2, pC->Num);
}
}
End_Curve (pC);
diff --git a/doc/.globalrc b/doc/.globalrc
new file mode 100644
index 0000000000..2b92f4f4cc
--- /dev/null
+++ b/doc/.globalrc
@@ -0,0 +1,165 @@
+#
+# Copyright (c) 1998, 1999
+# Shigio Yamaguchi. All rights reserved.
+# Copyright (c) 1999, 2000
+# Tama Communications Corporation. All rights reserved.
+#
+# This file is part of GNU GLOBAL.
+#
+# GNU GLOBAL is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# GNU GLOBAL is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# *
+# Configuration file for GNU GLOBAL source code tag system.
+#
+# GLOBAL doesn't need 'global.conf' because it has the default values in it.
+# But if you have this file as '/etc/global.conf' or "$HOME/.globalrc"
+# then GLOBAL system overwrite default values with the values from the file.
+#
+# 'global.conf' is termcap style file.
+# 'default' is default target.
+# You can specify target with GTAGSLABEL environment variable.
+#
+default:\
+ :tc=gctags:tc=htags:
+#---------------------------------------------------------------------
+#
+# Configuration for gtags(1)
+#
+# format:
+# Select 'standard' or 'compact'. By default, it assumes 'standard'.
+# suffixes:
+# Suffixes of target source file. By default, it assumes
+# 'c,h,y,c++,cc,cpp,cxx,hxx,C,H,s,S,java'
+# skip:
+# Skip files among the target files. If the name ends with '/',
+# gtags skips all files under the directory.
+# By default, it assumes 'y.tab.c,y.tab.h,SCCS/,RCS/,CVS/'.
+# extractmethod:
+# Please see source code of gtags(1).
+# GTAGS:
+# Tag command for definitions. Non of default value.
+# GRTAGS:
+# Tag command for references. Non of default value.
+# GSYMS:
+# Tag command for other symbols. Non of default value.
+#
+# Htags(1) needs both of GTAGS and GRTAGS. Global(1)'s -s option needs GSYMS.
+#
+#---------------------------------------------------------------------
+common:\
+ :skip=GetDP.tab.h,GetDP.tab.c,GetDP.yy.c,pvpii.c,utils/,trash/,\
+ Gmsh.tab.cpp,Gmsh.tab.cpp.h,Gmsh.yy.cpp,\
+ CVS/,HTML/:\
+ :format=standard:
+#
+# [gctags]
+#
+# This command is distributed as part of GLOBAL.
+#
+gctags|tag command for GLOBAL:\
+ :tc=common:\
+ :suffixes=c,h,y,c++,cc,cpp,cxx,hxx,C,H,s,S,java:\
+ :sort_command=sort:\
+ :sed_command=sed:\
+ :GTAGS=gctags %s:\
+ :GRTAGS=gctags -r %s:\
+ :GSYMS=gctags -s %s:
+#
+# [Emacs's ctags]
+#
+# This ctags is distributed as a part of Emacs editor.
+#
+# supported suffixes by etags.
+#
+# lisp: l,el,lsp,lisp,cl,clisp
+# scheme: sm,scm,scheme,t,sch,ss,SM,SCM
+# assembler: s,a,sa,asm,src,def,ins,inc
+# C++: C,H,cpp,cxx,hxx,cc
+# C*: cs,hs
+# c,yacc: c,h,y
+# pl,p,pas: pascal
+# fortran: f,for
+#
+# [Installation]
+# % cd <emacs source directory>/lib-src
+# % make ctags
+# # cp ctags /usr/local/bin/ctags-emacs
+#
+ctags-emacs|ctags based on etags|GNU Emacs ctags:\
+ :tc=common:\
+ :suffixes=el,s,a,sa,asm,C,H,cpp,cxx,hxx,cc,c,h,y:\
+ :extractmethod:\
+ :GTAGS=/usr/local/bin/ctags-emacs -x -d -T -w %s:
+#
+# [Exuberant Ctags]
+#
+# This ctags is distributed as a part of Vim editor.
+#
+# [Installation]
+# % cd <Vim source directory>/src/ctags
+# % make
+# # cp ctags /usr/local/bin/ctags-exuberant
+#
+ctags-exuberant|Exuberant Ctags|ctags by Darren Hiebert:\
+ :tc=common:\
+ :suffixes=s,a,sa,asm,C,H,cpp,cxx,hxx,cc,c,h,y:\
+ :extractmethod:\
+ :GTAGS=/usr/local/bin/ctags-exuberant -x %s | perl -ne '\
+ if (/^operator \\S+\\s+function\\s/) { s/^operator //; }\
+ ($name, $type, $no, $path, $line) = split(/[ \\t]+/, $_, 5);\
+ printf(STDOUT "%-16s %4d %-16s %s", $name, $no, $path, $line);':
+#---------------------------------------------------------------------
+#
+# Configuration for htags(1)
+# Let's paint hypertext with your favorite colors!
+#
+# body_begin,body_end:
+# body tag
+# title_begin,title_end:
+# title tag
+# comment_begin,comment_end:
+# comment tag. (/* ... */, // ...)
+# sharp_begin,sharp_end:
+# macro tag. (#include, #define, ...)
+# brace_begin,brace_end:
+# brace tag. ('{', '}')
+# reserved_begin,reserved_end:
+# reserved word tag. (while, if, char, ...)
+# ncol:
+# columns of line number. (default = 4)
+# tabs:
+# tab stop. (default = 8)
+# full_path:
+# list file names with full path in file index.
+# By default, the last component of a path.
+# table_list:
+# list tags using table tag (<table></table>).
+# normal_suffix:
+# normal suffix for html file. By default, 'html'.
+# gzipped_suffix:
+# suffix for compressed html file. By default, 'ghtml'.
+# script_alias:
+# specified -s option then use this value as script alias.
+#
+#---------------------------------------------------------------------
+htags:\
+ :body_begin=<BODY BGCOLOR="#ffffff">:body_end=</BODY>:\
+ :table_begin=<TABLE>:table_end=</TABLE>:\
+ :title_begin=<FONT COLOR=#cc0000>:title_end=</FONT>:\
+ :comment_begin=<I><FONT COLOR=darkred>:comment_end=</FONT></I>:\
+ :sharp_begin=<FONT COLOR=darkviolet>:sharp_end=</FONT>:\
+ :brace_begin=<FONT COLOR=blue>:brace_end=</FONT>:\
+ :reserved_begin=<FONT COLOR=green><B>:reserved_end=</B></FONT>:script_alias=/cgi-bin/:\
+ :ncol#4:tabs#8:normal_suffix=html:gzipped_suffix=ghtml:
diff --git a/doc/VERSIONS b/doc/VERSIONS
index f588115459..f9978e69fb 100644
--- a/doc/VERSIONS
+++ b/doc/VERSIONS
@@ -1,4 +1,6 @@
-$Id: VERSIONS,v 1.15 2001-05-07 06:25:26 geuzaine Exp $
+$Id: VERSIONS,v 1.16 2001-05-17 07:11:50 geuzaine Exp $
+
+New in 1.20: Various bug fixes (Include+Function, ...)
New in 1.19: Fixed seg. fault for scalar simplex post-processing; new
Solver menu; interface for GetDP solver through sockets; fixed
--
GitLab