updated for version 7.0d02

This commit is contained in:
Bram Moolenaar
2006-04-12 21:52:12 +00:00
parent 4c3f536f47
commit 18144c8423
57 changed files with 5356 additions and 963 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,135 +1,87 @@
*** hu_HU.orig.aff Sun Mar 26 15:05:13 2006
--- hu_HU.aff Thu Apr 6 19:48:01 2006
*** hu_HU.orig.aff Wed Apr 12 12:33:23 2006
--- hu_HU.aff Wed Apr 12 12:43:39 2006
***************
*** 57,59 ****
*** 58,60 ****
NAME Magyar Ispell helyes<65>r<EFBFBD>si sz<73>t<EFBFBD>r
! LANG hu_HU
HOME http://magyarispell.sourceforge.net
--- 57,59 ----
--- 58,60 ----
NAME Magyar Ispell helyes<65>r<EFBFBD>si sz<73>t<EFBFBD>r
! #LANG hu_HU
HOME http://magyarispell.sourceforge.net
***************
*** 62,63 ****
--- 62,68 ----
TRY <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>taeslz<6C>norhgki<6B>dmy<6D>pv<70>bucfj<66><6A>xwqTAESLZ<4C>NORHGKI<4B>DMY<4D>PV<50>BUCFJ<46><4A>XWQ-.
+
+ # There are soooo many affixes. Postpone the prefixes to keep the time needed
+ # for generating the .spl within reasonable limits.
+ PFXPOSTPONE
+
COMPOUNDMIN 1
***************
*** 66,69 ****
COMPOUNDPERMITFLAG @
*** 64,77 ****
COMPOUNDMIN 2
! COMPOUNDFLAG Y
! COMPOUNDWORD 2 y
! COMPOUNDSYLLABLE 6 a<>e<EFBFBD>i<EFBFBD>o<EFBFBD><6F><EFBFBD>u<EFBFBD><75><EFBFBD>
! SYLLABLENUM klmc
! COMPOUNDFIRST v
! COMPOUNDLAST x
! FORBIDDENWORD w
! ONLYROOT u
! ACCENT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> aeiooouuu
! CHECKNUM
! WORDCHARS -.<2E>%<25>0123456789
! HU_KOTOHANGZO Z
--- 71,81 ----
COMPOUNDPERMITFLAG @
! #
! # Strange that every vowel is counted as a syllable, that's how the hunspell
! # code works.
--- 64,115 ----
COMPOUNDMIN 2
! #COMPOUNDWORD 2 y
! COMPOUNDWORDMAX 2
! COMPOUNDROOT y
!
! #COMPOUNDSYLLABLE 6 a<>e<EFBFBD>i<EFBFBD>o<EFBFBD><6F><EFBFBD>u<EFBFBD><75><EFBFBD>
! COMPOUNDSYLMAX 6
! SYLLABLE a/<2F>/e/<2F>/i/<2F>/o/<2F>/<2F>/<2F>/u/<2F>/<2F>/<2F>
! # Strange that every vowel is counted as a syllable, that's how the hunspell
! # code works.
!
! # the effect of SYLLABLENUM is not documented
! #SYLLABLENUM klmc
***************
*** 74,88 ****
! # obsoloted
! COMPOUNDFIRST v
! COMPOUNDLAST x
! ONLYROOT u
#COMPOUNDWORD 2 y
! HU_KOTOHANGZO ?
# new (> Hunspell-1.0-RC2)
! COMPOUNDBEGIN v
! COMPOUNDEND x
! PSEUDOROOT u
# 2. parameter only for back compatibility:
! COMPOUNDWORDMAX 2 y
COMPOUNDROOT y
--- 86,110 ----
! # obsolete
!
! #COMPOUNDFLAG Y
! #COMPOUNDFIRST v
! #COMPOUNDLAST x
! #ONLYROOT u
! COMPOUNDRULE Y+
! COMPOUNDRULE vY*x
! COMPOUNDRULE Y+x
! COMPOUNDRULE vY+
!
#COMPOUNDWORD 2 y
!
! # Undocumented and ? is already used for KEEPCASE
! #HU_KOTOHANGZO ?
# new (> Hunspell-1.0-RC2)
! #COMPOUNDBEGIN v
! #COMPOUNDEND x
! COMPOUNDRULE vx
!
! # PSEUDOROOT was renamed to NEEDAFFIX
! #PSEUDOROOT u
! NEEDAFFIX u
!
# 2. parameter only for back compatibility:
! # What is the extra "y" for?
! #COMPOUNDWORDMAX 2 y
! COMPOUNDWORDMAX 2
COMPOUNDROOT y
***************
*** 93,94 ****
--- 115,117 ----
CHECKCOMPOUNDCASE
+
CHECKCOMPOUNDPATTERN 7
***************
*** 102,111 ****
! FORBIDDENWORD w
! WORDCHARS -.§%°0123456789
! NOT_GENERATE &
! GENERATE (
! LEMMA_PRESENT )
--- 125,151 ----
! #FORBIDDENWORD w
! BAD w
!
! #WORDCHARS -.§%°0123456789
+ # List the word characters for ISO-8859-2.
+ FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>%<25>
+ LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>%<25>
+ UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>%<25>
+ MIDWORD .
! # These are not documented and not in the source code either
! #NOT_GENERATE &
! #GENERATE (
! # Only for morphological analysis
! #LEMMA_PRESENT )
! #ONLYROOT u
! NEEDAFFIX u
!
! # This works better than REP items
! #ACCENT <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> aeiooouuu
! MAP 5
! MAP a<><61>
! MAP e<>
! MAP i<>
! MAP o<><6F><EFBFBD>
! MAP u<><75><EFBFBD>
!
! #CHECKNUM
! # Vim always handles numbers in the same way.
!
! #WORDCHARS -.<2E>%<25>0123456789
! FOL <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>%<25>
! LOW <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>%<25>
! UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>-<2D>%<25>
! MIDWORD .
!
! # Undocumented
! #HU_KOTOHANGZO Z
!
! # There are soooo many affixes. Postpone the prefixes to keep the time needed
! # for generating the .spl within reasonable limits.
! PFXPOSTPONE
***************
*** 115,130 ****
*** 81,96 ****
! REP 92
! REP 89
! REP <20> i
! REP i <20>
! REP <20> o
@ -144,174 +96,88 @@
REP ly j
- REP a <20> # Handel->H<>ndel
REP S <20> # Skoda-><3E>koda
--- 155,159 ----
--- 119,123 ----
! REP 81
! REP 78
REP j ly
REP ly j
REP S <20> # Skoda-><3E>koda
***************
*** 214,251 ****
*** 173,241 ****
! CHR HTML 35
! CHR HTML &curren; <20>
! CHR HTML &deg; <20>
! CHR HTML &acute; <20>
! CHR HTML &cedil; <20>
! CHR HTML &Aacute; <20>
! CHR HTML &Acirc; <20>
! CHR HTML &Auml; <20>
! CHR HTML &Ccedil; <20>
! CHR HTML &Eacute; <20>
! CHR HTML &Euml; <20>
! CHR HTML &Iacute; <20>
! CHR HTML &Icirc; <20>
! CHR HTML &Oacute; <20>
! CHR HTML &Ocirc; <20>
! CHR HTML &Ouml; <20>
! CHR HTML &times; <20>
! CHR HTML &Uacute; <20>
! CHR HTML &Uuml; <20>
! CHR HTML &Yacute; <20>
! CHR HTML &szlig; <20>
! CHR HTML &aacute; <20>
! CHR HTML &acirc; <20>
! CHR HTML &auml; <20>
! CHR HTML &ccedil; <20>
! CHR HTML &eacute; <20>
! CHR HTML &euml; <20>
! CHR HTML &iacute; <20>
! CHR HTML &icirc; <20>
! CHR HTML &oacute; <20>
! CHR HTML &ocirc; <20>
! CHR HTML &ouml; <20>
! CHR HTML &divide; <20>
! CHR HTML &uacute; <20>
! CHR HTML &uuml; <20>
! CHR HTML &yacute; <20>
--- 243,280 ----
! #CHR HTML 35
! #CHR HTML &curren; <20>
! #CHR HTML &deg; <20>
! #CHR HTML &acute; <20>
! #CHR HTML &cedil; <20>
! #CHR HTML &Aacute; <20>
! #CHR HTML &Acirc; <20>
! #CHR HTML &Auml; <20>
! #CHR HTML &Ccedil; <20>
! #CHR HTML &Eacute; <20>
! #CHR HTML &Euml; <20>
! #CHR HTML &Iacute; <20>
! #CHR HTML &Icirc; <20>
! #CHR HTML &Oacute; <20>
! #CHR HTML &Ocirc; <20>
! #CHR HTML &Ouml; <20>
! #CHR HTML &times; <20>
! #CHR HTML &Uacute; <20>
! #CHR HTML &Uuml; <20>
! #CHR HTML &Yacute; <20>
! #CHR HTML &szlig; <20>
! #CHR HTML &aacute; <20>
! #CHR HTML &acirc; <20>
! #CHR HTML &auml; <20>
! #CHR HTML &ccedil; <20>
! #CHR HTML &eacute; <20>
! #CHR HTML &euml; <20>
! #CHR HTML &iacute; <20>
! #CHR HTML &icirc; <20>
! #CHR HTML &oacute; <20>
! #CHR HTML &ocirc; <20>
! #CHR HTML &ouml; <20>
! #CHR HTML &divide; <20>
! #CHR HTML &uacute; <20>
! #CHR HTML &uuml; <20>
! #CHR HTML &yacute; <20>
***************
*** 255,277 ****
! CHR 123 20
! CHR 123 a1 <20>
! CHR 123 e1 <20>
! CHR 123 e2 <20>
! CHR 123 i1 <20>
! CHR 123 o1 <20>
! CHR 123 o2 <20>
! CHR 123 o3 <20>
! CHR 123 u1 <20>
! CHR 123 u2 <20>
! CHR 123 u3 <20>
! CHR 123 A1 <20>
! CHR 123 E1 <20>
! CHR 123 E2 <20>
! CHR 123 I1 <20>
! CHR 123 O1 <20>
! CHR 123 O2 <20>
! CHR 123 O3 <20>
! CHR 123 U1 <20>
! CHR 123 U2 <20>
! CHR 123 U3 <20>
--- 284,306 ----
! #CHR 123 20
! #CHR 123 a1 <20>
! #CHR 123 e1 <20>
! #CHR 123 e2 <20>
! #CHR 123 i1 <20>
! #CHR 123 o1 <20>
! #CHR 123 o2 <20>
! #CHR 123 o3 <20>
! #CHR 123 u1 <20>
! #CHR 123 u2 <20>
! #CHR 123 u3 <20>
! #CHR 123 A1 <20>
! #CHR 123 E1 <20>
! #CHR 123 E2 <20>
! #CHR 123 I1 <20>
! #CHR 123 O1 <20>
! #CHR 123 O2 <20>
! #CHR 123 O3 <20>
! #CHR 123 U1 <20>
! #CHR 123 U2 <20>
! #CHR 123 U3 <20>
***************
*** 22054,22055 ****
--- 22083,22085 ----
PFX D 0 leg [^A<>BCDE<44>FGHI<48>JKLMNO<4E><4F><EFBFBD>PQRSTU<54><55><EFBFBD>VWZ]
+
PFX " Y 37
*** hu_HU.orig.dic Sun Mar 26 15:05:13 2006
--- hu_HU.dic Sun Mar 26 20:12:13 2006
***************
*** 94597,94600 ****
0
- ...
- .
-<2D>t
--- 94597,94598 ----
***************
*** 94616,94622 ****
-/ABCUVWKLMQR
- ,
- +
- )
- (
- '
&aring;ngstr<74>m/W̯j<CCAF>M<EFBFBD><4D><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>TtYc<59><63>l
--- 94614,94615 ----
***************
*** 94634,94642 ****
%-/KU<4B><55>mQSsi)
- %
- $
- "
- !!!
- !!
- !
- /
- # character conversion table
- # (HTML latin-1 entities -> latin-2)
- # not implemented yet
-
--- 94627 ----
- CHR HTML 35
- CHR HTML &curren; <20>
- CHR HTML &deg; <20>
- CHR HTML &acute; <20>
- CHR HTML &cedil; <20>
- CHR HTML &Aacute; <20>
- CHR HTML &Acirc; <20>
- CHR HTML &Auml; <20>
- CHR HTML &Ccedil; <20>
- CHR HTML &Eacute; <20>
- CHR HTML &Euml; <20>
- CHR HTML &Iacute; <20>
- CHR HTML &Icirc; <20>
- CHR HTML &Oacute; <20>
- CHR HTML &Ocirc; <20>
- CHR HTML &Ouml; <20>
- CHR HTML &times; <20>
- CHR HTML &Uacute; <20>
- CHR HTML &Uuml; <20>
- CHR HTML &Yacute; <20>
- CHR HTML &szlig; <20>
- CHR HTML &aacute; <20>
- CHR HTML &acirc; <20>
- CHR HTML &auml; <20>
- CHR HTML &ccedil; <20>
- CHR HTML &eacute; <20>
- CHR HTML &euml; <20>
- CHR HTML &iacute; <20>
- CHR HTML &icirc; <20>
- CHR HTML &oacute; <20>
- CHR HTML &ocirc; <20>
- CHR HTML &ouml; <20>
- CHR HTML &divide; <20>
- CHR HTML &uacute; <20>
- CHR HTML &uuml; <20>
- CHR HTML &yacute; <20>
-
- # character conversion table
- # (Pr<50>sz<73>ky-code -> latin-2)
- # not implemented yet
-
- CHR 123 20
- CHR 123 a1 <20>
- CHR 123 e1 <20>
- CHR 123 e2 <20>
- CHR 123 i1 <20>
- CHR 123 o1 <20>
- CHR 123 o2 <20>
- CHR 123 o3 <20>
- CHR 123 u1 <20>
- CHR 123 u2 <20>
- CHR 123 u3 <20>
- CHR 123 A1 <20>
- CHR 123 E1 <20>
- CHR 123 E2 <20>
- CHR 123 I1 <20>
- CHR 123 O1 <20>
- CHR 123 O2 <20>
- CHR 123 O3 <20>
- CHR 123 U1 <20>
- CHR 123 U2 <20>
- CHR 123 U3 <20>
-
SFX z Y 6
--- 200,201 ----
***************
*** 17678,17681 ****
PFX D 0 leg .
-
- 1
-
--- 17638 ----

View File

@ -21,31 +21,23 @@ $SPELLDIR/hu.utf-8.spl : $FILES
$SPELLDIR/hu.cp1250.spl : $FILES
:sys $VIM -u NONE -e -c "set enc=cp1250" -c "mkspell! $SPELLDIR/hu hu_HU" -c q
# There is no readme in the .zip file, use the header of the .aff file.
../README_hu.txt: hu_HU.aff
:sys $VIM -u NONE -e hu_HU.aff -c "1,/# ---/w! $target" -c q
../README_hu.txt: README_hu_HU.txt
:copy $source $target
#
# Fetch the zip file from SourceForge. Version specific name...
# Fetching the files from OpenOffice.org.
#
OODIR = http://hunspell.sourceforge.net
zipname = hu_HU2.zip
:attr {fetch = $OODIR/%file%} $zipname
OODIR = http://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/dictionaries
:attr {fetch = $OODIR/%file%} hu_HU.zip
# 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.
# This is a bit tricky, since the file name includes the date.
hu_HU.aff hu_HU.dic: {buildcheck=}
:assertpkg unzip patch
:fetch $zipname
:sys $UNZIP $zipname
:delete $zipname
# Unfortunately the version number is in the file name...
:move hu_HU2.dic hu_HU.dic
:move hu_HU2.aff hu_HU.aff
:delete hu_HU2.history
:fetch hu_HU.zip
:sys $UNZIP hu_HU.zip
:delete hu_HU.zip
@if not os.path.exists('hu_HU.orig.aff'):
:copy hu_HU.aff hu_HU.orig.aff
@if not os.path.exists('hu_HU.orig.dic'):
@ -63,5 +55,27 @@ diff:
:sys {force} diff -a -C 1 hu_HU.orig.dic hu_HU.dic >>hu_HU.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:
:assertpkg unzip diff
:fetch hu_HU.zip
:mkdir tmp
:cd tmp
@try:
@import stat
:sys $UNZIP ../hu_HU.zip
:sys {force} diff ../hu_HU.orig.aff hu_HU.aff >d
@if os.stat('d')[stat.ST_SIZE] > 0:
:copy hu_HU.aff ../hu_HU.new.aff
:sys {force} diff ../hu_HU.orig.dic hu_HU.dic >d
@if os.stat('d')[stat.ST_SIZE] > 0:
:copy hu_HU.dic ../hu_HU.new.dic
@finally:
:cd ..
:delete {r}{f}{q} tmp
:delete hu_HU.zip
# vim: set sts=4 sw=4 :

View File

@ -9,9 +9,9 @@
SPELLDIR = ..
FILES = mi_NZ.aff mi_NZ.dic
all: $SPELLDIR/mi.latin1.spl $SPELLDIR/mi.utf-8.spl ../README_mi.txt
all: $SPELLDIR/mi.iso-8859-4.spl $SPELLDIR/mi.utf-8.spl ../README_mi.txt
$SPELLDIR/mi.latin1.spl : $FILES
$SPELLDIR/mi.iso-8859-4.spl : $FILES
:sys $VIM -u NONE -e -c "set enc=iso-8859-4"
-c "mkspell! $SPELLDIR/mi mi_NZ" -c q

View File

@ -153,7 +153,7 @@
+ REP zoz z.o.z.
+ REP hopenlijk hopelijk
*** nl_NL.orig.dic Sun Jul 3 18:24:07 2005
--- nl_NL.dic Fri Mar 10 09:58:01 2006
--- nl_NL.dic Wed Apr 12 15:18:00 2006
***************
*** 1,3 ****
119937
@ -609,7 +609,7 @@
zegenbede/N
***************
*** 119938 ****
--- 119990,173195 ----
--- 119990,173196 ----
<20>berhaupt
+ Christiaan/X
+ Fred/X
@ -803,6 +803,7 @@
+ Jos
+ Laurens
+ Leon
+ Linda
+ Luc
+ Luuk
+ Marion