Updates to the code, adding troparia and kontakia, and others #63
Conversation
…creation of Prime
mamyt
force-pushed
the
Updates+Foundation-for-Compiling-Services
branch
from
80ce09d
to
924b4f7
Compare
|
@lemtom Please comment. |
|
I've given it a shot, but with the way I refactored back then it's not very tenable to rebase on this given the significant changes. I'll conservatively start over, with this as the base. |
|
Well that doesn't sound like fun ... @mamyt please comment. |
|
Not fun indeed, but it has its benefits too. I'll stick to the existing structure and will refrain from significant code de-duplication for now. So mostly a focus on trying to follow current-day Java standards and take advantage of Java 8 features, without rocking the boat too much. It won't be as thorough as before in this stage because of that, but that should also make it easier for you to review and/or understand any changes. I should have something ready soon. In the meantime, no objections from my side to already merging this. |
| @@ -1,4 +1,4 @@ | |||
| #1 | |||
| ҇#1 | |||
There was a problem hiding this comment.
Looks like there is an extraneous symbol here.
| @@ -842,24 +842,24 @@ | |||
| #50 | |||
| 0| Въ коне́цъ, ѱало́мъ дв҃дꙋ, внегда̀ вни́ти къ немꙋ̀ наѳа́нꙋ прⷪ҇ро́кꙋ, є҆гда̀ вни́де къ вирсаві́и женѣ̀ ᲂу҆рі́евѣ, | |||
| 1| Поми́лꙋй мѧ̀, бж҃е, по вели́цѣй млⷭ҇ти твое́й, и҆ по мно́жествꙋ щедро́тъ твои́хъ ѡ҆чⷭ҇ти беззако́нїе моѐ. | |||
| 3| Наипа́че ѡ҆мы́й мѧ̀ ѿ беззако́нїѧ моегѡ̀ и҆ ѿ грѣха̀ моегѡ̀ ѡ҆чⷭ҇ти мѧ̀: | |||
There was a problem hiding this comment.
Is the reversification of Psalms correct?
| @@ -59,7 +28,7 @@ Likewise, the Bible in both Traditional and Simplified Chinese characters has be | |||
| <PHRASE Key="About" Value="Версия/,Ponomar is designed to provide the user with access to understand and experience the richness and beauty of the Orthodox tradition. The programme is currently in its developmental phase./,At Ponomar, we believe that Orthodox liturgical texts should be free for use and distribution. God did not copyright the Bible. St John of Damascus did not copyright the Octoechos. Thus, Ponomar and all incorporated texts are distributable under the terms of the GPL./,Copyright/,by/,Acknowledgements: (None)" /> | |||
| <PHRASE Key="GospelSelection" Value="НЕ использовать Воздвиженскую отступку/,Использовать Воздвиженскую отступку/,Лекционарий/,Выбор лекционария." /> | |||
| <PHRASE Key="Tones" Value="8-й/,1-й/,2-й/,3-й/,4-й/,5-й/,6-й/,7-й/,8-й" Comments="To allow different formatting of the tones in other languages, such as Greek (with letters) and Old Church Slavonic (with Cyrillic letters)" /> | |||
| <PHRASE Key="Main" Value="по гражданскому стилю/,<B>Восход солнца</B>: /,<B>Заход солнца</B>: /,<B>Фаза луны</B>: /,Глас TT/,Информация о /,Вы действительно хотите закрыть программу?" /> | |||
| <PHRASE Key="Main" Value="по грирогианскому стилю/,<B>Восход солнца</B>: /,<B>Заход солнца</B>: /,<B>Фаза луны</B>: /,Глас TT/,Информация о /,Вы действительно хотите закрыть программу?/,по юлианському стилю/,Юлианський календар/,Григорианський календар" /> | |||
There was a problem hiding this comment.
spelling: юлианский календарь, григорианский календарь
| @@ -1,5 +1,5 @@ | |||
| <SAINT> | |||
| <NAME Short="святым 40 мученикам" Genetive="святых 40 мучениках"/> | |||
| <NAME Nominative="40 мучеников, в Севастийском озере мучившихся: Кириона, Кандида, Домна, Исихия, Ираклия, Смарагда, Евноика, Уалента (Валента), Вивиана, Клавдия, Приска, Феодула, Евтихия, Иоанна, Ксанфия, Илиана, Сисиния, Ангия, Аетия, Флавия, Акакия, Екдикия (Екдикта), Лисимаха, Александра, Илия, Горгония, Феофила, Дометиана, Гаия, Леонтия, Афанасия, Кирилла, Сакердона, Николая, Уалерия (Валерия), Филоктимона, Севериана, Худиона, Мелитона и Аглаия († ок. 320)" Cmd="!(nday == 19 || nday == 26 || nday == 14)"/> | |||
| <NAME Nominative="Совершаем службу святым 40 мученикам Севастийским: Кириона, Кандида, Домна, Исихия, Ираклия, Смарагда, Евноика, Уалента (Валента), Вивиана, Клавдия, Приска, Феодула, Евтихия, Иоанна, Ксанфия, Илиана, Сисиния, Ангия, Аетия, Флавия, Акакия, Екдикия (Екдикта), Лисимаха, Александра, Илия, Горгония, Феофила, Дометиана, Гаия, Леонтия, Афанасия, Кирилла, Сакердона, Николая, Уалерия (Валерия), Филоктимона, Севериана, Худиона, Мелитона и Аглаия" Cmd="nday == 19 || nday == 26 || nday == 14"/> | |||
| <NAME Nominative="40 мучеников, в Севастийском озере мучившихся: Кириона, Кандида, Домна, Исихия, Ираклия, Смарагда, Евноика, Уалента (Валента), Вивиана, Клавдия, Приска, Феодула, Евтихия, Иоанна, Ксанфия, Илиана, Сисиния, Ангия, Аетия, Флавия, Акакия, Екдикия (Екдикта), Лисимаха, Александра, Илия, Горгония, Феофила, Дометиана, Гаия, Леонтия, Афанасия, Кирилла, Сакердона, Николая, Уалерия (Валерия), Филоктимона, Севериана, Худиона, Мелитона и Аглаия († ок. 320)" Cmd="!(nday == -17 || nday == -25 || nday == -15 || nday < -43)"/> | |||
There was a problem hiding this comment.
Are these changes to CMDs intentional?
|
I would just kindly request everyone to submit issue-specific pull requests, which makes it much easier to keep of track of what is going on. The problem with this PR is that there are changes to Java code together with changes to XML files together with changes to Slavonic Bible texts, etc. Some things in our repository (XML, Bible) are used not only by the Java program but also by the API. This, of course, is problematic and should be changed eventually, with the data separated from the code into a different repo. |
Including the rules for the creation of the First Hour.