Date: Sat, 12 Mar 2011 14:57:10 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r219569 - in stable/8/usr.bin/calendar: . calendars/ru_RU.KOI8-R Message-ID: <201103121457.p2CEvAhK022184@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa (ports committer) Date: Sat Mar 12 14:57:10 2011 New Revision: 219569 URL: http://svn.freebsd.org/changeset/base/219569 Log: MFC r216697: Fix typo (Pashka -> Paskha). MFC r217025: Fix typo: March -> September. MFC r218471: Fix Paskha and Paskha-specific holidays. MFC r218473: Always convert Paskha day from Julian (old) to Gregorian (new) style by adding 13 days. Bug introduced in 1.13 revision. MFC r218771: Fix the beginning day of the Great Lent, it starts on Monday for 7 weeks before Paskha. Fix the Exaltation of the Holy Cross day. Add more Twelve holidays (dvunadesyatye prazdniki). MFC r218797: Replace hard-coded value by Julian2Gregorian converter function. MFC r219174: Fix beginning day of the Carnival. MFC r219175: Expand the name of Palm Sunday holiday with more canonical Entry of the Lord into Jerusalem. Merge the Pentecost and Trinity Sunday holidays, they are synonyms. Remove Body of Christ day, nonexistent holiday for Orthodox Church. Fix typo in the name of Ioann The Baptist, introduced in previous commit. Modified: stable/8/usr.bin/calendar/calendar.1 stable/8/usr.bin/calendar/calendar.h stable/8/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox (contents, props changed) stable/8/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan (contents, props changed) stable/8/usr.bin/calendar/parsedata.c stable/8/usr.bin/calendar/paskha.c Directory Properties: stable/8/usr.bin/calendar/ (props changed) Modified: stable/8/usr.bin/calendar/calendar.1 ============================================================================== --- stable/8/usr.bin/calendar/calendar.1 Sat Mar 12 14:47:54 2011 (r219568) +++ stable/8/usr.bin/calendar/calendar.1 Sat Mar 12 14:57:10 2011 (r219569) @@ -128,7 +128,7 @@ The solar equinox in March. .It JunSolstice The solar solstice in June. .It SepEquinox -The solar equinox in March. +The solar equinox in September. .It DecSolstice The solar solstice in December. .It ChineseNewYear @@ -155,7 +155,7 @@ The names of the recognized special days positive or negative integer, like: .Dq Easter+3 or -.Dq Pashka-4 . +.Dq Paskha-4 . .Pp Weekdays may be followed by ``-4'' ...\& ``+5'' (aliases for last, first, second, third, fourth) for moving events like Modified: stable/8/usr.bin/calendar/calendar.h ============================================================================== --- stable/8/usr.bin/calendar/calendar.h Sat Mar 12 14:47:54 2011 (r219568) +++ stable/8/usr.bin/calendar/calendar.h Sat Mar 12 14:57:10 2011 (r219569) @@ -167,9 +167,10 @@ void cal(void); void closecal(FILE *); FILE *opencal(void); -/* ostern.c / pashka.c */ +/* ostern.c / paskha.c */ int paskha(int); int easter(int); +int j2g(int); /* dates.c */ extern int cumdaytab[][14]; Modified: stable/8/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox ============================================================================== --- stable/8/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox Sat Mar 12 14:47:54 2011 (r219568) +++ stable/8/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.orthodox Sat Mar 12 14:57:10 2011 (r219569) @@ -11,24 +11,26 @@ LANG=ru_RU.KOI8-R Paskha=Пасха 21 сен Рождество Пресвятой Богородицы -28 сен Воздвижение Креста Господня +27 сен Воздвижение Креста Господня 14 окт Покров Пресвятой Богородицы 4 дек Введение во храм Пресвятой Богородицы 7 янв Рождество Христово +14 янв Обрезание Господне 19 янв Богоявление или Крещение Господне 15 фев Сретение Господне -Пасха-46 Великий Пост -Пасха-7 Вербное Воскресенье +Пасха-48 Великий Пост +Пасха-7 Вход Господень в Иерусалим. Вербное Воскресенье Пасха-3 Великий Четверг Пасха-2 Страстная Пятница Пасха Воскресение Христово Пасха+39 Вознесение -Пасха+49 Пятидесятница -Пасха+56 Троицин День -Пасха+60 Праздник Тела Христова +Пасха+49 День Святой Троицы. Пятидесятница 7 апр Благовещение Пресвятой Богородицы + 7 июл Рождество Иоанна Предтечи +12 июл День святых первоверховных апостолов Петра и Павла 19 авг Преображение Господне 28 авг Успение Пресвятой Богородицы +11 сен Усекновение главы Иоанна Предтечи #endif /* !_ru_RU_KOI8_R_orthodox_ */ Modified: stable/8/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan ============================================================================== --- stable/8/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan Sat Mar 12 14:47:54 2011 (r219568) +++ stable/8/usr.bin/calendar/calendars/ru_RU.KOI8-R/calendar.pagan Sat Mar 12 14:57:10 2011 (r219569) @@ -17,7 +17,7 @@ Paskha=Пасха 29 фев День Кащея 1 мар День Марены 14 мар Новый Год, Овсень малый -Пасха-47 Масленица +Пасха-55 Масленица Пасха+7 Красная Горка Пасха+16 Радуница 20 мар* Весенние равноденствие Modified: stable/8/usr.bin/calendar/parsedata.c ============================================================================== --- stable/8/usr.bin/calendar/parsedata.c Sat Mar 12 14:47:54 2011 (r219568) +++ stable/8/usr.bin/calendar/parsedata.c Sat Mar 12 14:57:10 2011 (r219569) @@ -80,7 +80,7 @@ static char *floattotime(double f); * ModifierIndex ::= 'Second' | 'Third' | 'Fourth' | 'Fifth' | * 'First' | 'Last' * - * SpecialDay ::= 'Easter' | 'Pashka' | 'ChineseNewYear' + * SpecialDay ::= 'Easter' | 'Paskha' | 'ChineseNewYear' * */ static int @@ -459,6 +459,7 @@ parsedaymonth(char *date, int *yearp, in yearinfo->mondays = mondaytab[isleap(year)]; yearinfo->ieaster = easter(year); + yearinfo->ipaskha = paskha(year); fpom(year, UTCOffset, yearinfo->ffullmoon, yearinfo->fnewmoon); fpom(year, UTCOFFSET_CNY, yearinfo->ffullmooncny, Modified: stable/8/usr.bin/calendar/paskha.c ============================================================================== --- stable/8/usr.bin/calendar/paskha.c Sat Mar 12 14:47:54 2011 (r219568) +++ stable/8/usr.bin/calendar/paskha.c Sat Mar 12 14:57:10 2011 (r219569) @@ -36,8 +36,17 @@ __FBSDID("$FreeBSD$"); #define PASKHA "paskha" #define PASKHALEN (sizeof(PASKHA) - 1) +/* return difference in days between Julian and Gregorian calendars */ +int +j2g(int year) +{ + return (year < 1500) ? + 0 : + 10 + (year/100 - 16) - ((year/100 - 16) / 4); +} + /* return year day for Orthodox Easter using Gauss formula */ -/* (old style result) */ +/* (new style result) */ int paskha(int R) /*year*/ @@ -53,5 +62,5 @@ paskha(int R) /*year*/ d = (19 * a + x) % 30; e = (2 * b + 4 * c + 6 * d + y) % 7; cumday = cumdaytab[isleap(R)]; - return (((cumday[3] + 1) + 22) + (d + e)); + return (((cumday[3] + 1) + 22) + (d + e) + j2g(R)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201103121457.p2CEvAhK022184>