Package: clustalx / 2.1+lgpl-5

spelling.patch Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
Author: Andreas Tille <tille@debian.org>
Last-Update: Fri, 04 Dec 2015 09:44:24 +0100
Description: Fix spelling

--- a/clustalW/Help.cpp
+++ b/clustalW/Help.cpp
@@ -331,7 +331,7 @@ Help::Help()
 ".msf format files (multiple sequence file); new in version 7 of GCG.\n"
 "\n"
 "Fasta output cis widely used because of it's simplicity. Each sequence name is\n"
-"preceeded by a '>'-sign. The sequence itself is printed out in the following lines\n"
+"preceded by a '>'-sign. The sequence itself is printed out in the following lines\n"
 "\n"
 "PHYLIP format output can be used for input to the PHYLIP package of Joe \n"
 "Felsenstein.  This is an extremely widely used package for doing every \n"
--- a/clustalW/alignment/Alignment.cpp
+++ b/clustalW/alignment/Alignment.cpp
@@ -431,7 +431,7 @@ void Alignment::addSequencesToVector(vec
           && ((int)titles.size() == numSeqs + 1) && ((int)sequenceIds.size() == numSeqs + 1)))
     {
         cerr << "There has been an error adding the sequences to Alignment.\n"
-             << "Must terminate the program. EaddSequencesrror occured in addSequences.\n";
+             << "Must terminate the program. EaddSequencesrror occurred in addSequences.\n";
         exit(1);
     }
 }
--- a/clustalW/alignment/AlignmentOutput.cpp
+++ b/clustalW/alignment/AlignmentOutput.cpp
@@ -62,7 +62,7 @@ AlignmentOutput::AlignmentOutput()
     }
     catch(const exception& e)
     {
-        cerr << "An exception has occured in the contructor of AlignmentOutput.\n"
+        cerr << "An exception has occurred in the constructor of AlignmentOutput.\n"
              << e.what() << "\n";
         exit(1);    
     }
@@ -236,7 +236,7 @@ void AlignmentOutput::createAlignmentOut
     }
     catch(const exception& e)
     {
-        cerr << "An exception has occured in the createAlignmentOutput function.\n"
+        cerr << "An exception has occurred in the createAlignmentOutput function.\n"
              << e.what() << "\n";
         exit(1);    
     }
@@ -666,21 +666,21 @@ void AlignmentOutput::fastaOut(Alignment
     catch(const bad_alloc& e)
     {
         fastaOutFile->close();
-        cerr << "A bad_alloc exception has occured in the fastaOut function.\n"
+        cerr << "A bad_alloc exception has occurred in the fastaOut function.\n"
              << e.what() << "\n";
         exit(1);
     }
     catch(VectorOutOfRange e)
     {
         fastaOutFile->close();
-        cerr << "An exception has occured in the fastaOut function.\n"
+        cerr << "An exception has occurred in the fastaOut function.\n"
              << e.what() << "\n";
         exit(1);    
     }
     catch(...)
     {
         fastaOutFile->close();
-        cerr << "An exception has occured in the fastaOut function.\n";
+        cerr << "An exception has occurred in the fastaOut function.\n";
         exit(1);    
     }
 
@@ -861,21 +861,21 @@ void AlignmentOutput::gcgOut(Alignment*
     catch(const bad_alloc& e)
     {
         gcgOutFile->close();
-        cerr << "A bad_alloc exception has occured in the gcgOut function.\n"
+        cerr << "A bad_alloc exception has occurred in the gcgOut function.\n"
              << e.what() << "\n";
         exit(1);
     }
     catch(VectorOutOfRange e)
     {
         gcgOutFile->close();
-        cerr << "An exception has occured in the gcgOut function.\n"
+        cerr << "An exception has occurred in the gcgOut function.\n"
              << e.what() << "\n";
         exit(1);    
     }
     catch(...)
     {
         gcgOutFile->close();
-        cerr << "An exception has occured in the gcgOut function.\n";
+        cerr << "An exception has occurred in the gcgOut function.\n";
         exit(1);    
     }    
 }
@@ -1020,21 +1020,21 @@ void AlignmentOutput::phylipOut(Alignmen
     catch(const bad_alloc& e)
     {
         phylipOutFile->close();
-        cerr << "A bad_alloc exception has occured in the phylipOut function.\n"
+        cerr << "A bad_alloc exception has occurred in the phylipOut function.\n"
              << e.what() << "\n";
         exit(1);
     }
     catch(VectorOutOfRange e)
     {
         phylipOutFile->close();
-        cerr << "An exception has occured in the phylipOut function.\n"
+        cerr << "An exception has occurred in the phylipOut function.\n"
              << e.what() << "\n";
         exit(1);    
     }
     catch(...)
     {
         phylipOutFile->close();
-        cerr << "An exception has occured in the phylipOut function.\n";
+        cerr << "An exception has occurred in the phylipOut function.\n";
         exit(1);    
     }      
 }
@@ -1149,21 +1149,21 @@ void AlignmentOutput::nexusOut(Alignment
     catch(const bad_alloc& e)
     {
         nexusOutFile->close();
-        cerr << "A bad_alloc exception has occured in the nexusOut function.\n"
+        cerr << "A bad_alloc exception has occurred in the nexusOut function.\n"
              << e.what() << "\n";
         exit(1);
     }
     catch(VectorOutOfRange e)
     {
         nexusOutFile->close();
-        cerr << "An exception has occured in the nexusOut function.\n"
+        cerr << "An exception has occurred in the nexusOut function.\n"
              << e.what() << "\n";
         exit(1);    
     }
     catch(...)
     {
         nexusOutFile->close();
-        cerr << "An exception has occured in the nexusOut function.\n";
+        cerr << "An exception has occurred in the nexusOut function.\n";
         exit(1);    
     }      
 }
@@ -1438,21 +1438,21 @@ void AlignmentOutput::gdeOut(Alignment*
     catch(const bad_alloc& e)
     {
         gdeOutFile->close();
-        cerr << "A bad_alloc exception has occured in the gdeOut function.\n"
+        cerr << "A bad_alloc exception has occurred in the gdeOut function.\n"
              << e.what() << "\n";
         exit(1);
     }
     catch(VectorOutOfRange e)
     {
         gdeOutFile->close();
-        cerr << "An exception has occured in the gdeOut function.\n"
+        cerr << "An exception has occurred in the gdeOut function.\n"
              << e.what() << "\n";
         exit(1);    
     }
     catch(...)
     {
         gdeOutFile->close();
-        cerr << "An exception has occured in the gdeOut function.\n";
+        cerr << "An exception has occurred in the gdeOut function.\n";
         exit(1);    
     }     
 }
@@ -1553,21 +1553,21 @@ void AlignmentOutput::nbrfOut(Alignment*
     catch(const bad_alloc& e)
     {
         nbrfOutFile->close();
-        cerr << "A bad_alloc exception has occured in the nbrfOut function.\n"
+        cerr << "A bad_alloc exception has occurred in the nbrfOut function.\n"
              << e.what() << "\n";
         exit(1);
     }
     catch(VectorOutOfRange e)
     {
         nbrfOutFile->close();
-        cerr << "An exception has occured in the nbrfOut function.\n"
+        cerr << "An exception has occurred in the nbrfOut function.\n"
              << e.what() << "\n";
         exit(1);    
     }
     catch(...)
     {
         nbrfOutFile->close();
-        cerr << "An exception has occured in the nbrfOut function.\n";
+        cerr << "An exception has occurred in the nbrfOut function.\n";
         exit(1);    
     }    
 }
@@ -2088,28 +2088,28 @@ void AlignmentOutput::clustalOut(Alignme
     catch(const bad_alloc& e)
     {
         clustalOutFile->close();
-        cerr << "A bad_alloc exception has occured in the clustalOut function.\n"
+        cerr << "A bad_alloc exception has occurred in the clustalOut function.\n"
              << e.what() << "\n";
         exit(1);
     }
     catch(VectorOutOfRange e)
     {
         clustalOutFile->close();
-        cerr << "An exception has occured in the clustalOut function.\n"
+        cerr << "An exception has occurred in the clustalOut function.\n"
              << e.what() << "\n";
         exit(1);    
     }
     catch(exception e)
     {
         clustalOutFile->close();
-        cerr << "An exception has occured in the clustalOut function.\n"
+        cerr << "An exception has occurred in the clustalOut function.\n"
              << e.what() << "\n";
         exit(1);    
     }
     catch(...)
     {
         clustalOutFile->close();
-        cerr << "An exception has occured in the clustalOut function.\n";
+        cerr << "An exception has occurred in the clustalOut function.\n";
         exit(1);    
     }    
 }
@@ -2350,13 +2350,13 @@ void AlignmentOutput::findRangeValues(Al
     }
     catch(VectorOutOfRange e)
     {
-        cerr << "An exception has occured in the findRangeValues function.\n"
+        cerr << "An exception has occurred in the findRangeValues function.\n"
              << e.what() << "\n";
         exit(1);    
     }    
     catch(...)
     {
-        cerr << "An exception has occured in findRangeValues function\n";
+        cerr << "An exception has occurred in findRangeValues function\n";
         exit(1);
     }
 }
@@ -2383,7 +2383,7 @@ string AlignmentOutput::nameonly(string
     }
     catch(const exception& e)
     {
-        cerr << "An exception has occured in the function nameonly\n"
+        cerr << "An exception has occurred in the function nameonly\n"
              << e.what();
         exit(1);
     }
--- a/clustalW/fileInput/EMBLFileParser.cpp
+++ b/clustalW/fileInput/EMBLFileParser.cpp
@@ -229,7 +229,7 @@ int EMBLFileParser::countSeqs()
     catch(...)
     {
         _fileIn->close();
-        cerr << "An exception has occured in the function EMBLFileParser::countSeqs()\n"
+        cerr << "An exception has occurred in the function EMBLFileParser::countSeqs()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);     
     }
@@ -394,7 +394,7 @@ void EMBLFileParser::getSecStructure(vec
     catch(...)
     {
         _fileIn->close();
-        cerr << "An exception has occured in the function EMBLFileParser::getSecStructure()\n"
+        cerr << "An exception has occurred in the function EMBLFileParser::getSecStructure()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }
@@ -445,7 +445,7 @@ void EMBLFileParser::getSwissFeature(cha
     }
     catch(...)
     {
-        cerr << "An exception has occured in the function EMBLFileParser::getSwissFeature()\n"
+        cerr << "An exception has occurred in the function EMBLFileParser::getSwissFeature()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }
@@ -481,7 +481,7 @@ void EMBLFileParser::getSwissMask(char*
     }
     catch(...)
     {
-        cerr << "An exception has occured in the function EMBLFileParser::getSwissMask()\n"
+        cerr << "An exception has occurred in the function EMBLFileParser::getSwissMask()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }    
--- a/clustalW/fileInput/GDEFileParser.cpp
+++ b/clustalW/fileInput/GDEFileParser.cpp
@@ -206,7 +206,7 @@ int GDEFileParser::countSeqs()
     catch(...)
     {
         _fileIn->close();
-        cerr << "An exception has occured in the function GDEFileParser::countSeqs()\n"
+        cerr << "An exception has occurred in the function GDEFileParser::countSeqs()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }    
@@ -429,7 +429,7 @@ void GDEFileParser::getSecStructure(vect
     catch(...)
     {
         _fileIn->close();
-        cerr << "An exception has occured in the function GDEFileParser::getSecStructure()\n"
+        cerr << "An exception has occurred in the function GDEFileParser::getSecStructure()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }
--- a/clustalW/pairwise/FastPairwiseAlign.cpp
+++ b/clustalW/pairwise/FastPairwiseAlign.cpp
@@ -133,7 +133,7 @@ void FastPairwiseAlign::pairwiseAlign(Al
     }
     catch(const exception& e)
     {
-        cerr << "An exception has occured in the FastPairwiseAlign class.\n"
+        cerr << "An exception has occurred in the FastPairwiseAlign class.\n"
              << e.what() << "\n";
         exit(1);    
     }    
--- a/clustalW/fileInput/ClustalFileParser.cpp
+++ b/clustalW/fileInput/ClustalFileParser.cpp
@@ -165,7 +165,7 @@ Sequence ClustalFileParser::getSeq(int s
     catch(...)
     {
         freeFileResources(_fileIn);
-        cerr << "An exception has occured in the function ClustalFileParser::getSeq()\n"
+        cerr << "An exception has occurred in the function ClustalFileParser::getSeq()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);
     }
@@ -225,7 +225,7 @@ int ClustalFileParser::countSeqs()
     catch(...)
     {
         freeFileResources(_fileIn);
-        cerr << "An exception has occured in the function ClustalFileParser::countSeqs()\n"
+        cerr << "An exception has occurred in the function ClustalFileParser::countSeqs()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }    
@@ -582,7 +582,7 @@ void ClustalFileParser::getSecStructure(
     catch(...)
     {
         freeFileResources(_fileIn);
-        cerr << "An exception has occured in the function ClustalFileParser::getSecStructure()\n"
+        cerr << "An exception has occurred in the function ClustalFileParser::getSecStructure()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }
--- a/clustalW/fileInput/PearsonFileParser.cpp
+++ b/clustalW/fileInput/PearsonFileParser.cpp
@@ -426,7 +426,7 @@ int PearsonFileParser::countSeqs()
     catch(...)
     {
         freeFileResources(_fileIn);
-        cerr << "An exception has occured in the function PearsonFileParser::countSeqs()\n"
+        cerr << "An exception has occurred in the function PearsonFileParser::countSeqs()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }
--- a/clustalW/fileInput/RSFFileParser.cpp
+++ b/clustalW/fileInput/RSFFileParser.cpp
@@ -223,7 +223,7 @@ int RSFFileParser::countSeqs()
     catch(...)
     {
         _fileIn->close();
-        cerr << "An exception has occured in the function RSFFileParser::countSeqs()\n"
+        cerr << "An exception has occurred in the function RSFFileParser::countSeqs()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }    
@@ -364,7 +364,7 @@ void RSFFileParser::getSecStructure(vect
     catch(...)
     {
         _fileIn->close();
-        cerr << "An exception has occured in the function RSFFileParser::getSecStructure()\n"
+        cerr << "An exception has occurred in the function RSFFileParser::getSecStructure()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);
     }    
@@ -418,7 +418,7 @@ void RSFFileParser::getRSFFeature(char*
     }
     catch(...)
     {
-        cerr << "An exception has occured in the function RSFFileParser::getRSFFeature()\n"
+        cerr << "An exception has occurred in the function RSFFileParser::getRSFFeature()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }
--- a/clustalW/pairwise/FullPairwiseAlign.cpp
+++ b/clustalW/pairwise/FullPairwiseAlign.cpp
@@ -198,7 +198,7 @@ void FullPairwiseAlign::pairwiseAlign(Al
     }
     catch(const exception& e)
     {
-        cerr << "An exception has occured in the FullPairwiseAlign class.\n"
+        cerr << "An exception has occurred in the FullPairwiseAlign class.\n"
              << e.what() << "\n";
         exit(1);    
     }
--- a/clustalW/tree/UPGMA/RootedClusterTree.cpp
+++ b/clustalW/tree/UPGMA/RootedClusterTree.cpp
@@ -90,14 +90,14 @@ auto_ptr<AlignmentSteps> RootedClusterTr
     }
     catch(const exception &ex)
     {
-        cerr << "ERROR: Error has occured in treeFromDistMatrix. " 
+        cerr << "ERROR: Error has occurred in treeFromDistMatrix. " 
              << "Need to terminate program.\n"
              << ex.what();
         exit(1);   
     }
     catch(...)
     {
-        cerr << "ERROR: Error has occured in treeFromDistMatrix. " 
+        cerr << "ERROR: Error has occurred in treeFromDistMatrix. " 
              << "Need to terminate program.\n";      
         exit(1);  
     }
--- a/clustalW/tree/UnRootedClusterTree.cpp
+++ b/clustalW/tree/UnRootedClusterTree.cpp
@@ -257,14 +257,14 @@ void UnRootedClusterTree::treeFromDistMa
     }
     catch(const exception &ex)
     {
-        cerr << "ERROR: Error has occured in treeFromDistMatrix. " 
+        cerr << "ERROR: Error has occurred in treeFromDistMatrix. " 
              << "Need to terminate program.\n"
              << ex.what();
         exit(1);   
     }
     catch(...)
     {
-        cerr << "ERROR: Error has occured in treeFromDistMatrix. " 
+        cerr << "ERROR: Error has occurred in treeFromDistMatrix. " 
              << "Need to terminate program.\n";      
         exit(1);  
     }
--- a/clustalW/fileInput/MSFFileParser.cpp
+++ b/clustalW/fileInput/MSFFileParser.cpp
@@ -19,7 +19,7 @@ namespace clustalw
 {
 
 /**
- * MSFFileParser contructor sets up the chartab array.
+ * MSFFileParser constructor sets up the chartab array.
  * @param filePath 
  * @return 
  */
@@ -171,7 +171,7 @@ Sequence MSFFileParser::getSeq(int seqNu
     catch(...)
     {
         _fileIn->close();
-        cerr << "An exception has occured in the function MSFFileParser::getSeq()\n"
+        cerr << "An exception has occurred in the function MSFFileParser::getSeq()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);
     }
@@ -229,7 +229,7 @@ int MSFFileParser::countSeqs()
     catch(...)
     {
         _fileIn->close();
-        cerr << "An exception has occured in the function MSFFileParser::countSeqs()\n"
+        cerr << "An exception has occurred in the function MSFFileParser::countSeqs()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }
--- a/clustalW/fileInput/PIRFileParser.cpp
+++ b/clustalW/fileInput/PIRFileParser.cpp
@@ -19,7 +19,7 @@ namespace clustalw
 {
 
 /**
- * PIRFileParser contructor sets up the chartab array.
+ * PIRFileParser constructor sets up the chartab array.
  * @param filePath 
  */
 PIRFileParser::PIRFileParser(string filePath)
@@ -275,7 +275,7 @@ int PIRFileParser::countSeqs()
     catch(...)
     {
         _fileIn->close();
-        cerr << "An exception has occured in the function PIRFileParser::countSeqs()\n"
+        cerr << "An exception has occurred in the function PIRFileParser::countSeqs()\n"
              << "Program needs to terminate.\nPlease contact the Clustal developers\n";
         exit(1);    
     }
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -3108,7 +3108,7 @@ void MainWindow::errorHandler(int errorC
     else
     {
         QMessageBox::information(this, "",
-                                 "An unknown error occured reading in the file!",
+                                 "An unknown error occurred reading in the file!",
                                  QMessageBox::Ok);     
     }
 }
--- a/clustalW/tree/ClusterTree.cpp
+++ b/clustalW/tree/ClusterTree.cpp
@@ -956,7 +956,7 @@ void ClusterTree::printBootstrapHeaderTo
         (*clustalFile) << "\n Each column is 1 sequence; ";
         (*clustalFile) << "the stars in each line show 1 group; ";
         (*clustalFile) << "\n the dots show the other\n";
-        (*clustalFile) << "\n Numbers show occurences in bootstrap samples.";
+        (*clustalFile) << "\n Numbers show occurrences in bootstrap samples.";
     }
 }
 
--- a/clustalW/alignment/Sequence.cpp
+++ b/clustalW/alignment/Sequence.cpp
@@ -40,7 +40,7 @@ Sequence::Sequence(std::string& seq, std
 }
 
 /**
- * This is an overloaded contructor that is used to construct a seq object from an
+ * This is an overloaded constructor that is used to construct a seq object from an
  * encoded sequenced instead of a string.
  * @param encodedSequence 
  * @param name 
--- a/clustalW/tree/RandomGenerator.cpp
+++ b/clustalW/tree/RandomGenerator.cpp
@@ -12,7 +12,7 @@ namespace clustalw
 {
 
 /**
- * The contructor initialises the random algorithm.
+ * The constructor initialises the random algorithm.
  * @param s 
  * @return 
  */