aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/modules/filters/gbfosis.cpp20
-rw-r--r--src/modules/filters/thmlosis.cpp22
2 files changed, 21 insertions, 21 deletions
diff --git a/src/modules/filters/gbfosis.cpp b/src/modules/filters/gbfosis.cpp
index 43161d4..ec20675 100644
--- a/src/modules/filters/gbfosis.cpp
+++ b/src/modules/filters/gbfosis.cpp
@@ -228,11 +228,11 @@ char GBFOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu
if (vkey) {
char ref[254];
if (vkey->Verse())
- sprintf(ref, "<verseStart ref=\"%s\" />", vkey->getOSISRef());
+ sprintf(ref, "\t\t<verse osisID=\"%s\">", vkey->getOSISRef());
else if (vkey->Chapter())
- sprintf(ref, "<chapterStart ref=\"%s\" />", vkey->getOSISRef());
+ sprintf(ref, "\t<div type=\"chapter\" osisID=\"%s\">", vkey->getOSISRef());
else if (vkey->Book())
- sprintf(ref, "<bookStart ref=\"%s\" />", vkey->getOSISRef());
+ sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef());
else *ref = 0;
if (*ref) {
memmove(text+strlen(ref), text, maxlen-strlen(ref)-1);
@@ -243,27 +243,27 @@ char GBFOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWModu
tmp = *vkey;
tmp.AutoNormalize(0);
tmp.Headings(1);
- sprintf(ref, "<verseEnd ref=\"%s\" />", vkey->getOSISRef());
+ sprintf(ref, "</verse>");
pushString(&to, ref);
tmp = MAXVERSE;
if (*vkey == tmp) {
tmp.Verse(0);
- sprintf(ref, "<chapterEnd ref=\"%s\" />", tmp.getOSISRef());
+ sprintf(ref, "\t</div>");
pushString(&to, ref);
tmp = MAXCHAPTER;
tmp = MAXVERSE;
if (*vkey == tmp) {
tmp.Chapter(0);
tmp.Verse(0);
- sprintf(ref, "<bookEnd ref=\"%s\" />", tmp.getOSISRef());
+ sprintf(ref, "\t</div>");
pushString(&to, ref);
}
}
}
else if (vkey->Chapter())
- sprintf(ref, "<chapterStart ref=\"%s\" />", vkey->getOSISRef());
- else sprintf(ref, "<bookStart ref=\"%s\" />", vkey->getOSISRef());
+ sprintf(ref, "\t<div type=\"chapter\" osisID=\"%s\">", vkey->getOSISRef());
+ else sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef());
}
}
*to++ = 0;
@@ -299,13 +299,13 @@ const char *GBFOSIS::convertToOSIS(const char *inRef, const SWKey *key) {
memmove(frag, startFrag, ((const char *)element->userData - startFrag) + 1);
frag[((const char *)element->userData - startFrag) + 1] = 0;
startFrag = (const char *)element->userData + 1;
- sprintf(buf, "<reference refStart=\"KJV:%s\" refEnd=\"%s\">%s</reference>", element->LowerBound().getOSISRef(), element->UpperBound().getOSISRef(), frag);
+ sprintf(buf, "<reference osisRef=\"%s-\"%s\">%s</reference>", element->LowerBound().getOSISRef(), element->UpperBound().getOSISRef(), frag);
}
else {
memmove(frag, startFrag, ((const char *)verses.GetElement(i)->userData - startFrag) + 1);
frag[((const char *)verses.GetElement(i)->userData - startFrag) + 1] = 0;
startFrag = (const char *)verses.GetElement(i)->userData + 1;
- sprintf(buf, "<reference refStart=\"KJV:%s\">%s</reference>", VerseKey(*verses.GetElement(i)).getOSISRef(), frag);
+ sprintf(buf, "<reference osisRef=\"%s\">%s</reference>", VerseKey(*verses.GetElement(i)).getOSISRef(), frag);
}
outRef+=buf;
}
diff --git a/src/modules/filters/thmlosis.cpp b/src/modules/filters/thmlosis.cpp
index 54cd002..10f5892 100644
--- a/src/modules/filters/thmlosis.cpp
+++ b/src/modules/filters/thmlosis.cpp
@@ -92,7 +92,7 @@ char ThMLOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWMod
// Scripture Reference
if (!strncmp(token, "scripRef", 8)) {
- // pushString(buf, "<reference work=\"Bible.KJV\" reference=\"");
+ // pushString(buf, "<reference osisRef=\"");
suspendTextPassThru = true;
newText = true;
}
@@ -247,11 +247,11 @@ char ThMLOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWMod
if (vkey) {
char ref[254];
if (vkey->Verse())
- sprintf(ref, "<verseStart ref=\"%s\" />", vkey->getOSISRef());
+ sprintf(ref, "\t\t<verse osisID=\"%s\">", vkey->getOSISRef());
else if (vkey->Chapter())
- sprintf(ref, "<chapterStart ref=\"%s\" />", vkey->getOSISRef());
+ sprintf(ref, "\t<div type=\"chapter\" osisID=\"%s\">", vkey->getOSISRef());
else if (vkey->Book())
- sprintf(ref, "<bookStart ref=\"%s\" />", vkey->getOSISRef());
+ sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef());
else *ref = 0;
if (*ref) {
memmove(text+strlen(ref), text, maxlen-strlen(ref)-1);
@@ -262,27 +262,27 @@ char ThMLOSIS::ProcessText(char *text, int maxlen, const SWKey *key, const SWMod
tmp = *vkey;
tmp.AutoNormalize(0);
tmp.Headings(1);
- sprintf(ref, "<verseEnd ref=\"%s\" />", vkey->getOSISRef());
+ sprintf(ref, "</verse>");
pushString(&to, ref);
tmp = MAXVERSE;
if (*vkey == tmp) {
tmp.Verse(0);
- sprintf(ref, "<chapterEnd ref=\"%s\" />", tmp.getOSISRef());
+ sprintf(ref, "\t</div>");
pushString(&to, ref);
tmp = MAXCHAPTER;
tmp = MAXVERSE;
if (*vkey == tmp) {
tmp.Chapter(0);
tmp.Verse(0);
- sprintf(ref, "<bookEnd ref=\"%s\" />", tmp.getOSISRef());
+ sprintf(ref, "\t</div>");
pushString(&to, ref);
}
}
}
else if (vkey->Chapter())
- sprintf(ref, "<chapterStart ref=\"%s\" />", vkey->getOSISRef());
- else sprintf(ref, "<bookStart ref=\"%s\" />", vkey->getOSISRef());
+ sprintf(ref, "\t<div type=\"chapter\" osisID=\"%s\">", vkey->getOSISRef());
+ else sprintf(ref, "\t<div type=\"book\" osisID=\"%s\">", vkey->getOSISRef());
}
}
*to++ = 0;
@@ -318,13 +318,13 @@ const char *ThMLOSIS::convertToOSIS(const char *inRef, const SWKey *key) {
memmove(frag, startFrag, ((const char *)element->userData - startFrag) + 1);
frag[((const char *)element->userData - startFrag) + 1] = 0;
startFrag = (const char *)element->userData + 1;
- sprintf(buf, "<reference refStart=\"KJV:%s\" refEnd=\"%s\">%s</reference>", element->LowerBound().getOSISRef(), element->UpperBound().getOSISRef(), frag);
+ sprintf(buf, "<reference osisRef=\"%s-\"%s\">%s</reference>", element->LowerBound().getOSISRef(), element->UpperBound().getOSISRef(), frag);
}
else {
memmove(frag, startFrag, ((const char *)verses.GetElement(i)->userData - startFrag) + 1);
frag[((const char *)verses.GetElement(i)->userData - startFrag) + 1] = 0;
startFrag = (const char *)verses.GetElement(i)->userData + 1;
- sprintf(buf, "<reference refStart=\"KJV:%s\">%s</reference>", VerseKey(*verses.GetElement(i)).getOSISRef(), frag);
+ sprintf(buf, "<reference osisRef=\"%s\">%s</reference>", VerseKey(*verses.GetElement(i)).getOSISRef(), frag);
}
outRef+=buf;
}
generated by cgit (git 2.34.1) at 2024-11-09 16:31:16 +0000