[gle-graphics] 01/01: fix spelling mistakes found by codespell remove typo-occured patch (included in codespell) refresh patches
Christian T. Steigies
cts at moszumanska.debian.org
Wed Jul 6 21:14:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
cts pushed a commit to branch master
in repository gle-graphics.
commit 5966c679dde2e23861709002bd47216fc091e492
Author: Christian T. Steigies <cts at debian.org>
Date: Tue Jul 5 22:26:30 2016 +0200
fix spelling mistakes found by codespell
remove typo-occured patch (included in codespell)
refresh patches
---
debian/patches/codespell | 679 +++++++++++++++++++++++++++++
debian/patches/initialize_font_table | 10 +-
debian/patches/kfreebsd-buildd-has-no-proc | 8 +-
debian/patches/series | 2 +-
debian/patches/static-time | 6 +-
debian/patches/typo-occurred | 65 ---
6 files changed, 694 insertions(+), 76 deletions(-)
diff --git a/debian/patches/codespell b/debian/patches/codespell
new file mode 100644
index 0000000..524b3a4
--- /dev/null
+++ b/debian/patches/codespell
@@ -0,0 +1,679 @@
+Description: fix spelling mistakes found by codespell
+Author: Christian T. Steigies <cts at debian.org>
+Last-Update: 2016-07-05
+Index: gle-graphics/gle-refman/appendix/fig/showfont.gle
+===================================================================
+--- gle-graphics.orig/gle-refman/appendix/fig/showfont.gle
++++ gle-graphics/gle-refman/appendix/fig/showfont.gle
+@@ -93,7 +93,7 @@ set font fnm$
+ amove xstart ystart
+ for j = 0 to (yanz/2)
+ for i = 0 to 19
+- ! note: no spaces in expression below. (exept inside quotes)
++ ! note: no spaces in expression below. (except inside quotes)
+ xx$ = "\char{"+num1$(j*20+i)+"}"
+ write xx$
+ rmove xspace 0
+Index: gle-graphics/gle-refman/obsolete/gle32.tex
+===================================================================
+--- gle-graphics.orig/gle-refman/obsolete/gle32.tex
++++ gle-graphics/gle-refman/obsolete/gle32.tex
+@@ -122,7 +122,7 @@ Installation Quick guide: (By Chri
+ - There exists a multitude of GRX-graphics-drivers, e.g. for
+ TSENG ET4000(W32), S3, 8514A, Cirrus Logic GD 542x, Trident 8900,
+ Diamond Viper, ATI Ultra, ATI VGA and EGA. These drivers are highly
+- configureable and can use flicker-free high resolution modes.
++ configurable and can use flicker-free high resolution modes.
+
+
+ Installation
+@@ -240,7 +240,7 @@ Installation Quick guide: (By Chri
+ 3) Makefmt and fbuild are missing. DJGPP's Library lacks ecvt().
+ Both programs are used to calculate vector-fonts in the Unix-version
+ from the source-distribution. Both programs are NOT included in the
+- 16-bit DOS-version, too. This package includes all (allready calculated)
++ 16-bit DOS-version, too. This package includes all (already calculated)
+ fonts from the Unix-source distribution. They were calculated under Linux,
+ a free Unix-implementation for i386-PC's and higher. Since a few months,
+ there exists an archive with my patches (at the ftp-sites sunsite.unc.edu
+@@ -318,7 +318,7 @@ that they can be fixed.
+
+ Axel Rohde, 19.1.94, email: rohde at physik.uni-kiel.d400.de
+
+- Chris Pugmire's email adress: chrisp at marc.cri.nz
++ Chris Pugmire's email address: chrisp at marc.cri.nz
+ \end{verbatim}
+ }
+ \hfill {\small gle32b.txt}\\
+Index: gle-graphics/gle-refman/obsolete/obsolete.tex
+===================================================================
+--- gle-graphics.orig/gle-refman/obsolete/obsolete.tex
++++ gle-graphics/gle-refman/obsolete/obsolete.tex
+@@ -127,7 +127,7 @@ To get access to these files from the GL
+ $ cgle stack4b.gle ! or any other example
+ \end{verbatim}
+
+-If your keyboard doesn't have the function keys F9 thru F14 you can
++If your keyboard doesn't have the function keys F9 through F14 you can
+ use GOLD (PF1) followed by the numbers 9,0,1,2,3,4 (on the top of the
+ QWERTYUIOP keypad).
+
+@@ -417,7 +417,7 @@ To get Gle-Output in a WIN-WORD text, HP
+ The use of the HPGL-Converter HP2XX of Heinz W. Werntges is another way to
+ get various pix-map format output. HP2XX has been ported successfully
+ for Unix, OS/2, DOS, Amiga, Atari, VMS and AXP. \\
+-HP2XX has many controling options. In
++HP2XX has many controlling options. In
+ the current version it is able to write the following formats:
+ mf, cad, em, epic, eps, pcl, pcx, pic, img, pbm, pre, uis.
+
+Index: gle-graphics/gle-refman/obsolete/sm_gle32_tut.tex
+===================================================================
+--- gle-graphics.orig/gle-refman/obsolete/sm_gle32_tut.tex
++++ gle-graphics/gle-refman/obsolete/sm_gle32_tut.tex
+@@ -52,7 +52,7 @@ Properties of GLE 32:
+ - There exists a multitude of GRX-graphics-drivers, e.g. for
+ TSENG ET4000(W32), S3, 8514A, Cirrus Logic GD 542x, Trident 8900,
+ Diamond Viper, ATI Ultra, ATI VGA and EGA. These drivers are highly
+- configureable and can use flicker-free high resolution modes.
++ configurable and can use flicker-free high resolution modes.
+ \end{verbatim}
+ Installation Quick guide:
+ \begin{verbatim}
+@@ -96,7 +96,7 @@ compared to the original.
+ \item[3.] Makefmt and fbuild are missing. DJGPP's Library lacks ecvt().
+ Both programs are used to calculate vector-fonts in the Unix-version
+ from the source-distribution. Both programs are NOT included in the
+-16-bit DOS-version, too. This package includes all (allready calculated)
++16-bit DOS-version, too. This package includes all (already calculated)
+ fonts from the Unix-source distribution. They were calculated under Linux,
+ a free Unix-implementation for i386-PC's and higher.
+ \item[4.] The DVI-drivers are not testet!
+Index: gle-graphics/gle-refman/title/title.tex
+===================================================================
+--- gle-graphics.orig/gle-refman/title/title.tex
++++ gle-graphics/gle-refman/title/title.tex
+@@ -69,7 +69,7 @@ C. Pugmire, St.M. Mundt, V.P. LaBella, J
+
+ \section*{Abstract}
+
+-GLE (Graphics Layout Engine) is a graphics scripting language designed for creating publication quality figures (e.g., a chart, plot, graph, or diagram). It supports various chart types (including function plot, histogram, bar chart, scatter plot, contour plot, color map, and surface plot) through a simple but flexible set of graphing commands. More complex output can be created by relying on GLE's scripting language, which is full featured with subroutines, variables, and logic control [...]
++GLE (Graphics Layout Engine) is a graphics scripting language designed for creating publication quality figures (e.g., a chart, plot, graph, or diagram). It supports various chart types (including function plot, histogram, bar chart, scatter plot, contour plot, color map, and surface plot) through a simple but flexible set of graphing commands. More complex output can be created by relying on GLE's scripting language, which is full featured with subroutines, variables, and logic control [...]
+
+ \subsection*{Trademark Acknowledgements}
+ The following trademarks are used in this manual.
+Index: gle-graphics/gle-refman/utilities/fitls.tex
+===================================================================
+--- gle-graphics.orig/gle-refman/utilities/fitls.tex
++++ gle-graphics/gle-refman/utilities/fitls.tex
+@@ -93,7 +93,7 @@ Initial value for constant d [1.0] ?
+ 480 evaluations, -0.63808 -2.82357 0.140993 1.10452 , fit = 0.938389
+ a = -0.638262 b = -2.81719 c = 0.140722 d = 1.11256
+
+-10 Iterations, sum of squares devided by n = 0.938389
++10 Iterations, sum of squares divided by n = 0.938389
+ y = sin(-0.638262*x)*-2.81719+0.140722*x^2+1.11256
+ \end{verbatim}
+ \vspace*{1.0cm}
+Index: gle-graphics/gle-refman/utilities/manip.tex
+===================================================================
+--- gle-graphics.orig/gle-refman/utilities/manip.tex
++++ gle-graphics/gle-refman/utilities/manip.tex
+@@ -106,7 +106,7 @@ If your spreadsheet has 5 columns and 10
+ \subsubsection{Arrows}
+ \index{Manip!Arrows}
+ The arrow keys normally move the data cursor, however if you are half
+-way thru typing a command then, the left and right arrow keys allow you
++way through typing a command then, the left and right arrow keys allow you
+ to edit the command. Use the {\sf PAGE-UP} and {\sf PAGE-DOWN} keys to recall
+ your last command.
+
+@@ -193,7 +193,7 @@ deleted range.
+
+ \item[{\sf DATA [{\it range}]}]
+ \index{data}
+-Data entry mode is usefull for entering data. After typing in
++Data entry mode is useful for entering data. After typing in
+ \verb#"% DATA c1c3"# or \verb#"% DATA C2"# you can then enter data and pressing
+ {\sf <cr>} will move you to the next valid data position.
+ In this mode text or numbers can be entered.
+@@ -214,12 +214,12 @@ can optionally specify an output file as
+ The command \verb#"EXIT myfile.dat c3c5r1r3"# will write out that range of
+ numbers to the file.
+
+-By default manip will write columns seperated by spaces.
++By default manip will write columns separated by spaces.
+
+ The command \verb#"EXIT myfile.dat -TAB"# will put a single tab between
+ each column of numbers and \verb#"EXIT myfile.dat -COMMA"# will put a
+ comma and a space between each number. (these two options are
+-usefull if your data file is very big and you don't want to waste
++useful if your data file is very big and you don't want to waste
+ diskspace with the space characters.)
+ Note: The settings stay in effect for future saves and exits.
+
+@@ -238,12 +238,12 @@ Saves all or part of your data.
+ The command \verb#"SAVE myfile.dat c3c5r1r3"# will write out that range of
+ numbers to the file.
+
+-By default manip will write columns seperated by spaces.
++By default manip will write columns separated by spaces.
+
+ The command \verb#"SAVE myfile.dat -TAB"# will put a single tab between
+ each column of numbers and \verb#"SAVE myfile.dat -COMMA"# will put a
+ comma and a space between each number. (these two options are
+-usefull if your data file is very big and you don't want to waste
++useful if your data file is very big and you don't want to waste
+ diskspace with the space characters).
+
+ Further options are the same like {\sf EXIT}
+Index: gle-graphics/gle-refman/utilities/surface.tex
+===================================================================
+--- gle-graphics.orig/gle-refman/utilities/surface.tex
++++ gle-graphics/gle-refman/utilities/surface.tex
+@@ -268,7 +268,7 @@ The default setting is 60 50 0.
+ \item[{\sf view x y p }]
+ \index{view}
+ Sets the perspective, this is where the cube gets smaller
+-as the lines dissappear towards infinity.
++as the lines disappear towards infinity.
+
+ x and y are the position of infinity on your screen.
+ p is the degree of perspective, 0 = no perspective
+Index: gle-graphics/src/manip/manip.hlp
+===================================================================
+--- gle-graphics.orig/src/manip/manip.hlp
++++ gle-graphics/src/manip/manip.hlp
+@@ -103,7 +103,7 @@
+
+ 3 ARROWS
+ The arrow keys normally move the data cursor, however if you are half
+- way thru typing a command then, the left and right arrow keys allow you
++ way througg typing a command then, the left and right arrow keys allow you
+ to edit the command. Use the PAGE-UP and PAGE-DOWN keys to recall
+ your last command.
+
+@@ -133,7 +133,7 @@
+ deleted range.
+
+ 3 DATA
+- Data entry mode is usefull for entering data. After typing in
++ Data entry mode is useful for entering data. After typing in
+ "% DATA c1c3" or "% DATA C2" you can then enter data and pressing
+ <cr> will move you to the next valid data position.
+ In this mode text or numbers can be entered.
+@@ -151,12 +151,12 @@
+ The command "EXIT myfile.dat c3c5r1r3" will write out that range of
+ numbers to the file.
+
+- By default manip will write columns seperated by spaces.
++ By default manip will write columns separated by spaces.
+
+ The command "EXIT myfile.dat -TAB" will put a single tab between
+ each column of numbers and "EXIT myfile.dat -COMMA" will put a
+ comma and a space between each number. (these two options are
+- usefull if your data file is very big and you don't want to waste
++ useful if your data file is very big and you don't want to waste
+ diskspace with the space characters.) NOTE: The settings stay
+ in effect for future saves and exits.
+
+@@ -177,12 +177,12 @@
+ The command "SAVE myfile.dat c3c5r1r3" will write out that range of
+ numbers to the file.
+
+- By default manip will write columns seperated by spaces.
++ By default manip will write columns separated by spaces.
+
+ The command "SAVE myfile.dat -TAB" will put a single tab between
+ each column of numbers and "SAVE myfile.dat -COMMA" will put a
+ comma and a space between each number. (these two options are
+- usefull if your data file is very big and you don't want to waste
++ useful if your data file is very big and you don't want to waste
+ diskspace with the space characters) NOTE: The settings stay
+ in effect for future saves and exits.
+
+Index: gle-graphics/src/gle/file_io.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/file_io.cpp
++++ gle-graphics/src/gle/file_io.cpp
+@@ -830,7 +830,7 @@ int GLESystem(const string& cmd, bool wa
+ }
+ int nbytes = write(pin[GLESYS_PIPE_WR], write_buffer+offs_write, to_write);
+ if (nbytes < 0) {
+- /* an error occured */
++ /* an error occurred */
+ if (errno != EAGAIN) {
+ GLECloseFD(pin, GLESYS_PIPE_WR);
+ }
+@@ -844,7 +844,7 @@ int GLESystem(const string& cmd, bool wa
+ while (pout[GLESYS_PIPE_RD] >= 0) {
+ int nbytes = read(pout[GLESYS_PIPE_RD], read_buffer, GLEREAD_BUF);
+ if (nbytes < 0) {
+- /* an error occured */
++ /* an error occurred */
+ if (errno != EAGAIN) {
+ GLECloseFD(pout, GLESYS_PIPE_RD);
+ }
+@@ -872,7 +872,7 @@ int GLESystem(const string& cmd, bool wa
+ cnt++;
+ }
+ if (cnt == 0) {
+- /* everyting error or end of stream */
++ /* everything error or end of stream */
+ break;
+ }
+ /* wait for data to become available or flushed */
+Index: gle-graphics/src/gle/polish.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/polish.cpp
++++ gle-graphics/src/gle/polish.cpp
+@@ -153,7 +153,7 @@ void GLEPolish::internalPolish(GLEPcode&
+ if (*rtype==1) not_string = true;
+ if (*rtype>0) term_bracket = true;
+ pcode.addInt(PCODE_EXPR); /* Expression follows */
+- int savelen = pcode.size(); /* Used to set acutal length at end */
++ int savelen = pcode.size(); /* Used to set actual length at end */
+ pcode.addInt(0); /* Length of expression */
+ while (true) {
+ string token = m_tokens.try_next_token();
+@@ -514,7 +514,7 @@ GLEPcode::GLEPcode(GLEPcodeList* list) {
+
+ void GLEPcode::addColor(GLEColor* color) {
+ addInt(PCODE_EXPR);
+- int savelen = size(); /* Used to set acutal length at end */
++ int savelen = size(); /* Used to set actual length at end */
+ addInt(0); /* Length of expression */
+ addInt(PCODE_OBJECT);
+ int pos = getPcodeList()->size();
+Index: gle-graphics/src/gle/Makefile.os2
+===================================================================
+--- gle-graphics.orig/src/gle/Makefile.os2
++++ gle-graphics/src/gle/Makefile.os2
+@@ -81,7 +81,7 @@ $(PROJECT_BINDIR)/glerc:
+ #
+ # simple test to make the sample and compare it to
+ # the eps file that is included in the distribution
+-# -- if you get this far chances are it working allready ;-)
++# -- if you get this far chances are it working already ;-)
+ # you should only get an error on the Creation date
+ #
+ test: # do this after make install!
+Index: gle-graphics/src/gle/eval.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/eval.cpp
++++ gle-graphics/src/gle/eval.cpp
+@@ -396,7 +396,7 @@ void eval_pcode_loop(GLEArrayImpl* stk,
+ stk->ensure(stk->size());
+ getVarsInstance()->get(i, stk->get(stk->last()));
+ break;
+- case PCODE_STRING: /* Null terminated string follows (int alligned) */
++ case PCODE_STRING: /* Null terminated string follows (int aligned) */
+ c++;
+ stk->incrementSize(1);
+ setEvalStack(stk, stk->last(), eval_str(pcode, &c));
+Index: gle-graphics/src/gle/Makefile.gcc
+===================================================================
+--- gle-graphics.orig/src/gle/Makefile.gcc
++++ gle-graphics/src/gle/Makefile.gcc
+@@ -89,7 +89,7 @@ dofonts:
+ #
+ # simple test to make the sample and compare it to
+ # the eps file that is included in the distribution
+-# -- if you get this far chances are it working allready ;-)
++# -- if you get this far chances are it working already ;-)
+ # you should only get an error on the Creation date
+ #
+ test: # do this after make install!
+Index: gle-graphics/src/gle/Makefile.in
+===================================================================
+--- gle-graphics.orig/src/gle/Makefile.in
++++ gle-graphics/src/gle/Makefile.in
+@@ -185,7 +185,7 @@ dofonts:
+
+ # simple test to make the sample and compare it to
+ # the eps file that is included in the distribution
+-# -- if you get this far chances are it working allready ;-)
++# -- if you get this far chances are it working already ;-)
+ # you should only get an error on the Creation date
+
+ test: # do this after make install!
+Index: gle-graphics/src/gle/core.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/core.cpp
++++ gle-graphics/src/gle/core.cpp
+@@ -3433,7 +3433,7 @@ void GLEProjection::rotate(double angle,
+ /**
+ * Inspector invToReference
+ * Explanation : Returns the inverse viewing transformation
+- * Z-axis parrallel to eye-ref.
++ * Z-axis parallel to eye-ref.
+ * X-axis orthogonal to vvec and z-axis.
+ * Y-axis orthogonal to previous two axis.
+ */
+Index: gle-graphics/src/gle/d_ps.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/d_ps.cpp
++++ gle-graphics/src/gle/d_ps.cpp
+@@ -107,7 +107,7 @@ extern bool GS_PREVIEW;
+ extern int gle_debug;
+ extern ConfigCollection g_Config;
+
+-int MAX_VECTOR = MAXIMUM_PS_VECTOR; /* Cant send POSTSCRIPT too complex a path */
++int MAX_VECTOR = MAXIMUM_PS_VECTOR; /* Can't send POSTSCRIPT too complex a path */
+
+ int setMaxPSVector(int newMax) {
+ int oldValue = MAX_VECTOR;
+Index: gle-graphics/src/gle/drawit.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/drawit.cpp
++++ gle-graphics/src/gle/drawit.cpp
+@@ -281,7 +281,7 @@ void DrawIt(GLEScript* script, GLEFileLo
+ script->setParser(parser);
+ parser->initTokenizer();
+ try {
+- // Auto-include "compatibility.gle" if compatibilty mode is not most recent
++ // Auto-include "compatibility.gle" if compatibility mode is not most recent
+ string compat = "compatibility.gle";
+ if ((g_get_compatibility() < GLE_COMPAT_MOST_RECENT) && !glecode->includes(compat)) {
+ GLESourceFile* includefile = new GLESourceFile();
+Index: gle-graphics/src/gle/gle-interface.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/gle-interface.cpp
++++ gle-graphics/src/gle/gle-interface.cpp
+@@ -1687,7 +1687,7 @@ void GLEObjectDO::render() {
+ GLEPcodeList pc_list;
+ GLEPcode pcode(&pc_list);
+ pcode.addInt(PCODE_EXPR); /* Expression follows */
+- int savelen = pcode.size(); /* Used to set acutal length at end */
++ int savelen = pcode.size(); /* Used to set actual length at end */
+ pcode.addInt(0); /* Length of expression */
+ GLEPolish* polish = script->getPolish();
+ if (polish != NULL) {
+Index: gle-graphics/src/gle/numberformat.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/numberformat.cpp
++++ gle-graphics/src/gle/numberformat.cpp
+@@ -545,7 +545,7 @@ void GLENumberFormatterEng::format(doubl
+
+ void GLENumberFormatterEng::myDoAll(string* output) {
+ if (getAppend() == "") {
+- // no append, then remove trailing space intruduced if "eng" prefix is empty
++ // no append, then remove trailing space introduced if "eng" prefix is empty
+ str_trim_right(*output);
+ }
+ doAllSci(output);
+Index: gle-graphics/src/gle/pass.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/pass.cpp
++++ gle-graphics/src/gle/pass.cpp
+@@ -593,7 +593,7 @@ void GLEParser::gen_subroutine_call_code
+ GLESub* sub = info->getSub();
+ int np = sub->getNbParam();
+ pcode.addInt(PCODE_EXPR); /* Expression follows */
+- int savelen = pcode.size(); /* Used to set acutal length at end */
++ int savelen = pcode.size(); /* Used to set actual length at end */
+ pcode.addInt(0); /* Length of expression */
+ for (int i = 0; i < np; i++) {
+ gen_subroutine_call_polish_arg(info, i, pcode);
+Index: gle-graphics/src/gle/surface/gcontour.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/surface/gcontour.cpp
++++ gle-graphics/src/gle/surface/gcontour.cpp
+@@ -244,8 +244,8 @@ void GLEContourInfo::draw(double* x, dou
+ *x = getXCur();
+ *y = getYCur();
+ break;
+- case 2: /* start contour at bondary */
+- case 3: /* start contour not at bondary */
++ case 2: /* start contour at boundary */
++ case 3: /* start contour not at boundary */
+ if (smooth) addVect(1, sx(*x), sy(*y));
+ else {
+ addUnknown();
+Index: gle-graphics/src/gle/surface/gsurface.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/surface/gsurface.cpp
++++ gle-graphics/src/gle/surface/gsurface.cpp
+@@ -515,7 +515,7 @@ void pass_zdata(string fname,int *nx, in
+ check_again:
+ b = strlen(buff);
+ c = buff[b-1];
+- if (strchr(" \n\t",c)==NULL) { /* we're halfway thru a number */
++ if (strchr(" \n\t",c)==NULL) { /* we're halfway through a number */
+ buff[b] = getc(df);
+ buff[b+1] = 0;
+ goto check_again;
+Index: gle-graphics/src/gle/tex.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/tex.cpp
++++ gle-graphics/src/gle/tex.cpp
+@@ -181,7 +181,7 @@ deftable *tex_finddef(const char *s) ;
+
+ int fontfam[16][4];
+ double fontfamsz[16][4]; /* 1=text, 2=script, 3=scriptscript */
+-int famdef = -1; /* dont use unless/until it is defined */
++int famdef = -1; /* don't use unless/until it is defined */
+ char *cdeftable[256]; /* Character macro's */
+ uchar chr_code[256]; /* Character codes 1..9 */
+ int chr_mathcode[256]; /* Character codes 1..9 */
+@@ -1822,7 +1822,7 @@ void text_tomacro(const string& in, uch
+ for (s=out; *s != 0;s++) {
+ // cout << "current: '" << s << "'" << endl;
+ if (nrep>300) gle_abort("Loop in text macros\n");
+- if (chr_code[*s]==6) { /* backslash, begining of macro? */
++ if (chr_code[*s]==6) { /* backslash, beginning of macro? */
+ saves = s;
+ s++;
+ cmd_token(&s,macroname);
+Index: gle-graphics/src/manip/eval.cpp
+===================================================================
+--- gle-graphics.orig/src/manip/eval.cpp
++++ gle-graphics/src/manip/eval.cpp
+@@ -129,7 +129,7 @@ void eval(int32 *pcode,int *cp,double *o
+ if (stk_str[nstk]!=NULL) myfree(stk_str[nstk]);
+ stk_str[nstk] = sdup(sbuf);
+ break;
+- case 5: /* Null terminated string follows (int32 alligned) */
++ case 5: /* Null terminated string follows (int32 aligned) */
+ *otyp = 2;
+ c++;nstk++;
+ strcpy(sbuf,eval_str(pcode,&c));
+Index: gle-graphics/src/manip/polish.cpp
+===================================================================
+--- gle-graphics.orig/src/manip/polish.cpp
++++ gle-graphics/src/manip/polish.cpp
+@@ -91,7 +91,7 @@ const char *space_str=" ";
+ saveplen = *plen;
+
+ add_i(pcode,plen,1); /* expression follows */
+- savelen = *plen; /* Used to set acutal length at end */
++ savelen = *plen; /* Used to set actual length at end */
+ add_i(pcode,plen,0); /* Length of expression */
+ dbg gprint("====Start of expression {%s} \n",expr);
+ if (strlen(expr)==0) {gprint("Zero length expression\n"); return;}
+Index: gle-graphics/src/fonts/texstd.enc
+===================================================================
+--- gle-graphics.orig/src/fonts/texstd.enc
++++ gle-graphics/src/fonts/texstd.enc
+@@ -41,9 +41,9 @@
+ 2; capital theta
+ 3; capital lambda
+ 4; capital epsilon
+-5; captial pi
++5; capital pi
+ 6; capital sigma
+-7; captial gamma
++7; capital gamma
+ 8; capital phi
+ 9; capital psi
+ 10; capital omega
+Index: gle-graphics/src/gui/dialogues.cpp
+===================================================================
+--- gle-graphics.orig/src/gui/dialogues.cpp
++++ gle-graphics/src/gui/dialogues.cpp
+@@ -487,7 +487,7 @@ CrashRecoverDialogue::CrashRecoverDialog
+ setWindowIcon(QIcon(":images/gle_shadow.png"));
+ setWindowTitle(tr("GLE Internal Error"));
+ crashLogLines.append(QString("The following is the error code and memory location of the error."));
+- crashLogLines.append(QString("We use this to find the line in GLE's source code where the error occured."));
++ crashLogLines.append(QString("We use this to find the line in GLE's source code where the error occurred."));
+ crashLogLines.append(QString());
+ QFile myfile(file);
+ if (myfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+Index: gle-graphics/src/gui/gsinc/iapi.h
+===================================================================
+--- gle-graphics.orig/src/gui/gsinc/iapi.h
++++ gle-graphics/src/gui/gsinc/iapi.h
+@@ -208,7 +208,7 @@ GSDLLEXPORT int GSDLLAPI gsapi_init_with
+ * The gsapi_run_* functions are like gs_main_run_* except
+ * that the error_object is omitted.
+ * If these functions return <= -100, either quit or a fatal
+- * error has occured. You then call gsapi_exit() next.
++ * error has occurred. You then call gsapi_exit() next.
+ * The only exception is gsapi_run_string_continue()
+ * which will return e_NeedInput if all is well.
+ */
+Index: gle-graphics/src/gui/main.cpp
+===================================================================
+--- gle-graphics.orig/src/gui/main.cpp
++++ gle-graphics/src/gui/main.cpp
+@@ -197,7 +197,7 @@ LONG WINAPI MyUnhandledExceptionFilter(E
+ if (hLogFile == INVALID_HANDLE_VALUE) {
+ return EXCEPTION_CONTINUE_SEARCH;
+ }
+- // Find out module in which crash occured
++ // Find out module in which crash occurred
+ CONTEXT* Context = info->ContextRecord;
+ char szCrashModulePathName[MAX_PATH*2];
+ strcpy(szCrashModulePathName, "Unknown");
+Index: gle-graphics/src/gui/mainwindow.cpp
+===================================================================
+--- gle-graphics.orig/src/gui/mainwindow.cpp
++++ gle-graphics/src/gui/mainwindow.cpp
+@@ -2615,7 +2615,7 @@ void GLEMainWindow::setRelativeBasePoint
+ lastPoint = gle;
+ }
+
+-// Get the size of the scoll area
++// Get the size of the scroll area
+ QSize GLEMainWindow::getScrollAreaSize()
+ {
+ return scrollArea->size();
+Index: gle-graphics/src/gui/qgs.h
+===================================================================
+--- gle-graphics.orig/src/gui/qgs.h
++++ gle-graphics/src/gui/qgs.h
+@@ -199,7 +199,7 @@ public:
+
+ /** @brief Enables progressive updating of the image
+ Enabling progressive updating means, that before Finished() is emitted, Updated() signals
+- are emmitted with the area that was updated. If disabled (by default disabled),
++ are emitted with the area that was updated. If disabled (by default disabled),
+ @param progr enable/disable progressive updating
+ */
+ void setGhostscriptArguments( const QStringList &list );
+Index: gle-graphics/src/lib/piesub.gle
+===================================================================
+--- gle-graphics.orig/src/lib/piesub.gle
++++ gle-graphics/src/lib/piesub.gle
+@@ -45,7 +45,7 @@ sub pie ang1 ang2 radius colour$
+ ! colour$... the fill color of the wedge
+ !
+ begin path fill colour$ stroke
+- rmove 0 0 !The rmove command is neccesary to set
++ rmove 0 0 !The rmove command is necessary to set
+ arc radius ang1 ang2 !the beginning of the path
+ closepath
+ end path
+@@ -62,7 +62,7 @@ sub pie_text ang1 ang2 radius colour$ la
+ !
+ gsave
+ begin path fill colour$ stroke
+- rmove 0 0 !The rmove command is neccesary to set
++ rmove 0 0 !The rmove command is necessary to set
+ arc radius ang1 ang2 !the beginning of the path
+ closepath
+ end path
+Index: gle-graphics/src/lib/stm.gle
+===================================================================
+--- gle-graphics.orig/src/lib/stm.gle
++++ gle-graphics/src/lib/stm.gle
+@@ -250,7 +250,7 @@ sub axis_box lx ly textx$ texty$ angle x
+ ! angle........axis is rotated
+ ! xoffset......location of origin relative to corner of box
+ ! yoffset......""""""" """ """ """
+-! axis_length..lenght of axis
++! axis_length..length of axis
+ ! ap$..........anchor point (does not work yet puts it at lower left
+ ! boxit........1 draws box 0 no box
+ ! text_offset....offset of text from axis
+@@ -281,7 +281,7 @@ sub axis_boxr lx ly textx$ texty$ angle
+ ! angle........axis is rotated
+ ! xoffset......location of origin relative to corner of box
+ ! yoffset......""""""" """ """ """
+-! axis_length..lenght of axis
++! axis_length..length of axis
+ ! ap$..........anchor point (does not work yet puts it at lower left
+ ! boxit........1 draws box 0 no box
+ ! text_offset....offset of text from axis
+Index: gle-graphics/src/makefmt/makefmt.cpp
+===================================================================
+--- gle-graphics.orig/src/makefmt/makefmt.cpp
++++ gle-graphics/src/makefmt/makefmt.cpp
+@@ -182,7 +182,7 @@ void writefmt(const char* fmtname, const
+ GLEFileIO fmt;
+ fmt.open(fmtname, WRITE_BIN);
+ if (!fmt.isOpen()) {
+- perror ("Cant open output file");
++ perror ("Can't open output file");
+ exit(1);
+ }
+ GLEFontTable fnt;
+Index: gle-graphics/src/makefmt/parseAFM.cpp
+===================================================================
+--- gle-graphics.orig/src/makefmt/parseAFM.cpp
++++ gle-graphics/src/makefmt/parseAFM.cpp
+@@ -27,7 +27,7 @@
+
+ /* parseAFM.c
+ *
+- * This file is used in conjuction with the parseAFM.h header file.
++ * This file is used in conjunction with the parseAFM.h header file.
+ * This file contains several procedures that are used to parse AFM
+ * files. It is intended to work with an application program that needs
+ * font metric information. The program can be used as is by making a
+Index: gle-graphics/src/makefmt/parseAFM.h
+===================================================================
+--- gle-graphics.orig/src/makefmt/parseAFM.h
++++ gle-graphics/src/makefmt/parseAFM.h
+@@ -27,7 +27,7 @@
+
+ /* ParseAFM.h
+ *
+- * This header file is used in conjuction with the parseAFM.c file.
++ * This header file is used in conjunction with the parseAFM.c file.
+ * Together these files provide the functionality to parse Adobe Font
+ * Metrics files and store the information in predefined data structures.
+ * It is intended to work with an application program that needs font metric
+@@ -311,7 +311,7 @@ typedef struct
+ *
+ * "fp" should be a valid file pointer to an AFM file.
+ *
+- * "fi" is a pointer to a pointer to a FontInfo record sturcture
++ * "fi" is a pointer to a pointer to a FontInfo record structure
+ * (defined above). Storage for the FontInfo structure will be
+ * allocated in parseFile and the structure will be filled in
+ * with the requested data from the AFM File.
+Index: gle-graphics/src/manip/cmd.cpp
+===================================================================
+--- gle-graphics.orig/src/manip/cmd.cpp
++++ gle-graphics/src/manip/cmd.cpp
+@@ -265,7 +265,7 @@ void passcmd(char *source,char *tk[],int
+ case k_move: /* move range1 range2 [if exp] (leaves gaps) */
+ cmd_copy(tk[2],tk[3],tk[5],*ntok,false);
+ break;
+- case k_prop: /* prop range1 range2 (cycle thru range1) */
++ case k_prop: /* prop range1 range2 (cycle through range1) */
+ cmd_copy(tk[2],tk[3],tk[5],*ntok,2);
+ break;
+ case k_generate: /* gen 2(1,2:4)3 c1 (1 1 2 2 3 3 4 4) 3 times*/
diff --git a/debian/patches/initialize_font_table b/debian/patches/initialize_font_table
index 271c6cc..588e284 100644
--- a/debian/patches/initialize_font_table
+++ b/debian/patches/initialize_font_table
@@ -1,10 +1,12 @@
Author: Reiner Herrmann <reiner at reiner-h.de>
Description: Initialize font table to not leak random memory in output
---- a/src/makefmt/makefmt.cpp
-+++ b/src/makefmt/makefmt.cpp
-@@ -185,7 +185,7 @@
- perror ("Cant open output file");
+Index: gle-graphics/src/makefmt/makefmt.cpp
+===================================================================
+--- gle-graphics.orig/src/makefmt/makefmt.cpp
++++ gle-graphics/src/makefmt/makefmt.cpp
+@@ -185,7 +185,7 @@ void writefmt(const char* fmtname, const
+ perror ("Can't open output file");
exit(1);
}
- GLEFontTable fnt;
diff --git a/debian/patches/kfreebsd-buildd-has-no-proc b/debian/patches/kfreebsd-buildd-has-no-proc
index 3dbcc85..a28b121 100644
--- a/debian/patches/kfreebsd-buildd-has-no-proc
+++ b/debian/patches/kfreebsd-buildd-has-no-proc
@@ -8,9 +8,11 @@ Author: Petr Salinger <Petr.Salinger at seznam.cz>
Author: Jan Struyf <jan.struyf at struyf-ye.org>
Reviewed-by: Christian T. Steigies <cts at debian.org>
Last-Update: 2011-10-18
---- a/src/gle/file_io.cpp
-+++ b/src/gle/file_io.cpp
-@@ -1350,7 +1350,7 @@
+Index: gle-graphics/src/gle/file_io.cpp
+===================================================================
+--- gle-graphics.orig/src/gle/file_io.cpp
++++ gle-graphics/src/gle/file_io.cpp
+@@ -1354,7 +1354,7 @@ bool GetExeName(const char* appname, cha
return true;
}
#endif
diff --git a/debian/patches/series b/debian/patches/series
index 1887586..1dc775b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,8 @@
+codespell
kfreebsd-buildd-has-no-proc
qmake
source_date_epoch
replace-today-in-manual
-typo-occurred
static-time
initialize_font_table
configure.ac
diff --git a/debian/patches/static-time b/debian/patches/static-time
index 5804487..0870291 100644
--- a/debian/patches/static-time
+++ b/debian/patches/static-time
@@ -3,10 +3,10 @@ Description: replace time$() with static time string for manual
This is not needed when then manual is built with faketime
Author: Christian T. Steigies <cts at debian.org>
Last-Update: 2016-03-28
-Index: gle-graphics-4.2.5/gle-refman/primitives/fig/gc_write.gle
+Index: gle-graphics/gle-refman/primitives/fig/gc_write.gle
===================================================================
---- gle-graphics-4.2.5.orig/gle-refman/primitives/fig/gc_write.gle
-+++ gle-graphics-4.2.5/gle-refman/primitives/fig/gc_write.gle
+--- gle-graphics.orig/gle-refman/primitives/fig/gc_write.gle
++++ gle-graphics/gle-refman/primitives/fig/gc_write.gle
@@ -44,7 +44,7 @@ begin origin
amove 3 .5
a$ = "Hello there "
diff --git a/debian/patches/typo-occurred b/debian/patches/typo-occurred
deleted file mode 100644
index 64adbd9..0000000
--- a/debian/patches/typo-occurred
+++ /dev/null
@@ -1,65 +0,0 @@
-Description: use correct spelling of occurred
- Use the correct spelling of occurred
-Author: Christian T. Steigies <cts at debian.org>
-Last-Update: 2016-03-26
-Index: gle-graphics/src/gle/file_io.cpp
-===================================================================
---- gle-graphics.orig/src/gle/file_io.cpp
-+++ gle-graphics/src/gle/file_io.cpp
-@@ -830,7 +830,7 @@ int GLESystem(const string& cmd, bool wa
- }
- int nbytes = write(pin[GLESYS_PIPE_WR], write_buffer+offs_write, to_write);
- if (nbytes < 0) {
-- /* an error occured */
-+ /* an error occurred */
- if (errno != EAGAIN) {
- GLECloseFD(pin, GLESYS_PIPE_WR);
- }
-@@ -844,7 +844,7 @@ int GLESystem(const string& cmd, bool wa
- while (pout[GLESYS_PIPE_RD] >= 0) {
- int nbytes = read(pout[GLESYS_PIPE_RD], read_buffer, GLEREAD_BUF);
- if (nbytes < 0) {
-- /* an error occured */
-+ /* an error occurred */
- if (errno != EAGAIN) {
- GLECloseFD(pout, GLESYS_PIPE_RD);
- }
-Index: gle-graphics/src/gui/dialogues.cpp
-===================================================================
---- gle-graphics.orig/src/gui/dialogues.cpp
-+++ gle-graphics/src/gui/dialogues.cpp
-@@ -487,7 +487,7 @@ CrashRecoverDialogue::CrashRecoverDialog
- setWindowIcon(QIcon(":images/gle_shadow.png"));
- setWindowTitle(tr("GLE Internal Error"));
- crashLogLines.append(QString("The following is the error code and memory location of the error."));
-- crashLogLines.append(QString("We use this to find the line in GLE's source code where the error occured."));
-+ crashLogLines.append(QString("We use this to find the line in GLE's source code where the error occurred."));
- crashLogLines.append(QString());
- QFile myfile(file);
- if (myfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
-Index: gle-graphics/src/gui/gsinc/iapi.h
-===================================================================
---- gle-graphics.orig/src/gui/gsinc/iapi.h
-+++ gle-graphics/src/gui/gsinc/iapi.h
-@@ -208,7 +208,7 @@ GSDLLEXPORT int GSDLLAPI gsapi_init_with
- * The gsapi_run_* functions are like gs_main_run_* except
- * that the error_object is omitted.
- * If these functions return <= -100, either quit or a fatal
-- * error has occured. You then call gsapi_exit() next.
-+ * error has occurred. You then call gsapi_exit() next.
- * The only exception is gsapi_run_string_continue()
- * which will return e_NeedInput if all is well.
- */
-Index: gle-graphics/src/gui/main.cpp
-===================================================================
---- gle-graphics.orig/src/gui/main.cpp
-+++ gle-graphics/src/gui/main.cpp
-@@ -197,7 +197,7 @@ LONG WINAPI MyUnhandledExceptionFilter(E
- if (hLogFile == INVALID_HANDLE_VALUE) {
- return EXCEPTION_CONTINUE_SEARCH;
- }
-- // Find out module in which crash occured
-+ // Find out module in which crash occurred
- CONTEXT* Context = info->ContextRecord;
- char szCrashModulePathName[MAX_PATH*2];
- strcpy(szCrashModulePathName, "Unknown");
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gle-graphics.git
More information about the debian-science-commits
mailing list