Nope, sorry Greg. I reviewed and approved of it :) Applied.
On 03/27/2018 08:43 AM, Greg Hellings wrote: > Troy, > > I know you were working on the repo quite a bit over the weekend. I > didn't see this patch land. Did I miss it in the commit emails? > > --Greg > > On Wed, Mar 21, 2018 at 12:32 AM, Troy A. Griffitts > <scr...@crosswire.org <mailto:scr...@crosswire.org>> wrote: > > Thanks for the patch, Greg. Yes. Agreed it is not intuitive to the > uninitiated. The warring factions are that a module key can be > changed with a reference directly to its key, the module being > oblivious to that fact that it changed. Also, a module position > might be incremented but never asked to do all the heavy work to > render the entry. We went with a manual trigger that renders the > entry of a module when desired. I tried to help by not simply > naming the method as a getter, getRenderText(), but instead > renderText() to imply this activates the rendering, not simply > retrieving the rendering. It's not perfect. > > Thanks again for the patch. > > Troy > > > On March 20, 2018 8:33:21 PM MST, Greg Hellings > <greg.helli...@gmail.com <mailto:greg.helli...@gmail.com>> wrote: > > > > On Tue, Mar 20, 2018 at 10:21 PM, Troy A. Griffitts > <scr...@crosswire.org <mailto:scr...@crosswire.org>> wrote: > > If I had to guess, I suspect diatheke is not calling > renderText before asking for the header. The renderText > method triggers all entryAttributes to be filled. The > header is an entryAttribute. > > > Spot on. If I were offering commentary, I would call that a > bug in the UX of the API. But I do get why it is that way. > Attaching a patch that solves the problem. > > --Greg > > > > > On March 20, 2018 8:13:41 PM MST, Greg Hellings > <greg.helli...@gmail.com <mailto:greg.helli...@gmail.com>> > wrote: > > To be quite specific: diatheke does not encounter that > header in the preverse content until it reaches Psalm > 3:2 for some reason that is beyond my ken. Therefore, > it is properly rendering that content as preverse, but > it has attached it to the wrong verse. Output from my > slightly modified diatheke confirms this: > > $ ./inst/bin/diatheke -b KJV -o h -f Plain -k Ps 3 > key: Psalms 3:1 > header: > Psalms 3:1: LORD, how are they increased that trouble > me! many are they that rise up against me. > key: Psalms 3:2 > header: <title canonical="true" type="section"><w > savlm="strong:H04210">A Psalm</w> <w > savlm="strong:H01732">of David</w>, <w > savlm="strong:H01272">when he fled</w> <w > savlm="strong:H06440">from</w> <w > savlm="strong:H053">Absalom</w> <w > savlm="strong:H01121">his son</w>.</title> > A Psalm of David, when he fled from Absalom his son. > Psalms 3:2: Many there be which say of my soul, There > is no help for him in God. Selah. > > --Greg > > On Tue, Mar 20, 2018 at 9:53 PM, Greg Hellings > <greg.helli...@gmail.com > <mailto:greg.helli...@gmail.com>> wrote: > > It's easier to see the problem when using plain > formatting: > > $ diatheke -b KJV -o h -f Plain -k Ps 3 > Psalms 3:1: LORD, how are they increased that > trouble me! many are they that rise up against me. > A Psalm of David, when he fled from Absalom his son. > Psalms 3:2: Many there be which say of my soul, > There is no help for him in God. Selah. > Psalms 3:3: But thou, O LORD, art a shield for me; > my glory, and the lifter up of mine head. > Psalms 3:4: > I cried unto the LORD with my voice, and he heard > me out of his holy hill. Selah. > Psalms 3:5: I laid me down and slept; I awaked; > for the LORD sustained me. > Psalms 3:6: I will not be afraid of ten thousands > of people, that have set themselves against me > round about. > Psalms 3:7: Arise, O LORD; save me, O my God: for > thou hast smitten all mine enemies upon the cheek > bone; thou hast broken the teeth of the ungodly. > Psalms 3:8: Salvation belongeth unto the LORD: thy > blessing is upon thy people. Selah. > (KJV) > > --Greg > > > On Tue, Mar 20, 2018 at 9:50 PM, Greg Hellings > <greg.helli...@gmail.com > <mailto:greg.helli...@gmail.com>> wrote: > > I'm not so sure your initial assertion is > correct. > > $ diatheke -b KJV -o h -k Ps 3 > Psalms 3:1: <w > > savlm="strong:H03068"><seg><divineName>Lord</divineName></seg></w>, > <w savlm="strong:H07231">how are they > increased</w> <w savlm="strong:H06862">that > trouble</w> <w savlm="strong:H07227">me! > many</w> <transChange > type="added">are</transChange> <w > savlm="strong:H06965">they that rise up</w> > against me. > <title canonical="true" type="section"><w > savlm="strong:H04210">A Psalm</w> <w > savlm="strong:H01732">of David</w>, <w > savlm="strong:H01272">when he fled</w> <w > savlm="strong:H06440">from</w> <w > savlm="strong:H053">Absalom</w> <w > savlm="strong:H01121">his > son</w>.</title>Psalms 3:2: <w > savlm="strong:H07227">Many</w> <transChange > type="added">there be</transChange> <w > savlm="strong:H0559">which say</w> <w > savlm="strong:H05315">of my soul</w>, > <transChange type="added">There > is</transChange> <w savlm="strong:H03444">no > help</w> <w savlm="strong:H0430">for him in > God</w>. <w savlm="strong:H05542">Selah</w>. > > If you notice carefully, the canonical title > is there. It is just misplaced. It comes after > the text of Psalm 3:1 and not before. > > --Greg > > On Tue, Mar 20, 2018 at 4:40 PM, David Haslam > <dfh...@protonmail.com > <mailto:dfh...@protonmail.com>> wrote: > > Maybe someone could patch diatheke to fix > this? > > Best regards, David > > > Sent from ProtonMail Mobile > > > On Wed, Mar 14, 2018 at 12:14, David > Haslam <dfh...@protonmail.com > <mailto:dfh...@protonmail.com>> wrote: >> Diatheke does not output the canonical >> Psalm titles when output option h is used. >> >> Try this and see what I mean. >> >> diatheke -b KJV -o h -k Ps 3 >> >> This is a significant lack of feature. >> >> Best regards, >> >> David >> >> Sent from ProtonMail Mobile > > _______________________________________________ > sword-devel mailing list: > sword-devel@crosswire.org > <mailto:sword-devel@crosswire.org> > > http://www.crosswire.org/mailman/listinfo/sword-devel > > <http://www.crosswire.org/mailman/listinfo/sword-devel> > Instructions to unsubscribe/change your > settings at above page > > > > > > -- > Sent from my Android device with K-9 Mail. Please excuse > my brevity. > > > > -- > Sent from my Android device with K-9 Mail. Please excuse my brevity. > >
_______________________________________________ sword-devel mailing list: sword-devel@crosswire.org http://www.crosswire.org/mailman/listinfo/sword-devel Instructions to unsubscribe/change your settings at above page