I will now start updating Voice using the sutta-vinaya-abhidhamma branch.
NOTE: my head is exploding slightly and to simplify matters, I’ve merged in Anagarika @Sabbamitta’s German translations as well as @Kaz’s Japanese translations into the sutta-vinaya-abhidhamma branch. The Voice automated tests rely on this content. The merged content is in the new folder format.
Okay, great. Now, I will check things more thoroughly, but we need some testing and so on for the next steps.
I don’t want to explode your head further, but on the 2-do, once all the Pali texts are present and accounted for:
run text-content diff of bilara pali texts vs. original mahasangiti files, to make sure we haven’t accidentally lost any texts. When to do this? It should definitely be done as a final thing, but maybe do interim tests as well?
Redo segment numbering of previously-segmented texts to ensure consistency across the whole corpus. This will mainly affect things like headings.
We should have issues to track each of these until I can tackle them. Right now Voice is on the operating table and I’m performing a bit of brain surgery, moving slowly and carefully. After that, I’ll need to sit down with Anagarika Sabbamitta to address our delayed release. We’ve delayed all our releases substantially to accommodate the bilara-data imports and restructuring. If we have one issue for each of the above then we can slowly integrate progress across all the issues. Each one of the issues will require a chat to understand what needs to be done in detail.
BTW. Just chatted with Anagarika Sabbamitta. We both recommend strongly that these three issues should be done AFTER the merge of sutta-vinaya-abhidhamma into master. The bilara-data folder structure divergence should be minimized and the merge should completed as soon as @Blake and I are ready. I plan on being done with Voice software changes next week. Blake, let us know if you can’t complete your own software changes by next week. There’s a fair amount of testing that will need to be done in staging as well beyond that software change.
Update 2/16: scv-bilara v1.2.0 is now available. The scv-bilara library is the search engine used by Voice. The v1.2.0 version automatically detects bilara-data folder structure and is happy with both new and old folder structures. Starting tomorrow I’ll integrate the latest scv-bilara into Voice itself for testing in our staging environment next week. Once that testing is completed Voice will be ready for merging sutta-vinaya-abhidhamma branch into bilara-data master.
@Blake, please advise if you need any more time to complete your own transition for the sutta-vinaya-abhidhamma folder structure. We might be able to merge the new folder structure into bilara-data as early as next week.
@Sabbamitta, large earthquake merge approaching! Date is not fixed but we are discussing merge date. Please advise if you need more time to merge all your own translation branches into master.
@Kaz, this won’t affect you since you’re essentially working sutta by sutta offline.
@Sujato, the import-pali branch is actually the basis of sutta-vinaya-abhidhamma branch. Please make any changes to sutta-vinaya-abhidhamma branch instead of import-pali branch, which will eventually be deleted.
Thanks for the heads up! No, I don’t need extra time to merge translation branches. I am not working on more than one branch at a time right now, and the suttas in this section are all fairly short, so there is no problem.
Update 2/17: Voice v2.1.21 is ready for staging. This release of Voice works with either bilara-data folder structure.
At this point I would like to propose that we merge sutta-vinaya-abhidhamma branch of bilara-data into master on Wednesday 2/19. Please advise if this merge would disrupt anything. The merge will change all existing content in root, translation and other folders. ATTN: @blake, @sujato, @Brahmali, @sabbamitta
Ah yes! Thanks for the reminder. Please also close out any branches that you may have open.
Ajahn @Brahmali, I am less familiar with your authoring paradigm, but similar concerns will apply. The destination for all your edits is changing. To avoid content loss, please keep your changes offline until we have completed the merge. Also make a record of recent changes so that we can ensure that the merge is successful. Any new content of yours must appear in sutta-vinaya-abhidhamma branch or might be lost.
I am currently merging master content into sutta-vinaya-abhidhamma. Please review that these are correctly named and placed. We should all make necessary corrections in the sutta-vinaya-abhidhamma branch:
@sujato@brahamali I noticed a lot of changes in root files:
With the Vinaya files, keep the latest version used by Brahmali.
The changes are mostly to accommodate headings and the like. I have been coordinating these with Ven Brahmali, and we hope that they will not be too disruptive. The root of the problem is simply that when he began this translation, several years ago, we did it very differently and we have had to adapt across multiple systems. We won’t be able to really settle the texts down until the revision is finished. But anyway, this text is not published yet, so it will not affect the apps.
Hokay! Does this mean I can continue to make changes until Wednesday morning US west coast time?
So am I! My paradigm is to do stuff whenever I have the time. I will work around your schedule. It’s no problem for me.
Are you suggesting changes might get lost? I am not sure how I would make a record of all changes. And the question then is since when.
I did not translate from the segmented text, but from the original Mahāsaṅgīti document. Once the text was segmented, there was the occasional bad correspondence between my translations and the Pali segments. To fix this, I have sometimes had to adjust the Pali segments. Usually this has involved moving one or more Pali word from one segment to another. That’s all really. Entire segments have not been deleted. In fact, I am still occasionally making such changes.
Karl has created the bilara-data branch called sutta-vinaya-abhidhamma which has the new folder structure, and copied all existing content from the old folders into this new branch. Since that time more edits have been done to the old folders, and in order to do the merge the new folders need to be updated by these edits.
If you keep making changes the updating process will never be finished.
I guess after the merge is done you will be able to make changes again. Until that time I too am restricting my work to my local working environment without touching the files in the GitHub repositories.
Probably this concerns all changes that have been made after the sutta-vinaya-abhidhamma branch has been created—I guess.