--- /dev/null
+# Aap recipe for Spanish Vim spell files.
+
+# Use a freshly compiled Vim if it exists.
+@if os.path.exists('../../../src/vim'):
+ VIM = ../../../src/vim
+@else:
+ :progsearch VIM vim
+
+REGIONS = ES MX
+ES_REGIONS = es_$*REGIONS
+
+SPELLDIR = ..
+FILES = es_$*(REGIONS).aff es_$*(REGIONS).dic
+
+ZIPFILE_ES = es_ES.zip
+ZIPFILE_MX = es_MX.zip
+ZIPFILES = $ZIPFILE_ES $ZIPFILE_MX
+
+READMES = README_es_$*(REGIONS).txt
+
+all: $SPELLDIR/es.latin1.spl $SPELLDIR/es.utf-8.spl ../README_es.txt
+
+$SPELLDIR/es.latin1.spl : $FILES
+ :sys env LANG=es_ES.ISO8859-1
+ $VIM -u NONE -e -c "mkspell! $SPELLDIR/es $ES_REGIONS" -c q
+
+$SPELLDIR/es.utf-8.spl : $FILES
+ :sys env LANG=es_ES.UTF-8
+ $VIM -u NONE -e -c "mkspell! $SPELLDIR/es $ES_REGIONS" -c q
+
+../README_es.txt: $READMES
+ :print es_ES >! $target
+ :cat README_es_ES.txt >> $target
+ :print =================================================== >>$target
+ :print es_MX >> $target
+ :cat README_es_MX.txt >> $target
+
+#
+# Fetching the files from the OpenOffice.org site.
+# The OLDSPELL file comes from elsewhere
+#
+OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
+:attr {fetch = $OODIR/%file%} $ZIPFILES
+
+# The files don't depend on the .zip file so that we can delete it.
+# Only download the zip file if the targets don't exist.
+es_ES.aff es_ES.dic: {buildcheck=}
+ :assertpkg unzip patch
+ :fetch $ZIPFILE_ES
+ :sys $UNZIP $ZIPFILE_ES
+ :delete add-to--dictionary.lst.example
+ #:delete $ZIPFILE_ES
+ @if not os.path.exists('es_ES.orig.aff'):
+ :copy es_ES.aff es_ES.orig.aff
+ @if not os.path.exists('es_ES.orig.dic'):
+ :copy es_ES.dic es_ES.orig.dic
+ @if os.path.exists('es_ES.diff'):
+ :sys patch <es_ES.diff
+
+es_MX.aff es_MX.dic: {buildcheck=}
+ :assertpkg unzip patch
+ :fetch $ZIPFILE_MX
+ :print No copyright information for es_MX wordlist >! README_es_MX.txt
+ :sys $UNZIP $ZIPFILE_MX
+ #:delete $ZIPFILE_MX
+ :sys $VIM -e -c "set ff=unix | wq" es_MX.dic
+ @if not os.path.exists('es_MX.orig.aff'):
+ :copy es_MX.aff es_MX.orig.aff
+ @if not os.path.exists('es_MX.orig.dic'):
+ :copy es_MX.dic es_MX.orig.dic
+ @if os.path.exists('es_MX.diff'):
+ :sys patch <es_MX.diff
+
+
+# Generate diff files, so that others can get the OpenOffice files and apply
+# the diffs to get the Vim versions.
+diff:
+ :assertpkg diff
+ :sys {force} diff -a -C 1 es_ES.orig.aff es_ES.aff >es_ES.diff
+ :sys {force} diff -a -C 1 es_ES.orig.dic es_ES.dic >>es_ES.diff
+ :sys {force} diff -a -C 1 es_MX.orig.aff es_MX.aff >es_MX.diff
+ :sys {force} diff -a -C 1 es_MX.orig.dic es_MX.dic >>es_MX.diff
+
+
+# Check for updated OpenOffice spell files. When there are changes the
+# ".new.aff" and ".new.dic" files are left behind for manual inspection.
+
+check:
+ :print TODO!!!!
+
+
+# vim: set sts=4 sw=4 :
static void find_prefix __ARGS((matchinf_T *mip, int mode));
static int fold_more __ARGS((matchinf_T *mip));
static int spell_valid_case __ARGS((int wordflags, int treeflags));
-static int no_spell_checking __ARGS((void));
+static int no_spell_checking __ARGS((win_T *wp));
static void spell_load_lang __ARGS((char_u *lang));
static char_u *spell_enc __ARGS((void));
static void int_wordlist_spl __ARGS((char_u *fname));
* Return TRUE if spell checking is not enabled.
*/
static int
-no_spell_checking()
+no_spell_checking(wp)
+ win_T *wp;
{
- if (!curwin->w_p_spell || *curbuf->b_p_spl == NUL)
+ if (!wp->w_p_spell || *wp->w_buffer->b_p_spl == NUL)
{
EMSG(_("E756: Spell checking is not enabled"));
return TRUE;
* Return 0 if not found, length of the badly spelled word otherwise.
*/
int
-spell_move_to(dir, allwords, curline)
+spell_move_to(wp, dir, allwords, curline, attrp)
+ win_T *wp;
int dir; /* FORWARD or BACKWARD */
int allwords; /* TRUE for "[s" and "]s" */
int curline;
+ int *attrp; /* return: attributes of bad word or NULL */
{
linenr_T lnum;
pos_T found_pos;
char_u *endp;
int attr;
int len;
- int has_syntax = syntax_present(curbuf);
+ int has_syntax = syntax_present(wp->w_buffer);
int col;
int can_spell;
char_u *buf = NULL;
int skip = 0;
int capcol = -1;
- if (no_spell_checking())
+ if (no_spell_checking(wp))
return 0;
/*
* (e.g. "et<line-break>cetera"). Doesn't work when searching backwards
* though...
*/
- lnum = curwin->w_cursor.lnum;
+ lnum = wp->w_cursor.lnum;
found_pos.lnum = 0;
while (!got_int)
{
- line = ml_get(lnum);
+ line = ml_get_buf(wp->w_buffer, lnum, FALSE);
len = STRLEN(line);
if (buflen < len + MAXWLEN + 2)
/* Copy the line into "buf" and append the start of the next line if
* possible. */
STRCPY(buf, line);
- if (lnum < curbuf->b_ml.ml_line_count)
+ if (lnum < wp->w_buffer->b_ml.ml_line_count)
spell_cat_line(buf + STRLEN(buf), ml_get(lnum + 1), MAXWLEN);
p = buf + skip;
{
/* When searching backward don't search after the cursor. */
if (dir == BACKWARD
- && lnum == curwin->w_cursor.lnum
- && (colnr_T)(p - buf) >= curwin->w_cursor.col)
+ && lnum == wp->w_cursor.lnum
+ && (colnr_T)(p - buf) >= wp->w_cursor.col)
break;
/* start of word */
attr = 0;
- len = spell_check(curwin, p, &attr, &capcol);
+ len = spell_check(wp, p, &attr, &capcol);
if (attr != 0)
{
/* When searching forward only accept a bad word after
* the cursor. */
if (dir == BACKWARD
- || lnum > curwin->w_cursor.lnum
- || (lnum == curwin->w_cursor.lnum
+ || lnum > wp->w_cursor.lnum
+ || (lnum == wp->w_cursor.lnum
&& (colnr_T)(curline ? p - buf + len
: p - buf)
- > curwin->w_cursor.col))
+ > wp->w_cursor.col))
{
if (has_syntax)
{
col = p - buf;
- (void)syn_get_id(lnum, (colnr_T)col,
+ (void)syn_get_id(wp, lnum, (colnr_T)col,
FALSE, &can_spell);
}
else
if (dir == FORWARD)
{
/* No need to search further. */
- curwin->w_cursor = found_pos;
+ wp->w_cursor = found_pos;
vim_free(buf);
+ if (attrp != NULL)
+ *attrp = attr;
return len;
}
else if (curline)
if (dir == BACKWARD && found_pos.lnum != 0)
{
/* Use the last match in the line. */
- curwin->w_cursor = found_pos;
+ wp->w_cursor = found_pos;
vim_free(buf);
return found_len;
}
}
else
{
- if (lnum == curbuf->b_ml.ml_line_count)
+ if (lnum == wp->w_buffer->b_ml.ml_line_count)
break;
++lnum;
}
/*
- * Return TRUE if "byte" appears in "str".
+ * Return TRUE if byte "n" appears in "str".
* Like strchr() but independent of locale.
*/
static int
-byte_in_str(str, byte)
+byte_in_str(str, n)
char_u *str;
- int byte;
+ int n;
{
char_u *p;
for (p = str; *p != NUL; ++p)
- if (*p == byte)
+ if (*p == n)
return TRUE;
return FALSE;
}
typedef struct afffile_S
{
char_u *af_enc; /* "SET", normalized, alloc'ed string or NULL */
- int af_flagtype; /* AFT_CHAR, AFT_2CHAR, AFT_NUMBER or AFT_HUH */
+ int af_flagtype; /* AFT_CHAR, AFT_LONG, AFT_NUM or AFT_CAPLONG */
int af_slash; /* character used in word for slash */
unsigned af_rar; /* RAR ID for rare word */
unsigned af_kep; /* KEP ID for keep-case word */
} afffile_T;
#define AFT_CHAR 0 /* flags are one character */
-#define AFT_2CHAR 1 /* flags are two characters */
-#define AFT_HUH 2 /* flags are one or two characters */
-#define AFT_NUMBER 3 /* flags are numbers, comma separated */
+#define AFT_LONG 1 /* flags are two characters */
+#define AFT_CAPLONG 2 /* flags are one or two characters */
+#define AFT_NUM 3 /* flags are numbers, comma separated */
typedef struct affentry_S affentry_T;
/* Affix entry from ".aff" file. Used for prefixes and suffixes. */
#ifdef FEAT_MBYTE
# define AH_KEY_LEN 17 /* 2 x 8 bytes + NUL */
#else
-# define AH_KEY_LEN 3 /* 2 x 1 byte + NUL */
+# define AH_KEY_LEN 7 /* 6 digits + NUL */
#endif
/* Affix header from ".aff" file. Used for af_pref and af_suff. */
unsigned ah_flag; /* affix name as number, uses "af_flagtype" */
int ah_newID; /* prefix ID after renumbering; 0 if not used */
int ah_combine; /* suffix may combine with prefix */
+ int ah_follows; /* another affix block should be following */
affentry_T *ah_first; /* first affix entry */
} affheader_T;
&& aff->af_flagtype == AFT_CHAR)
{
if (STRCMP(items[1], "long") == 0)
- aff->af_flagtype = AFT_2CHAR;
+ aff->af_flagtype = AFT_LONG;
else if (STRCMP(items[1], "num") == 0)
- aff->af_flagtype = AFT_NUMBER;
- else if (STRCMP(items[1], "huh") == 0)
- aff->af_flagtype = AFT_HUH;
+ aff->af_flagtype = AFT_NUM;
+ else if (STRCMP(items[1], "caplong") == 0)
+ aff->af_flagtype = AFT_CAPLONG;
else
smsg((char_u *)_("Invalid value for FLAG in %s line %d: %s"),
fname, lnum, items[1]);
&& aff_todo == 0
&& itemcnt >= 4)
{
+ int lasti = 4;
+ char_u key[AH_KEY_LEN];
+
+ if (*items[0] == 'P')
+ tp = &aff->af_pref;
+ else
+ tp = &aff->af_suff;
+
+ /* Myspell allows the same affix name to be used multiple
+ * times. The affix files that do this have an undocumented
+ * "S" flag on all but the last block, thus we check for that
+ * and store it in ah_follows. */
+ vim_strncpy(key, items[1], AH_KEY_LEN - 1);
+ hi = hash_find(tp, key);
+ if (!HASHITEM_EMPTY(hi))
+ {
+ cur_aff = HI2AH(hi);
+ if (cur_aff->ah_combine != (*items[2] == 'Y'))
+ smsg((char_u *)_("Different combining flag in continued affix block in %s line %d: %s"),
+ fname, lnum, items[1]);
+ if (!cur_aff->ah_follows)
+ smsg((char_u *)_("Duplicate affix in %s line %d: %s"),
+ fname, lnum, items[1]);
+ }
+ else
+ {
+ /* New affix letter. */
+ cur_aff = (affheader_T *)getroom(spin,
+ sizeof(affheader_T), TRUE);
+ if (cur_aff == NULL)
+ break;
+ cur_aff->ah_flag = affitem2flag(aff->af_flagtype, items[1],
+ fname, lnum);
+ if (cur_aff->ah_flag == 0 || STRLEN(items[1]) >= AH_KEY_LEN)
+ break;
+ if (cur_aff->ah_flag == aff->af_bad
+ || cur_aff->ah_flag == aff->af_rar
+ || cur_aff->ah_flag == aff->af_kep
+ || cur_aff->ah_flag == aff->af_needaffix)
+ smsg((char_u *)_("Affix also used for BAD/RAR/KEP/NEEDAFFIX in %s line %d: %s"),
+ fname, lnum, items[1]);
+ STRCPY(cur_aff->ah_key, items[1]);
+ hash_add(tp, cur_aff->ah_key);
+
+ cur_aff->ah_combine = (*items[2] == 'Y');
+ }
+
+ /* Check for the "S" flag, which apparently means that another
+ * block with the same affix name is following. */
+ if (itemcnt > lasti && STRCMP(items[lasti], "S") == 0)
+ {
+ ++lasti;
+ cur_aff->ah_follows = TRUE;
+ }
+ else
+ cur_aff->ah_follows = FALSE;
+
/* Myspell allows extra text after the item, but that might
* mean mistakes go unnoticed. Require a comment-starter. */
- if (itemcnt > 4 && *items[4] != '#')
+ if (itemcnt > lasti && *items[lasti] != '#')
smsg((char_u *)_("Trailing text in %s line %d: %s"),
fname, lnum, items[4]);
- /* New affix letter. */
- cur_aff = (affheader_T *)getroom(spin,
- sizeof(affheader_T), TRUE);
- if (cur_aff == NULL)
- break;
- cur_aff->ah_flag = affitem2flag(aff->af_flagtype, items[1],
- fname, lnum);
- if (cur_aff->ah_flag == 0 || STRLEN(items[1]) >= AH_KEY_LEN)
- break;
- STRCPY(cur_aff->ah_key, items[1]);
- if (*items[2] == 'Y')
- cur_aff->ah_combine = TRUE;
- else if (*items[2] != 'N')
+ if (STRCMP(items[2], "Y") != 0 && STRCMP(items[2], "N") != 0)
smsg((char_u *)_("Expected Y or N in %s line %d: %s"),
fname, lnum, items[2]);
- if (*items[0] == 'P')
+ if (*items[0] == 'P' && aff->af_pfxpostpone)
{
- tp = &aff->af_pref;
- if (aff->af_pfxpostpone)
+ if (cur_aff->ah_newID == 0)
{
/* Use a new number in the .spl file later, to be able
* to handle multiple .aff files. */
* the items. */
did_postpone_prefix = FALSE;
}
+ else
+ /* Did use the ID in a previous block. */
+ did_postpone_prefix = TRUE;
}
- else
- tp = &aff->af_suff;
+
aff_todo = atoi((char *)items[3]);
- hi = hash_find(tp, cur_aff->ah_key);
- if (!HASHITEM_EMPTY(hi)
- || cur_aff->ah_flag == aff->af_bad
- || cur_aff->ah_flag == aff->af_rar
- || cur_aff->ah_flag == aff->af_kep
- || cur_aff->ah_flag == aff->af_needaffix)
- {
- smsg((char_u *)_("Duplicate affix in %s line %d: %s"),
- fname, lnum, items[1]);
- aff_todo = 0;
- }
- else
- hash_add(tp, cur_aff->ah_key);
}
else if ((STRCMP(items[0], "PFX") == 0
|| STRCMP(items[0], "SFX") == 0)
res = get_affitem(flagtype, &p);
if (res == 0)
{
- if (flagtype == AFT_NUMBER)
+ if (flagtype == AFT_NUM)
smsg((char_u *)_("Flag is not a number in %s line %d: %s"),
fname, lnum, item);
else
{
int res;
- if (flagtype == AFT_NUMBER)
+ if (flagtype == AFT_NUM)
{
if (!VIM_ISDIGIT(**pp))
{
- ++*pp;
+ ++*pp; /* always advance, avoid getting stuck */
return 0;
}
res = getdigits(pp);
#else
res = *(*pp)++;
#endif
- if (flagtype == AFT_2CHAR || (flagtype == AFT_HUH
+ if (flagtype == AFT_LONG || (flagtype == AFT_CAPLONG
&& res >= 'A' && res <= 'Z'))
{
if (**pp == NUL)
}
*tp++ = id;
}
- if (aff->af_flagtype == AFT_NUMBER && *p == ',')
+ if (aff->af_flagtype == AFT_NUM && *p == ',')
++p;
}
}
case AFT_CHAR:
return vim_strchr(afflist, flag) != NULL;
- case AFT_HUH:
- case AFT_2CHAR:
+ case AFT_CAPLONG:
+ case AFT_LONG:
for (p = afflist; *p != NUL; )
{
#ifdef FEAT_MBYTE
#else
n = *p++;
#endif
- if ((flagtype == AFT_2CHAR || (n >= 'A' && n <= 'Z'))
+ if ((flagtype == AFT_LONG || (n >= 'A' && n <= 'Z'))
&& *p != NUL)
#ifdef FEAT_MBYTE
n = mb_ptr2char_adv(&p) + (n << 16);
}
break;
- case AFT_NUMBER:
+ case AFT_NUM:
for (p = afflist; *p != NUL; )
{
n = getdigits(&p);
store_afflist[cnt++] = id;
}
}
- if (affile->af_flagtype == AFT_NUMBER && *p == ',')
+ if (affile->af_flagtype == AFT_NUM && *p == ',')
++p;
}
if (!HASHITEM_EMPTY(hi))
store_afflist[cnt++] = HI2CI(hi)->ci_newID;
}
- if (affile->af_flagtype == AFT_NUMBER && *p == ',')
+ if (affile->af_flagtype == AFT_NUM && *p == ',')
++p;
}
int selected = count;
/* Find the start of the badly spelled word. */
- if (spell_move_to(FORWARD, TRUE, TRUE) == 0
+ if (spell_move_to(curwin, FORWARD, TRUE, TRUE, NULL) == 0
|| curwin->w_cursor.col > prev_cursor.col)
{
if (!curwin->w_p_spell || *curbuf->b_p_spl == NUL)
int do_region = TRUE; /* dump region names and numbers */
char_u *p;
- if (no_spell_checking())
+ if (no_spell_checking(curwin))
return;
/* Create a new empty buffer by splitting the window. */
return lnum;
}
+/*
+ * Move "p" to end of word.
+ */
+ char_u *
+spell_to_word_end(start, buf)
+ char_u *start;
+ buf_T *buf;
+{
+ char_u *p = start;
+
+ while (*p != NUL && spell_iswordp(p, buf))
+ mb_ptr_adv(p);
+ return p;
+}
+
#if defined(FEAT_INS_EXPAND) || defined(PROTO)
static int spell_expand_need_cap;
char_u *p;
int col = 0;
- if (no_spell_checking())
+ if (no_spell_checking(curwin))
return startcol;
/* Find a word character before "startcol". */
projects / vim / commitdiff