[sword-svn] r3472 - in branches/sword-1-8-x: . examples/cmdline include locales.d scripts src/modules src/modules/filters tests/testsuite
scribe at crosswire.org
scribe at crosswire.org
Sun May 21 21:19:03 MST 2017
Author: scribe
Date: 2017-05-21 21:19:02 -0700 (Sun, 21 May 2017)
New Revision: 3472
Added:
branches/sword-1-8-x/scripts/eligible
branches/sword-1-8-x/scripts/merge
Modified:
branches/sword-1-8-x/
branches/sword-1-8-x/ChangeLog
branches/sword-1-8-x/configure.ac
branches/sword-1-8-x/examples/cmdline/search.cpp
branches/sword-1-8-x/include/swversion.h
branches/sword-1-8-x/include/utf8scsu.h
branches/sword-1-8-x/locales.d/fr-utf8.conf
branches/sword-1-8-x/locales.d/fr.conf
branches/sword-1-8-x/locales.d/fr_abbrev-utf8.conf
branches/sword-1-8-x/locales.d/fr_abbrev.conf
branches/sword-1-8-x/src/modules/filters/osisplain.cpp
branches/sword-1-8-x/src/modules/filters/osisxhtml.cpp
branches/sword-1-8-x/src/modules/filters/scsuutf8.cpp
branches/sword-1-8-x/src/modules/filters/swbasicfilter.cpp
branches/sword-1-8-x/src/modules/swmodule.cpp
branches/sword-1-8-x/tests/testsuite/osisReference.xml
branches/sword-1-8-x/tests/testsuite/osis_basic.good
branches/sword-1-8-x/tests/testsuite/osis_basic.sh
branches/sword-1-8-x/tests/testsuite/osis_mod2zmod.good
branches/sword-1-8-x/tests/testsuite/osis_mod2zmod.sh
branches/sword-1-8-x/tests/testsuite/osis_osis2modcipher.good
branches/sword-1-8-x/tests/testsuite/osis_osis2modcipher.sh
branches/sword-1-8-x/usrinst.sh
Log:
Merged /trunk:r3459-3471
1.8.0RC2
Property changes on: branches/sword-1-8-x
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk:3459-3471
Modified: branches/sword-1-8-x/ChangeLog
===================================================================
--- branches/sword-1-8-x/ChangeLog 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/ChangeLog 2017-05-22 04:19:02 UTC (rev 3472)
@@ -1,5 +1,8 @@
API ChangeLog
+21-May-2017 Troy A. Griffitts <scribe at crosswire.org>
+ Added --with-icuregex option to use ICU regex engine
+
24-Apr-2017 Troy A. Griffitts <scribe at crosswire.org>
Branching 1.8.x
Modified: branches/sword-1-8-x/configure.ac
===================================================================
--- branches/sword-1-8-x/configure.ac 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/configure.ac 2017-05-22 04:19:02 UTC (rev 3472)
@@ -5,7 +5,7 @@
# Version change: Change line 8 only !
# Change it immediately after a release
-AC_INIT(sword, 1.7.900, sword-bugs at crosswire.org, sword, http://crosswire.org/sword)
+AC_INIT(sword, 1.7.902, sword-bugs at crosswire.org, sword, http://crosswire.org/sword)
AC_CONFIG_SRCDIR(sword.bmp)
AC_PREREQ(2.52)
AC_REVISION($Revision: 1.45 $)
@@ -53,9 +53,9 @@
AC_ARG_WITH(zlib,
AC_HELP_STRING([--with-zlib],[allow zlib compressed modules (default=yes)]),,with_zlib=yes)
AC_ARG_WITH(bzip2,
- AC_HELP_STRING([--with-bzip2],[allow bzip2 compressed modules (default=yes)]),,with_bzip2=yes)
+ AC_HELP_STRING([--with-bzip2],[allow bzip2 compressed modules (default=no)]),,with_bzip2=no)
AC_ARG_WITH(xz,
- AC_HELP_STRING([--with-xz],[allow xz compressed modules (default=yes)]),,with_xz=yes)
+ AC_HELP_STRING([--with-xz],[allow xz compressed modules (default=no)]),,with_xz=no)
AC_ARG_WITH(icu,
AC_HELP_STRING([--with-icu],[use ICU for unicode (default=yes)]),,with_icu=yes)
AC_ARG_WITH(icusword,
@@ -72,6 +72,8 @@
# AC_HELP_STRING([--with-lucene],[include lucene support for searching (default=no)]),,with_lucene=no)
AC_ARG_WITH([internalregex],
AS_HELP_STRING([--with-internalregex], [Compile using SWORDs internal copy of regex]))
+AC_ARG_WITH([icuregex],
+ AS_HELP_STRING([--with-icuregex], [use ICU regex engine]))
AC_ARG_WITH(xapian,
AC_HELP_STRING([--with-xapian],[use xapian search engine (default=yes)]),,with_xapian=yes)
@@ -118,8 +120,15 @@
fi
AM_CFLAGS="$AM_CFLAGS -fPIC"
-AM_CXXFLAGS="$AM_CXXFLAGS -fPIC -ftemplate-depth=100"
+AM_CXXFLAGS="$AM_CXXFLAGS -fPIC"
+#stupid check for old or new g++ compiler param syntax for this compiler option
+saved_CXXFLAGS="$CXXFLAGS"
+CXXFLAGS="$CXXFLAGS -ftemplate-depth=100"
+AC_LANG_PUSH([C++])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])],,[CXXFLAGS="$saved_CXXFLAGS -ftemplate-depth-100";])
+AC_LANG_POP([C++])
+
# ---------------------------------------------------------------------
# Check libraries
# ---------------------------------------------------------------------
@@ -306,13 +315,24 @@
fi
fi
-if test x$with_xapian = xyes; then
+if test x$with_xapian = xyes; then
AC_LANG_CPLUSPLUS
AC_CHECK_LIB(xapian,main,,with_xapian="no")
else
with_xapian="no"
fi
+if test x$with_icuregex = xyes; then
+ if test x$with_icu = xno; then
+ with_icuregex="requested; but using ICU not enabled"
+ else
+ AM_CFLAGS="$AM_CFLAGS -DUSEICUREGEX"
+ AM_CXXFLAGS="$AM_CXXFLAGS -DUSEICUREGEX"
+ fi
+else
+ with_icuregex="no"
+fi
+
if test x$with_xapian = xyes; then
AM_CFLAGS="$AM_CFLAGS -DUSEXAPIAN"
AM_CXXFLAGS="$AM_CXXFLAGS -DUSEXAPIAN"
@@ -425,6 +445,7 @@
AM_CONDITIONAL(SHAREDLIB, test x$enable_shared = xyes)
AM_CONDITIONAL(INSTCONF, test x$with_conf = xyes)
AM_CONDITIONAL(USECXX11REGEX, test x$with_cxx11regex = xyes)
+AM_CONDITIONAL(USEICUREGEX, test x$with_icuregex = xyes)
AM_CONDITIONAL(WITHCURL, test x$with_curl = xyes)
AM_CONDITIONAL(WITHCURLSFTP, test x$with_curl_sftp = xyes)
AM_CONDITIONAL(INTERNALFTPLIB, test x$with_internalftplib = xyes)
@@ -465,7 +486,8 @@
echo " BZIP2: $with_bzip2"
echo " XZ: $with_xz"
echo " ICUSWORD: $with_icusword"
-echo " CXX11REGEX: $with_cxx11regex"
+echo " CXX11-REGEX: $with_cxx11regex"
+echo " ICU-REGEX: $with_icuregex"
echo " XAPIAN-CORE: $with_xapian"
Modified: branches/sword-1-8-x/examples/cmdline/search.cpp
===================================================================
--- branches/sword-1-8-x/examples/cmdline/search.cpp 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/examples/cmdline/search.cpp 2017-05-22 04:19:02 UTC (rev 3472)
@@ -89,7 +89,7 @@
SWBuf searchTerm = argv[2];
manager.setGlobalOption("Greek Accents", "Off");
- manager.setGlobalOption("Strong's Numbers", "On");
+ manager.setGlobalOption("Strong's Numbers", "Off");
manager.setGlobalOption("Hebrew Vowel Points", "Off");
manager.filterText("Greek Accents", searchTerm);
Modified: branches/sword-1-8-x/include/swversion.h
===================================================================
--- branches/sword-1-8-x/include/swversion.h 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/include/swversion.h 2017-05-22 04:19:02 UTC (rev 3472)
@@ -24,11 +24,11 @@
#ifndef SWVERSION_H
#define SWVERSION_H
-#define SWORD_VERSION_NUM 107900000
-#define SWORD_VERSION_STR "1.7.900"
+#define SWORD_VERSION_NUM 107902000
+#define SWORD_VERSION_STR "1.7.902"
#define SWORD_VERSION_MAJOR 1
#define SWORD_VERSION_MINOR 7
-#define SWORD_VERSION_MICRO 900
+#define SWORD_VERSION_MICRO 902
#define SWORD_VERSION_NANO 0
#include <defs.h>
Modified: branches/sword-1-8-x/include/utf8scsu.h
===================================================================
--- branches/sword-1-8-x/include/utf8scsu.h 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/include/utf8scsu.h 2017-05-22 04:19:02 UTC (rev 3472)
@@ -28,6 +28,7 @@
#include <unicode/utypes.h>
#include <unicode/ucnv.h>
#include <unicode/uchar.h>
+#include <unicode/unistr.h>
SWORD_NAMESPACE_START
Modified: branches/sword-1-8-x/locales.d/fr-utf8.conf
===================================================================
--- branches/sword-1-8-x/locales.d/fr-utf8.conf 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/locales.d/fr-utf8.conf 2017-05-22 04:19:02 UTC (rev 3472)
@@ -1,3 +1,7 @@
+# File creation: 2017-01-20
+# French translation for Sword
+# Provided by yvand <yvand.sword at gmail.com>, Cyrille <lafricain79 at gmail.com>, domcox <dominique at corbex.org>
+
[Meta]
Name=fr
Description=French (Unicode)
@@ -4,80 +8,344 @@
Encoding=UTF-8
[Text]
+# Old Testament* (39)
+# Genesis
Genesis=Genèse
+# Exodus
Exodus=Exode
+# Leviticus
Leviticus=Lévitique
+# Numbers
Numbers=Nombres
+# Deuteronomy
Deuteronomy=Deutéronome
+# Joshua
Joshua=Josué
+# Judges
Judges=Juges
+# Ruth
Ruth=Ruth
+# I Samuel
I Samuel=1 Samuel
+# II Samuel
II Samuel=2 Samuel
+# I Kings
I Kings=1 Rois
+# II Kings
II Kings=2 Rois
+# I Chronicles
I Chronicles=1 Chroniques
+# II Chronicles
II Chronicles=2 Chroniques
+# Ezra
Ezra=Esdras
+# Nehemiah
Nehemiah=Néhémie
-Tobit=Tobie
-Judith=Judith
+# Esther
Esther=Esther
-I Maccabees=1 Maccabées
-II Maccabees=2 Maccabées
+# Job
Job=Job
+# Psalms
Psalms=Psaumes
+# Proverbs
Proverbs=Proverbes
-Ecclesiastes=Qohélet
-Song of Solomon=Le Cantique des cantiques
-Wisdom=Sagesse
-Sirach=Le Siracide
-Isaiah=Isaïe
+# Ecclesiastes
+Ecclesiastes=Ecclésiaste ou Qohélet
+# Song of Solomon
+Song of Solomon=Cantique des cantiques
+# Isaiah
+Isaiah=Ésaïe
+# Jeremiah
Jeremiah=Jérémie
+# Lamentations
Lamentations=Lamentations de Jérémie
-Baruch=Baruch
+# Ezekiel
Ezekiel=Ézéchiel
+# Daniel
Daniel=Daniel
+# Hosea
Hosea=Osée
+# Joel
Joel=Joël
+# Amos
Amos=Amos
+# Obadiah
Obadiah=Abdias
+# Jonah
Jonah=Jonas
+# Micah
Micah=Michée
+# Nahum
Nahum=Nahum
-Habakkuk=Habaquq
+# Habakkuk
+Habakkuk=Habacuc
+# Zephaniah
Zephaniah=Sophonie
+# Haggai
Haggai=Aggée
+# Zechariah
Zechariah=Zacharie
+# Malachi
Malachi=Malachie
+
+# New Testament* (27)
+# Matthew
Matthew=Matthieu
+# Mark
Mark=Marc
+# Luke
Luke=Luc
+# John
John=Jean
-Acts=Actes
+# Acts
+Acts=Actes des Apôtres
+# Romans
Romans=Romains
+# I Corinthians
I Corinthians=1 Corinthiens
+# II Corinthians
II Corinthians=2 Corinthiens
+# Galatians
Galatians=Galates
+# Ephesians
Ephesians=Éphésiens
+# Philippians
Philippians=Philippiens
+# Colossians
Colossians=Colossiens
+# I Thessalonians
I Thessalonians=1 Thessaloniciens
+# II Thessalonians
II Thessalonians=2 Thessaloniciens
+# I Timothy
I Timothy=1 Timothée
+# II Timothy
II Timothy=2 Timothée
+# Titus
Titus=Tite
+# Philemon
Philemon=Philémon
+# Hebrews
Hebrews=Hébreux
+# James
James=Jacques
+# I Peter
I Peter=1 Pierre
+# II Peter
II Peter=2 Pierre
+# I John
I John=1 Jean
+# II John
II John=2 Jean
+# III John
III John=3 Jean
+# Jude
Jude=Jude
-Revelation of John=Apocalypse
+# Revelation of John
+Revelation of John=Apocalypse de Jean
+# Apocrypha/Deuterocanon* (22)
+# Tobit
+Tobit=Tobit
+# Judith
+Judith=Judith
+# Esther (Greek)
+Esther (Greek)=Esther grec
+# Additions to Esther
+Additions to Esther=Additions à Esther
+# Wisdom
+Wisdom=Sagesse
+# Sirach (Prologue)
+Sirach (Prologue)=Prologue du Siracide
+# Sirach
+Sirach=Siracide
+# Baruch
+Baruch=Baruch
+# Epistle of Jeremiah
+Epistle of Jeremiah=Lettre de Jérémie
+# Daniel (Greek)
+Daniel (Greek)=Daniel grec
+# Additions to Daniel
+Additions to Daniel=Additions à Daniel
+# Prayer of Azariah
+Prayer of Azariah=Prière d’Azarias
+# Susanna
+Susanna=Suzanne
+# Bel and the Dragon
+Bel and the Dragon=Bel et le dragon
+# I Maccabees
+I Maccabees=1 Maccabées
+# II Maccabees
+II Maccabees=2 Maccabées
+# III Maccabees
+III Maccabees=3 Maccabées
+# IV Maccabees
+IV Maccabees=4 Maccabées
+# Prayer of Manasses
+Prayer of Manasses=Prière de Manassé
+# I Esdras
+I Esdras=1 Esdras
+# II Esdras
+II Esdras=2 Esdras
+# Additional Psalm
+Additional Psalm=Psaume 151
+
+# Rahlfs' LXX* (2)
+# Odes
+Odes=Odes de Salomon
+# Psalms of Solomon
+Psalms of Solomon=Psaumes de Salomon
+
+# Rahlfs' variant books* (6)
+# Joshua Codex Alexandrinus
+Joshua Codex Alexandrinus=Josué (Alexandrinus)
+# Judges Codex Vaticanus
+Judges Codex Vaticanus=Juges (Vaticanus)
+# Tobit Codex Sinaiticus
+Tobit Codex Sinaiticus=Tobie (Sinaiticus)
+# Susanna Theodotion
+Susanna Theodotion=Suzanne (Théodotion)
+# Daniel Theodotion
+Daniel Theodotion=Daniel (Théodotion)
+# Bel and the Dragon Theodotion
+Bel and the Dragon Theodotion=Bel et le dragon (Théodotion)
+
+# Vulgate & other later Latin mss* (6)
+# Laodiceans
+Laodiceans=Laodicéens
+# V Ezra
+V Ezra=V Esdras
+# IV Ezra
+IV Ezra=Apocalypse d’Esdras
+# VI Ezra
+VI Ezra=VI Esdras
+# Prayer of Solomon
+Prayer of Solomon=Prière de Salomon
+# Prayer of Jeremiah
+Prayer of Jeremiah=Prière de Jérémie
+
+# Ethiopian Orthodox Canon/Ge'ez Translation Additions (7)
+# I Enoch
+I Enoch=Hénoch
+# Jubilees
+Jubilees=Jubilés
+# IV Baruch
+IV Baruch=4 Baruch
+# I Meqabyan
+I Meqabyan=1 Maccabées éthiopiens
+# II Meqabyan
+II Meqabyan=2 Maccabées éthiopiens
+# III Meqabyan
+III Meqabyan=3 Maccabées éthiopiens
+# Reproof
+#Reproof=
+# Additions to Jeremiah
+#Additions to Jeremiah=
+# Pseudo-Josephus
+#Pseudo-Josephus=
+
+# Armenian Orthodox Canon Additions (7/19)
+# Epistle of the Corinthians to Paul
+Epistle of the Corinthians to Paul=Lettre des Corinthiens à l’Apôtre Paul
+# III Corinthians
+III Corinthians=3 Corinthiens
+# Words of Sirach
+#Words of Sirach=
+# Prayer of Euthalius
+#Prayer of Euthalius=
+# Dormition of John
+Dormition of John=Dormition de Marie du Pseudo-Jean
+# Joseph and Asenath
+Joseph and Asenath=Joseph et Aséneth
+# Testaments of the Twelve Patriarchs (composed of:)
+Testaments of the Twelve Patriarchs (composed of:)=Testaments des 12 Patriarches
+# Testament of Asher
+Testament of Asher=Testament d’Aser
+# Testament of Benjamin
+Testament of Benjamin=Testament de Benjamin
+# Testament of Dan
+Testament of Dan=Testament de Dan
+# Testament of Gad
+Testament of Gad=Testament de Gad
+# Testament of Issachar
+Testament of Issachar=Testament d’Issacar
+# Testament of Joseph
+Testament of Joseph=Testament de Joseph
+# Testament of Judah
+Testament of Judah=Testament de Juda
+# Testament of Levi
+Testament of Levi=Testament de Lévi
+# Testament of Naphtali
+Testament of Naphtali=Testament de Nephtali
+# Testament of Reuben
+Testament of Reuben=Testament de Ruben
+# Testament of Simeon
+Testament of Simeon=Testament de Siméon
+# Testament of Zebulun
+Testament of Zebulun=Testament de Zabulon
+
+# Peshitta/Syriac Orthodox Canon (4)
+# II Baruch
+#II Baruch=
+# Letter of Baruch
+#Letter of Baruch=
+# Additional Syriac Psalms
+Additional Syriac Psalms=Psaumes surnuméraires
+# Josephus' Jewish War VI
+#Josephus' Jewish War VI=
+
+# Apostolic Fathers (19/22)
+# I Clement
+I Clement=1 Clément
+# II Clement
+II Clement=2 Clément
+# Ignatius to the Ephesians
+Ignatius to the Ephesians=Ignace aux Éphésiens
+# Ignatius to the Magnesians
+Ignatius to the Magnesians=Ignace aux Magnésiens
+# Ignatius to the Trallians
+Ignatius to the Trallians=Ignace aux Tralliens
+# Ignatius to the Romans
+Ignatius to the Romans=Ignace aux Romains
+# Ignatius to the Philadelphians
+Ignatius to the Philadelphians=Ignace aux Philadelphiens
+# Ignatius to the Smyrnaeans
+Ignatius to the Smyrnaeans=Ignace aux Smyrniens
+# Ignatius to Polycarp
+Ignatius to Polycarp=Ignace d’Antioche à Polycarpe
+# Polycarp to the Philippians
+Polycarp to the Philippians=Polycarpe aux Philippiens
+# Martyrdom of Polycarp
+Martyrdom of Polycarp=Martyr de Polycarpe
+# Didache
+Didache=Didachè
+# Barnabas
+Barnabas=Épître de Barnabé
+# Shepherd of Hermas (comprised of:)
+Shepherd of Hermas (comprised of:)=Pasteur d’Hermas
+# Shepherd of Hermas, Mandates
+#Shepherd of Hermas, Mandates=
+# Shepherd of Hermas, Similitudes
+#Shepherd of Hermas, Similitudes=
+# Shepherd of Hermas, Visions
+#Shepherd of Hermas, Visions=
+# Diognetus
+#Diognetus=
+# Apostles' Creed
+#Apostles' Creed=
+# Fragments of Papias
+Fragments of Papias=Fragments de Papias
+# Reliques of the Elders
+#Reliques of the Elders=
+# Fragment of Quadratus
+#Fragment of Quadratus=
+
+# Other (2)
+# Diatessaron
+Diatessaron=Diatessaron
+# Metrical Psalms
+#Metrical Psalms=
+
[Book Abbrevs]
GENÈSE=Gen
EXODE=Exod
@@ -95,22 +363,15 @@
2 CHRONIQUES=2Chr
ESDRAS=Ezra
NÉHÉMIE=Neh
-TOBIT=Tob
-JUDITH=Jdt
ESTHER=Esth
-I MACCABÉES=1Ma
-II MACCABÉES=2Ma
JOB=Job
PSAUMES=Ps
PROVERBES=Prov
-QOHÉLET=Eccl
-LE CANTIQUE DES CANTIQUES=Song
-SAGESSE=Wis
-LE SIRACIDE=Si
-ESAÃE=Isa
+ECCLÉSIASTE OU QOHÉLET=Eccl
+CANTIQUE DES CANTIQUES=Song
+ÉSAÃE=Isa
JÉRÉMIE=Jer
LAMENTATIONS DE JÉRÉMIE=Lam
-BARUCH=Bar
ÉZÉCHIEL=Ezek
DANIEL=Dan
OSÉE=Hos
@@ -120,22 +381,21 @@
JONAS=Jonah
MICHÉE=Mic
NAHUM=Nah
-HABAKUK=Hab
+HABACUC=Hab
SOPHONIE=Zeph
AGGÉE=Hag
ZACHARIE=Zech
-ZACCHARIE=Zech
MALACHIE=Mal
MATTHIEU=Matt
MARC=Mark
LUC=Luke
JEAN=John
-ACTES=Acts
+ACTES DES APÔTRES=Acts
ROMAINS=Rom
1 CORINTHIENS=1Cor
2 CORINTHIENS=2Cor
GALATES=Gal
-EPHÉSIENS=Eph
+ÉPHÉSIENS=Eph
PHILIPPIENS=Phil
COLOSSIENS=Col
1 THESSALONICIENS=1Thess
@@ -152,127 +412,285 @@
2 JEAN=2John
3 JEAN=3John
JUDE=Jude
-APOCALYPSE=Rev
+APOCALYPSE DE JEAN=Rev
+TOBIT=Tob
+JUDITH=Jdt
+ESTHER GREC=EsthGr
+ADDITIONS À ESTHER=AddEsth
+SAGESSE=Wis
+PROLOGUE DU SIRACIDE=SirP
+SIRACIDE=Sir
+BARUCH=Bar
+LETTRE DE JÉRÉMIE=EpJer
+DANIEL GREC=DanGr
+ADDITIONS À DANIEL=AddDan
+PRIÈRE D’AZARIAS=PrAzar
+SUZANNE=Sus
+BEL ET LE DRAGON=Bel
+1 MACCABÉES=1Macc
+2 MACCABÉES=2Macc
+3 MACCABÉES=3Macc
+4 MACCABÉES=4Macc
+PRIÈRE DE MANASSÉ=PrMan
+1 ESDRAS=1Esd
+2 ESDRAS=2Esd
+PSAUME 151=AddPs
+ODES DE SALOMON=Odes
+PSAUMES DE SALOMON=PssSol
+JOSUÉ (ALEXANDRINUS)=JoshA
+JUGES (VATICANUS)=JudgB
+TOBIE (SINAITICUS)=TobS
+SUZANNE (THÉODOTION)=SusTh
+DANIEL (THÉODOTION)=DanTh
+BEL ET LE DRAGON (THÉODOTION)=BelTh
+LAODICÉENS=EpLao
+V ESDRAS=5Ezra
+APOCALYPSE D’ESDRAS=4Ezra
+VI ESDRAS=6Ezra
+PRIÈRE DE SALOMON=PrSol
+PRIÈRE DE JÉRÉMIE=PrJer
+HÉNOCH=1En
+JUBILÉS=Jub
+4 BARUCH=4Bar
+1 MACCABÉES ÉTHIOPIENS=1Meq
+2 MACCABÉES ÉTHIOPIENS=2Meq
+3 MACCABÉES ÉTHIOPIENS=3Meq
+LETTRE DES CORINTHIENS À L’APÔTRE PAUL=EpCorPaul
+3 CORINTHIENS=3Cor
+DORMITION DE MARIE DU PSEUDO-JEAN=DormJohn
+JOSEPH ET ASÉNETH=JosAsen
+TESTAMENTS DES 12 PATRIARCHES=T12Patr
+TESTAMENT D’ASER=T12Patr.Tash
+TESTAMENT DE BENJAMIN=T12Patr.Tbenj
+TESTAMENT DE DAN=T12Patr.Tdan
+TESTAMENT DE GAD=T12Patr.Tgad
+TESTAMENT D’ISSACAR=T12Patr.Tiss
+TESTAMENT DE JOSEPH=T12Patr.Tjos
+TESTAMENT DE JUDA=T12Patr.Tjud
+TESTAMENT DE LÉVI=T12Patr.Tlevi
+TESTAMENT DE NEPHTALI=T12Patr.Tnaph
+TESTAMENT DE RUBEN=T12Patr.Treu
+TESTAMENT DE SIMÉON=T12Patr.Tsim
+TESTAMENT DE ZABULON=T12Patr.Tzeb
+PSAUMES SURNUMÉRAIRES=5ApocSyrPss
+1 CLÉMENT=1Clem
+2 CLÉMENT=2Clem
+IGNACE AUX ÉPHÉSIENS=IgnEph
+IGNACE AUX MAGNÉSIENS=IgnMagn
+IGNACE AUX TRALLIENS=IgnTrall
+IGNACE AUX ROMAINS=IgnRom
+IGNACE AUX PHILADELPHIENS=IgnPhld
+IGNACE AUX SMYRNIENS=IgnSmyrn
+IGNACE D’ANTIOCHE À POLYCARPE=IgnPol
+POLYCARPE AUX PHILIPPIENS=PolPhil
+MARTYR DE POLYCARPE=MartPol
+DIDACHÈ=Did
+ÉPÎTRE DE BARNABÉ=Barn
+PASTEUR D’HERMAS=Herm
+FRAGMENTS DE PAPIAS=PapFrag
+DIATESSARON=TatDiat
+1C=1Cor
1 C=1Cor
-1C=1Cor
+1CH=1Chr
1 CH=1Chr
-1CH=1Chr
+1CHR=1Chr
1 CHR=1Chr
-1CHR=1Chr
-1 CHRO=1Chr
-1CHRO=1Chr
+1CHRON=1Chr
+1 CHRON=1Chr
+1CLEM=1Clem
+1 CLEM=1Clem
+1CLÉM=1Clem
+1 CLÉM=1Clem
+1CO=1Cor
1 CO=1Cor
-1CO=1Cor
+1COR=1Cor
1 COR=1Cor
-1COR=1Cor
+1J=1John
1 J=1John
-1J=1John
+1JE=1John
1 JE=1John
-1JE=1John
+1JEA=1John
1 JEA=1John
-1JEA=1John
+1JN=1John
1 JN=1John
-1JN=1John
+1M=1Macc
+1 M=1Macc
+1MA=1Macc
+1 MA=1Macc
+1MAC=1Macc
+1 MAC=1Macc
+1MÉT=1Meq
+1 MÉT=1Meq
+1 M ÉT=1Meq
+1P=1Pet
1 P=1Pet
-1P=1Pet
+1PI=1Pet
1 PI=1Pet
-1PI=1Pet
+1PIE=1Pet
1 PIE=1Pet
-1PIE=1Pet
+1R=1Kgs
1 R=1Kgs
-1R=1Kgs
+1RO=1Kgs
1 RO=1Kgs
-1RO=1Kgs
+1ROI=1Kgs
1 ROI=1Kgs
-1ROI=1Kgs
+1S=1Sam
1 S=1Sam
-1S=1Sam
+1SA=1Sam
1 SA=1Sam
-1SA=1Sam
+1SAM=1Sam
1 SAM=1Sam
-1SAM=1Sam
-1 T=1Thess
-1T=1Thess
+1T=1Tim
+1 T=1Tim
+1TH=1Thess
1 TH=1Thess
-1TH=1Thess
+1THE=1Thess
1 THE=1Thess
-1THE=1Thess
+1THESS=1Thess
+1 THESS=1Thess
+1TI=1Tim
1 TI=1Tim
-1TI=1Tim
+1TIM=1Tim
1 TIM=1Tim
-1TIM=1Tim
+1TIMOTHEE=1Tim
1 TIMOTHEE=1Tim
-1TIMOTHEE=1Tim
+1TM=1Tim
1 TM=1Tim
-1TM=1Tim
+2C=2Cor
2 C=2Cor
-2C=2Cor
+2CH=2Chr
2 CH=2Chr
-2CH=2Chr
+2CHR=2Chr
2 CHR=2Chr
-2CHR=2Chr
-2 CHRO=2Chr
-2CHRO=2Chr
+2CHRON=2Chr
+2 CHRON=2Chr
+2CLEM=2Clem
+2 CLEM=2Clem
+2CLÉM=2Clem
+2 CLÉM=2Clem
+2CO=2Cor
2 CO=2Cor
-2CO=2Cor
+2COR=2Cor
2 COR=2Cor
-2COR=2Cor
+2J=2John
2 J=2John
-2J=2John
+2JE=2John
2 JE=2John
-2JE=2John
+2JEA=2John
2 JEA=2John
-2JEA=2John
+2JN=2John
2 JN=2John
-2JN=2John
+2M=2Macc
+2 M=2Macc
+2MA=2Macc
+2 MA=2Macc
+2MAC=2Macc
+2 MAC=2Macc
+2MÉT=2Meq
+2 MÉT=2Meq
+2 M ÉT=2Meq
+2P=2Pet
2 P=2Pet
-2P=2Pet
+2PI=2Pet
2 PI=2Pet
-2PI=2Pet
+2PIE=2Pet
2 PIE=2Pet
-2PIE=2Pet
+2R=2Kgs
2 R=2Kgs
-2R=2Kgs
+2RO=2Kgs
2 RO=2Kgs
-2RO=2Kgs
+2ROI=2Kgs
2 ROI=2Kgs
-2ROI=2Kgs
+2S=2Sam
2 S=2Sam
-2S=2Sam
+2SA=2Sam
2 SA=2Sam
-2SA=2Sam
+2SAM=2Sam
2 SAM=2Sam
-2SAM=2Sam
-2 T=2Thess
-2T=2Thess
+2T=2Tim
+2 T=2Tim
+2TH=2Thess
2 TH=2Thess
-2TH=2Thess
+2THE=2Thess
2 THE=2Thess
-2THE=2Thess
+2THESS=2Thess
+2 THESS=2Thess
+2TI=2Tim
2 TI=2Tim
-2TI=2Tim
+2TIM=2Tim
2 TIM=2Tim
-2TIM=2Tim
+2TIMOTHEE=2Tim
2 TIMOTHEE=2Tim
-2TIMOTHEE=2Tim
+2TM=2Tim
2 TM=2Tim
-2TM=2Tim
+3C=3Cor
+3 C=3Cor
+3CO=3Cor
+3 CO=3Cor
+3COR=3Cor
+3 COR=3Cor
+3E=1Esd
+3 E=1Esd
+3ES=1Esd
+3 ES=1Esd
+3ESD=1Esd
+3 ESD=1Esd
+3J=3John
3 J=3John
-3J=3John
+3JE=3John
3 JE=3John
-3JE=3John
+3JEA=3John
3 JEA=3John
-3JEA=3John
+3JN=3John
3 JN=3John
-3JN=3John
-A=Acts
+3M=3Macc
+3 M=3Macc
+3MA=3Macc
+3 MA=3Macc
+3MAC=3Macc
+3 MAC=3Macc
+3MÉT=3Meq
+3 MÉT=3Meq
+3 M ÉT=3Meq
+4BAR=4Bar
+4 BAR=4Bar
+4E=2Esd
+4 E=2Esd
+4ES=2Esd
+4 ES=2Esd
+4ESD=2Esd
+4 ESD=2Esd
+4M=4Macc
+4 M=4Macc
+4MA=4Macc
+4 MA=4Macc
+4MAC=4Macc
+4 MAC=4Macc
+5E=5Ezra
+5 E=5Ezra
+5ES=5Ezra
+5 ES=5Ezra
+5ESD=5Ezra
+5 ESD=5Ezra
+6E=6Ezra
+6 E=6Ezra
+6ES=6Ezra
+6 ES=6Ezra
+6ESD=6Ezra
+6 ESD=6Ezra
AB=Obad
ABD=Obad
-ABDI=Obad
AC=Acts
ACT=Acts
-ACTE=Acts
+ACTES=Acts
+ACTS=Acts
+ADDDAN=AddDan
+ADD DAN=AddDan
+ADDDN=AddDan
+ADD DN=AddDan
+ADDEST=AddEsth
+ADD EST=AddEsth
AG=Hag
AGG=Hag
AGGE=Hag
@@ -281,9 +699,19 @@
AM=Amos
AMO=Amos
AP=Rev
+APE=4Ezra
+AP ES=4Ezra
+APESD=4Ezra
+AP ESD=4Ezra
APO=Rev
APOC=Rev
-B=Heb
+APOCALYPSE=Rev
+BA=Bar
+BAR=Bar
+BE=Bel
+BEL=Bel
+BELTH=BelTh
+BL=Bel
CA=Song
CAN=Song
CANT=Song
@@ -291,27 +719,45 @@
CO=Col
COL=Col
COLO=Col
+COP=EpCorPaul
CT=Song
+D=Deut
DA=Dan
DAN=Dan
+DANGREC=DanGr
+DAN GREC=DanGr
DANI=Dan
+DANTH=DanTh
DE=Deut
DEU=Deut
DEUT=Deut
DEUTERONOME=Deut
+DID=Did
+DIDAC=Did
+DIDACHE=Did
+DIDACHÉ=Did
DN=Dan
+DNG=DanGr
+DN G=DanGr
+DNGREC=DanGr
+DN GREC=DanGr
+DORMJEAN=DormJohn
DT=Deut
E=Exod
-É=Eph
EC=Eccl
+ÉC=Eccl
ECC=Eccl
+ÉCC=Eccl
ECCL=Eccl
+ÉCCL=Eccl
ECCLESIASTE=Eccl
-ÉC=Eccl
-ÉCC=Eccl
-ÉCCL=Eccl
-ECL=Eccl
-ÉCL=Eccl
+ECCLÉSIASTE=Eccl
+ECCLESIASTIQUE=Sir
+ECCLÉSIASTIQUE=Sir
+EN=1En
+ÉN=1En
+ENOCH=1En
+ÉNOCH=1En
EP=Eph
ÉP=Eph
EPH=Eph
@@ -319,9 +765,9 @@
EPHE=Eph
ÉPHE=Eph
EPHÉ=Eph
-ÉPHÉ=Eph
EPHESIENS=Eph
-ÉPHÉSIENS=Eph
+ÉPHESIENS=Eph
+EPHÉSIENS=Eph
ES=Isa
ÉS=Isa
ESA=Isa
@@ -331,17 +777,23 @@
ÉSAÃ=Isa
ESAIE=Isa
ÉSAIE=Isa
+ESAÃE=Isa
ÉSAÃE=Isa
ESD=Ezra
+ÉSD=Ezra
ESDR=Ezra
-ÉSD=Ezra
EST=Esth
+ÉST=Esth
+ESTG=EsthGr
+EST G=EsthGr
+ESTGREC=EsthGr
+EST GREC=EsthGr
ESTH=Esth
-ÉST=Esth
EX=Exod
EXO=Exod
EXOD=Exod
EZ=Ezek
+ÉZ=Ezek
EZE=Ezek
ÉZE=Ezek
EZÉ=Ezek
@@ -351,46 +803,170 @@
EZÉC=Ezek
ÉZÉC=Ezek
EZECHIEL=Ezek
-F=Eph
G=Gen
GA=Gal
GAL=Gal
-GALA=Gal
+GALAT=Gal
GE=Gen
+GÉ=Gen
GEN=Gen
+GÉN=Gen
GENE=Gen
GENÈ=Gen
GENESE=Gen
-GÉ=Gen
-GÉN=Gen
GN=Gen
-H=Hab
HA=Hab
HAB=Hab
HABA=Hab
-HABACUC=Hab
+HABAKUK=Hab
HABAQUQ=Hab
HE=Heb
HÉ=Heb
HEB=Heb
HÉB=Heb
+HEBR=Heb
+HÉBR=Heb
HEBREUX=Heb
-I=Isa
+HEN=1En
+HÉN=1En
+HENOC=1En
+HENOCH=1En
+HERM=Herm
+IC=1Cor
+I C=1Cor
+ICH=1Chr
+I CH=1Chr
+ICHR=1Chr
+I CHR=1Chr
+ICHRONIQUES=1Chr
+I CHRONIQUES=1Chr
+ICO=1Cor
+I CO=1Cor
+ICOR=1Cor
+I COR=1Cor
+I CORINTHIENS=1Cor
+IIC=2Cor
+II C=2Cor
+IICH=2Chr
+II CH=2Chr
+IICHR=2Chr
+II CHR=2Chr
+IICHRONIQUES=2Chr
+II CHRONIQUES=2Chr
+IICO=2Cor
+II CO=2Cor
+IICOR=2Cor
+II COR=2Cor
+II CORINTHIENS=2Cor
+IIIJ=3John
+III J=3John
+IIIJE=3John
+III JE=3John
+IIIJEA=3John
+III JEA=3John
+IIIJN=3John
+III JN=3John
+IIJ=2John
+II J=2John
+IIJE=2John
+II JE=2John
+IIJEA=2John
+II JEA=2John
+IIJN=2John
+II JN=2John
+IIP=2Pet
+II P=2Pet
+IIPI=2Pet
+II PI=2Pet
+IIPIE=2Pet
+II PIE=2Pet
+IIR=2Kgs
+II R=2Kgs
+IIRO=2Kgs
+II RO=2Kgs
+IIROIS=2Kgs
+II ROIS=2Kgs
+II S=2Sam
+II SA=2Sam
+IISAM=2Sam
+II SAM=2Sam
+II SAMUEL=2Sam
+IIT=2Tim
+II T=2Tim
+IITH=2Thess
+II TH=2Thess
+IITHE=2Thess
+II THE=2Thess
+IITHESS=2Thess
+II THESS=2Thess
+II THESSALONICIENS=2Thess
+IITI=2Tim
+II TI=2Tim
+IITIM=2Tim
+II TIM=2Tim
+IITIMOTHEE=2Tim
+II TIMOTHEE=2Tim
+II TIMOTHÉE=2Tim
+IITM=2Tim
+II TM=2Tim
+IJ=1John
+I J=1John
+IJE=1John
+I JE=1John
+IJEA=1John
+I JEA=1John
+IJN=1John
+I JN=1John
+IP=1Pet
+I P=1Pet
+IPI=1Pet
+I PI=1Pet
+IPIE=1Pet
+I PIE=1Pet
+IR=1Kgs
+I R=1Kgs
+IRO=1Kgs
+I RO=1Kgs
+IROIS=1Kgs
+I ROIS=1Kgs
IS=Isa
+I S=1Sam
ISA=Isa
+I SA=1Sam
ISAI=Isa
ISAÃ=Isa
ISAIE=Isa
-J=Josh
+ISAM=1Sam
+I SAM=1Sam
+I SAMUEL=1Sam
+IT=1Tim
+I T=1Tim
+ITH=1Thess
+I TH=1Thess
+ITHE=1Thess
+I THE=1Thess
+ITHESS=1Thess
+I THESS=1Thess
+I THESSALONICIENS=1Thess
+ITI=1Tim
+I TI=1Tim
+ITIM=1Tim
+I TIM=1Tim
+ITIMOTHEE=1Tim
+I TIMOTHEE=1Tim
+I TIMOTHÉE=1Tim
+ITM=1Tim
+I TM=1Tim
JA=Jas
JAC=Jas
JACQ=Jas
JB=Job
JC=Jas
JD=Jude
+JDT=Jdt
+JE=John
JÉ=Jer
-JE=John
-JEA=John
+JEAN=John
JER=Jer
JÉR=Jer
JERE=Jer
@@ -399,8 +975,10 @@
JÉRÉ=Jer
JEREMIE=Jer
JG=Judg
+JGV=JudgB
JL=Joel
JN=John
+JO=Joel
JOB=Job
JOE=Joel
JOË=Joel
@@ -408,18 +986,27 @@
JON=Jonah
JONA=Jonah
JOS=Josh
+JOSA=JoshA
+JOSASEN=JosAsen
JOSUE=Josh
JR=Jer
JS=Josh
-JU=Judg
+JU=Jude
+JUB=Jub
+JUBILES=Jub
JUD=Jude
+JUDE=Jude
+JUDI=Jdt
JUG=Judg
JUGE=Judg
-K=Hab
L=Lev
LA=Lam
LAM=Lam
LAME=Lam
+LAMENT=Lam
+LAO=EpLao
+LAOD=EpLao
+LAODICEENS=EpLao
LC=Luke
LDJ=Lam
LE=Lev
@@ -430,14 +1017,17 @@
LÉVI=Lev
LEVITIQUE=Lev
LM=Lam
+LTJR=EpJer
+LT JR=EpJer
LU=Luke
LUC=Luke
LV=Lev
-M=Matt
MA=Mal
MAL=Mal
MALA=Mal
+MAN=PrMan
MAR=Mark
+MARC=Mark
MAT=Matt
MATT=Matt
MC=Mark
@@ -451,7 +1041,7 @@
N=Num
NA=Nah
NAH=Nah
-NAHU=Hab
+NAHOUM=Nah
NB=Num
NE=Neh
NÉ=Neh
@@ -465,7 +1055,9 @@
NO=Num
NOM=Num
NOMB=Num
-O=Hos
+OD=Odes
+ODE=Odes
+ODES=Odes
OS=Hos
OSE=Hos
OSÉ=Hos
@@ -477,19 +1069,46 @@
PHILEMON=Phlm
PHLM=Phlm
PHM=Phlm
+PHP=Phil
PR=Prov
+PRA=PrAzar
+PR A=PrAzar
+PRAZAR=PrAzar
PRE=Eccl
PRÉ=Eccl
PRED=Eccl
PRÉD=Eccl
PREDICATEUR=Eccl
+PRJ=PrJer
+PR J=PrJer
+PRJER=PrJer
+PR JER=PrJer
+PRJÉR=PrJer
+PR JÉR=PrJer
+PRMAN=PrMan
+PR MAN=PrMan
PRO=Prov
PROV=Prov
+PRSAL=PrSol
+PR SAL=PrSol
+PRSIR=SirP
+PR SIR=SirP
+PRV=Prov
PS=Ps
+PS151=AddPs
+PS 151=AddPs
PSA=Ps
PSAU=Ps
+PSSAL=PssSol
+PS SAL=PssSol
+QH=Eccl
QO=Eccl
-R=Rom
+QOH=Eccl
+QÔH=Eccl
+QOHELET=Eccl
+QÔHELET=Eccl
+QOHÉLET=Eccl
+QÔHÉLET=Eccl
RE=Rev
RÉ=Rev
REV=Rev
@@ -504,17 +1123,54 @@
RT=Ruth
RU=Ruth
RUT=Ruth
-S=Zeph
+RV=Rev
+SAG=Wis
+SG=Wis
+SI=Sir
+SIR=Sir
+SIRA=Sir
SO=Zeph
SOP=Zeph
SOPH=Zeph
-T=Titus
+SP=Zeph
+SU=Sus
+SUSTH=SusTh
+SUZ=Sus
+SZ=Sus
+T12=T12Patr
+T12PATR=T12Patr
+TASER=T12Patr.Tash
+TB=Tob
+TBEN=T12Patr.Tbenj
+TDAN=T12Patr.Tdan
+TGAD=T12Patr.Tgad
TI=Titus
+TISS=T12Patr.Tiss
TIT=Titus
+TITE=Titus
+TJOS=T12Patr.Tjos
+TJUDA=T12Patr.Tjud
+TLEVI=T12Patr.Tlevi
+TLÉVI=T12Patr.Tlevi
+TNEPH=T12Patr.Tnaph
+TOB=Tob
+TOBS=TobS
+TRUB=T12Patr.Treu
+TSIM=T12Patr.Tsim
TT=Titus
-U=Judg
-V=Lev
-Z=Zech
+TZAB=T12Patr.Tzeb
+VE=5Ezra
+V E=5Ezra
+VES=5Ezra
+V ES=5Ezra
+VESD=5Ezra
+V ESD=5Ezra
+VIE=6Ezra
+VI E=6Ezra
+VIES=6Ezra
+VI ES=6Ezra
+VIESD=6Ezra
+VI ESD=6Ezra
ZA=Zech
ZAC=Zech
ZACH=Zech
Modified: branches/sword-1-8-x/locales.d/fr.conf
===================================================================
--- branches/sword-1-8-x/locales.d/fr.conf 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/locales.d/fr.conf 2017-05-22 04:19:02 UTC (rev 3472)
@@ -1,3 +1,7 @@
+# File creation: 2017-01-20
+# French translation for Sword
+# Provided by yvand <yvand.sword at gmail.com>, Cyrille <lafricain79 at gmail.com>, domcox <dominique at corbex.org>
+
[Meta]
Name=fr
Description=French
@@ -4,73 +8,344 @@
Encoding=ISO8859-1
[Text]
+# Old Testament* (39)
+# Genesis
Genesis=Genèse
+# Exodus
Exodus=Exode
+# Leviticus
Leviticus=Lévitique
+# Numbers
Numbers=Nombres
+# Deuteronomy
Deuteronomy=Deutéronome
+# Joshua
Joshua=Josué
+# Judges
Judges=Juges
+# Ruth
Ruth=Ruth
+# I Samuel
I Samuel=1 Samuel
+# II Samuel
II Samuel=2 Samuel
+# I Kings
I Kings=1 Rois
+# II Kings
II Kings=2 Rois
+# I Chronicles
I Chronicles=1 Chroniques
+# II Chronicles
II Chronicles=2 Chroniques
+# Ezra
Ezra=Esdras
+# Nehemiah
Nehemiah=Néhémie
+# Esther
Esther=Esther
+# Job
Job=Job
+# Psalms
Psalms=Psaumes
+# Proverbs
Proverbs=Proverbes
-Ecclesiastes=Écclésiaste
+# Ecclesiastes
+Ecclesiastes=Ecclésiaste ou Qohélet
+# Song of Solomon
Song of Solomon=Cantique des cantiques
-Isaiah=Esaïe
+# Isaiah
+Isaiah=Ésaïe
+# Jeremiah
Jeremiah=Jérémie
+# Lamentations
Lamentations=Lamentations de Jérémie
+# Ezekiel
Ezekiel=Ézéchiel
+# Daniel
Daniel=Daniel
+# Hosea
Hosea=Osée
+# Joel
Joel=Joël
+# Amos
Amos=Amos
+# Obadiah
Obadiah=Abdias
+# Jonah
Jonah=Jonas
+# Micah
Micah=Michée
+# Nahum
Nahum=Nahum
-Habakkuk=Habakuk
+# Habakkuk
+Habakkuk=Habacuc
+# Zephaniah
Zephaniah=Sophonie
+# Haggai
Haggai=Aggée
+# Zechariah
Zechariah=Zacharie
+# Malachi
Malachi=Malachie
+
+# New Testament* (27)
+# Matthew
Matthew=Matthieu
+# Mark
Mark=Marc
+# Luke
Luke=Luc
+# John
John=Jean
-Acts=Actes
+# Acts
+Acts=Actes des Apôtres
+# Romans
Romans=Romains
+# I Corinthians
I Corinthians=1 Corinthiens
+# II Corinthians
II Corinthians=2 Corinthiens
+# Galatians
Galatians=Galates
+# Ephesians
Ephesians=Éphésiens
+# Philippians
Philippians=Philippiens
+# Colossians
Colossians=Colossiens
+# I Thessalonians
I Thessalonians=1 Thessaloniciens
+# II Thessalonians
II Thessalonians=2 Thessaloniciens
+# I Timothy
I Timothy=1 Timothée
+# II Timothy
II Timothy=2 Timothée
+# Titus
Titus=Tite
+# Philemon
Philemon=Philémon
+# Hebrews
Hebrews=Hébreux
+# James
James=Jacques
+# I Peter
I Peter=1 Pierre
+# II Peter
II Peter=2 Pierre
+# I John
I John=1 Jean
+# II John
II John=2 Jean
+# III John
III John=3 Jean
+# Jude
Jude=Jude
-Revelation of John=Apocalypse
+# Revelation of John
+Revelation of John=Apocalypse de Jean
+# Apocrypha/Deuterocanon* (22)
+# Tobit
+Tobit=Tobit
+# Judith
+Judith=Judith
+# Esther (Greek)
+Esther (Greek)=Esther grec
+# Additions to Esther
+Additions to Esther=Additions à Esther
+# Wisdom
+Wisdom=Sagesse
+# Sirach (Prologue)
+Sirach (Prologue)=Prologue du Siracide
+# Sirach
+Sirach=Siracide
+# Baruch
+Baruch=Baruch
+# Epistle of Jeremiah
+Epistle of Jeremiah=Lettre de Jérémie
+# Daniel (Greek)
+Daniel (Greek)=Daniel grec
+# Additions to Daniel
+Additions to Daniel=Additions à Daniel
+# Prayer of Azariah
+Prayer of Azariah=Prière d'Azarias
+# Susanna
+Susanna=Suzanne
+# Bel and the Dragon
+Bel and the Dragon=Bel et le dragon
+# I Maccabees
+I Maccabees=1 Maccabées
+# II Maccabees
+II Maccabees=2 Maccabées
+# III Maccabees
+III Maccabees=3 Maccabées
+# IV Maccabees
+IV Maccabees=4 Maccabées
+# Prayer of Manasses
+Prayer of Manasses=Prière de Manassé
+# I Esdras
+I Esdras=1 Esdras
+# II Esdras
+II Esdras=2 Esdras
+# Additional Psalm
+Additional Psalm=Psaume 151
+
+# Rahlfs' LXX* (2)
+# Odes
+Odes=Odes de Salomon
+# Psalms of Solomon
+Psalms of Solomon=Psaumes de Salomon
+
+# Rahlfs' variant books* (6)
+# Joshua Codex Alexandrinus
+Joshua Codex Alexandrinus=Josué (Alexandrinus)
+# Judges Codex Vaticanus
+Judges Codex Vaticanus=Juges (Vaticanus)
+# Tobit Codex Sinaiticus
+Tobit Codex Sinaiticus=Tobie (Sinaiticus)
+# Susanna Theodotion
+Susanna Theodotion=Suzanne (Théodotion)
+# Daniel Theodotion
+Daniel Theodotion=Daniel (Théodotion)
+# Bel and the Dragon Theodotion
+Bel and the Dragon Theodotion=Bel et le dragon (Théodotion)
+
+# Vulgate & other later Latin mss* (6)
+# Laodiceans
+Laodiceans=Laodicéens
+# V Ezra
+V Ezra=V Esdras
+# IV Ezra
+IV Ezra=Apocalypse d'Esdras
+# VI Ezra
+VI Ezra=VI Esdras
+# Prayer of Solomon
+Prayer of Solomon=Prière de Salomon
+# Prayer of Jeremiah
+Prayer of Jeremiah=Prière de Jérémie
+
+# Ethiopian Orthodox Canon/Ge'ez Translation Additions (7)
+# I Enoch
+I Enoch=Hénoch
+# Jubilees
+Jubilees=Jubilés
+# IV Baruch
+IV Baruch=4 Baruch
+# I Meqabyan
+I Meqabyan=1 Maccabées éthiopiens
+# II Meqabyan
+II Meqabyan=2 Maccabées éthiopiens
+# III Meqabyan
+III Meqabyan=3 Maccabées éthiopiens
+# Reproof
+#Reproof=
+# Additions to Jeremiah
+#Additions to Jeremiah=
+# Pseudo-Josephus
+#Pseudo-Josephus=
+
+# Armenian Orthodox Canon Additions (7/19)
+# Epistle of the Corinthians to Paul
+Epistle of the Corinthians to Paul=Lettre des Corinthiens à l'Apôtre Paul
+# III Corinthians
+III Corinthians=3 Corinthiens
+# Words of Sirach
+#Words of Sirach=
+# Prayer of Euthalius
+#Prayer of Euthalius=
+# Dormition of John
+Dormition of John=Dormition de Marie du Pseudo-Jean
+# Joseph and Asenath
+Joseph and Asenath=Joseph et Aséneth
+# Testaments of the Twelve Patriarchs (composed of:)
+Testaments of the Twelve Patriarchs (composed of:)=Testaments des 12 Patriarches
+# Testament of Asher
+Testament of Asher=Testament d'Aser
+# Testament of Benjamin
+Testament of Benjamin=Testament de Benjamin
+# Testament of Dan
+Testament of Dan=Testament de Dan
+# Testament of Gad
+Testament of Gad=Testament de Gad
+# Testament of Issachar
+Testament of Issachar=Testament d'Issacar
+# Testament of Joseph
+Testament of Joseph=Testament de Joseph
+# Testament of Judah
+Testament of Judah=Testament de Juda
+# Testament of Levi
+Testament of Levi=Testament de Lévi
+# Testament of Naphtali
+Testament of Naphtali=Testament de Nephtali
+# Testament of Reuben
+Testament of Reuben=Testament de Ruben
+# Testament of Simeon
+Testament of Simeon=Testament de Siméon
+# Testament of Zebulun
+Testament of Zebulun=Testament de Zabulon
+
+# Peshitta/Syriac Orthodox Canon (4)
+# II Baruch
+#II Baruch=
+# Letter of Baruch
+#Letter of Baruch=
+# Additional Syriac Psalms
+Additional Syriac Psalms=Psaumes surnuméraires
+# Josephus' Jewish War VI
+#Josephus' Jewish War VI=
+
+# Apostolic Fathers (19/22)
+# I Clement
+I Clement=1 Clément
+# II Clement
+II Clement=2 Clément
+# Ignatius to the Ephesians
+Ignatius to the Ephesians=Ignace aux Éphésiens
+# Ignatius to the Magnesians
+Ignatius to the Magnesians=Ignace aux Magnésiens
+# Ignatius to the Trallians
+Ignatius to the Trallians=Ignace aux Tralliens
+# Ignatius to the Romans
+Ignatius to the Romans=Ignace aux Romains
+# Ignatius to the Philadelphians
+Ignatius to the Philadelphians=Ignace aux Philadelphiens
+# Ignatius to the Smyrnaeans
+Ignatius to the Smyrnaeans=Ignace aux Smyrniens
+# Ignatius to Polycarp
+Ignatius to Polycarp=Ignace d'Antioche à Polycarpe
+# Polycarp to the Philippians
+Polycarp to the Philippians=Polycarpe aux Philippiens
+# Martyrdom of Polycarp
+Martyrdom of Polycarp=Martyr de Polycarpe
+# Didache
+Didache=Didachè
+# Barnabas
+Barnabas=Épître de Barnabé
+# Shepherd of Hermas (comprised of:)
+Shepherd of Hermas (comprised of:)=Pasteur d'Hermas
+# Shepherd of Hermas, Mandates
+#Shepherd of Hermas, Mandates=
+# Shepherd of Hermas, Similitudes
+#Shepherd of Hermas, Similitudes=
+# Shepherd of Hermas, Visions
+#Shepherd of Hermas, Visions=
+# Diognetus
+#Diognetus=
+# Apostles' Creed
+#Apostles' Creed=
+# Fragments of Papias
+Fragments of Papias=Fragments de Papias
+# Reliques of the Elders
+#Reliques of the Elders=
+# Fragment of Quadratus
+#Fragment of Quadratus=
+
+# Other (2)
+# Diatessaron
+Diatessaron=Diatessaron
+# Metrical Psalms
+#Metrical Psalms=
+
[Book Abbrevs]
GENÈSE=Gen
EXODE=Exod
@@ -92,10 +367,9 @@
JOB=Job
PSAUMES=Ps
PROVERBES=Prov
-ECCLÉSIASTE=Eccl
-ÉCCLÉSIASTE=Eccl
+ECCLÉSIASTE OU QOHÉLET=Eccl
CANTIQUE DES CANTIQUES=Song
-ESAÏE=Isa
+ÉSAÏE=Isa
JÉRÉMIE=Jer
LAMENTATIONS DE JÉRÉMIE=Lam
ÉZÉCHIEL=Ezek
@@ -107,22 +381,20 @@
JONAS=Jonah
MICHÉE=Mic
NAHUM=Nah
-HABAKUK=Hab
+HABACUC=Hab
SOPHONIE=Zeph
AGGÉE=Hag
ZACHARIE=Zech
-ZACCHARIE=Zech
MALACHIE=Mal
MATTHIEU=Matt
MARC=Mark
LUC=Luke
JEAN=John
-ACTES=Acts
+ACTES DES APÔTRES=Acts
ROMAINS=Rom
1 CORINTHIENS=1Cor
2 CORINTHIENS=2Cor
GALATES=Gal
-EPHÉSIENS=Eph
ÉPHÉSIENS=Eph
PHILIPPIENS=Phil
COLOSSIENS=Col
@@ -140,127 +412,285 @@
2 JEAN=2John
3 JEAN=3John
JUDE=Jude
-APOCALYPSE=Rev
+APOCALYPSE DE JEAN=Rev
+TOBIT=Tob
+JUDITH=Jdt
+ESTHER GREC=EsthGr
+ADDITIONS À ESTHER=AddEsth
+SAGESSE=Wis
+PROLOGUE DU SIRACIDE=SirP
+SIRACIDE=Sir
+BARUCH=Bar
+LETTRE DE JÉRÉMIE=EpJer
+DANIEL GREC=DanGr
+ADDITIONS À DANIEL=AddDan
+PRIÈRE D'AZARIAS=PrAzar
+SUZANNE=Sus
+BEL ET LE DRAGON=Bel
+1 MACCABÉES=1Macc
+2 MACCABÉES=2Macc
+3 MACCABÉES=3Macc
+4 MACCABÉES=4Macc
+PRIÈRE DE MANASSÉ=PrMan
+1 ESDRAS=1Esd
+2 ESDRAS=2Esd
+PSAUME 151=AddPs
+ODES DE SALOMON=Odes
+PSAUMES DE SALOMON=PssSol
+JOSUÉ (ALEXANDRINUS)=JoshA
+JUGES (VATICANUS)=JudgB
+TOBIE (SINAITICUS)=TobS
+SUZANNE (THÉODOTION)=SusTh
+DANIEL (THÉODOTION)=DanTh
+BEL ET LE DRAGON (THÉODOTION)=BelTh
+LAODICÉENS=EpLao
+V ESDRAS=5Ezra
+APOCALYPSE D'ESDRAS=4Ezra
+VI ESDRAS=6Ezra
+PRIÈRE DE SALOMON=PrSol
+PRIÈRE DE JÉRÉMIE=PrJer
+HÉNOCH=1En
+JUBILÉS=Jub
+4 BARUCH=4Bar
+1 MACCABÉES ÉTHIOPIENS=1Meq
+2 MACCABÉES ÉTHIOPIENS=2Meq
+3 MACCABÉES ÉTHIOPIENS=3Meq
+LETTRE DES CORINTHIENS À L'APÔTRE PAUL=EpCorPaul
+3 CORINTHIENS=3Cor
+DORMITION DE MARIE DU PSEUDO-JEAN=DormJohn
+JOSEPH ET ASÉNETH=JosAsen
+TESTAMENTS DES 12 PATRIARCHES=T12Patr
+TESTAMENT D'ASER=T12Patr.Tash
+TESTAMENT DE BENJAMIN=T12Patr.Tbenj
+TESTAMENT DE DAN=T12Patr.Tdan
+TESTAMENT DE GAD=T12Patr.Tgad
+TESTAMENT D'ISSACAR=T12Patr.Tiss
+TESTAMENT DE JOSEPH=T12Patr.Tjos
+TESTAMENT DE JUDA=T12Patr.Tjud
+TESTAMENT DE LÉVI=T12Patr.Tlevi
+TESTAMENT DE NEPHTALI=T12Patr.Tnaph
+TESTAMENT DE RUBEN=T12Patr.Treu
+TESTAMENT DE SIMÉON=T12Patr.Tsim
+TESTAMENT DE ZABULON=T12Patr.Tzeb
+PSAUMES SURNUMÉRAIRES=5ApocSyrPss
+1 CLÉMENT=1Clem
+2 CLÉMENT=2Clem
+IGNACE AUX ÉPHÉSIENS=IgnEph
+IGNACE AUX MAGNÉSIENS=IgnMagn
+IGNACE AUX TRALLIENS=IgnTrall
+IGNACE AUX ROMAINS=IgnRom
+IGNACE AUX PHILADELPHIENS=IgnPhld
+IGNACE AUX SMYRNIENS=IgnSmyrn
+IGNACE D'ANTIOCHE À POLYCARPE=IgnPol
+POLYCARPE AUX PHILIPPIENS=PolPhil
+MARTYR DE POLYCARPE=MartPol
+DIDACHÈ=Did
+ÉPÎTRE DE BARNABÉ=Barn
+PASTEUR D'HERMAS=Herm
+FRAGMENTS DE PAPIAS=PapFrag
+DIATESSARON=TatDiat
+1C=1Cor
1 C=1Cor
-1C=1Cor
+1CH=1Chr
1 CH=1Chr
-1CH=1Chr
+1CHR=1Chr
1 CHR=1Chr
-1CHR=1Chr
-1 CHRO=1Chr
-1CHRO=1Chr
+1CHRON=1Chr
+1 CHRON=1Chr
+1CLEM=1Clem
+1 CLEM=1Clem
+1CLÉM=1Clem
+1 CLÉM=1Clem
+1CO=1Cor
1 CO=1Cor
-1CO=1Cor
+1COR=1Cor
1 COR=1Cor
-1COR=1Cor
+1J=1John
1 J=1John
-1J=1John
+1JE=1John
1 JE=1John
-1JE=1John
+1JEA=1John
1 JEA=1John
-1JEA=1John
+1JN=1John
1 JN=1John
-1JN=1John
+1M=1Macc
+1 M=1Macc
+1MA=1Macc
+1 MA=1Macc
+1MAC=1Macc
+1 MAC=1Macc
+1MÉT=1Meq
+1 MÉT=1Meq
+1 M ÉT=1Meq
+1P=1Pet
1 P=1Pet
-1P=1Pet
+1PI=1Pet
1 PI=1Pet
-1PI=1Pet
+1PIE=1Pet
1 PIE=1Pet
-1PIE=1Pet
+1R=1Kgs
1 R=1Kgs
-1R=1Kgs
+1RO=1Kgs
1 RO=1Kgs
-1RO=1Kgs
+1ROI=1Kgs
1 ROI=1Kgs
-1ROI=1Kgs
+1S=1Sam
1 S=1Sam
-1S=1Sam
+1SA=1Sam
1 SA=1Sam
-1SA=1Sam
+1SAM=1Sam
1 SAM=1Sam
-1SAM=1Sam
-1 T=1Thess
-1T=1Thess
+1T=1Tim
+1 T=1Tim
+1TH=1Thess
1 TH=1Thess
-1TH=1Thess
+1THE=1Thess
1 THE=1Thess
-1THE=1Thess
+1THESS=1Thess
+1 THESS=1Thess
+1TI=1Tim
1 TI=1Tim
-1TI=1Tim
+1TIM=1Tim
1 TIM=1Tim
-1TIM=1Tim
+1TIMOTHEE=1Tim
1 TIMOTHEE=1Tim
-1TIMOTHEE=1Tim
+1TM=1Tim
1 TM=1Tim
-1TM=1Tim
+2C=2Cor
2 C=2Cor
-2C=2Cor
+2CH=2Chr
2 CH=2Chr
-2CH=2Chr
+2CHR=2Chr
2 CHR=2Chr
-2CHR=2Chr
-2 CHRO=2Chr
-2CHRO=2Chr
+2CHRON=2Chr
+2 CHRON=2Chr
+2CLEM=2Clem
+2 CLEM=2Clem
+2CLÉM=2Clem
+2 CLÉM=2Clem
+2CO=2Cor
2 CO=2Cor
-2CO=2Cor
+2COR=2Cor
2 COR=2Cor
-2COR=2Cor
+2J=2John
2 J=2John
-2J=2John
+2JE=2John
2 JE=2John
-2JE=2John
+2JEA=2John
2 JEA=2John
-2JEA=2John
+2JN=2John
2 JN=2John
-2JN=2John
+2M=2Macc
+2 M=2Macc
+2MA=2Macc
+2 MA=2Macc
+2MAC=2Macc
+2 MAC=2Macc
+2MÉT=2Meq
+2 MÉT=2Meq
+2 M ÉT=2Meq
+2P=2Pet
2 P=2Pet
-2P=2Pet
+2PI=2Pet
2 PI=2Pet
-2PI=2Pet
+2PIE=2Pet
2 PIE=2Pet
-2PIE=2Pet
+2R=2Kgs
2 R=2Kgs
-2R=2Kgs
+2RO=2Kgs
2 RO=2Kgs
-2RO=2Kgs
+2ROI=2Kgs
2 ROI=2Kgs
-2ROI=2Kgs
+2S=2Sam
2 S=2Sam
-2S=2Sam
+2SA=2Sam
2 SA=2Sam
-2SA=2Sam
+2SAM=2Sam
2 SAM=2Sam
-2SAM=2Sam
-2 T=2Thess
-2T=2Thess
+2T=2Tim
+2 T=2Tim
+2TH=2Thess
2 TH=2Thess
-2TH=2Thess
+2THE=2Thess
2 THE=2Thess
-2THE=2Thess
+2THESS=2Thess
+2 THESS=2Thess
+2TI=2Tim
2 TI=2Tim
-2TI=2Tim
+2TIM=2Tim
2 TIM=2Tim
-2TIM=2Tim
+2TIMOTHEE=2Tim
2 TIMOTHEE=2Tim
-2TIMOTHEE=2Tim
+2TM=2Tim
2 TM=2Tim
-2TM=2Tim
+3C=3Cor
+3 C=3Cor
+3CO=3Cor
+3 CO=3Cor
+3COR=3Cor
+3 COR=3Cor
+3E=1Esd
+3 E=1Esd
+3ES=1Esd
+3 ES=1Esd
+3ESD=1Esd
+3 ESD=1Esd
+3J=3John
3 J=3John
-3J=3John
+3JE=3John
3 JE=3John
-3JE=3John
+3JEA=3John
3 JEA=3John
-3JEA=3John
+3JN=3John
3 JN=3John
-3JN=3John
-A=Acts
+3M=3Macc
+3 M=3Macc
+3MA=3Macc
+3 MA=3Macc
+3MAC=3Macc
+3 MAC=3Macc
+3MÉT=3Meq
+3 MÉT=3Meq
+3 M ÉT=3Meq
+4BAR=4Bar
+4 BAR=4Bar
+4E=2Esd
+4 E=2Esd
+4ES=2Esd
+4 ES=2Esd
+4ESD=2Esd
+4 ESD=2Esd
+4M=4Macc
+4 M=4Macc
+4MA=4Macc
+4 MA=4Macc
+4MAC=4Macc
+4 MAC=4Macc
+5E=5Ezra
+5 E=5Ezra
+5ES=5Ezra
+5 ES=5Ezra
+5ESD=5Ezra
+5 ESD=5Ezra
+6E=6Ezra
+6 E=6Ezra
+6ES=6Ezra
+6 ES=6Ezra
+6ESD=6Ezra
+6 ESD=6Ezra
AB=Obad
ABD=Obad
-ABDI=Obad
AC=Acts
ACT=Acts
-ACTE=Acts
+ACTES=Acts
+ACTS=Acts
+ADDDAN=AddDan
+ADD DAN=AddDan
+ADDDN=AddDan
+ADD DN=AddDan
+ADDEST=AddEsth
+ADD EST=AddEsth
AG=Hag
AGG=Hag
AGGE=Hag
@@ -269,9 +699,19 @@
AM=Amos
AMO=Amos
AP=Rev
+APE=4Ezra
+AP ES=4Ezra
+APESD=4Ezra
+AP ESD=4Ezra
APO=Rev
APOC=Rev
-B=Heb
+APOCALYPSE=Rev
+BA=Bar
+BAR=Bar
+BE=Bel
+BEL=Bel
+BELTH=BelTh
+BL=Bel
CA=Song
CAN=Song
CANT=Song
@@ -279,27 +719,45 @@
CO=Col
COL=Col
COLO=Col
+COP=EpCorPaul
CT=Song
+D=Deut
DA=Dan
DAN=Dan
+DANGREC=DanGr
+DAN GREC=DanGr
DANI=Dan
+DANTH=DanTh
DE=Deut
DEU=Deut
DEUT=Deut
DEUTERONOME=Deut
+DID=Did
+DIDAC=Did
+DIDACHE=Did
+DIDACHÉ=Did
DN=Dan
+DNG=DanGr
+DN G=DanGr
+DNGREC=DanGr
+DN GREC=DanGr
+DORMJEAN=DormJohn
DT=Deut
E=Exod
-É=Eph
EC=Eccl
+ÉC=Eccl
ECC=Eccl
+ÉCC=Eccl
ECCL=Eccl
+ÉCCL=Eccl
ECCLESIASTE=Eccl
-ÉC=Eccl
-ÉCC=Eccl
-ÉCCL=Eccl
-ECL=Eccl
-ÉCL=Eccl
+ECCLÉSIASTE=Eccl
+ECCLESIASTIQUE=Sir
+ECCLÉSIASTIQUE=Sir
+EN=1En
+ÉN=1En
+ENOCH=1En
+ÉNOCH=1En
EP=Eph
ÉP=Eph
EPH=Eph
@@ -307,8 +765,9 @@
EPHE=Eph
ÉPHE=Eph
EPHÉ=Eph
-ÉPHÉ=Eph
EPHESIENS=Eph
+ÉPHESIENS=Eph
+EPHÉSIENS=Eph
ES=Isa
ÉS=Isa
ESA=Isa
@@ -318,16 +777,23 @@
ÉSAÏ=Isa
ESAIE=Isa
ÉSAIE=Isa
+ESAÏE=Isa
+ÉSAÏE=Isa
ESD=Ezra
+ÉSD=Ezra
ESDR=Ezra
-ÉSD=Ezra
EST=Esth
+ÉST=Esth
+ESTG=EsthGr
+EST G=EsthGr
+ESTGREC=EsthGr
+EST GREC=EsthGr
ESTH=Esth
-ÉST=Esth
EX=Exod
EXO=Exod
EXOD=Exod
EZ=Ezek
+ÉZ=Ezek
EZE=Ezek
ÉZE=Ezek
EZÉ=Ezek
@@ -337,46 +803,170 @@
EZÉC=Ezek
ÉZÉC=Ezek
EZECHIEL=Ezek
-F=Eph
G=Gen
GA=Gal
GAL=Gal
-GALA=Gal
+GALAT=Gal
GE=Gen
+GÉ=Gen
GEN=Gen
+GÉN=Gen
GENE=Gen
GENÈ=Gen
GENESE=Gen
-GÉ=Gen
-GÉN=Gen
GN=Gen
-H=Hab
HA=Hab
HAB=Hab
HABA=Hab
-HABACUC=Hab
+HABAKUK=Hab
HABAQUQ=Hab
HE=Heb
HÉ=Heb
HEB=Heb
HÉB=Heb
+HEBR=Heb
+HÉBR=Heb
HEBREUX=Heb
-I=Isa
+HEN=1En
+HÉN=1En
+HENOC=1En
+HENOCH=1En
+HERM=Herm
+IC=1Cor
+I C=1Cor
+ICH=1Chr
+I CH=1Chr
+ICHR=1Chr
+I CHR=1Chr
+ICHRONIQUES=1Chr
+I CHRONIQUES=1Chr
+ICO=1Cor
+I CO=1Cor
+ICOR=1Cor
+I COR=1Cor
+I CORINTHIENS=1Cor
+IIC=2Cor
+II C=2Cor
+IICH=2Chr
+II CH=2Chr
+IICHR=2Chr
+II CHR=2Chr
+IICHRONIQUES=2Chr
+II CHRONIQUES=2Chr
+IICO=2Cor
+II CO=2Cor
+IICOR=2Cor
+II COR=2Cor
+II CORINTHIENS=2Cor
+IIIJ=3John
+III J=3John
+IIIJE=3John
+III JE=3John
+IIIJEA=3John
+III JEA=3John
+IIIJN=3John
+III JN=3John
+IIJ=2John
+II J=2John
+IIJE=2John
+II JE=2John
+IIJEA=2John
+II JEA=2John
+IIJN=2John
+II JN=2John
+IIP=2Pet
+II P=2Pet
+IIPI=2Pet
+II PI=2Pet
+IIPIE=2Pet
+II PIE=2Pet
+IIR=2Kgs
+II R=2Kgs
+IIRO=2Kgs
+II RO=2Kgs
+IIROIS=2Kgs
+II ROIS=2Kgs
+II S=2Sam
+II SA=2Sam
+IISAM=2Sam
+II SAM=2Sam
+II SAMUEL=2Sam
+IIT=2Tim
+II T=2Tim
+IITH=2Thess
+II TH=2Thess
+IITHE=2Thess
+II THE=2Thess
+IITHESS=2Thess
+II THESS=2Thess
+II THESSALONICIENS=2Thess
+IITI=2Tim
+II TI=2Tim
+IITIM=2Tim
+II TIM=2Tim
+IITIMOTHEE=2Tim
+II TIMOTHEE=2Tim
+II TIMOTHÉE=2Tim
+IITM=2Tim
+II TM=2Tim
+IJ=1John
+I J=1John
+IJE=1John
+I JE=1John
+IJEA=1John
+I JEA=1John
+IJN=1John
+I JN=1John
+IP=1Pet
+I P=1Pet
+IPI=1Pet
+I PI=1Pet
+IPIE=1Pet
+I PIE=1Pet
+IR=1Kgs
+I R=1Kgs
+IRO=1Kgs
+I RO=1Kgs
+IROIS=1Kgs
+I ROIS=1Kgs
IS=Isa
+I S=1Sam
ISA=Isa
+I SA=1Sam
ISAI=Isa
ISAÏ=Isa
ISAIE=Isa
-J=Josh
+ISAM=1Sam
+I SAM=1Sam
+I SAMUEL=1Sam
+IT=1Tim
+I T=1Tim
+ITH=1Thess
+I TH=1Thess
+ITHE=1Thess
+I THE=1Thess
+ITHESS=1Thess
+I THESS=1Thess
+I THESSALONICIENS=1Thess
+ITI=1Tim
+I TI=1Tim
+ITIM=1Tim
+I TIM=1Tim
+ITIMOTHEE=1Tim
+I TIMOTHEE=1Tim
+I TIMOTHÉE=1Tim
+ITM=1Tim
+I TM=1Tim
JA=Jas
JAC=Jas
JACQ=Jas
JB=Job
JC=Jas
JD=Jude
+JDT=Jdt
+JE=John
JÉ=Jer
-JE=John
-JEA=John
+JEAN=John
JER=Jer
JÉR=Jer
JERE=Jer
@@ -385,8 +975,10 @@
JÉRÉ=Jer
JEREMIE=Jer
JG=Judg
+JGV=JudgB
JL=Joel
JN=John
+JO=Joel
JOB=Job
JOE=Joel
JOË=Joel
@@ -394,18 +986,27 @@
JON=Jonah
JONA=Jonah
JOS=Josh
+JOSA=JoshA
+JOSASEN=JosAsen
JOSUE=Josh
JR=Jer
JS=Josh
-JU=Judg
+JU=Jude
+JUB=Jub
+JUBILES=Jub
JUD=Jude
+JUDE=Jude
+JUDI=Jdt
JUG=Judg
JUGE=Judg
-K=Hab
L=Lev
LA=Lam
LAM=Lam
LAME=Lam
+LAMENT=Lam
+LAO=EpLao
+LAOD=EpLao
+LAODICEENS=EpLao
LC=Luke
LDJ=Lam
LE=Lev
@@ -416,14 +1017,17 @@
LÉVI=Lev
LEVITIQUE=Lev
LM=Lam
+LTJR=EpJer
+LT JR=EpJer
LU=Luke
LUC=Luke
LV=Lev
-M=Matt
MA=Mal
MAL=Mal
MALA=Mal
+MAN=PrMan
MAR=Mark
+MARC=Mark
MAT=Matt
MATT=Matt
MC=Mark
@@ -437,7 +1041,7 @@
N=Num
NA=Nah
NAH=Nah
-NAHU=Hab
+NAHOUM=Nah
NB=Num
NE=Neh
NÉ=Neh
@@ -451,7 +1055,9 @@
NO=Num
NOM=Num
NOMB=Num
-O=Hos
+OD=Odes
+ODE=Odes
+ODES=Odes
OS=Hos
OSE=Hos
OSÉ=Hos
@@ -463,19 +1069,46 @@
PHILEMON=Phlm
PHLM=Phlm
PHM=Phlm
+PHP=Phil
PR=Prov
+PRA=PrAzar
+PR A=PrAzar
+PRAZAR=PrAzar
PRE=Eccl
PRÉ=Eccl
PRED=Eccl
PRÉD=Eccl
PREDICATEUR=Eccl
+PRJ=PrJer
+PR J=PrJer
+PRJER=PrJer
+PR JER=PrJer
+PRJÉR=PrJer
+PR JÉR=PrJer
+PRMAN=PrMan
+PR MAN=PrMan
PRO=Prov
PROV=Prov
+PRSAL=PrSol
+PR SAL=PrSol
+PRSIR=SirP
+PR SIR=SirP
+PRV=Prov
PS=Ps
+PS151=AddPs
+PS 151=AddPs
PSA=Ps
PSAU=Ps
+PSSAL=PssSol
+PS SAL=PssSol
+QH=Eccl
QO=Eccl
-R=Rom
+QOH=Eccl
+QÔH=Eccl
+QOHELET=Eccl
+QÔHELET=Eccl
+QOHÉLET=Eccl
+QÔHÉLET=Eccl
RE=Rev
RÉ=Rev
REV=Rev
@@ -490,17 +1123,54 @@
RT=Ruth
RU=Ruth
RUT=Ruth
-S=Zeph
+RV=Rev
+SAG=Wis
+SG=Wis
+SI=Sir
+SIR=Sir
+SIRA=Sir
SO=Zeph
SOP=Zeph
SOPH=Zeph
-T=Titus
+SP=Zeph
+SU=Sus
+SUSTH=SusTh
+SUZ=Sus
+SZ=Sus
+T12=T12Patr
+T12PATR=T12Patr
+TASER=T12Patr.Tash
+TB=Tob
+TBEN=T12Patr.Tbenj
+TDAN=T12Patr.Tdan
+TGAD=T12Patr.Tgad
TI=Titus
+TISS=T12Patr.Tiss
TIT=Titus
+TITE=Titus
+TJOS=T12Patr.Tjos
+TJUDA=T12Patr.Tjud
+TLEVI=T12Patr.Tlevi
+TLÉVI=T12Patr.Tlevi
+TNEPH=T12Patr.Tnaph
+TOB=Tob
+TOBS=TobS
+TRUB=T12Patr.Treu
+TSIM=T12Patr.Tsim
TT=Titus
-U=Judg
-V=Lev
-Z=Zech
+TZAB=T12Patr.Tzeb
+VE=5Ezra
+V E=5Ezra
+VES=5Ezra
+V ES=5Ezra
+VESD=5Ezra
+V ESD=5Ezra
+VIE=6Ezra
+VI E=6Ezra
+VIES=6Ezra
+VI ES=6Ezra
+VIESD=6Ezra
+VI ESD=6Ezra
ZA=Zech
ZAC=Zech
ZACH=Zech
Modified: branches/sword-1-8-x/locales.d/fr_abbrev-utf8.conf
===================================================================
--- branches/sword-1-8-x/locales.d/fr_abbrev-utf8.conf 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/locales.d/fr_abbrev-utf8.conf 2017-05-22 04:19:02 UTC (rev 3472)
@@ -1,9 +1,6 @@
-#
-# French Bible bookname abbreviations -- derived from the "Louis Segond 1910"
-# Corrections & Contributions welcome
-#
-# Dominique Corbex domcox at users.sf.net
-#
+# File creation: 2017-01-20
+# French translation for Sword
+# Provided by yvand <yvand.sword at gmail.com>, Cyrille <lafricain79 at gmail.com>, domcox <dominique at corbex.org>
[Meta]
Name=fr_abbrev
@@ -11,138 +8,471 @@
Encoding=UTF-8
[Text]
-Genesis=Ge
+# Old Testament* (39)
+# Genesis
+Genesis=Gen
+# Exodus
Exodus=Ex
-Leviticus=Lé
-Numbers=No
-Deuteronomy=De
+# Leviticus
+Leviticus=Lév
+# Numbers
+Numbers=Nb
+# Deuteronomy
+Deuteronomy=Deut
+# Joshua
Joshua=Jos
-Judges=Jg
-Ruth=Ru
-I Samuel=1 S
-II Samuel=2 S
-I Kings=1 R
-II Kings=2 R
-I Chronicles=1 Ch
-II Chronicles=2 Ch
-Ezra=Esd
-Nehemiah=Né
-Esther=Est
+# Judges
+Judges=Jug
+# Ruth
+Ruth=Ruth
+# I Samuel
+I Samuel=1 Sam
+# II Samuel
+II Samuel=2 Sam
+# I Kings
+I Kings=1 Rois
+# II Kings
+II Kings=2 Rois
+# I Chronicles
+I Chronicles=1 Chr
+# II Chronicles
+II Chronicles=2 Chr
+# Ezra
+Ezra=Esdr
+# Nehemiah
+Nehemiah=Néh
+# Esther
+Esther=Esth
+# Job
Job=Job
+# Psalms
Psalms=Ps
-Proverbs=Pr
-Ecclesiastes=Ec
-Song of Solomon=Ca
-Isaiah=Es
-Jeremiah=Jé
-Lamentations=La
-Ezekiel=Ez
-Daniel=Da
+# Proverbs
+Proverbs=Prov
+# Ecclesiastes
+Ecclesiastes=Eccl
+# Song of Solomon
+Song of Solomon=Cant
+# Isaiah
+Isaiah=És
+# Jeremiah
+Jeremiah=Jér
+# Lamentations
+Lamentations=Lam
+# Ezekiel
+Ezekiel=Éz
+# Daniel
+Daniel=Dan
+# Hosea
Hosea=Os
-Joel=Joë
+# Joel
+Joel=Joël
+# Amos
Amos=Am
-Obadiah=Ab
+# Obadiah
+Obadiah=Abd
+# Jonah
Jonah=Jon
-Micah=Mi
-Nahum=Na
-Habakkuk=Ha
-Zephaniah=So
-Haggai=Ag
-Zechariah=Za
+# Micah
+Micah=Mich
+# Nahum
+Nahum=Nah
+# Habakkuk
+Habakkuk=Hab
+# Zephaniah
+Zephaniah=Soph
+# Haggai
+Haggai=Agg
+# Zechariah
+Zechariah=Zach
+# Malachi
Malachi=Mal
+
+# New Testament* (27)
+# Matthew
Matthew=Mt
-Mark=Mc
-Luke=Lu
-John=Jn
-Acts=Ac
-Romans=Ro
-I Corinthians=1 Co
-II Corinthians=2 Co
-Galatians=Ga
-Ephesians=Ep
-Philippians=Ph
+# Mark
+Mark=Marc
+# Luke
+Luke=Luc
+# John
+John=Jean
+# Acts
+Acts=Act
+# Romans
+Romans=Rom
+# I Corinthians
+I Corinthians=1 Cor
+# II Corinthians
+II Corinthians=2 Cor
+# Galatians
+Galatians=Gal
+# Ephesians
+Ephesians=Éph
+# Philippians
+Philippians=Php
+# Colossians
Colossians=Col
+# I Thessalonians
I Thessalonians=1 Th
+# II Thessalonians
II Thessalonians=2 Th
-I Timothy=1 Ti
-II Timothy=2 Ti
-Titus=Tit
+# I Timothy
+I Timothy=1 Tim
+# II Timothy
+II Timothy=2 Tim
+# Titus
+Titus=Tite
+# Philemon
Philemon=Phm
-Hebrews=Hé
-James=Ja
-I Peter=1 Pi
-II Peter=2 Pi
+# Hebrews
+Hebrews=Hébr
+# James
+James=Jacq
+# I Peter
+I Peter=1 P
+# II Peter
+II Peter=2 P
+# I John
I John=1 Jn
+# II John
II John=2 Jn
+# III John
III John=3 Jn
-Jude=Jud
-Revelation of John=Ap
+# Jude
+Jude=Jude
+# Revelation of John
+Revelation of John=Apoc
+# Apocrypha/Deuterocanon* (22)
+# Tobit
+Tobit=Tob
+# Judith
+Judith=Jdt
+# Esther (Greek)
+Esther (Greek)=Estgrec
+# Additions to Esther
+Additions to Esther=AddEst
+# Wisdom
+Wisdom=Sag
+# Sirach (Prologue)
+Sirach (Prologue)=PrSir
+# Sirach
+Sirach=Sir
+# Baruch
+Baruch=Bar
+# Epistle of Jeremiah
+Epistle of Jeremiah=LtJr
+# Daniel (Greek)
+Daniel (Greek)=Dangrec
+# Additions to Daniel
+Additions to Daniel=AddDan
+# Prayer of Azariah
+Prayer of Azariah=PrAzar
+# Susanna
+Susanna=Suz
+# Bel and the Dragon
+Bel and the Dragon=Bel
+# I Maccabees
+I Maccabees=1 M
+# II Maccabees
+II Maccabees=2 M
+# III Maccabees
+III Maccabees=3 M
+# IV Maccabees
+IV Maccabees=4 M
+# Prayer of Manasses
+Prayer of Manasses=Man
+# I Esdras
+I Esdras=3 Esd
+# II Esdras
+II Esdras=4 Esd
+# Additional Psalm
+Additional Psalm=Ps 151
+
+# Rahlfs' LXX* (2)
+# Odes
+Odes=Odes
+# Psalms of Solomon
+Psalms of Solomon=Ps Sal
+
+# Rahlfs' variant books* (6)
+# Joshua Codex Alexandrinus
+Joshua Codex Alexandrinus=JosA
+# Judges Codex Vaticanus
+Judges Codex Vaticanus=JgV
+# Tobit Codex Sinaiticus
+Tobit Codex Sinaiticus=TobS
+# Susanna Theodotion
+Susanna Theodotion=SusTh
+# Daniel Theodotion
+Daniel Theodotion=DanTh
+# Bel and the Dragon Theodotion
+Bel and the Dragon Theodotion=BelTh
+
+# Vulgate & other later Latin mss* (6)
+# Laodiceans
+Laodiceans=Laod
+# V Ezra
+V Ezra=5 Esd
+# IV Ezra
+IV Ezra=Ap Esd
+# VI Ezra
+VI Ezra=6 Esd
+# Prayer of Solomon
+Prayer of Solomon=PrSal
+# Prayer of Jeremiah
+Prayer of Jeremiah=PrJér
+
+# Ethiopian Orthodox Canon/Ge'ez Translation Additions (7)
+# I Enoch
+I Enoch=Hén
+# Jubilees
+Jubilees=Jub
+# IV Baruch
+IV Baruch=4 Bar
+# I Meqabyan
+I Meqabyan=1 M Ét
+# II Meqabyan
+II Meqabyan=2 M Ét
+# III Meqabyan
+III Meqabyan=3 M Ét
+# Reproof
+#Reproof=
+# Additions to Jeremiah
+#Additions to Jeremiah=
+# Pseudo-Josephus
+#Pseudo-Josephus=
+
+# Armenian Orthodox Canon Additions (7/19)
+# Epistle of the Corinthians to Paul
+Epistle of the Corinthians to Paul=CoP
+# III Corinthians
+III Corinthians=3 Cor
+# Words of Sirach
+#Words of Sirach=
+# Prayer of Euthalius
+#Prayer of Euthalius=
+# Dormition of John
+Dormition of John=DormJean
+# Joseph and Asenath
+Joseph and Asenath=JosAsen
+# Testaments of the Twelve Patriarchs (composed of:)
+Testaments of the Twelve Patriarchs (composed of:)=T12Patr
+# Testament of Asher
+Testament of Asher=tAser
+# Testament of Benjamin
+Testament of Benjamin=tBen
+# Testament of Dan
+Testament of Dan=tDan
+# Testament of Gad
+Testament of Gad=tGad
+# Testament of Issachar
+Testament of Issachar=tIss
+# Testament of Joseph
+Testament of Joseph=tJos
+# Testament of Judah
+Testament of Judah=tJuda
+# Testament of Levi
+Testament of Levi=tLévi
+# Testament of Naphtali
+Testament of Naphtali=tNeph
+# Testament of Reuben
+Testament of Reuben=tRub
+# Testament of Simeon
+Testament of Simeon=tSim
+# Testament of Zebulun
+Testament of Zebulun=tZab
+
+# Peshitta/Syriac Orthodox Canon (4)
+# II Baruch
+#II Baruch=
+# Letter of Baruch
+#Letter of Baruch=
+# Additional Syriac Psalms
+#Additional Syriac Psalms=
+# Josephus' Jewish War VI
+#Josephus' Jewish War VI=
+
+# Apostolic Fathers (19/22)
+# I Clement
+I Clement=1 Clém
+# II Clement
+II Clement=2 Clém
+# Ignatius to the Ephesians
+#Ignatius to the Ephesians=
+# Ignatius to the Magnesians
+#Ignatius to the Magnesians=
+# Ignatius to the Trallians
+#Ignatius to the Trallians=
+# Ignatius to the Romans
+#Ignatius to the Romans=
+# Ignatius to the Philadelphians
+#Ignatius to the Philadelphians=
+# Ignatius to the Smyrnaeans
+#Ignatius to the Smyrnaeans=
+# Ignatius to Polycarp
+#Ignatius to Polycarp=
+# Polycarp to the Philippians
+#Polycarp to the Philippians=
+# Martyrdom of Polycarp
+#Martyrdom of Polycarp=
+# Didache
+Didache=Did
+# Barnabas
+#Barnabas=
+# Shepherd of Hermas (comprised of:)
+Shepherd of Hermas (comprised of:)=Herm
+# Shepherd of Hermas, Mandates
+#Shepherd of Hermas, Mandates=
+# Shepherd of Hermas, Similitudes
+#Shepherd of Hermas, Similitudes=
+# Shepherd of Hermas, Visions
+#Shepherd of Hermas, Visions=
+# Diognetus
+#Diognetus=
+# Apostles' Creed
+#Apostles' Creed=
+# Fragments of Papias
+#Fragments of Papias=
+# Reliques of the Elders
+#Reliques of the Elders=
+# Fragment of Quadratus
+#Fragment of Quadratus=
+
+# Other (2)
+# Diatessaron
+#Diatessaron=
+# Metrical Psalms
+#Metrical Psalms=
+
[Book Abbrevs]
-
-GN=Gen
+GEN=Gen
EX=Exod
-LV=Lev
+LÉV=Lev
NB=Num
-DT=Deut
+DEUT=Deut
JOS=Josh
-JG=Judg
-RT=Ruth
-1S=1Sam
-2S=2Sam
-1R=1Kgs
-2R=2Kgs
-1CH=1Chr
-2CH=2Chr
-ESD=Ezra
-NE=Neh
-EST=Esth
-JB=Job
+JUG=Judg
+RUTH=Ruth
+1 SAM=1Sam
+2 SAM=2Sam
+1 ROIS=1Kgs
+2 ROIS=2Kgs
+1 CHR=1Chr
+2 CHR=2Chr
+ESDR=Ezra
+NÉH=Neh
+ESTH=Esth
+JOB=Job
PS=Ps
-PR=Prov
-ECC=Eccl
-CT=Song
+PROV=Prov
+ECCL=Eccl
+CANT=Song
ÉS=Isa
-JR=Jer
-LM=Lam
-EZ=Ezek
-DN=Dan
+JÉR=Jer
+LAM=Lam
+ÉZ=Ezek
+DAN=Dan
OS=Hos
-JL=Joel
+JOËL=Joel
AM=Amos
-AB=Obad
+ABD=Obad
JON=Jonah
-MI=Mic
-NA=Nah
-HA=Hab
-SO=Zeph
-AG=Hag
-ZA=Zech
-ML=Mal
+MICH=Mic
+NAH=Nah
+HAB=Hab
+SOPH=Zeph
+AGG=Hag
+ZACH=Zech
+MAL=Mal
MT=Matt
-MC=Mark
-LC=Luke
-JN=John
-AC=Acts
-RM=Rom
-1CO=1Cor
-2CO=2Cor
-GA=Gal
+MARC=Mark
+LUC=Luke
+JEAN=John
+ACT=Acts
+ROM=Rom
+1 COR=1Cor
+2 COR=2Cor
+GAL=Gal
ÉPH=Eph
-PH=Phil
+PHP=Phil
COL=Col
-1TH=1Thess
-2TH=2Thess
-1TM=1Tim
-2TM=2Tim
-TT=Titus
+1 TH=1Thess
+2 TH=2Thess
+1 TIM=1Tim
+2 TIM=2Tim
+TITE=Titus
PHM=Phlm
-HE=Heb
-JC=Jas
-1P=1Pet
-2P=2Pet
-1JN=1John
-2JN=2John
-3JN=3John
-JD=Jude
-AP=Rev
+HÉBR=Heb
+JACQ=Jas
+1 P=1Pet
+2 P=2Pet
+1 JN=1John
+2 JN=2John
+3 JN=3John
+JUDE=Jude
+APOC=Rev
+TOB=Tob
+JDT=Jdt
+ESTGREC=EsthGr
+ADDEST=AddEsth
+SAG=Wis
+PRSIR=SirP
+SIR=Sir
+BAR=Bar
+LTJR=EpJer
+DANGREC=DanGr
+ADDDAN=AddDan
+PRAZAR=PrAzar
+SUZ=Sus
+BEL=Bel
+1 M=1Macc
+2 M=2Macc
+3 M=3Macc
+4 M=4Macc
+MAN=PrMan
+3 ESD=1Esd
+4 ESD=2Esd
+PS 151=AddPs
+ODES=Odes
+PS SAL=PssSol
+JOSA=JoshA
+JGV=JudgB
+TOBS=TobS
+SUSTH=SusTh
+DANTH=DanTh
+BELTH=BelTh
+LAOD=EpLao
+5 ESD=5Ezra
+AP ESD=4Ezra
+6 ESD=6Ezra
+PRSAL=PrSol
+PRJÉR=PrJer
+HÉN=1En
+JUB=Jub
+4 BAR=4Bar
+1 M ÉT=1Meq
+2 M ÉT=2Meq
+3 M ÉT=3Meq
+COP=EpCorPaul
+3 COR=3Cor
+DORMJEAN=DormJohn
+JOSASEN=JosAsen
+T12PATR=T12Patr
+TASER=T12Patr.Tash
+TBEN=T12Patr.Tbenj
+TDAN=T12Patr.Tdan
+TGAD=T12Patr.Tgad
+TISS=T12Patr.Tiss
+TJOS=T12Patr.Tjos
+TJUDA=T12Patr.Tjud
+TLÉVI=T12Patr.Tlevi
+TNEPH=T12Patr.Tnaph
+TRUB=T12Patr.Treu
+TSIM=T12Patr.Tsim
+TZAB=T12Patr.Tzeb
+1 CLÉM=1Clem
+2 CLÉM=2Clem
+DID=Did
+HERM=Herm
Modified: branches/sword-1-8-x/locales.d/fr_abbrev.conf
===================================================================
--- branches/sword-1-8-x/locales.d/fr_abbrev.conf 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/locales.d/fr_abbrev.conf 2017-05-22 04:19:02 UTC (rev 3472)
@@ -1,9 +1,6 @@
-#
-# French Bible bookname abbreviations -- derived from the "Louis Segond 1910"
-# Corrections & Contributions welcome
-#
-# Dominique Corbex domcox at users.sf.net
-#
+# File creation: 2017-01-20
+# French translation for Sword
+# Provided by yvand <yvand.sword at gmail.com>, Cyrille <lafricain79 at gmail.com>, domcox <dominique at corbex.org>
[Meta]
Name=fr_abbrev
@@ -11,152 +8,471 @@
Encoding=ISO8859-1
[Text]
-Genesis=Ge
+# Old Testament* (39)
+# Genesis
+Genesis=Gen
+# Exodus
Exodus=Ex
-Leviticus=Lé
-Numbers=No
-Deuteronomy=De
+# Leviticus
+Leviticus=Lév
+# Numbers
+Numbers=Nb
+# Deuteronomy
+Deuteronomy=Deut
+# Joshua
Joshua=Jos
-Judges=Jg
-Ruth=Ru
-I Samuel=1 S
-II Samuel=2 S
-I Kings=1 R
-II Kings=2 R
-I Chronicles=1 Ch
-II Chronicles=2 Ch
-Ezra=Esd
-Nehemiah=Né
-Esther=Est
+# Judges
+Judges=Jug
+# Ruth
+Ruth=Ruth
+# I Samuel
+I Samuel=1 Sam
+# II Samuel
+II Samuel=2 Sam
+# I Kings
+I Kings=1 Rois
+# II Kings
+II Kings=2 Rois
+# I Chronicles
+I Chronicles=1 Chr
+# II Chronicles
+II Chronicles=2 Chr
+# Ezra
+Ezra=Esdr
+# Nehemiah
+Nehemiah=Néh
+# Esther
+Esther=Esth
+# Job
Job=Job
+# Psalms
Psalms=Ps
-Proverbs=Pr
-Ecclesiastes=Ec
-Song of Solomon=Ca
-Isaiah=Es
-Jeremiah=Jé
-Lamentations=La
-Ezekiel=Ez
-Daniel=Da
+# Proverbs
+Proverbs=Prov
+# Ecclesiastes
+Ecclesiastes=Eccl
+# Song of Solomon
+Song of Solomon=Cant
+# Isaiah
+Isaiah=És
+# Jeremiah
+Jeremiah=Jér
+# Lamentations
+Lamentations=Lam
+# Ezekiel
+Ezekiel=Éz
+# Daniel
+Daniel=Dan
+# Hosea
Hosea=Os
-Joel=Joë
+# Joel
+Joel=Joël
+# Amos
Amos=Am
-Obadiah=Ab
+# Obadiah
+Obadiah=Abd
+# Jonah
Jonah=Jon
-Micah=Mi
-Nahum=Na
-Habakkuk=Ha
-Zephaniah=So
-Haggai=Ag
-Zechariah=Za
+# Micah
+Micah=Mich
+# Nahum
+Nahum=Nah
+# Habakkuk
+Habakkuk=Hab
+# Zephaniah
+Zephaniah=Soph
+# Haggai
+Haggai=Agg
+# Zechariah
+Zechariah=Zach
+# Malachi
Malachi=Mal
+
+# New Testament* (27)
+# Matthew
Matthew=Mt
-Mark=Mc
-Luke=Lu
-John=Jn
-Acts=Ac
-Romans=Ro
-I Corinthians=1 Co
-II Corinthians=2 Co
-Galatians=Ga
-Ephesians=Ep
-Philippians=Ph
+# Mark
+Mark=Marc
+# Luke
+Luke=Luc
+# John
+John=Jean
+# Acts
+Acts=Act
+# Romans
+Romans=Rom
+# I Corinthians
+I Corinthians=1 Cor
+# II Corinthians
+II Corinthians=2 Cor
+# Galatians
+Galatians=Gal
+# Ephesians
+Ephesians=Éph
+# Philippians
+Philippians=Php
+# Colossians
Colossians=Col
+# I Thessalonians
I Thessalonians=1 Th
+# II Thessalonians
II Thessalonians=2 Th
-I Timothy=1 Ti
-II Timothy=2 Ti
-Titus=Tit
+# I Timothy
+I Timothy=1 Tim
+# II Timothy
+II Timothy=2 Tim
+# Titus
+Titus=Tite
+# Philemon
Philemon=Phm
-Hebrews=Hé
-James=Ja
-I Peter=1 Pi
-II Peter=2 Pi
+# Hebrews
+Hebrews=Hébr
+# James
+James=Jacq
+# I Peter
+I Peter=1 P
+# II Peter
+II Peter=2 P
+# I John
I John=1 Jn
+# II John
II John=2 Jn
+# III John
III John=3 Jn
-Jude=Jud
-Revelation of John=Ap
+# Jude
+Jude=Jude
+# Revelation of John
+Revelation of John=Apoc
+# Apocrypha/Deuterocanon* (22)
+# Tobit
+Tobit=Tob
+# Judith
+Judith=Jdt
+# Esther (Greek)
+Esther (Greek)=Estgrec
+# Additions to Esther
+Additions to Esther=AddEst
+# Wisdom
+Wisdom=Sag
+# Sirach (Prologue)
+Sirach (Prologue)=PrSir
+# Sirach
+Sirach=Sir
+# Baruch
+Baruch=Bar
+# Epistle of Jeremiah
+Epistle of Jeremiah=LtJr
+# Daniel (Greek)
+Daniel (Greek)=Dangrec
+# Additions to Daniel
+Additions to Daniel=AddDan
+# Prayer of Azariah
+Prayer of Azariah=PrAzar
+# Susanna
+Susanna=Suz
+# Bel and the Dragon
+Bel and the Dragon=Bel
+# I Maccabees
+I Maccabees=1 M
+# II Maccabees
+II Maccabees=2 M
+# III Maccabees
+III Maccabees=3 M
+# IV Maccabees
+IV Maccabees=4 M
+# Prayer of Manasses
+Prayer of Manasses=Man
+# I Esdras
+I Esdras=3 Esd
+# II Esdras
+II Esdras=4 Esd
+# Additional Psalm
+Additional Psalm=Ps 151
+
+# Rahlfs' LXX* (2)
+# Odes
+Odes=Odes
+# Psalms of Solomon
+Psalms of Solomon=Ps Sal
+
+# Rahlfs' variant books* (6)
+# Joshua Codex Alexandrinus
+Joshua Codex Alexandrinus=JosA
+# Judges Codex Vaticanus
+Judges Codex Vaticanus=JgV
+# Tobit Codex Sinaiticus
+Tobit Codex Sinaiticus=TobS
+# Susanna Theodotion
+Susanna Theodotion=SusTh
+# Daniel Theodotion
+Daniel Theodotion=DanTh
+# Bel and the Dragon Theodotion
+Bel and the Dragon Theodotion=BelTh
+
+# Vulgate & other later Latin mss* (6)
+# Laodiceans
+Laodiceans=Laod
+# V Ezra
+V Ezra=5 Esd
+# IV Ezra
+IV Ezra=Ap Esd
+# VI Ezra
+VI Ezra=6 Esd
+# Prayer of Solomon
+Prayer of Solomon=PrSal
+# Prayer of Jeremiah
+Prayer of Jeremiah=PrJér
+
+# Ethiopian Orthodox Canon/Ge'ez Translation Additions (7)
+# I Enoch
+I Enoch=Hén
+# Jubilees
+Jubilees=Jub
+# IV Baruch
+IV Baruch=4 Bar
+# I Meqabyan
+I Meqabyan=1 M Ét
+# II Meqabyan
+II Meqabyan=2 M Ét
+# III Meqabyan
+III Meqabyan=3 M Ét
+# Reproof
+#Reproof=
+# Additions to Jeremiah
+#Additions to Jeremiah=
+# Pseudo-Josephus
+#Pseudo-Josephus=
+
+# Armenian Orthodox Canon Additions (7/19)
+# Epistle of the Corinthians to Paul
+Epistle of the Corinthians to Paul=CoP
+# III Corinthians
+III Corinthians=3 Cor
+# Words of Sirach
+#Words of Sirach=
+# Prayer of Euthalius
+#Prayer of Euthalius=
+# Dormition of John
+Dormition of John=DormJean
+# Joseph and Asenath
+Joseph and Asenath=JosAsen
+# Testaments of the Twelve Patriarchs (composed of:)
+Testaments of the Twelve Patriarchs (composed of:)=T12Patr
+# Testament of Asher
+Testament of Asher=tAser
+# Testament of Benjamin
+Testament of Benjamin=tBen
+# Testament of Dan
+Testament of Dan=tDan
+# Testament of Gad
+Testament of Gad=tGad
+# Testament of Issachar
+Testament of Issachar=tIss
+# Testament of Joseph
+Testament of Joseph=tJos
+# Testament of Judah
+Testament of Judah=tJuda
+# Testament of Levi
+Testament of Levi=tLévi
+# Testament of Naphtali
+Testament of Naphtali=tNeph
+# Testament of Reuben
+Testament of Reuben=tRub
+# Testament of Simeon
+Testament of Simeon=tSim
+# Testament of Zebulun
+Testament of Zebulun=tZab
+
+# Peshitta/Syriac Orthodox Canon (4)
+# II Baruch
+#II Baruch=
+# Letter of Baruch
+#Letter of Baruch=
+# Additional Syriac Psalms
+#Additional Syriac Psalms=
+# Josephus' Jewish War VI
+#Josephus' Jewish War VI=
+
+# Apostolic Fathers (19/22)
+# I Clement
+I Clement=1 Clém
+# II Clement
+II Clement=2 Clém
+# Ignatius to the Ephesians
+#Ignatius to the Ephesians=
+# Ignatius to the Magnesians
+#Ignatius to the Magnesians=
+# Ignatius to the Trallians
+#Ignatius to the Trallians=
+# Ignatius to the Romans
+#Ignatius to the Romans=
+# Ignatius to the Philadelphians
+#Ignatius to the Philadelphians=
+# Ignatius to the Smyrnaeans
+#Ignatius to the Smyrnaeans=
+# Ignatius to Polycarp
+#Ignatius to Polycarp=
+# Polycarp to the Philippians
+#Polycarp to the Philippians=
+# Martyrdom of Polycarp
+#Martyrdom of Polycarp=
+# Didache
+Didache=Did
+# Barnabas
+#Barnabas=
+# Shepherd of Hermas (comprised of:)
+Shepherd of Hermas (comprised of:)=Herm
+# Shepherd of Hermas, Mandates
+#Shepherd of Hermas, Mandates=
+# Shepherd of Hermas, Similitudes
+#Shepherd of Hermas, Similitudes=
+# Shepherd of Hermas, Visions
+#Shepherd of Hermas, Visions=
+# Diognetus
+#Diognetus=
+# Apostles' Creed
+#Apostles' Creed=
+# Fragments of Papias
+#Fragments of Papias=
+# Reliques of the Elders
+#Reliques of the Elders=
+# Fragment of Quadratus
+#Fragment of Quadratus=
+
+# Other (2)
+# Diatessaron
+#Diatessaron=
+# Metrical Psalms
+#Metrical Psalms=
+
[Book Abbrevs]
-
-GN=Gen
+GEN=Gen
EX=Exod
-LV=Lev
+LÉV=Lev
NB=Num
-DT=Deut
+DEUT=Deut
JOS=Josh
-JG=Judg
-RT=Ruth
-1S=1Sam
-2S=2Sam
-1R=1Kgs
-2R=2Kgs
-1CH=1Chr
-2CH=2Chr
-ESD=Ezra
-NE=Neh
-EST=Esth
-JB=Job
+JUG=Judg
+RUTH=Ruth
+1 SAM=1Sam
+2 SAM=2Sam
+1 ROIS=1Kgs
+2 ROIS=2Kgs
+1 CHR=1Chr
+2 CHR=2Chr
+ESDR=Ezra
+NÉH=Neh
+ESTH=Esth
+JOB=Job
PS=Ps
-PR=Prov
-ECC=Eccl
-ÉCCLÉSIASTE=Eccl
-CT=Song
+PROV=Prov
+ECCL=Eccl
+CANT=Song
ÉS=Isa
-JR=Jer
-LM=Lam
-EZ=Ezek
-DN=Dan
+JÉR=Jer
+LAM=Lam
+ÉZ=Ezek
+DAN=Dan
OS=Hos
-JL=Joel
+JOËL=Joel
AM=Amos
-AB=Obad
+ABD=Obad
JON=Jonah
-MI=Mic
-NA=Nah
-HA=Hab
-SO=Zeph
-AG=Hag
-ZA=Zech
-ML=Mal
+MICH=Mic
+NAH=Nah
+HAB=Hab
+SOPH=Zeph
+AGG=Hag
+ZACH=Zech
+MAL=Mal
MT=Matt
-MC=Mark
-LC=Luke
-JN=John
-AC=Acts
-RM=Rom
-1CO=1Cor
-2CO=2Cor
-GA=Gal
+MARC=Mark
+LUC=Luke
+JEAN=John
+ACT=Acts
+ROM=Rom
+1 COR=1Cor
+2 COR=2Cor
+GAL=Gal
ÉPH=Eph
-PH=Phil
+PHP=Phil
COL=Col
-1TH=1Thess
-2TH=2Thess
-1TM=1Tim
-2TM=2Tim
-TT=Titus
+1 TH=1Thess
+2 TH=2Thess
+1 TIM=1Tim
+2 TIM=2Tim
+TITE=Titus
PHM=Phlm
-HE=Heb
-JC=Jas
-1P=1Pet
-2P=2Pet
-1JN=1John
-2JN=2John
-3JN=3John
-JD=Jude
-AP=Rev
-
-LÉ=Lev
-NO=Num
-1 R=1Kgs
-2 R=2Kgs
-NÉ=Neh
-ES=Isa
-JÉ=Jer
-JOË=Joel
-HÉ=Heb
-1 PI=1Pet
-2 PI=2Pet
-
+HÉBR=Heb
+JACQ=Jas
+1 P=1Pet
+2 P=2Pet
+1 JN=1John
+2 JN=2John
+3 JN=3John
+JUDE=Jude
+APOC=Rev
+TOB=Tob
+JDT=Jdt
+ESTGREC=EsthGr
+ADDEST=AddEsth
+SAG=Wis
+PRSIR=SirP
+SIR=Sir
+BAR=Bar
+LTJR=EpJer
+DANGREC=DanGr
+ADDDAN=AddDan
+PRAZAR=PrAzar
+SUZ=Sus
+BEL=Bel
+1 M=1Macc
+2 M=2Macc
+3 M=3Macc
+4 M=4Macc
+MAN=PrMan
+3 ESD=1Esd
+4 ESD=2Esd
+PS 151=AddPs
+ODES=Odes
+PS SAL=PssSol
+JOSA=JoshA
+JGV=JudgB
+TOBS=TobS
+SUSTH=SusTh
+DANTH=DanTh
+BELTH=BelTh
+LAOD=EpLao
+5 ESD=5Ezra
+AP ESD=4Ezra
+6 ESD=6Ezra
+PRSAL=PrSol
+PRJÉR=PrJer
+HÉN=1En
+JUB=Jub
+4 BAR=4Bar
+1 M ÉT=1Meq
+2 M ÉT=2Meq
+3 M ÉT=3Meq
+COP=EpCorPaul
+3 COR=3Cor
+DORMJEAN=DormJohn
+JOSASEN=JosAsen
+T12PATR=T12Patr
+TASER=T12Patr.Tash
+TBEN=T12Patr.Tbenj
+TDAN=T12Patr.Tdan
+TGAD=T12Patr.Tgad
+TISS=T12Patr.Tiss
+TJOS=T12Patr.Tjos
+TJUDA=T12Patr.Tjud
+TLÉVI=T12Patr.Tlevi
+TNEPH=T12Patr.Tnaph
+TRUB=T12Patr.Treu
+TSIM=T12Patr.Tsim
+TZAB=T12Patr.Tzeb
+1 CLÉM=1Clem
+2 CLÉM=2Clem
+DID=Did
+HERM=Herm
Copied: branches/sword-1-8-x/scripts/eligible (from rev 3468, trunk/scripts/eligible)
===================================================================
--- branches/sword-1-8-x/scripts/eligible (rev 0)
+++ branches/sword-1-8-x/scripts/eligible 2017-05-22 04:19:02 UTC (rev 3472)
@@ -0,0 +1,2 @@
+#!/bin/sh
+svn mergeinfo --show-revs=eligible ^/trunk | tr "\\n" "," | xargs -i svn log -c {} ^/trunk
Copied: branches/sword-1-8-x/scripts/merge (from rev 3469, trunk/scripts/merge)
===================================================================
--- branches/sword-1-8-x/scripts/merge (rev 0)
+++ branches/sword-1-8-x/scripts/merge 2017-05-22 04:19:02 UTC (rev 3472)
@@ -0,0 +1,9 @@
+#!/bin/sh
+COMMIT_REV=$1
+
+[ -z "$COMMIT_REV" ] && {
+ echo $"usage: $0 <eligible revision number to merge>" >&2
+ exit 1
+}
+
+svn merge -c $1 ^/trunk
Modified: branches/sword-1-8-x/src/modules/filters/osisplain.cpp
===================================================================
--- branches/sword-1-8-x/src/modules/filters/osisplain.cpp 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/src/modules/filters/osisplain.cpp 2017-05-22 04:19:02 UTC (rev 3472)
@@ -240,9 +240,9 @@
}
}
else {
- buf.append("*");
+ buf.append("* ");
buf.append(u->lastSuspendSegment);
- buf.append("*");
+ buf.append(" *");
}
u->suspendTextPassThru = false;
}
Modified: branches/sword-1-8-x/src/modules/filters/osisxhtml.cpp
===================================================================
--- branches/sword-1-8-x/src/modules/filters/osisxhtml.cpp 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/src/modules/filters/osisxhtml.cpp 2017-05-22 04:19:02 UTC (rev 3472)
@@ -54,6 +54,7 @@
.colophon {font-style: italic; font-size=small; display:block;}\n\
.rdg { font-style: italic;}\n\
.catchWord {font-style: bold;}\n\
+ .x-p-indent {text-indent: 10px;}\n\
";
// Acrostic for things like the titles in Psalm 119
return header;
@@ -90,7 +91,7 @@
// show = false;
//else {
if (!suspendTextPassThru) {
- buf.appendFormatted("<small><em class=\"strongs\"><<a href=\"passagestudy.jsp?action=showStrongs&type=%s&value=%s\" class=\"strongs\">%s</a>></em></small>",
+ buf.appendFormatted("<small><em class=\"strongs\"><<a class=\"strongs\" href=\"passagestudy.jsp?action=showStrongs&type=%s&value=%s\" class=\"strongs\">%s</a>></em></small>",
(gh.length()) ? gh.c_str() : "",
URL::encode(val2).c_str(),
val2);
@@ -122,7 +123,7 @@
if ((*val == 'T') && (strchr("GH", val[1])) && (isdigit(val[2])))
val2+=2;
if (!suspendTextPassThru) {
- buf.appendFormatted("<small><em class=\"morph\">(<a href=\"passagestudy.jsp?action=showMorph&type=%s&value=%s\" class=\"morph\">%s</a>)</em></small>",
+ buf.appendFormatted("<small><em class=\"morph\">(<a class=\"morph\" href=\"passagestudy.jsp?action=showMorph&type=%s&value=%s\" class=\"morph\">%s</a>)</em></small>",
URL::encode(tag.getAttribute("morph")).c_str(),
URL::encode(val).c_str(),
val2);
@@ -173,7 +174,7 @@
suspendLevel = 0;
wordsOfChristStart = "<span class=\"wordsOfJesus\"> ";
wordsOfChristEnd = "</span> ";
- interModuleLinkStart = "<a href=\"sword://%s/%s\">";
+ interModuleLinkStart = "<a class=\"%s\" href=\"sword://%s/%s\">";
interModuleLinkEnd = "</a>";
if (module) {
osisQToTick = ((!module->getConfigEntry("OSISqToTick")) || (strcmp(module->getConfigEntry("OSISqToTick"), "false")));
@@ -273,6 +274,16 @@
else if (!strcmp(tag.getName(), "note")) {
if (!tag.isEndTag()) {
SWBuf type = tag.getAttribute("type");
+ SWBuf subType = tag.getAttribute("subType");
+ SWBuf classExtras = "";
+
+ if (type.size()) {
+ classExtras.append(" ").append(type);
+ }
+ if (subType.size()) {
+ classExtras.append(" ").append(subType);
+ }
+
bool strongsMarkup = (type == "x-strongsMarkup" || type == "strongsMarkup"); // the latter is deprecated
if (strongsMarkup) {
tag.setEmpty(false); // handle bug in KJV2003 module where some note open tags were <note ... />
@@ -296,7 +307,8 @@
SWCATCH ( ... ) { }
if (vkey) {
//printf("URL = %s\n",URL::encode(vkey->getText()).c_str());
- buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>",
+ buf.appendFormatted("<a class=\"%s\" href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>",
+ classExtras.c_str(),
ch,
URL::encode(footnoteNumber.c_str()).c_str(),
URL::encode(u->version.c_str()).c_str(),
@@ -306,7 +318,8 @@
(renderNoteNumbers ? noteName.c_str() : ""));
}
else {
- buf.appendFormatted("<a href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>",
+ buf.appendFormatted("<a class=\"%s\" href=\"passagestudy.jsp?action=showNote&type=%c&value=%s&module=%s&passage=%s\"><small><sup class=\"%c\">*%c%s</sup></small></a>",
+ classExtras.c_str(),
ch,
URL::encode(footnoteNumber.c_str()).c_str(),
URL::encode(u->version.c_str()).c_str(),
@@ -370,11 +383,19 @@
SWBuf target;
SWBuf work;
SWBuf ref;
+ SWBuf type;
+ SWBuf classes = "";
+
bool is_scripRef = false;
target = tag.getAttribute("osisRef");
const char* the_ref = strchr(target, ':');
+ type = tag.getAttribute("type");
+ if (type.size()) {
+ classes.append(type);
+ }
+
if(!the_ref) {
// No work
ref = target;
@@ -395,7 +416,8 @@
if(is_scripRef)
{
- buf.appendFormatted("<a href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=\">",
+ buf.appendFormatted("<a class=\"%s\" href=\"passagestudy.jsp?action=showRef&type=scripRef&value=%s&module=\">",
+ classes.c_str(),
URL::encode(ref.c_str()).c_str()
// (work.size()) ? URL::encode(work.c_str()).c_str() : "")
);
@@ -403,7 +425,8 @@
else
{
// Dictionary link, or something
- buf.appendFormatted(u->interModuleLinkStart,
+ buf.appendFormatted(u->interModuleLinkStart,
+ classes.c_str(),
URL::encode(work.c_str()).c_str(),
URL::encode(ref.c_str()).c_str()
);
@@ -485,16 +508,31 @@
else if (u->osisQToTick)
outText((level % 2) ? '\"' : '\'', buf, u);
}
+ else if (!strcmp(type, "x-importer")) {
+ //drop tag as not relevant
+ }
+
+
+ else {
+ SWBuf type = tag.getAttribute("type");
+ outText(SWBuf("<span class=\"") + type + "\"/>", buf,u);
+ }
}
// <title>
else if (!strcmp(tag.getName(), "title")) {
if ((!tag.isEndTag()) && (!tag.isEmpty())) {
SWBuf type = tag.getAttribute("type");
+ SWBuf canonical = tag.getAttribute("canonical");
+
SWBuf classExtras = "";
+
if (type.size()) {
classExtras.append(" ").append(type);
}
+ if (canonical.size() && !strcmp(canonical,"true")) {
+ classExtras.append(" canonical");
+ }
VerseKey *vkey = SWDYNAMIC_CAST(VerseKey, u->key);
if (vkey && !vkey->getVerse()) {
if (!vkey->getChapter()) {
Modified: branches/sword-1-8-x/src/modules/filters/scsuutf8.cpp
===================================================================
--- branches/sword-1-8-x/src/modules/filters/scsuutf8.cpp 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/src/modules/filters/scsuutf8.cpp 2017-05-22 04:19:02 UTC (rev 3472)
@@ -31,8 +31,12 @@
#include <scsuutf8.h>
#include <swbuf.h>
+#ifdef _ICU_
+#include <unicode/unistr.h>
+#endif
+
SWORD_NAMESPACE_START
Modified: branches/sword-1-8-x/src/modules/filters/swbasicfilter.cpp
===================================================================
--- branches/sword-1-8-x/src/modules/filters/swbasicfilter.cpp 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/src/modules/filters/swbasicfilter.cpp 2017-05-22 04:19:02 UTC (rev 3472)
@@ -383,6 +383,9 @@
}
escEndPos = escStartPos = tokenEndPos = tokenStartPos = 0;
lastTextNode = "";
+ if (!userData->suspendTextPassThru) {
+ userData->lastSuspendSegment.size(0);
+ }
continue;
}
}
@@ -398,7 +401,6 @@
if ((!userData->supressAdjacentWhitespace) || (*from != ' ')) {
if (!userData->suspendTextPassThru) {
text.append(*from);
- userData->lastSuspendSegment.size(0);
}
else userData->lastSuspendSegment.append(*from);
lastTextNode.append(*from);
Modified: branches/sword-1-8-x/src/modules/swmodule.cpp
===================================================================
--- branches/sword-1-8-x/src/modules/swmodule.cpp 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/src/modules/swmodule.cpp 2017-05-22 04:19:02 UTC (rev 3472)
@@ -46,6 +46,9 @@
#endif
#elif defined(USEICUREGEX)
#include <unicode/regex.h>
+#ifndef REG_ICASE
+#define REG_ICASE UREGEX_CASE_INSENSITIVE
+#endif
#else
#include <regex.h> // GNU
#endif
@@ -418,6 +421,8 @@
std::locale::global(std::locale("en_US.UTF-8"));
std::regex preg;
+#elif defined(USEICUREGEX)
+ RegexMatcher *matcher = 0;
#else
regex_t preg;
#endif
@@ -461,6 +466,14 @@
if (searchType >= 0) {
#ifdef USECXX11REGEX
preg = std::regex((SWBuf(".*")+istr+".*").c_str(), std::regex_constants::extended | searchType | flags);
+#elif defined(USEICUREGEX)
+ UErrorCode status = U_ZERO_ERROR;
+ matcher = new RegexMatcher(istr, searchType | flags, status);
+ if (U_FAILURE(status)) {
+ SWLog::getSystemLog()->logError("Error compiling Regex: %d", status);
+ return listKey;
+ }
+
#else
flags |=searchType|REG_NOSUB|REG_EXTENDED;
int err = regcomp(&preg, istr, flags);
@@ -648,6 +661,11 @@
SWBuf textBuf = stripText();
#ifdef USECXX11REGEX
if (std::regex_match(std::string(textBuf.c_str()), preg)) {
+#elif defined(USEICUREGEX)
+ UnicodeString stringToTest = textBuf.c_str();
+ matcher->reset(stringToTest);
+
+ if (matcher->find()) {
#else
if (!regexec(&preg, textBuf, 0, 0, 0)) {
#endif
@@ -658,6 +676,12 @@
}
#ifdef USECXX11REGEX
else if (std::regex_match(std::string((lastBuf + ' ' + textBuf).c_str()), preg)) {
+#elif defined(USEICUREGEX)
+ else {
+ stringToTest = (lastBuf + ' ' + textBuf).c_str();
+ matcher->reset(stringToTest);
+
+ if (matcher->find()) {
#else
else if (!regexec(&preg, lastBuf + ' ' + textBuf, 0, 0, 0)) {
#endif
@@ -668,6 +692,9 @@
else {
lastBuf = textBuf;
}
+#if defined(USEICUREGEX)
+ }
+#endif
}
// phrase
@@ -851,6 +878,8 @@
if (searchType >= 0) {
#ifdef USECXX11REGEX
std::locale::global(oldLocale);
+#elif defined(USEICUREGEX)
+ delete matcher;
#else
regfree(&preg);
#endif
Modified: branches/sword-1-8-x/tests/testsuite/osisReference.xml
===================================================================
--- branches/sword-1-8-x/tests/testsuite/osisReference.xml 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/tests/testsuite/osisReference.xml 2017-05-22 04:19:02 UTC (rev 3472)
@@ -178,6 +178,11 @@
</div>
<chapter eID="Mark.1"/>
</div>
+ <div type="book" osisID="Acts">
+ <chapter sID="Acts.2" osisID="Acts.2"/>
+ <verse sID="Acts.2.19" osisID="Acts.2.19"/><l level="1">‘<hi type="small-caps"><w lemma="strong:G1325">And I will grant</w> <w lemma="strong:G5059">wonders</w> <w lemma="strong:G3772">in the sky</w> <w lemma="strong:G0507">above</w></hi></l><l level="1"> <hi type="small-caps"><w lemma="strong:G4592">And signs</w> <w lemma="strong:G1093">on the earth</w> <w lemma="strong:G2736">below</w></hi>,</l><l level="1"> <hi type="small-caps"><w lemma="strong:G0129">Blood</w>, <w lemma="strong:G4442">and fire</w>, <w lemma="strong:G0822">and vapor</w> <w lemma="strong:G2586">of smoke</w></hi>.</l><verse eID="Acts.2.19"/>
+ <verse sID="Acts.2.20" osisID="Acts.2.20"/><l level="1">‘<hi type="small-caps"><w lemma="strong:G2246">The sun</w> <w lemma="strong:G3344">will be turned</w> <w lemma="strong:G4655">into darkness</w></hi></l><l level="1"> <hi type="small-caps"><w lemma="strong:G4582">And the moon</w> <w lemma="strong:G0129">into blood</w></hi>,</l><l level="1"> <hi type="small-caps"><w lemma="strong:G4250">Before</w> <w lemma="strong:G3173">the great</w> <w lemma="strong:G2016">and glorious</w> <w lemma="strong:G2250">day</w> <w lemma="strong:G2962">of the Lord</w> <w lemma="strong:G2064">shall come</w></hi>.</l><verse eID="Acts.2.20"/>
+ <chapter eID="Acts.2"/>
</div>
</osisText>
</osis>
Modified: branches/sword-1-8-x/tests/testsuite/osis_basic.good
===================================================================
--- branches/sword-1-8-x/tests/testsuite/osis_basic.good 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/tests/testsuite/osis_basic.good 2017-05-22 04:19:02 UTC (rev 3472)
@@ -7,7 +7,7 @@
<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.</title> <div sID="gen13" type="x-p"/> <lg sID="gen14"/>
-------
Rendered Header:
- <h3 class="title psalm">A Psalm of David, when he fled from Absalom his son.</h3>
+ <h3 class="title psalm canonical">A Psalm of David, when he fled from Absalom his son.</h3>
<br />
@@ -32,6 +32,7 @@
.colophon {font-style: italic; font-size=small; display:block;}
.rdg { font-style: italic;}
.catchWord {font-style: bold;}
+ .x-p-indent {text-indent: 10px;}
-------
RenderText:
@@ -51,7 +52,7 @@
Rendered Header:
<h3 class="title">The Beginning of the Ministry of Jesus</h3>
-<h3 class="title parallel">(<a href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3>
+<h3 class="title parallel">(<a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3>
<br />
@@ -76,6 +77,7 @@
.colophon {font-style: italic; font-size=small; display:block;}
.rdg { font-style: italic;}
.catchWord {font-style: bold;}
+ .x-p-indent {text-indent: 10px;}
-------
RenderText:
@@ -122,3 +124,18 @@
<br />
[ Genesis 1:2 ] Text of verse 2.
+
+-- Plain output
+Acts 2:19: ‘* And I will grant wonders in the sky above *
+* And signs on the earth below *,
+* Blood, and fire, and vapor of smoke *.
+
+Acts 2:20: ‘* The sun will be turned into darkness *
+* And the moon into blood *,
+* Before the great and glorious day of the Lord shall come *.
+
+
+-- RTF output
+{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par
+Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par
+}
Modified: branches/sword-1-8-x/tests/testsuite/osis_basic.sh
===================================================================
--- branches/sword-1-8-x/tests/testsuite/osis_basic.sh 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/tests/testsuite/osis_basic.sh 2017-05-22 04:19:02 UTC (rev 3472)
@@ -13,6 +13,7 @@
CompressType=ZIP
SourceType=OSIS
Lang=en
+GlobalOptionFilter=OSISLemma
GlobalOptionFilter=OSISStrongs
GlobalOptionFilter=OSISMorph
GlobalOptionFilter=OSISFootnotes
@@ -23,4 +24,12 @@
../../utilities/osis2mod tmp/osis_basic/modules/ osisReference.xml -z 2>&1 | grep -v \$Rev
-cd tmp/osis_basic && ../../../osistest OSISReference
+cd tmp/osis_basic
+../../../osistest OSISReference
+
+echo
+echo "-- Plain output"
+../../../../utilities/diatheke/diatheke -b OSISReference -f plain -k Acts 2:19-20 | grep -v OSISReference
+echo
+echo "-- RTF output"
+../../../../utilities/diatheke/diatheke -b OSISReference -f RTF -k Acts 2:19-20 | grep -v OSISReference
Modified: branches/sword-1-8-x/tests/testsuite/osis_mod2zmod.good
===================================================================
--- branches/sword-1-8-x/tests/testsuite/osis_mod2zmod.good 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/tests/testsuite/osis_mod2zmod.good 2017-05-22 04:19:02 UTC (rev 3472)
@@ -7,7 +7,7 @@
<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.</title> <div sID="gen13" type="x-p"/> <lg sID="gen14"/>
-------
Rendered Header:
- <h3 class="title psalm">A Psalm of David, when he fled from Absalom his son.</h3>
+ <h3 class="title psalm canonical">A Psalm of David, when he fled from Absalom his son.</h3>
<br />
@@ -32,6 +32,7 @@
.colophon {font-style: italic; font-size=small; display:block;}
.rdg { font-style: italic;}
.catchWord {font-style: bold;}
+ .x-p-indent {text-indent: 10px;}
-------
RenderText:
@@ -51,7 +52,7 @@
Rendered Header:
<h3 class="title">The Beginning of the Ministry of Jesus</h3>
-<h3 class="title parallel">(<a href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3>
+<h3 class="title parallel">(<a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3>
<br />
@@ -76,6 +77,7 @@
.colophon {font-style: italic; font-size=small; display:block;}
.rdg { font-style: italic;}
.catchWord {font-style: bold;}
+ .x-p-indent {text-indent: 10px;}
-------
RenderText:
@@ -122,3 +124,18 @@
<br />
[ Genesis 1:2 ] Text of verse 2.
+
+-- Plain output
+Acts 2:19: ‘* And I will grant wonders in the sky above *
+* And signs on the earth below *,
+* Blood, and fire, and vapor of smoke *.
+
+Acts 2:20: ‘* The sun will be turned into darkness *
+* And the moon into blood *,
+* Before the great and glorious day of the Lord shall come *.
+
+
+-- RTF output
+{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par
+Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par
+}
Modified: branches/sword-1-8-x/tests/testsuite/osis_mod2zmod.sh
===================================================================
--- branches/sword-1-8-x/tests/testsuite/osis_mod2zmod.sh 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/tests/testsuite/osis_mod2zmod.sh 2017-05-22 04:19:02 UTC (rev 3472)
@@ -16,6 +16,7 @@
CompressType=ZIP
SourceType=OSIS
Lang=en
+GlobalOptionFilter=OSISLemma
GlobalOptionFilter=OSISStrongs
GlobalOptionFilter=OSISMorph
GlobalOptionFilter=OSISFootnotes
@@ -35,6 +36,7 @@
CompressType=ZIP
SourceType=OSIS
Lang=en
+GlobalOptionFilter=OSISLemma
GlobalOptionFilter=OSISStrongs
GlobalOptionFilter=OSISMorph
GlobalOptionFilter=OSISFootnotes
@@ -49,3 +51,10 @@
cd tmp/osis_mod2zmod
../../../../utilities/mod2zmod OSISReference zmodules/ 4 2 0 abc123 > /dev/null 2>&1
../../../osistest zOSISReference
+
+echo
+echo "-- Plain output"
+../../../../utilities/diatheke/diatheke -b zOSISReference -f plain -k Acts 2:19-20 | grep -v zOSISReference
+echo
+echo "-- RTF output"
+../../../../utilities/diatheke/diatheke -b zOSISReference -f RTF -k Acts 2:19-20 | grep -v zOSISReference
Modified: branches/sword-1-8-x/tests/testsuite/osis_osis2modcipher.good
===================================================================
--- branches/sword-1-8-x/tests/testsuite/osis_osis2modcipher.good 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/tests/testsuite/osis_osis2modcipher.good 2017-05-22 04:19:02 UTC (rev 3472)
@@ -7,7 +7,7 @@
<div sID="gen12" type="section"/> <title canonical="true" type="psalm">A Psalm of David, when he fled from Absalom his son.</title> <div sID="gen13" type="x-p"/> <lg sID="gen14"/>
-------
Rendered Header:
- <h3 class="title psalm">A Psalm of David, when he fled from Absalom his son.</h3>
+ <h3 class="title psalm canonical">A Psalm of David, when he fled from Absalom his son.</h3>
<br />
@@ -32,6 +32,7 @@
.colophon {font-style: italic; font-size=small; display:block;}
.rdg { font-style: italic;}
.catchWord {font-style: bold;}
+ .x-p-indent {text-indent: 10px;}
-------
RenderText:
@@ -51,7 +52,7 @@
Rendered Header:
<h3 class="title">The Beginning of the Ministry of Jesus</h3>
-<h3 class="title parallel">(<a href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3>
+<h3 class="title parallel">(<a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Matt.4.12-Matt.4.22&module=">Matt 4:12–22</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.14&module=">Luke 4:14</a>, <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.4.15&module=">15</a>; <a class="" href="passagestudy.jsp?action=showRef&type=scripRef&value=Luke.5.1-Luke.5.11&module=">5:1-11</a>) </h3>
<br />
@@ -76,6 +77,7 @@
.colophon {font-style: italic; font-size=small; display:block;}
.rdg { font-style: italic;}
.catchWord {font-style: bold;}
+ .x-p-indent {text-indent: 10px;}
-------
RenderText:
@@ -122,3 +124,18 @@
<br />
[ Genesis 1:2 ] Text of verse 2.
+
+-- Plain output
+Acts 2:19: ‘* And I will grant wonders in the sky above *
+* And signs on the earth below *,
+* Blood, and fire, and vapor of smoke *.
+
+Acts 2:20: ‘* The sun will be turned into darkness *
+* And the moon into blood *,
+* Before the great and glorious day of the Lord shall come *.
+
+
+-- RTF output
+{\rtf1\ansi{\fonttbl{\f0\froman\fcharset0\fprq2 Times New Roman;}{\f1\fdecor\fprq2 Gentium;}{\f7\froman\fcharset2\fprq2 Symbol;}}Acts 2:19: {\f1 ‘{\i1 {And I will grant} {wonders} {in the sky} {above}}{\par} {\i1 {And signs} {on the earth} {below}},{\par} {\i1 {Blood}, {and fire}, {and vapor} {of smoke}}.{\par}}\par
+Acts 2:20: {\f1 ‘{\i1 {The sun} {will be turned} {into darkness}}{\par} {\i1 {And the moon} {into blood}},{\par} {\i1 {Before} {the great} {and glorious} {day} {of the Lord} {shall come}}.{\par} }\par
+}
Modified: branches/sword-1-8-x/tests/testsuite/osis_osis2modcipher.sh
===================================================================
--- branches/sword-1-8-x/tests/testsuite/osis_osis2modcipher.sh 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/tests/testsuite/osis_osis2modcipher.sh 2017-05-22 04:19:02 UTC (rev 3472)
@@ -14,6 +14,7 @@
CompressType=ZIP
SourceType=OSIS
Lang=en
+GlobalOptionFilter=OSISLemma
GlobalOptionFilter=OSISStrongs
GlobalOptionFilter=OSISMorph
GlobalOptionFilter=OSISFootnotes
@@ -27,3 +28,10 @@
cp osis_basic.good osis_osis2modcipher.good
cd tmp/osis_osis2modcipher
../../../osistest OSISReference
+
+echo
+echo "-- Plain output"
+../../../../utilities/diatheke/diatheke -b OSISReference -f plain -k Acts 2:19-20 | grep -v OSISReference
+echo
+echo "-- RTF output"
+../../../../utilities/diatheke/diatheke -b OSISReference -f RTF -k Acts 2:19-20 | grep -v OSISReference
Modified: branches/sword-1-8-x/usrinst.sh
===================================================================
--- branches/sword-1-8-x/usrinst.sh 2017-05-22 04:15:45 UTC (rev 3471)
+++ branches/sword-1-8-x/usrinst.sh 2017-05-22 04:19:02 UTC (rev 3472)
@@ -35,6 +35,7 @@
#OPTIONS="--enable-profile $OPTIONS"
#OPTIONS="--with-cxx11regex $OPTIONS"
+OPTIONS="--with-icuregex $OPTIONS"
#OPTIONS="--with-icusword $OPTIONS"
#OPTIONS="--without-icu $OPTIONS"
#OPTIONS="--without-clucene $OPTIONS"
@@ -48,6 +49,25 @@
#LIBS="-no-undefined"
#OPTIONS="lt_cv_deplibs_check_method=pass_all $OPTIONS"
+# These are for experimental purposes, review,
+# may not be available on all platforms, are unsupported,
+# and no modules should be released which depend on them.
+# If significant gains in size and speed are achieved,
+# we should discuss the portability of these libraries
+# and decide if we should make the switch to prefer one
+# of these compression systems over zlib.
+# That's not to say that support for these is not appreciated
+# (chrislit)-- on the contrary, this is the R in R&D, we just
+# need to consider portability: ios, android-ndk, and
+# windows support, before implying modules can be made with them.
+# I am all for switching to one, by policy, if we observe appreciable
+# gains and confirm portability. I only see support disadvantages to
+# expanding compression options, otherwise.
+
+#OPTIONS="--with-bzip2 $OPTIONS"
+#OPTIONS="--with-xz $OPTIONS"
+
+
LIBS="$LIBS" ./configure $OPTIONS $*
More information about the sword-cvs
mailing list