[SCM] Extract bibliographic references from various sources branch, upstream, updated. upstream/1.3.4
Filippo Rusconi (Debian Maintainer)
rusconi-debian at laposte.net
Sun Oct 25 18:20:54 UTC 2009
The following commit has been merged in the upstream branch:
commit a2f22e8b00a846fae7f7084217fa92547ed9a1ec
Author: Filippo Rusconi (Debian Maintainer) <rusconi-debian at laposte.net>
Date: Wed Oct 21 19:31:10 2009 +0200
Imported cb2bib-1.3.4
Summary: Imported cb2bib-1.3.4
Keywords:
Imported cb2bib-1.3.4
into Git repository
diff --git a/CHANGELOG b/CHANGELOG
index 2d534d6..d00d3fe 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+2009-09-13 REALEASE OF VERSION 1.3.4
+2009-10-12 Skip copy/move document on save if BibTeX file is not writable
+2009-10-11 Updated bookmark's file netqinf.txt (Thanks to H. Seifzadeh)
+2009-10-09 Added minor improvements for author, pages and volume recognition
+2009-10-09 Included citeid in check repeated
+2009-09-19 Fixed a typo, --tempdir must be --tmpdir, in bib2pdf (Thanks to F. Rusconi)
+2009-09-11 Protected all shell variables against spaces in configure (Thanks to F. Rusconi)
2009-09-10 REALEASE OF VERSION 1.3.3
2009-09-06 Added 'fix string: context' search type
2009-08-26 Optimized search in files, and implemented fast matching for approximate strings
diff --git a/c2btools/bib2pdf b/c2btools/bib2pdf
index a65be97..265e3be 100755
--- a/c2btools/bib2pdf
+++ b/c2btools/bib2pdf
@@ -82,7 +82,7 @@ fi
latex_flags="-interaction=nonstopmode"
# Note that we use the mktemp utility that ensures that
# we do not overwrite any preexisting directory.
-tmp_dir=$(mktemp --tempdir c2b_tools_tmp.XXXXXXXX)
+tmp_dir=$(mktemp -d --tmpdir c2b_tools_tmp.XXXXXXXX)
# Setting files
diff --git a/c2btools/isi2bib b/c2btools/isi2bib
index 7eebf3a..76ca90b 100755
--- a/c2btools/isi2bib
+++ b/c2btools/isi2bib
@@ -76,7 +76,7 @@ fi
# Create temporary directory
# Note that we use the mktemp utility that ensures that
# we do not overwrite any preexisting directory
-tmp_dir=$(mktemp --tmpdir c2b_tools_tmp.XXXXXXXX)
+tmp_dir=$(mktemp -d --tmpdir c2b_tools_tmp.XXXXXXXX)
# Setting files
isi="$1"
diff --git a/c2btools/med2bib b/c2btools/med2bib
index 5f86315..242b382 100755
--- a/c2btools/med2bib
+++ b/c2btools/med2bib
@@ -71,7 +71,7 @@ fi
# Create temporary directory
# Note that we use the mktemp utility that ensures that
# we do not overwrite any preexisting directory
-tmp_dir=$(mktemp --tmpdir c2b_tools_tmp.XXXXXXXX)
+tmp_dir=$(mktemp -d --tmpdir c2b_tools_tmp.XXXXXXXX)
# Setting files
med="$1"
diff --git a/c2btools/ris2bib b/c2btools/ris2bib
index e0bfab2..046129d 100755
--- a/c2btools/ris2bib
+++ b/c2btools/ris2bib
@@ -76,7 +76,7 @@ fi
# Create temporary directory
# Note that we use the mktemp utility that ensures that
# we do not overwrite any preexisting directory
-tmp_dir=$(mktemp --tmpdir c2b_tools_tmp.XXXXXXXX)
+tmp_dir=$(mktemp -d --tmpdir c2b_tools_tmp.XXXXXXXX)
# Setting files
ris="$1"
diff --git a/configure b/configure
index 8434bb3..52241b8 100755
--- a/configure
+++ b/configure
@@ -8,12 +8,14 @@
# - Runs qmake
#
#
-# Modifications for the cb2Bib Debian distribution package (June 2009)
+# Modifications for the cb2Bib Debian distribution package
# by Filippo Rusconi
# Copyright 2009 Filippo Rusconi
#
-# - Replace ' ' with ':' along with use of IFS=: as word-splitting
-# delimiter for PATH-related tasks (Thanks Lionel Mamane).
+# - June 2009: replace ' ' with ':' along with use of IFS=: as
+# word-splitting delimiter for PATH-related tasks (Thanks Lionel
+# Mamane).
+# - September 2009: protect all shell variables against spaces.
#
#------------------------------------------------------------------------------
# ( originally based upon 'shell script to configure doxygen',
@@ -46,22 +48,22 @@ f_disable_lzo=NO
while test -n "$1"; do
case $1 in
--prefix | -prefix)
- shift; f_prefix="$1" ; f_bindir=$1/bin ; f_datadir=$1/share/cb2bib ; f_desktopdatadir=$1/share/applications ; f_icondir=$1/share/pixmaps
+ shift; f_prefix="$1" ; f_bindir="$1/bin" ; f_datadir="$1/share/cb2bib" ; f_desktopdatadir="$1/share/applications" ; f_icondir="$1/share/pixmaps"
;;
--bindir | -bindir)
- shift; unset f_prefix ; f_bindir=$1
+ shift; unset f_prefix ; f_bindir="$1"
;;
--datadir | -datadir)
- shift; unset f_prefix ; f_datadir=$1/cb2bib
+ shift; unset f_prefix ; f_datadir="$1/cb2bib"
;;
--desktopdatadir | -desktopdatadir)
- shift; unset f_prefix ; f_desktopdatadir=$1
+ shift; unset f_prefix ; f_desktopdatadir="$1"
;;
--icondir | -icondir)
- shift; unset f_prefix ; f_icondir=$1
+ shift; unset f_prefix ; f_icondir="$1"
;;
--qmakepath | -qmakepath)
- shift; unset f_qmake ; f_qmake=$1
+ shift; unset f_qmake ; f_qmake="$1"
;;
-h | --help | -help)
f_help=y
@@ -196,7 +198,7 @@ echo "Checking for Qt/qmake:"
echo "using $QTDIR/bin/qmake."
fi
fi
- $f_qmake -v
+ "$f_qmake" -v
#------------------------------------------------------------------------------
@@ -264,10 +266,10 @@ fi
if test "$platform" = Darwin; then
echo "Running $f_qmake -spec macx-g++ $f_configs -o Makefile"
-$f_qmake -spec macx-g++ $f_configs -o Makefile
+"$f_qmake" -spec macx-g++ $f_configs -o Makefile
else
echo "Running $f_qmake $f_configs -o Makefile"
-$f_qmake $f_configs -o Makefile
+"$f_qmake" $f_configs -o Makefile
fi
echo " "
diff --git a/data/netqinf.txt b/data/netqinf.txt
index d717cb5..e10705f 100644
--- a/data/netqinf.txt
+++ b/data/netqinf.txt
@@ -17,7 +17,7 @@ bookmark=PubMed Citation Finder|http://www.ncbi.nlm.nih.gov/entrez/query/static/
bookmark=HighWire Press -- Search|http://highwire.stanford.edu/cgi/search/
bookmark=DBLP Bibliography|http://www.informatik.uni-trier.de/~ley/db/indices/query.html
bookmark=arXiv.org e-Print archive|http://arxiv.org/
-bookmark=CiteSeer.IST|http://citeseer.ist.psu.edu/cs
+bookmark=CiteSeerX|http://citeseerx.ist.psu.edu/
bookmark=Directory of Open Access Journals|http://www.doaj.org/home
bookmark=PLoS - The Public Library of Science|http://www.plos.org/
bookmark=OAIster|http://www.oaister.org/
@@ -27,7 +27,7 @@ bookmark=Google Scholar|http://scholar.google.com/
bookmark= |
bookmark=Search arXiv for selected text|http://search.arxiv.org:8081/?query=<<selection>>
bookmark=Search Citebase for Authors|http://www.citebase.org/search?type=metadata&maxrows=10&author=<<author>>&submitted=Search
-bookmark=Search CiteSeer for Title|http://citeseer.ist.psu.edu/cis?q=<<title>>&cs=1&af=Title
+bookmark=Search CiteSeerX for Title|http://citeseerx.ist.psu.edu/search?q=title%3A<<title>>&sort=cite
bookmark=Search PubMed for Title|http://www.ncbi.nlm.nih.gov/sites/entrez?orig_db=PubMed&db=pubmed&cmd=Search&TransSchema=title&term=<<title>>
bookmark=Search PubMed for DOI|http://www.ncbi.nlm.nih.gov/sites/entrez?orig_db=PubMed&db=PubMed&cmd=Search&term=<<doi>>
bookmark=Search Google for literal Title|http://www.google.com/search?ie=UTF-8&q=%22<<title>>%22
@@ -115,7 +115,7 @@ action=browse_referenceurl
# QUERY INFO FOR PNAS (Volume and Page)
# Extracts BibTeX reference and article PDF file
journal=Proceedings of the National Academy of Sciences of the United States of America|
-query=http://www.pnas.org/search?submit=yes&submit=Submit&pubdate_year=&volume=<<volume>>&firstpage=<<pages>>&doi=&author1=&author2=&title=&andorexacttitle=and&titleabstract=&andorexacttitleabs=and&fulltext=&andorexactfulltext=and&fmonth=Jan&fyear=1915&tmonth=Jul&tyear=2009&tocsectionid=all&format=standard&hits=10&sortspec=relevance&submit=yes
+query=http://www.pnas.org/search?submit=yes&submit=Submit&pubdate_year=&volume=<<volume>>&firstpage=<<pages>>&doi=&author1=&author2=&title=&andorexacttitle=and&titleabstract=&andorexacttitleabs=and&fulltext=&andorexactfulltext=and&fmonth=Jan&fyear=1915&tmonth=Jul&tyear=2010&tocsectionid=all&format=standard&hits=10&sortspec=relevance&submit=yes
capture_from_query=/content/(.+)\.(extract|abstract|full)
referenceurl_prefix=http://www.pnas.org/citmgr?type=bibtex&gca=pnas;
referenceurl_sufix=
@@ -316,7 +316,7 @@ action=
# QUERY INFO FOR Scitation
# Extracts BibTeX reference
journal=
-query=http://scitation.aip.org/vsearch/servlet/VerityServlet?KEY=FREESR&possible1=<<doi>>&frommonth=Jan&fromyear=1893&tomonth=May&toyear=2009&x=34&y=10&=search&smode=results&CURRENT=&ONLINE=&SMODE=&possible1zone=article&maxdisp=10
+query=http://scitation.aip.org/vsearch/servlet/VerityServlet?KEY=FREESR&possible1=<<doi>>&frommonth=Jan&fromyear=1893&tomonth=May&toyear=2010&x=34&y=10&=search&smode=results&CURRENT=&ONLINE=&SMODE=&possible1zone=article&maxdisp=10
capture_from_query="SelectCheck" value="([\w\d]+)"
referenceurl_prefix=http://scitation.aip.org/getabs/servlet/GetCitation?fn=view_bibtex2&source=scitation&PrefType=ARTICLE&PrefAction=Add+Selected&SelectCheck=
referenceurl_sufix=&downloadcitation=+Go+
diff --git a/data/regexps.txt b/data/regexps.txt
index 3e675e2..19a38a7 100644
--- a/data/regexps.txt
+++ b/data/regexps.txt
@@ -62,7 +62,7 @@ year journal volume pages title author abstract
PubMed Search
article
journal year volume pages
-^(.+) (\d\d\d\d).*;(\d+).+:([\w\d|\-|\s]+)\..*$
+^(.+) (\d\d\d\d).*;(\d+).*:([\w\d|\-|\s]+)\..*$
# cb2Bib 0.6.0 Pattern:
JSTOR
diff --git a/src/bookmarkPlugin.cpp b/src/bookmarkPlugin.cpp
index 4f31402..88ff442 100644
--- a/src/bookmarkPlugin.cpp
+++ b/src/bookmarkPlugin.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "bookmarkPlugin.h"
diff --git a/src/bookmarkPlugin.h b/src/bookmarkPlugin.h
index 21124cd..b306d9c 100644
--- a/src/bookmarkPlugin.h
+++ b/src/bookmarkPlugin.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BOOKMARKPLUGIN_H
diff --git a/src/c2b.cpp b/src/c2b.cpp
index 3a79e80..23cf0af 100644
--- a/src/c2b.cpp
+++ b/src/c2b.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2b.h"
diff --git a/src/c2b.h b/src/c2b.h
index 9a7506f..46c5840 100644
--- a/src/c2b.h
+++ b/src/c2b.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2B_H
diff --git a/src/c2b/approximatePattern.cpp b/src/c2b/approximatePattern.cpp
index 03772f8..675a9c8 100644
--- a/src/c2b/approximatePattern.cpp
+++ b/src/c2b/approximatePattern.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
*
* Class implementation of the approximate search algorithm
diff --git a/src/c2b/approximatePattern.h b/src/c2b/approximatePattern.h
index 19607c5..011f394 100644
--- a/src/c2b/approximatePattern.h
+++ b/src/c2b/approximatePattern.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
*
* Class implementation of the approximate search algorithm
@@ -15,8 +15,6 @@
#include "substringMatcher.h"
#define C2B_DEBUG_APPROXIMATEPATTERN 0
-#if C2B_DEBUG_APPROXIMATEPATTERN
-#endif
class approximatePattern : public compositePattern
diff --git a/src/c2b/authorString.cpp b/src/c2b/authorString.cpp
index bdfbf87..9c6d303 100644
--- a/src/c2b/authorString.cpp
+++ b/src/c2b/authorString.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "authorString.h"
diff --git a/src/c2b/authorString.h b/src/c2b/authorString.h
index b75d3c0..9a8d312 100644
--- a/src/c2b/authorString.h
+++ b/src/c2b/authorString.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef AUTHORSTRING_H
@@ -18,7 +18,7 @@ namespace author
{
static const QString double_initials("(Al|Ch|Kh|Md|Th|Xh|Ya|Yu|Zs)");
-static const QString prefixes("(da|de|dal|del|der|di|do|du|dos|la|le|lo|van|vande|von|zur)");
+static const QString prefixes("(da|de|dal|del|der|di|do|du|dos|el|la|le|lo|van|vande|von|zur)");
static const QString name("(?:\\w[-'\\w]{1,})");
static const QString initials("(?:\\s*-{0,1}\\b\\w\\b\\.{0,1}){1,3}");
diff --git a/src/c2b/bibExtractor.cpp b/src/c2b/bibExtractor.cpp
index 5c13374..fde59ca 100644
--- a/src/c2b/bibExtractor.cpp
+++ b/src/c2b/bibExtractor.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "bibExtractor.h"
diff --git a/src/c2b/bibExtractor.h b/src/c2b/bibExtractor.h
index 25ffc3c..2fdcc2a 100644
--- a/src/c2b/bibExtractor.h
+++ b/src/c2b/bibExtractor.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BIBEXTRACTOR_H
diff --git a/src/c2b/bibParser.cpp b/src/c2b/bibParser.cpp
index 35b1533..bba0c61 100644
--- a/src/c2b/bibParser.cpp
+++ b/src/c2b/bibParser.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "bibParser.h"
diff --git a/src/c2b/bibParser.h b/src/c2b/bibParser.h
index b539113..9331ead 100644
--- a/src/c2b/bibParser.h
+++ b/src/c2b/bibParser.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BIBPARSER_H
diff --git a/src/c2b/bibPreparser.cpp b/src/c2b/bibPreparser.cpp
index e0f34ab..f275823 100644
--- a/src/c2b/bibPreparser.cpp
+++ b/src/c2b/bibPreparser.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "bibPreparser.h"
diff --git a/src/c2b/bibPreparser.h b/src/c2b/bibPreparser.h
index b029725..cb4a309 100644
--- a/src/c2b/bibPreparser.h
+++ b/src/c2b/bibPreparser.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BIBPREPARSER_H
diff --git a/src/c2b/bibReference.h b/src/c2b/bibReference.h
index bd2afcd..4199322 100644
--- a/src/c2b/bibReference.h
+++ b/src/c2b/bibReference.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BIBREFERENCE_H
diff --git a/src/c2b/bibSearcher.cpp b/src/c2b/bibSearcher.cpp
index 0024671..611434a 100644
--- a/src/c2b/bibSearcher.cpp
+++ b/src/c2b/bibSearcher.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "bibSearcher.h"
@@ -93,11 +93,30 @@
/**
Top level driver for searching BibTeX files
*/
-bibSearcher::bibSearcher(bibParser* bp, QObject* parento) : QObject(parento), _bpP(bp)
+bibSearcher::bibSearcher(bibParser* bp, QObject* parento) : QObject(parento), _bpP(bp), _do_search_similar(false)
{
clear();
}
+/**
+ Top level driver for searching BibTeX files. Specialized constructor for
+ searching repeated or similar references.
+*/
+bibSearcher::bibSearcher(bibParser* bp, const QString& bib_dir, QObject* parento) : QObject(parento), _bpP(bp), _do_search_similar(true)
+{
+ // Retrieve (any_author(approximate) AND any_title(approximate)) OR citeidName(exact)
+ clear();
+ setSearchScope(bib_dir, bib_dir, true, false);
+ setSimplifySource(false);
+ setBoolean(true);
+ const QString type(searchPattern::type(searchPattern::ApproximateString));
+ addPattern(false, false, type, "all", QChar(), _bpP->currentReference().anyAuthor());
+ addPattern(false, false, type, "all", QChar(), _bpP->currentReference().anyTitle());
+ _do_search_similar_citeid = _bpP->currentReference().citeidName;
+ if (_do_search_similar_citeid.isEmpty())
+ _do_search_similar_citeid = '@';
+}
+
void bibSearcher::addPattern(bool Not, bool caseSensitive, const QString& patternType, const QString& scope,
const QChar& yearScope, const QString& pattern)
@@ -111,9 +130,8 @@ void bibSearcher::addPattern(bool Not, bool caseSensitive, const QString& patter
void bibSearcher::exec()
{
- if (_patterns.count() == 0)
+ if (_patterns.count() == 0 && !_do_search_similar)
return;
-
qSort(_patterns);
_include_documents = _include_documents && (_scopes.contains("all") || _scopes.contains("file"));
if (_include_documents && !_scopes.contains("file"))
@@ -176,6 +194,7 @@ void bibSearcher::clear()
_bibtex_dir.clear();
_bibtex_file.clear();
_boolean_and = true;
+ _do_search_similar_citeid.clear();
_document_counter = 0;
_error_counter = 0;
_hits_map.clear();
@@ -218,7 +237,10 @@ void bibSearcher::search(const QString& bib_file)
while (_bpP->referencesIn(bib_file_contents, &ref))
{
_reference_counter++;
- searchReference(bib_file, ref);
+ if (_do_search_similar)
+ searchSimilarReferences(bib_file, ref);
+ else
+ searchReference(bib_file, ref);
QCoreApplication::processEvents();
if (_aborted)
return;
@@ -299,6 +321,33 @@ void bibSearcher::searchReference(const QString& bib_file, const bibReference& r
}
}
+void bibSearcher::searchSimilarReferences(const QString& bib_file, const bibReference& ref)
+{
+ if (ref.citeidName == _do_search_similar_citeid)
+ {
+ if (!_hits_map.contains(ref.rawReference))
+ _hits_map.insert(ref.rawReference, location(bib_file, ref));
+ return;
+ }
+ if (_patterns.count() == 0)
+ return;
+
+ // Initialize composite search
+ bool hit(_boolean_and);
+
+ // Composite search
+ for (int i = 0; i < _patterns.count(); ++i)
+ {
+ const searchPattern& pattern = _patterns.at(i);
+ hit = hit && pattern.matches(ref.unicodeReference);
+ if (!hit)
+ break;
+ }
+ if (hit)
+ if (!_hits_map.contains(ref.rawReference))
+ _hits_map.insert(ref.rawReference, location(bib_file, ref));
+}
+
const QString bibSearcher::excerpts(const QString& contents) const
{
const int max_excerpts(25);
diff --git a/src/c2b/bibSearcher.h b/src/c2b/bibSearcher.h
index ea50600..0b7e65c 100644
--- a/src/c2b/bibSearcher.h
+++ b/src/c2b/bibSearcher.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BIBSEARCHER_H
@@ -26,7 +26,8 @@ class bibSearcher : public QObject
public:
bibSearcher(bibParser* bp, QObject* parento = 0);
- ~bibSearcher() {}
+ bibSearcher(bibParser* bp, const QString& bib_dir, QObject* parento = 0);
+ inline ~bibSearcher() {}
const QString highlight(const QString& abstract) const;
void addPattern(bool Not, bool caseSensitive, const QString& patternType, const QString& scope,
@@ -97,6 +98,7 @@ private:
QMap<QString, QString> _hits_map;
QString _bibtex_dir;
QString _bibtex_file;
+ QString _do_search_similar_citeid;
QString _hits_string;
QString _log_string;
QStringList _scopes;
@@ -108,6 +110,7 @@ private:
bool _simplify_source;
const QString excerpts(const QString& contents) const;
const QString location(const QString& fn, const bibReference& ref) const;
+ const bool _do_search_similar;
documentCache _documents;
int _bibtex_counter;
int _document_counter;
@@ -115,6 +118,7 @@ private:
int _reference_counter;
void search(const QString& bib_file);
void searchReference(const QString& bib_file, const bibReference& ref);
+ void searchSimilarReferences(const QString& bib_file, const bibReference& ref);
};
diff --git a/src/c2b/cb2bib_parameters.h b/src/c2b/cb2bib_parameters.h
index 22139a5..d4e7b8f 100644
--- a/src/c2b/cb2bib_parameters.h
+++ b/src/c2b/cb2bib_parameters.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef CB2BIB_PARAMETERS_H
@@ -33,7 +33,7 @@ const QString C2B_ICON_DISCONNECT_B("connect_no.png");
const QString C2B_ICON_VIEWBIB_B("viewbib.png");
const QString C2B_ICON_VIEWC2B_B("viewcb.png");
const QString C2B_ORGANIZATION("MOLspaces");
-const QString C2B_VERSION("1.3.3");
+const QString C2B_VERSION("1.3.4");
// File Manager Client
#ifdef Q_WS_X11
diff --git a/src/c2b/cb2bib_utilities.cpp b/src/c2b/cb2bib_utilities.cpp
index 75774fa..b4d50f4 100644
--- a/src/c2b/cb2bib_utilities.cpp
+++ b/src/c2b/cb2bib_utilities.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "cb2bib_utilities.h"
@@ -36,20 +36,19 @@ QString& simplifyString(QString& str)
{
if (str.length() == 0)
return str;
- const ushort space(QChar(' ').unicode());
+ const ushort space(32);
ushort* const c0 = (ushort*)str.data();
ushort* const cn = c0 + str.length();
ushort* c = c0;
ushort* o = c0;
- QChar* cc = str.data();
while (c < cn)
{
- if ((*c > 32 && *c < 160) || !(*c == space || cc->isSpace()))
- *o++ = *c;
+ const ushort ch = *c;
+ if ((ch > 32 && ch < 160) || !(ch == space || QChar(ch).isSpace()))
+ *o++ = ch;
else if (o > c0 && *(o - 1) != space)
*o++ = space;
++c;
- ++cc;
}
if (o > c0 && *(o - 1) == space)
--o;
@@ -154,8 +153,9 @@ static inline QString& _to_ascii_keep_words(QString& str)
while (c < cn)
{
- if ((*c >= la && *c <= lz) || (*c >= ua && *c <= uz) || (*c >= n0 && *c <= n9) || *c == dash || *c == plus)
- *o++ = *c;
+ const ushort ch = *c;
+ if ((ch >= la && ch <= lz) || (ch >= ua && ch <= uz) || (ch >= n0 && ch <= n9) || ch == dash || ch == plus)
+ *o++ = ch;
else if (o > c0 && *(o - 1) != space)
*o++ = space;
++c;
diff --git a/src/c2b/cb2bib_utilities.h b/src/c2b/cb2bib_utilities.h
index 957ba47..fde40b8 100644
--- a/src/c2b/cb2bib_utilities.h
+++ b/src/c2b/cb2bib_utilities.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef CB2BIB_UTILITIES_H
diff --git a/src/c2b/compositePattern.cpp b/src/c2b/compositePattern.cpp
index ee0fc2a..f92c321 100644
--- a/src/c2b/compositePattern.cpp
+++ b/src/c2b/compositePattern.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "compositePattern.h"
diff --git a/src/c2b/compositePattern.h b/src/c2b/compositePattern.h
index 75e4836..7a58cf0 100644
--- a/src/c2b/compositePattern.h
+++ b/src/c2b/compositePattern.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef COMPOSITEPATTERN_H
diff --git a/src/c2b/coreBibParser.cpp b/src/c2b/coreBibParser.cpp
index cb98919..bc17608 100644
--- a/src/c2b/coreBibParser.cpp
+++ b/src/c2b/coreBibParser.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "coreBibParser.h"
diff --git a/src/c2b/coreBibParser.h b/src/c2b/coreBibParser.h
index bfcdfe6..67bcbe4 100644
--- a/src/c2b/coreBibParser.h
+++ b/src/c2b/coreBibParser.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef COREBIBPARSER_H
diff --git a/src/c2b/document.cpp b/src/c2b/document.cpp
index d19c4fb..759c529 100644
--- a/src/c2b/document.cpp
+++ b/src/c2b/document.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "document.h"
diff --git a/src/c2b/document.h b/src/c2b/document.h
index 0d2b502..3002330 100644
--- a/src/c2b/document.h
+++ b/src/c2b/document.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef DOCUMENT_H
diff --git a/src/c2b/documentCache.cpp b/src/c2b/documentCache.cpp
index ca06913..2882b01 100644
--- a/src/c2b/documentCache.cpp
+++ b/src/c2b/documentCache.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "documentCache.h"
diff --git a/src/c2b/documentCache.h b/src/c2b/documentCache.h
index 84e227d..3a65d6f 100644
--- a/src/c2b/documentCache.h
+++ b/src/c2b/documentCache.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef DOCUMENTCACHE_H
diff --git a/src/c2b/documentContents.h b/src/c2b/documentContents.h
index cabbb69..3730643 100644
--- a/src/c2b/documentContents.h
+++ b/src/c2b/documentContents.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef DOCUMENTCONTENTS_H
diff --git a/src/c2b/heuristicBibParser.cpp b/src/c2b/heuristicBibParser.cpp
index 9a72009..4b5ed6e 100644
--- a/src/c2b/heuristicBibParser.cpp
+++ b/src/c2b/heuristicBibParser.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "heuristicBibParser.h"
@@ -17,6 +17,16 @@
heuristicBibParser::heuristicBibParser(bibParser* bp) :
_bpP(bp),
_current_reference(bp->_current_reference),
+ _abstract("abstract"),
+ _addauthors("addauthors"),
+ _author("author"),
+ _isbn("isbn"),
+ _keywords("keywords"),
+ _number("number"),
+ _pages("pages"),
+ _title("title"),
+ _volume("volume"),
+ _year("year"),
_bibliographic_fields(bp->_bibliographic_fields),
_journal_db(*bp->_journal_dbP)
{
@@ -147,7 +157,7 @@ void heuristicBibParser::guessAbstract(const QString& text)
if (rxH.cap(1).length() > 93)
{
const QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["abstract"] = _bpP->parse("abstract", val);
+ _current_reference[_abstract] = _bpP->parse(_abstract, val);
return;
}
rxH = QRegExp("(?:<NewLine\\d+>|<Tab\\d+>)\\s*Abstract[\\s\\.:]*<NewLine\\d+>(.+)(?:<NewLine\\d+>\\s*<NewLine|$)",
@@ -157,7 +167,7 @@ void heuristicBibParser::guessAbstract(const QString& text)
if (nH > -1)
{
const QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["abstract"] = _bpP->parse("abstract", val);
+ _current_reference[_abstract] = _bpP->parse(_abstract, val);
return;
}
rxH = QRegExp("(?:<NewLine\\d+>|<Tab\\d+>)\\s*Abstract\\b(.+)(?:<NewLine|$)", Qt::CaseInsensitive);
@@ -167,7 +177,7 @@ void heuristicBibParser::guessAbstract(const QString& text)
if (rxH.cap(1).length() > 93)
{
const QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["abstract"] = _bpP->parse("abstract", val);
+ _current_reference[_abstract] = _bpP->parse(_abstract, val);
return;
}
rxH = QRegExp("(?:<NewLine\\d+>|<Tab\\d+>)\\s*Abstract\\b(.+)(?:<NewLine\\d+>\\s*<NewLine|$)", Qt::CaseInsensitive);
@@ -176,7 +186,7 @@ void heuristicBibParser::guessAbstract(const QString& text)
if (nH > -1)
{
const QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["abstract"] = _bpP->parse("abstract", val);
+ _current_reference[_abstract] = _bpP->parse(_abstract, val);
return;
}
}
@@ -189,7 +199,7 @@ void heuristicBibParser::guessAbstract(const QString& text)
if (rxH.cap(1).length() > 93)
{
const QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["abstract"] = _bpP->parse("abstract", val);
+ _current_reference[_abstract] = _bpP->parse(_abstract, val);
return;
}
rxH = QRegExp("(?:<NewLine\\d+>|<Tab\\d+>)\\s*Summary[\\s\\.:]*<NewLine\\d+>(.+)(?:<NewLine\\d+>\\s*<NewLine|$)",
@@ -199,7 +209,7 @@ void heuristicBibParser::guessAbstract(const QString& text)
if (nH > -1)
{
const QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["abstract"] = _bpP->parse("abstract", val);
+ _current_reference[_abstract] = _bpP->parse(_abstract, val);
return;
}
rxH = QRegExp("(?:<NewLine\\d+>|<Tab\\d+>)\\s*Summary\\b(.+)(?:<NewLine|$)", Qt::CaseInsensitive);
@@ -209,7 +219,7 @@ void heuristicBibParser::guessAbstract(const QString& text)
if (rxH.cap(1).length() > 93)
{
const QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["abstract"] = _bpP->parse("abstract", val);
+ _current_reference[_abstract] = _bpP->parse(_abstract, val);
return;
}
rxH = QRegExp("(?:<NewLine\\d+>|<Tab\\d+>)\\s*Summary\\b(.+)(?:<NewLine\\d+>\\s*<NewLine|$)", Qt::CaseInsensitive);
@@ -218,7 +228,7 @@ void heuristicBibParser::guessAbstract(const QString& text)
if (nH > -1)
{
const QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["abstract"] = _bpP->parse("abstract", val);
+ _current_reference[_abstract] = _bpP->parse(_abstract, val);
return;
}
}
@@ -268,22 +278,22 @@ void heuristicBibParser::guessAuthor(const QString& tagged_text)
const QString mb_author(guessAuthor_multi_block());
const int n_mb_author(authorCount(mb_author));
if (n_mb_author > n_sb_author)
- _current_reference["author"] = mb_author;
+ _current_reference[_author] = mb_author;
else
- _current_reference["author"] = sb_author;
+ _current_reference[_author] = sb_author;
}
QString heuristicBibParser::guessAuthor_single_block()
{
QString author;
if (_author_sb_lc.indexIn(_aencoder.code) > -1)
- author = _bpP->parse("author", _aencoder.decoded(_author_sb_lc.pos(0), _author_sb_lc.matchedLength()));
+ author = _bpP->parse(_author, _aencoder.decoded(_author_sb_lc.pos(0), _author_sb_lc.matchedLength()));
else if (_author_sb_uc.indexIn(_aencoder.code) > -1)
- author = _bpP->parse("author", _aencoder.decoded(_author_sb_uc.pos(0), _author_sb_uc.matchedLength()));
+ author = _bpP->parse(_author, _aencoder.decoded(_author_sb_uc.pos(0), _author_sb_uc.matchedLength()));
else if (_author_sb.indexIn(_aencoder.code) > -1)
// Few cases are extracted by _author_sb, keep it for cases 'A. Name,', with ',' usually coming
// from a faulty plain text conversion.
- author = _bpP->parse("author", _aencoder.decoded(_author_sb.pos(0), _author_sb.matchedLength()));
+ author = _bpP->parse(_author, _aencoder.decoded(_author_sb.pos(0), _author_sb.matchedLength()));
return author;
}
@@ -292,35 +302,35 @@ QString heuristicBibParser::guessAuthor_multi_block()
QString author;
if (_author_b5_uc_rx->indexIn(_aencoder.code) > -1)
for (int i = 1; i < _author_b5_uc_rx->capturedTexts().count(); ++i)
- author = _bpP->parse("addauthors", _aencoder.decoded(_author_b5_uc_rx->pos(i), _author_b5_uc_rx->cap(i).length()),
+ author = _bpP->parse(_addauthors, _aencoder.decoded(_author_b5_uc_rx->pos(i), _author_b5_uc_rx->cap(i).length()),
author);
else if (_author_b5_lc_rx->indexIn(_aencoder.code) > -1)
for (int i = 1; i < _author_b5_lc_rx->capturedTexts().count(); ++i)
- author = _bpP->parse("addauthors", _aencoder.decoded(_author_b5_lc_rx->pos(i), _author_b5_lc_rx->cap(i).length()),
+ author = _bpP->parse(_addauthors, _aencoder.decoded(_author_b5_lc_rx->pos(i), _author_b5_lc_rx->cap(i).length()),
author);
else if (_author_b4_uc_rx->indexIn(_aencoder.code) > -1)
for (int i = 1; i < _author_b4_uc_rx->capturedTexts().count(); ++i)
- author = _bpP->parse("addauthors", _aencoder.decoded(_author_b4_uc_rx->pos(i), _author_b4_uc_rx->cap(i).length()),
+ author = _bpP->parse(_addauthors, _aencoder.decoded(_author_b4_uc_rx->pos(i), _author_b4_uc_rx->cap(i).length()),
author);
else if (_author_b4_lc_rx->indexIn(_aencoder.code) > -1)
for (int i = 1; i < _author_b4_lc_rx->capturedTexts().count(); ++i)
- author = _bpP->parse("addauthors", _aencoder.decoded(_author_b4_lc_rx->pos(i), _author_b4_lc_rx->cap(i).length()),
+ author = _bpP->parse(_addauthors, _aencoder.decoded(_author_b4_lc_rx->pos(i), _author_b4_lc_rx->cap(i).length()),
author);
else if (_author_b3_uc_rx->indexIn(_aencoder.code) > -1)
for (int i = 1; i < _author_b3_uc_rx->capturedTexts().count(); ++i)
- author = _bpP->parse("addauthors", _aencoder.decoded(_author_b3_uc_rx->pos(i), _author_b3_uc_rx->cap(i).length()),
+ author = _bpP->parse(_addauthors, _aencoder.decoded(_author_b3_uc_rx->pos(i), _author_b3_uc_rx->cap(i).length()),
author);
else if (_author_b3_lc_rx->indexIn(_aencoder.code) > -1)
for (int i = 1; i < _author_b3_lc_rx->capturedTexts().count(); ++i)
- author = _bpP->parse("addauthors", _aencoder.decoded(_author_b3_lc_rx->pos(i), _author_b3_lc_rx->cap(i).length()),
+ author = _bpP->parse(_addauthors, _aencoder.decoded(_author_b3_lc_rx->pos(i), _author_b3_lc_rx->cap(i).length()),
author);
else if (_author_b2_uc_rx->indexIn(_aencoder.code) > -1)
for (int i = 1; i < _author_b2_uc_rx->capturedTexts().count(); ++i)
- author = _bpP->parse("addauthors", _aencoder.decoded(_author_b2_uc_rx->pos(i), _author_b2_uc_rx->cap(i).length()),
+ author = _bpP->parse(_addauthors, _aencoder.decoded(_author_b2_uc_rx->pos(i), _author_b2_uc_rx->cap(i).length()),
author);
else if (_author_b2_lc_rx->indexIn(_aencoder.code) > -1)
for (int i = 1; i < _author_b2_lc_rx->capturedTexts().count(); ++i)
- author = _bpP->parse("addauthors", _aencoder.decoded(_author_b2_lc_rx->pos(i), _author_b2_lc_rx->cap(i).length()),
+ author = _bpP->parse(_addauthors, _aencoder.decoded(_author_b2_lc_rx->pos(i), _author_b2_lc_rx->cap(i).length()),
author);
return author;
}
@@ -346,7 +356,7 @@ void heuristicBibParser::guessKeywords(const QString& text)
if (nH > -1)
{
const QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["keywords"] = _bpP->parse("keywords", val);
+ _current_reference[_keywords] = _bpP->parse(_keywords, val);
return;
}
rxH = QRegExp("<NewLine\\d+>\\s*Key\\s{0,1}words\\b(.+)(<NewLine|$)", Qt::CaseInsensitive);
@@ -355,7 +365,7 @@ void heuristicBibParser::guessKeywords(const QString& text)
if (nH > -1)
{
const QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["keywords"] = _bpP->parse("keywords", val);
+ _current_reference[_keywords] = _bpP->parse(_keywords, val);
}
}
@@ -376,28 +386,28 @@ void heuristicBibParser::guessVolume(const QString& text)
int nH(rxH.indexIn(text));
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
return;
}
rxH = QRegExp("Vols{0,1}\\.{0,1}\\s*(" + _hyphen_nums + ')', Qt::CaseInsensitive);
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
return;
}
rxH = QRegExp("\\b(\\d+)\\s*\\(" + _hyphen_nums + "\\)[,:]\\s*pp\\.{0,1}\\s*\\d+", Qt::CaseInsensitive);
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
return;
}
rxH = QRegExp("\\b(\\d+)[,:]\\s*pp\\.{0,1}\\s*\\d+", Qt::CaseInsensitive);
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
return;
}
_reliable_volume = false;
@@ -405,27 +415,27 @@ void heuristicBibParser::guessVolume(const QString& text)
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
return;
}
rxH = QRegExp("\\b(\\d+)[,:]\\s*" + _hyphen_nums, Qt::CaseInsensitive);
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
return;
}
rxH = QRegExp("\\b(\\d+)\\s*\\(\\d+\\)");
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
return;
}
rxH = QRegExp("\\b(\\d+)[,:]\\s*\\d+\\b");
nH = rxH.indexIn(text);
if (nH > -1)
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
}
/** \page heuristic_guess
@@ -444,29 +454,29 @@ void heuristicBibParser::guessNumber(const QString& text)
int nH(rxH.indexIn(text));
if (nH > -1)
{
- _current_reference["number"] = _bpP->parse("number", rxH.cap(1));
+ _current_reference[_number] = _bpP->parse(_number, rxH.cap(1));
return;
}
rxH = QRegExp("Nos{0,1}\\.{0,1}\\s*(" + _hyphen_nums + ')', Qt::CaseInsensitive);
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["number"] = _bpP->parse("number", rxH.cap(1));
+ _current_reference[_number] = _bpP->parse(_number, rxH.cap(1));
return;
}
rxH = QRegExp("Issues{0,1}\\:{0,1}\\s*(" + _hyphen_nums + ')', Qt::CaseInsensitive);
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["number"] = _bpP->parse("number", rxH.cap(1));
+ _current_reference[_number] = _bpP->parse(_number, rxH.cap(1));
return;
}
_reliable_number = false;
rxH = QRegExp("\\d\\s*\\((" + _hyphen_nums + ")\\)[^\\.]");
nH = rxH.indexIn(text);
if (nH > -1)
- if (rxH.cap(1) != _current_reference.value("year")) // Avoid confusing (number) and (year)
- _current_reference["number"] = _bpP->parse("number", rxH.cap(1));
+ if (rxH.cap(1) != _current_reference.value(_year)) // Avoid confusing (number) and (year)
+ _current_reference[_number] = _bpP->parse(_number, rxH.cap(1));
}
/** \page heuristic_guess
@@ -485,21 +495,21 @@ void heuristicBibParser::guessPages(const QString& text)
int nH(rxH.indexIn(text));
if (nH > -1)
{
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(1));
return;
}
rxH = QRegExp("(?!\\()(\\d+[\\s-]\\d+pp)(?!\\))", Qt::CaseInsensitive);
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(1));
return;
}
rxH = QRegExp("\\bpp\\.{0,1}\\s+(" + _hyphen_nums + ')', Qt::CaseInsensitive);
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(1));
return;
}
_reliable_pages = false;
@@ -507,14 +517,14 @@ void heuristicBibParser::guessPages(const QString& text)
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(1));
return;
}
rxH = QRegExp("\\d+\\s*\\(" + _hyphen_nums + "\\),{0,1}\\s*(" + _hyphen_nums + ')');
nH = rxH.indexIn(text); // 120 (1-3), 927
if (nH > -1)
{
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(1));
return;
}
rxH = QRegExp("(?!\\()(\\d+)\\s*-{1,2}\\s*(\\d+)\\b(?!\\))");
@@ -526,7 +536,7 @@ void heuristicBibParser::guessPages(const QString& text)
{
if (!rxH.cap(1).startsWith('0'))
{
- const QString pp(_bpP->parse("pages", QString("%1 %2").arg(rxH.cap(1)).arg(rxH.cap(2))));
+ const QString pp(_bpP->parse(_pages, QString("%1 %2").arg(rxH.cap(1)).arg(rxH.cap(2))));
const QStringList flpp(pp.split(QRegExp("\\D"), QString::SkipEmptyParts));
if (flpp.count() != 2)
continue;
@@ -534,7 +544,7 @@ void heuristicBibParser::guessPages(const QString& text)
const int lp(flpp.last().toInt());
if (fp < lp && lp - fp < 250)
{
- _current_reference["pages"] = pp;
+ _current_reference[_pages] = pp;
return;
}
}
@@ -555,10 +565,10 @@ void heuristicBibParser::guessYear(const QString& text)
int nH(rxH.indexIn(text));
if (nH > -1)
{
- const QString y(_bpP->parse("year", rxH.cap(1) + rxH.cap(2)));
+ const QString y(_bpP->parse(_year, rxH.cap(1) + rxH.cap(2)));
if (y.toInt() < _max_year)
{
- _current_reference["year"] = y;
+ _current_reference[_year] = y;
return;
}
}
@@ -566,10 +576,10 @@ void heuristicBibParser::guessYear(const QString& text)
nH = rxH.indexIn(text); // 44:2077 – 2082, 2004.
if (nH > -1)
{
- const QString y(_bpP->parse("year", rxH.cap(1) + rxH.cap(2)));
+ const QString y(_bpP->parse(_year, rxH.cap(1) + rxH.cap(2)));
if (y.toInt() < _max_year)
{
- _current_reference["year"] = y;
+ _current_reference[_year] = y;
return;
}
}
@@ -577,10 +587,10 @@ void heuristicBibParser::guessYear(const QString& text)
nH = rxH.indexIn(text);
if (nH > -1)
{
- const QString y(_bpP->parse("year", rxH.cap(1) + rxH.cap(2)));
+ const QString y(_bpP->parse(_year, rxH.cap(1) + rxH.cap(2)));
if (y.toInt() < _max_year)
{
- _current_reference["year"] = y;
+ _current_reference[_year] = y;
return;
}
}
@@ -600,7 +610,7 @@ void heuristicBibParser::guessTitle(const QString& text)
if (nH > -1)
{
QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["title"] = _bpP->parse("title", val);
+ _current_reference[_title] = _bpP->parse(_title, val);
return;
}
rxH = QRegExp("\\bTitle:{0,1}(.+)(<NewLine|$)", Qt::CaseInsensitive);
@@ -609,7 +619,7 @@ void heuristicBibParser::guessTitle(const QString& text)
if (nH > -1)
{
QString val(rxH.cap(1).remove(_leading_non_letters));
- _current_reference["title"] = _bpP->parse("title", val);
+ _current_reference[_title] = _bpP->parse(_title, val);
}
}
@@ -626,14 +636,14 @@ void heuristicBibParser::guessISBN(const QString& text)
int nH(rxH.indexIn(text));
if (nH > -1)
{
- _current_reference["isbn"] = _bpP->parse("isbn", rxH.cap(1));
+ _current_reference[_isbn] = _bpP->parse(_isbn, rxH.cap(1));
return;
}
rxH = QRegExp("\\bISBN\\b(?:[ -]\\d+){0,1}:{0,1}(?:-\\d+){0,1}\\s*(\\d+)", Qt::CaseInsensitive);
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["isbn"] = _bpP->parse("isbn", rxH.cap(1));
+ _current_reference[_isbn] = _bpP->parse(_isbn, rxH.cap(1));
return;
}
}
@@ -701,10 +711,10 @@ void heuristicBibParser::guessVolumePagesYear(const QString& text)
int nH(rxH.indexIn(text));
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
- _current_reference["number"] = _bpP->parse("number", rxH.cap(2));
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(3));
- _current_reference["year"] = _bpP->parse("year", rxH.cap(4) + rxH.cap(5));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
+ _current_reference[_number] = _bpP->parse(_number, rxH.cap(2));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(3));
+ _current_reference[_year] = _bpP->parse(_year, rxH.cap(4) + rxH.cap(5));
return;
}
// J. Sci., 108 (15), 3206 (2004)
@@ -712,10 +722,10 @@ void heuristicBibParser::guessVolumePagesYear(const QString& text)
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
- _current_reference["number"] = _bpP->parse("number", rxH.cap(2));
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(3));
- _current_reference["year"] = _bpP->parse("year", rxH.cap(4) + rxH.cap(5));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
+ _current_reference[_number] = _bpP->parse(_number, rxH.cap(2));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(3));
+ _current_reference[_year] = _bpP->parse(_year, rxH.cap(4) + rxH.cap(5));
return;
}
if (_reliable_pages && _reliable_volume)
@@ -726,9 +736,9 @@ void heuristicBibParser::guessVolumePagesYear(const QString& text)
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(2));
- _current_reference["year"] = _bpP->parse("year", rxH.cap(3) + rxH.cap(4));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(2));
+ _current_reference[_year] = _bpP->parse(_year, rxH.cap(3) + rxH.cap(4));
return;
}
// 120, 8425 - 8433 (2004)
@@ -737,9 +747,9 @@ void heuristicBibParser::guessVolumePagesYear(const QString& text)
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(2));
- _current_reference["year"] = _bpP->parse("year", rxH.cap(3) + rxH.cap(4));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(2));
+ _current_reference[_year] = _bpP->parse(_year, rxH.cap(3) + rxH.cap(4));
return;
}
}
@@ -750,12 +760,12 @@ void heuristicBibParser::guessVolumeYearPages(const QString& text)
if (_reliable_pages && _reliable_volume)
return;
// J. Sci. 203 (2003) 209.
- QRegExp rxH("(\\d+)\\s*\\(" + _current_reference.value("year") + "\\)\\s*(" + _hyphen_pages + ')');
+ QRegExp rxH("(\\d+)\\s*\\(" + _current_reference.value(_year) + "\\)\\s*(" + _hyphen_pages + ')');
int nH(rxH.indexIn(text));
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(2));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(2));
return;
}
}
@@ -765,57 +775,59 @@ void heuristicBibParser::guessYearVolumePages(const QString& text)
// Does several year volume pages formats
if (_reliable_pages && _reliable_volume && _reliable_number)
return;
+ // J. Sci. 1995 January 25; 247(4):536-40.
// J. Sci. 1995, 247(4):536-40.
- QRegExp rxH(_current_reference.value("year") + "[,:; ]\\s*(\\d+)\\((" + _hyphen_nums + ")\\)\\s*[,:;]\\s*(" + _hyphen_pages + ')');
+ QRegExp rxH(_current_reference.value(_year) + "[\\w ]{0,15}[,:; ]\\s*(\\d+)\\((" + _hyphen_nums + ")\\)\\s*[,:;]\\s*(" + _hyphen_pages + ')');
int nH(rxH.indexIn(text));
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
- _current_reference["number"] = _bpP->parse("number", rxH.cap(2));
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(3));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
+ _current_reference[_number] = _bpP->parse(_number, rxH.cap(2));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(3));
_reliable_pages = true;
_reliable_volume = true;
return;
}
if (_reliable_pages && _reliable_volume)
return;
+ // J. Sci. 1995 January 25; 247:536-40.
// J. Sci. 2005, 103, 818
// J. Sci. 2002;9:101–106.5.
- rxH = QRegExp(_current_reference.value("year") + "\\s*[,:;]\\s*(\\d+)\\s*[,:;]\\s*(" + _hyphen_pages + ')');
+ rxH = QRegExp(_current_reference.value(_year) + "\\s*[\\w ]{0,15}[,:;]\\s*(\\d+)\\s*[,:;]\\s*(" + _hyphen_pages + ')');
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(2));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(2));
_reliable_pages = true;
_reliable_volume = true;
return;
}
// J. Sci. 2005 103:818
- rxH = QRegExp(_current_reference.value("year") + "\\s+(\\d+)\\s*:\\s*(" + _hyphen_pages + ')');
+ rxH = QRegExp(_current_reference.value(_year) + "\\s+(\\d+)\\s*:\\s*(" + _hyphen_pages + ')');
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(2));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(2));
return;
}
// (2006) J. Sci. 39:3047
- rxH = QRegExp("\\(" + _current_reference.value("year") + "\\)\\D{5,30}(\\d+)\\s*[,:;]\\s*(" + _hyphen_pages + ')');
+ rxH = QRegExp("\\(" + _current_reference.value(_year) + "\\)\\D{5,30}(\\d+)\\s*[,:;]\\s*(" + _hyphen_pages + ')');
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(2));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(2));
return;
}
// 2006 J. Sci. 39 3047
- rxH = QRegExp(_current_reference.value("year") + "\\D{5,30}(\\d+)\\s*[,:; ]\\s*(" + _hyphen_pages + ')');
+ rxH = QRegExp(_current_reference.value(_year) + "\\D{5,30}(\\d+)\\s*[,:; ]\\s*(" + _hyphen_pages + ')');
nH = rxH.indexIn(text);
if (nH > -1)
{
- _current_reference["volume"] = _bpP->parse("volume", rxH.cap(1));
- _current_reference["pages"] = _bpP->parse("pages", rxH.cap(2));
+ _current_reference[_volume] = _bpP->parse(_volume, rxH.cap(1));
+ _current_reference[_pages] = _bpP->parse(_pages, rxH.cap(2));
return;
}
}
diff --git a/src/c2b/heuristicBibParser.h b/src/c2b/heuristicBibParser.h
index 2f82cd9..e97cf0e 100644
--- a/src/c2b/heuristicBibParser.h
+++ b/src/c2b/heuristicBibParser.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef HEURISTICBIBPARSER_H
@@ -56,6 +56,16 @@ private:
bool _reliable_number;
bool _reliable_pages;
bool _reliable_volume;
+ const QString _abstract;
+ const QString _addauthors;
+ const QString _author;
+ const QString _isbn;
+ const QString _keywords;
+ const QString _number;
+ const QString _pages;
+ const QString _title;
+ const QString _volume;
+ const QString _year;
const QStringList& _bibliographic_fields;
const journalDB& _journal_db;
int _max_year;
diff --git a/src/c2b/idMaker.cpp b/src/c2b/idMaker.cpp
index f879849..059cb25 100644
--- a/src/c2b/idMaker.cpp
+++ b/src/c2b/idMaker.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
*
* Improvements and modifications:
diff --git a/src/c2b/idMaker.h b/src/c2b/idMaker.h
index dcecc09..2276505 100644
--- a/src/c2b/idMaker.h
+++ b/src/c2b/idMaker.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
*
* Improvements and modifications:
diff --git a/src/c2b/journalDB.cpp b/src/c2b/journalDB.cpp
index e8a3906..2def4d1 100644
--- a/src/c2b/journalDB.cpp
+++ b/src/c2b/journalDB.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "journalDB.h"
diff --git a/src/c2b/journalDB.h b/src/c2b/journalDB.h
index ea9f6e8..6fccee4 100644
--- a/src/c2b/journalDB.h
+++ b/src/c2b/journalDB.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef JOURNALDB_H
diff --git a/src/c2b/metadataParser.cpp b/src/c2b/metadataParser.cpp
index f12d75d..20b84b3 100644
--- a/src/c2b/metadataParser.cpp
+++ b/src/c2b/metadataParser.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "metadataParser.h"
diff --git a/src/c2b/metadataParser.h b/src/c2b/metadataParser.h
index d5048fd..ae1231a 100644
--- a/src/c2b/metadataParser.h
+++ b/src/c2b/metadataParser.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef METADATAPARSER_H
diff --git a/src/c2b/monthDB.cpp b/src/c2b/monthDB.cpp
index 5706b14..0a1d2ff 100644
--- a/src/c2b/monthDB.cpp
+++ b/src/c2b/monthDB.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "monthDB.h"
diff --git a/src/c2b/monthDB.h b/src/c2b/monthDB.h
index 8d44dd2..c78ae5e 100644
--- a/src/c2b/monthDB.h
+++ b/src/c2b/monthDB.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef MONTHDB_H
diff --git a/src/c2b/network.cpp b/src/c2b/network.cpp
index 6343b66..52ce6cc 100644
--- a/src/c2b/network.cpp
+++ b/src/c2b/network.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "network.h"
diff --git a/src/c2b/network.h b/src/c2b/network.h
index 68cdf2f..51254a5 100644
--- a/src/c2b/network.h
+++ b/src/c2b/network.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef NETWORK_H
diff --git a/src/c2b/networkQuery.cpp b/src/c2b/networkQuery.cpp
index 073717c..2c9d789 100644
--- a/src/c2b/networkQuery.cpp
+++ b/src/c2b/networkQuery.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "networkQuery.h"
diff --git a/src/c2b/networkQuery.h b/src/c2b/networkQuery.h
index 17142c3..558179f 100644
--- a/src/c2b/networkQuery.h
+++ b/src/c2b/networkQuery.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef NETWORKQUERY_H
diff --git a/src/c2b/preprocess.cpp b/src/c2b/preprocess.cpp
index e94b9eb..56a35f3 100644
--- a/src/c2b/preprocess.cpp
+++ b/src/c2b/preprocess.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "preprocess.h"
diff --git a/src/c2b/preprocess.h b/src/c2b/preprocess.h
index 8cc4a84..4e1fd65 100644
--- a/src/c2b/preprocess.h
+++ b/src/c2b/preprocess.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef PREPROCESS_H
diff --git a/src/c2b/pubmedXml.cpp b/src/c2b/pubmedXml.cpp
index 399c1e4..7d01fd9 100644
--- a/src/c2b/pubmedXml.cpp
+++ b/src/c2b/pubmedXml.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "pubmedXml.h"
diff --git a/src/c2b/pubmedXml.h b/src/c2b/pubmedXml.h
index 706f7e2..3fafe40 100644
--- a/src/c2b/pubmedXml.h
+++ b/src/c2b/pubmedXml.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef PUBMEDXML_H
diff --git a/src/c2b/qtregexp/eqregexp.cpp b/src/c2b/qtregexp/eqregexp.cpp
index 6cc2c2b..ea71cab 100644
--- a/src/c2b/qtregexp/eqregexp.cpp
+++ b/src/c2b/qtregexp/eqregexp.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Modified QRegExp
* constans at molspaces.com, 2009
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
*
***************************************************************************
** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
diff --git a/src/c2b/qtregexp/eqregexp.h b/src/c2b/qtregexp/eqregexp.h
index 93be26d..8ea9fb6 100644
--- a/src/c2b/qtregexp/eqregexp.h
+++ b/src/c2b/qtregexp/eqregexp.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Modified QRegExp
* constans at molspaces.com, 2009
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
*
***************************************************************************
** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
diff --git a/src/c2b/searchPattern.cpp b/src/c2b/searchPattern.cpp
index 27a27bb..f6fe21f 100644
--- a/src/c2b/searchPattern.cpp
+++ b/src/c2b/searchPattern.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "searchPattern.h"
diff --git a/src/c2b/searchPattern.h b/src/c2b/searchPattern.h
index e37a96c..b2be5fd 100644
--- a/src/c2b/searchPattern.h
+++ b/src/c2b/searchPattern.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef SEARCHPATTERN_H
diff --git a/src/c2b/settings.cpp b/src/c2b/settings.cpp
index 8e2a5d2..aa4bd2d 100644
--- a/src/c2b/settings.cpp
+++ b/src/c2b/settings.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "settings.h"
diff --git a/src/c2b/settings.h b/src/c2b/settings.h
index 8897edb..07b0049 100644
--- a/src/c2b/settings.h
+++ b/src/c2b/settings.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef SETTINGS_H
diff --git a/src/c2b/substringMatcher.cpp b/src/c2b/substringMatcher.cpp
index 47ad046..85e338c 100644
--- a/src/c2b/substringMatcher.cpp
+++ b/src/c2b/substringMatcher.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "substringMatcher.h"
diff --git a/src/c2b/substringMatcher.h b/src/c2b/substringMatcher.h
index d2ffdd0..ceefe16 100644
--- a/src/c2b/substringMatcher.h
+++ b/src/c2b/substringMatcher.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef SUBSTRINGMATCHER_H
@@ -11,8 +11,6 @@
#include <QVector>
#define C2B_DEBUG_SUBSTRINGMATCHER 0
-#if C2B_DEBUG_SUBSTRINGMATCHER
-#endif
class substringMatcher
diff --git a/src/c2b/texParser.cpp b/src/c2b/texParser.cpp
index d695cb5..3c778e3 100644
--- a/src/c2b/texParser.cpp
+++ b/src/c2b/texParser.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "texParser.h"
diff --git a/src/c2b/texParser.h b/src/c2b/texParser.h
index 271542f..b8d61a3 100644
--- a/src/c2b/texParser.h
+++ b/src/c2b/texParser.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef TEXPARSER_H
diff --git a/src/c2b/texToHtml.cpp b/src/c2b/texToHtml.cpp
index 39d13f9..47c9dae 100644
--- a/src/c2b/texToHtml.cpp
+++ b/src/c2b/texToHtml.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "texToHtml.h"
diff --git a/src/c2b/texToHtml.h b/src/c2b/texToHtml.h
index 51c6e37..1c7c43e 100644
--- a/src/c2b/texToHtml.h
+++ b/src/c2b/texToHtml.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef TEXTOHTML_H
diff --git a/src/c2b/triads.cpp b/src/c2b/triads.cpp
index 5db3f14..0d3700d 100644
--- a/src/c2b/triads.cpp
+++ b/src/c2b/triads.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "triads.h"
diff --git a/src/c2b/triads.h b/src/c2b/triads.h
index 71869e7..84d232d 100644
--- a/src/c2b/triads.h
+++ b/src/c2b/triads.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef TRIADS_H
diff --git a/src/c2b/txt/word_prefix_lexicon.txt b/src/c2b/txt/word_prefix_lexicon.txt
index 9702c26..aace2b6 100644
--- a/src/c2b/txt/word_prefix_lexicon.txt
+++ b/src/c2b/txt/word_prefix_lexicon.txt
@@ -63,7 +63,6 @@ _cells
_cellul
_center_
_centra
-_cereb
_cerev
_changes
_channe
@@ -151,7 +150,6 @@ _enco
_endot
_energ
_enh
-_enter
_enzy
_epid
_epit
@@ -265,6 +263,7 @@ _metab
_metad
_method
_methy
+_metri
_micr
_mitoc
_model_
@@ -342,6 +341,7 @@ _prepr
_presen
_primar
_principl
+_probab
_probl
_proces
_produ
diff --git a/src/c2b/wordMatcher.cpp b/src/c2b/wordMatcher.cpp
index b710f7a..df3b32b 100644
--- a/src/c2b/wordMatcher.cpp
+++ b/src/c2b/wordMatcher.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "wordMatcher.h"
diff --git a/src/c2b/wordMatcher.h b/src/c2b/wordMatcher.h
index 6f1c5fe..d3659b9 100644
--- a/src/c2b/wordMatcher.h
+++ b/src/c2b/wordMatcher.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef WORDMATCHER_H
diff --git a/src/c2b/wordPattern.cpp b/src/c2b/wordPattern.cpp
index 32c154f..5cb7153 100644
--- a/src/c2b/wordPattern.cpp
+++ b/src/c2b/wordPattern.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "wordPattern.h"
diff --git a/src/c2b/wordPattern.h b/src/c2b/wordPattern.h
index c838b43..3c2a4f3 100644
--- a/src/c2b/wordPattern.h
+++ b/src/c2b/wordPattern.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef WORDPATTERN_H
diff --git a/src/c2bAnnote.cpp b/src/c2bAnnote.cpp
index 2f70eee..6b0075e 100644
--- a/src/c2bAnnote.cpp
+++ b/src/c2bAnnote.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bAnnote.h"
diff --git a/src/c2bAnnote.h b/src/c2bAnnote.h
index f963942..4d0bd16 100644
--- a/src/c2bAnnote.h
+++ b/src/c2bAnnote.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BANNOTE_H
diff --git a/src/c2bBibHighlighter.cpp b/src/c2bBibHighlighter.cpp
index f130b71..21c03e2 100644
--- a/src/c2bBibHighlighter.cpp
+++ b/src/c2bBibHighlighter.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bBibHighlighter.h"
diff --git a/src/c2bBibHighlighter.h b/src/c2bBibHighlighter.h
index d977674..ab53216 100644
--- a/src/c2bBibHighlighter.h
+++ b/src/c2bBibHighlighter.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BBIBHIGHLIGHTER_H
diff --git a/src/c2bBibParser.cpp b/src/c2bBibParser.cpp
index a3d20ef..ca42d04 100644
--- a/src/c2bBibParser.cpp
+++ b/src/c2bBibParser.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bBibParser.h"
diff --git a/src/c2bBibParser.h b/src/c2bBibParser.h
index c65017d..c2bcf86 100644
--- a/src/c2bBibParser.h
+++ b/src/c2bBibParser.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BBIBPARSER_H
diff --git a/src/c2bBibPreparserLog.cpp b/src/c2bBibPreparserLog.cpp
index 49cd4c1..35a6e4f 100644
--- a/src/c2bBibPreparserLog.cpp
+++ b/src/c2bBibPreparserLog.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bBibPreparserLog.h"
diff --git a/src/c2bBibPreparserLog.h b/src/c2bBibPreparserLog.h
index d457458..2325693 100644
--- a/src/c2bBibPreparserLog.h
+++ b/src/c2bBibPreparserLog.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BBIBPREPARSERLOG_H
diff --git a/src/c2bCiter.cpp b/src/c2bCiter.cpp
index a877e38..b3deba1 100644
--- a/src/c2bCiter.cpp
+++ b/src/c2bCiter.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bCiter.h"
diff --git a/src/c2bCiter.h b/src/c2bCiter.h
index 74ecc40..02b91fa 100644
--- a/src/c2bCiter.h
+++ b/src/c2bCiter.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BCITER_H
diff --git a/src/c2bCiterModel.cpp b/src/c2bCiterModel.cpp
index 29d46cb..2d450a9 100644
--- a/src/c2bCiterModel.cpp
+++ b/src/c2bCiterModel.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bCiterModel.h"
diff --git a/src/c2bCiterModel.h b/src/c2bCiterModel.h
index 9af2121..5c9f186 100644
--- a/src/c2bCiterModel.h
+++ b/src/c2bCiterModel.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BCITERMODEL_H
diff --git a/src/c2bCiterView.cpp b/src/c2bCiterView.cpp
index 74b9aa8..8ffb801 100644
--- a/src/c2bCiterView.cpp
+++ b/src/c2bCiterView.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bCiterView.h"
diff --git a/src/c2bCiterView.h b/src/c2bCiterView.h
index 6a01bcb..598b546 100644
--- a/src/c2bCiterView.h
+++ b/src/c2bCiterView.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BCITERVIEW_H
diff --git a/src/c2bClipEdit.cpp b/src/c2bClipEdit.cpp
index 93aa7eb..d69d951 100644
--- a/src/c2bClipEdit.cpp
+++ b/src/c2bClipEdit.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bClipEdit.h"
diff --git a/src/c2bClipEdit.h b/src/c2bClipEdit.h
index 1b4d053..604cadb 100644
--- a/src/c2bClipEdit.h
+++ b/src/c2bClipEdit.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BCLIPEDIT_H
diff --git a/src/c2bClipboard.cpp b/src/c2bClipboard.cpp
index 1ea1ea6..5c58972 100644
--- a/src/c2bClipboard.cpp
+++ b/src/c2bClipboard.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bClipboard.h"
diff --git a/src/c2bClipboard.h b/src/c2bClipboard.h
index ff36332..18be026 100644
--- a/src/c2bClipboard.h
+++ b/src/c2bClipboard.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BCLIPBOARD_H
diff --git a/src/c2bColors.cpp b/src/c2bColors.cpp
index ffd004b..7132449 100644
--- a/src/c2bColors.cpp
+++ b/src/c2bColors.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bColors.h"
diff --git a/src/c2bColors.h b/src/c2bColors.h
index 89a436f..1e2c83b 100644
--- a/src/c2bColors.h
+++ b/src/c2bColors.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BCOLORS_H
diff --git a/src/c2bComboBox.cpp b/src/c2bComboBox.cpp
index ce8d42f..611dede 100644
--- a/src/c2bComboBox.cpp
+++ b/src/c2bComboBox.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bComboBox.h"
diff --git a/src/c2bComboBox.h b/src/c2bComboBox.h
index a6d9f31..3a46ff4 100644
--- a/src/c2bComboBox.h
+++ b/src/c2bComboBox.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef F_COMBOBOX_H
diff --git a/src/c2bConfigure.cpp b/src/c2bConfigure.cpp
index f91be98..a07db29 100644
--- a/src/c2bConfigure.cpp
+++ b/src/c2bConfigure.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bConfigure.h"
@@ -95,8 +95,9 @@
- <b>Check Repeated On Save</b> \n If checked, cb2Bib looks for existing
references in the BibTeX directory similar to the one being saved. The
- search is done for title and author field values, or, if empty, for
- booktitle and editor, using the
+ search is based on exact cite ID match, or on reference contents, by
+ considering title and author field values, or, if empty, booktitle and
+ editor, and using the
\htmlonly
<a href="http://arxiv.org/abs/0705.0751v1" target="_blank">approximate string</a>
\endhtmlonly
diff --git a/src/c2bConfigure.h b/src/c2bConfigure.h
index 2ee97e6..84485eb 100644
--- a/src/c2bConfigure.h
+++ b/src/c2bConfigure.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BCONFIGURE_H
diff --git a/src/c2bConfigureFR.cpp b/src/c2bConfigureFR.cpp
index 649b57a..c5454c5 100644
--- a/src/c2bConfigureFR.cpp
+++ b/src/c2bConfigureFR.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bConfigureFR.h"
diff --git a/src/c2bConfigureFR.h b/src/c2bConfigureFR.h
index 2aa3b9e..cacced2 100644
--- a/src/c2bConfigureFR.h
+++ b/src/c2bConfigureFR.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BCONFIGUREFR_H
diff --git a/src/c2bConsole.cpp b/src/c2bConsole.cpp
index 088f1a8..4d26432 100644
--- a/src/c2bConsole.cpp
+++ b/src/c2bConsole.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bConsole.h"
diff --git a/src/c2bConsole.h b/src/c2bConsole.h
index 99af250..e1a7080 100644
--- a/src/c2bConsole.h
+++ b/src/c2bConsole.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BCONSOLE_H
diff --git a/src/c2bCoreCiter.cpp b/src/c2bCoreCiter.cpp
index 780cc9d..4e5b283 100644
--- a/src/c2bCoreCiter.cpp
+++ b/src/c2bCoreCiter.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
*
* The LyX pipe procedure in citeToLyXPipe has been adapted from Tellico
diff --git a/src/c2bCoreCiter.h b/src/c2bCoreCiter.h
index aab9b55..057c98e 100644
--- a/src/c2bCoreCiter.h
+++ b/src/c2bCoreCiter.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BCORECITER_H
diff --git a/src/c2bEditor.cpp b/src/c2bEditor.cpp
index 1da7a72..df00a7d 100644
--- a/src/c2bEditor.cpp
+++ b/src/c2bEditor.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bEditor.h"
diff --git a/src/c2bEditor.h b/src/c2bEditor.h
index b7d677b..0b6c7fd 100644
--- a/src/c2bEditor.h
+++ b/src/c2bEditor.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BEDITOR_H
diff --git a/src/c2bExport.cpp b/src/c2bExport.cpp
index 970166b..b08ac22 100644
--- a/src/c2bExport.cpp
+++ b/src/c2bExport.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bExport.h"
diff --git a/src/c2bExport.h b/src/c2bExport.h
index 41fba20..725ecef 100644
--- a/src/c2bExport.h
+++ b/src/c2bExport.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BEXPORT_H
diff --git a/src/c2bExportDialog.cpp b/src/c2bExportDialog.cpp
index ea70db1..38b9b11 100644
--- a/src/c2bExportDialog.cpp
+++ b/src/c2bExportDialog.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bExportDialog.h"
diff --git a/src/c2bExportDialog.h b/src/c2bExportDialog.h
index 805b412..2bcad89 100644
--- a/src/c2bExportDialog.h
+++ b/src/c2bExportDialog.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BEXPORTDIALOG_H
diff --git a/src/c2bFileDialog.cpp b/src/c2bFileDialog.cpp
index 7d5fbff..01d3d68 100644
--- a/src/c2bFileDialog.cpp
+++ b/src/c2bFileDialog.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bFileDialog.h"
diff --git a/src/c2bFileDialog.h b/src/c2bFileDialog.h
index 299ec29..4f578cf 100644
--- a/src/c2bFileDialog.h
+++ b/src/c2bFileDialog.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BFILEDIALOG_H
diff --git a/src/c2bHighlighter.cpp b/src/c2bHighlighter.cpp
index 61ca7c7..ba0452a 100644
--- a/src/c2bHighlighter.cpp
+++ b/src/c2bHighlighter.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bHighlighter.h"
diff --git a/src/c2bHighlighter.h b/src/c2bHighlighter.h
index f75491a..3b85322 100644
--- a/src/c2bHighlighter.h
+++ b/src/c2bHighlighter.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BHIGHLIGHTER_H
diff --git a/src/c2bIdLineEdit.cpp b/src/c2bIdLineEdit.cpp
index c7f5208..ccf8c27 100644
--- a/src/c2bIdLineEdit.cpp
+++ b/src/c2bIdLineEdit.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
*
* Improvements and modifications:
diff --git a/src/c2bIdLineEdit.h b/src/c2bIdLineEdit.h
index 2b932d7..874283c 100644
--- a/src/c2bIdLineEdit.h
+++ b/src/c2bIdLineEdit.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
*
* Improvements and modifications:
diff --git a/src/c2bLineEdit.cpp b/src/c2bLineEdit.cpp
index 85b05e8..1265553 100644
--- a/src/c2bLineEdit.cpp
+++ b/src/c2bLineEdit.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bLineEdit.h"
diff --git a/src/c2bLineEdit.h b/src/c2bLineEdit.h
index b810676..a990caa 100644
--- a/src/c2bLineEdit.h
+++ b/src/c2bLineEdit.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BLINEEDIT_H
diff --git a/src/c2bNetworkQuery.cpp b/src/c2bNetworkQuery.cpp
index 73a56d1..4b17d19 100644
--- a/src/c2bNetworkQuery.cpp
+++ b/src/c2bNetworkQuery.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bNetworkQuery.h"
diff --git a/src/c2bNetworkQuery.h b/src/c2bNetworkQuery.h
index 7a9b8d5..a55724f 100644
--- a/src/c2bNetworkQuery.h
+++ b/src/c2bNetworkQuery.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BNETWORKQUERY_H
diff --git a/src/c2bNetworkQueryInfo.cpp b/src/c2bNetworkQueryInfo.cpp
index eaac1a7..8f888e3 100644
--- a/src/c2bNetworkQueryInfo.cpp
+++ b/src/c2bNetworkQueryInfo.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bNetworkQueryInfo.h"
diff --git a/src/c2bNetworkQueryInfo.h b/src/c2bNetworkQueryInfo.h
index d1c2202..3643586 100644
--- a/src/c2bNetworkQueryInfo.h
+++ b/src/c2bNetworkQueryInfo.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BNETWORKQUERYINFO_H
diff --git a/src/c2bPdfImport.cpp b/src/c2bPdfImport.cpp
index ae10575..c1ac2e6 100644
--- a/src/c2bPdfImport.cpp
+++ b/src/c2bPdfImport.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bPdfImport.h"
@@ -81,7 +81,7 @@
reference is saved. While processing, the clipboard is disabled for safety.
Once finished, this box is unchecked, to avoid a possible accidental saving
of a void reference. Network queries that require intervention, i.e., whose
- result is launching a given page, are disabled. The processes follows until
+ result is launching a given page, are skipped. The processes follows until
all files are processed. However, it will stop to avoid a file being
overwritten, as a result of a repeated key. In this case, it will resume
after manual renaming and saving. See also \ref commandline, commands
diff --git a/src/c2bPdfImport.h b/src/c2bPdfImport.h
index f50d6cd..9c37712 100644
--- a/src/c2bPdfImport.h
+++ b/src/c2bPdfImport.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BPDFIMPORT_H
diff --git a/src/c2bPostprocess.cpp b/src/c2bPostprocess.cpp
index 16d8dce..95ec55f 100644
--- a/src/c2bPostprocess.cpp
+++ b/src/c2bPostprocess.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bPostprocess.h"
diff --git a/src/c2bPostprocess.h b/src/c2bPostprocess.h
index e683f6b..6791789 100644
--- a/src/c2bPostprocess.h
+++ b/src/c2bPostprocess.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BPOSTPROCESS_H
diff --git a/src/c2bREHighlighter.cpp b/src/c2bREHighlighter.cpp
index bf6615b..7e1e817 100644
--- a/src/c2bREHighlighter.cpp
+++ b/src/c2bREHighlighter.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bREHighlighter.h"
diff --git a/src/c2bREHighlighter.h b/src/c2bREHighlighter.h
index 92e3d3b..94fd124 100644
--- a/src/c2bREHighlighter.h
+++ b/src/c2bREHighlighter.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BREHIGHLIGHTER_H
diff --git a/src/c2bRLWebSearchSettings.cpp b/src/c2bRLWebSearchSettings.cpp
index 826a9a9..17cbf7a 100644
--- a/src/c2bRLWebSearchSettings.cpp
+++ b/src/c2bRLWebSearchSettings.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bRLWebSearchSettings.h"
diff --git a/src/c2bRLWebSearchSettings.h b/src/c2bRLWebSearchSettings.h
index 8f53b60..effaa42 100644
--- a/src/c2bRLWebSearchSettings.h
+++ b/src/c2bRLWebSearchSettings.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BRLWEBSEARCHSETTINGS_H
diff --git a/src/c2bReferenceList.cpp b/src/c2bReferenceList.cpp
index 9b974a3..71f3cd3 100644
--- a/src/c2bReferenceList.cpp
+++ b/src/c2bReferenceList.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bReferenceList.h"
diff --git a/src/c2bReferenceList.h b/src/c2bReferenceList.h
index 225d4b5..2e6fcdd 100644
--- a/src/c2bReferenceList.h
+++ b/src/c2bReferenceList.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BREFERENCELIST_H
diff --git a/src/c2bSaveREHighlighter.cpp b/src/c2bSaveREHighlighter.cpp
index 427d429..c5fd006 100644
--- a/src/c2bSaveREHighlighter.cpp
+++ b/src/c2bSaveREHighlighter.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bSaveREHighlighter.h"
diff --git a/src/c2bSaveREHighlighter.h b/src/c2bSaveREHighlighter.h
index 3f7140c..41a4487 100644
--- a/src/c2bSaveREHighlighter.h
+++ b/src/c2bSaveREHighlighter.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BSAVEREHIGHLIGHTER_H
diff --git a/src/c2bSaveRegExp.cpp b/src/c2bSaveRegExp.cpp
index a310e96..c0ce4d5 100644
--- a/src/c2bSaveRegExp.cpp
+++ b/src/c2bSaveRegExp.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bSaveRegExp.h"
diff --git a/src/c2bSaveRegExp.h b/src/c2bSaveRegExp.h
index 6a3c424..9af32cf 100644
--- a/src/c2bSaveRegExp.h
+++ b/src/c2bSaveRegExp.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BSAVEREGEXP_H
diff --git a/src/c2bSearchInFiles.cpp b/src/c2bSearchInFiles.cpp
index 4f85c29..d709bae 100644
--- a/src/c2bSearchInFiles.cpp
+++ b/src/c2bSearchInFiles.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bSearchInFiles.h"
diff --git a/src/c2bSearchInFiles.h b/src/c2bSearchInFiles.h
index fdabff8..edfa8dc 100644
--- a/src/c2bSearchInFiles.h
+++ b/src/c2bSearchInFiles.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BSEARCHINFILES_H
diff --git a/src/c2bSearchInFilesPattern.cpp b/src/c2bSearchInFilesPattern.cpp
index 3c57934..d79be0e 100644
--- a/src/c2bSearchInFilesPattern.cpp
+++ b/src/c2bSearchInFilesPattern.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bSearchInFilesPattern.h"
diff --git a/src/c2bSearchInFilesPattern.h b/src/c2bSearchInFilesPattern.h
index 8291795..8df0313 100644
--- a/src/c2bSearchInFilesPattern.h
+++ b/src/c2bSearchInFilesPattern.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BSEARCHINFILESPATTERN_H
diff --git a/src/c2bSettings.cpp b/src/c2bSettings.cpp
index f2db32b..d94b20a 100644
--- a/src/c2bSettings.cpp
+++ b/src/c2bSettings.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bSettings.h"
diff --git a/src/c2bSettings.h b/src/c2bSettings.h
index 136f3a7..4f31008 100644
--- a/src/c2bSettings.h
+++ b/src/c2bSettings.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BSETTINGS_H
diff --git a/src/c2bTests.cpp b/src/c2bTests.cpp
index 8f4e6b0..bb1c1b5 100644
--- a/src/c2bTests.cpp
+++ b/src/c2bTests.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#define C2B_CHECK_CAPITALIZATION 0
@@ -492,6 +492,8 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "Science 120, 1922 2007");
heuristic(bp, reference, "Science 120, 1922(2007)");
heuristic(bp, reference, "Science 120(2007) 1922");
+ heuristic(bp, reference, "Science 2007;120:1922.");
+ heuristic(bp, reference, "Science 2007 May 2;120:1922");
reference.clearReference();
reference.insert("journal", bp.parse("journal", "Science"));
@@ -501,6 +503,7 @@ void c2bTests::heuristic_pvny()
write(bp, reference);
heuristic(bp, reference, "Science 2007, 120, 22");
heuristic(bp, reference, "Science 2007 120: 22");
+ heuristic(bp, reference, "Science 2007 May 2, 120: 22");
heuristic(bp, reference, "Science. 120: 22, 2007");
heuristic(bp, reference, "(2007) Science 120: 22");
heuristic(bp, reference, "Science 120, 22 2007");
@@ -521,6 +524,7 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "2007 Science 120 3 - 7");
heuristic(bp, reference, "Science. 2007, 120, 3 - 7");
heuristic(bp, reference, "Science. 2007 120: 3 - 7");
+ heuristic(bp, reference, "Science. 2007 May 2, 120: 3 - 7");
heuristic(bp, reference, "Science. 2007, 120, 3 - 5pp");
heuristic(bp, reference, "Science 2007;120: 3 - 7");
@@ -538,6 +542,7 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "Science 120(2007) 1997 - 2001");
heuristic(bp, reference, "2007 Science 120 1997 - 2001");
heuristic(bp, reference, "Science. 2007, 120, 1997 - 2001");
+ heuristic(bp, reference, "Science. 2007 May 2, 120, 1997 - 2001");
heuristic(bp, reference, "Science. 2007 120: 1997 - 2001");
heuristic(bp, reference, "Science. 2007, 120, 1997 - 5pp");
heuristic(bp, reference, "Science 2007;120: 1997 - 2001");
@@ -555,6 +560,7 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "Science 120(2007) 044103 - 044110");
heuristic(bp, reference, "2007 Science 120 044103 - 044110");
heuristic(bp, reference, "Science. 2007, 120, 044103 - 044110");
+ heuristic(bp, reference, "Science. 2007 May 2; 120, 044103 - 044110");
heuristic(bp, reference, "Science. 2007 120: 044103 - 044110");
heuristic(bp, reference, "Science 2007;120: 044103 - 044110");
@@ -575,6 +581,9 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "Science 2007, 120(1): 117");
heuristic(bp, reference, "Science 2007 120(1): 117");
heuristic(bp, reference, "Science 2007, 120(1), 117");
+ heuristic(bp, reference, "Science 2007 January 25; 120(1), 117");
+ heuristic(bp, reference, "Science 2007 January 25 120(1), 117");
+ heuristic(bp, reference, "Science 2007 May 25 120(1), 117");
reference.clearReference();
reference.insert("journal", bp.parse("journal", "Science"));
@@ -592,6 +601,7 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "Science. 2007, 120(1): 10 8pp");
heuristic(bp, reference, "Science. 2007, 120(1), 10 - 17");
heuristic(bp, reference, "Science. 2007, 120(1), pp 10 - 17");
+ heuristic(bp, reference, "Science. 2007 January 25, 120(1), pp 10 - 17");
reference.clearReference();
reference.insert("journal", bp.parse("journal", "Science"));
@@ -605,6 +615,7 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "Science 120(1 - 6): 117, 2007");
heuristic(bp, reference, "Science 2007, 120(1 - 6): 117");
heuristic(bp, reference, "Science 2007 120(1 - 6): 117");
+ heuristic(bp, reference, "Science 2007 May 25 120(1 - 6): 117");
reference.clearReference();
reference.insert("journal", bp.parse("journal", "Science"));
@@ -620,6 +631,7 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "Science. 2007, 120(1 - 6): 10 - 7");
heuristic(bp, reference, "Science. 2007, 120(1 - 6): 10 8pp");
heuristic(bp, reference, "Science 2007 120(1 - 6): 10 8pp");
+ heuristic(bp, reference, "Science 2007 May 25 120(1 - 6): 10 8pp");
// Pages susceptible to be confused by years
reference.clearReference();
@@ -635,6 +647,7 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "Science 2007, 120(1): 1922");
heuristic(bp, reference, "Science 2007, 120(1), 1922");
heuristic(bp, reference, "Science 2007 120(1): 1922");
+ heuristic(bp, reference, "Science 2007 May 25 120(1): 1922");
reference.clearReference();
reference.insert("journal", bp.parse("journal", "Science"));
@@ -652,6 +665,7 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "Science. 2007 120(1): 1922 6pp");
heuristic(bp, reference, "Science. 2007, 120(1), 1922 - 1927");
heuristic(bp, reference, "Science. 2007, 120(1), pp 1922 - 1927");
+ heuristic(bp, reference, "Science. 2007 May 25, 120(1), pp 1922 - 1927");
reference.clearReference();
reference.insert("journal", bp.parse("journal", "Science"));
@@ -665,6 +679,7 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "Science 120(1 - 6): 1922, 2007");
heuristic(bp, reference, "Science 2007, 120(1 - 6): 1922");
heuristic(bp, reference, "Science 2007 120(1 - 6): 1922");
+ heuristic(bp, reference, "Science 2007 May 25 120(1 - 6): 1922");
reference.clearReference();
reference.insert("journal", bp.parse("journal", "Science"));
@@ -680,6 +695,7 @@ void c2bTests::heuristic_pvny()
heuristic(bp, reference, "Science 2007 120(1 - 6): 1922 - 1927");
heuristic(bp, reference, "Science. 2007, 120(1 - 6): 1922 - 7");
heuristic(bp, reference, "Science. 2007, 120(1 - 6): 1922 6pp");
+ heuristic(bp, reference, "Science. 2007 May 25, 120(1 - 6): 1922 6pp");
}
void c2bTests::heuristic_misc()
diff --git a/src/c2bTests.h b/src/c2bTests.h
index 55c7e39..0241f53 100644
--- a/src/c2bTests.h
+++ b/src/c2bTests.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BTESTS_H
diff --git a/src/c2bTextBrowser.cpp b/src/c2bTextBrowser.cpp
index f5bd8bd..ca05d03 100644
--- a/src/c2bTextBrowser.cpp
+++ b/src/c2bTextBrowser.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bTextBrowser.h"
diff --git a/src/c2bTextBrowser.h b/src/c2bTextBrowser.h
index 0a8535f..3acb827 100644
--- a/src/c2bTextBrowser.h
+++ b/src/c2bTextBrowser.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BTEXTBROWSER_H
diff --git a/src/c2bTextEdit.cpp b/src/c2bTextEdit.cpp
index 41eb811..1fa3918 100644
--- a/src/c2bTextEdit.cpp
+++ b/src/c2bTextEdit.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bTextEdit.h"
diff --git a/src/c2bTextEdit.h b/src/c2bTextEdit.h
index e46d5d7..1b99497 100644
--- a/src/c2bTextEdit.h
+++ b/src/c2bTextEdit.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BTEXTEDIT_H
diff --git a/src/c2bUpdateMetadata.cpp b/src/c2bUpdateMetadata.cpp
index 1cb4445..3db28f8 100644
--- a/src/c2bUpdateMetadata.cpp
+++ b/src/c2bUpdateMetadata.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bUpdateMetadata.h"
diff --git a/src/c2bUpdateMetadata.h b/src/c2bUpdateMetadata.h
index 1e0988f..5e820ac 100644
--- a/src/c2bUpdateMetadata.h
+++ b/src/c2bUpdateMetadata.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BUPDATEMETADATA_H
diff --git a/src/c2bUtils.cpp b/src/c2bUtils.cpp
index 9874f59..1189d74 100644
--- a/src/c2bUtils.cpp
+++ b/src/c2bUtils.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bUtils.h"
diff --git a/src/c2bUtils.h b/src/c2bUtils.h
index 7041e6e..efa9d3e 100644
--- a/src/c2bUtils.h
+++ b/src/c2bUtils.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BUTILS_H
diff --git a/src/c2bWebBrowser.cpp b/src/c2bWebBrowser.cpp
index 93f169f..59bcdc9 100644
--- a/src/c2bWebBrowser.cpp
+++ b/src/c2bWebBrowser.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2bWebBrowser.h"
diff --git a/src/c2bWebBrowser.h b/src/c2bWebBrowser.h
index bb5e2cb..da5ad1d 100644
--- a/src/c2bWebBrowser.h
+++ b/src/c2bWebBrowser.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2BWEBBROWSER_H
diff --git a/src/cb2Bib.cpp b/src/cb2Bib.cpp
index 26c9847..bafd311 100644
--- a/src/cb2Bib.cpp
+++ b/src/cb2Bib.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "cb2Bib.h"
@@ -278,8 +278,9 @@
expressions.
- <b>Alt X</b> \n Check Repeated looks for existing references in the
- BibTeX directory similar to the current one. The search is done for title
- and author field values, or, if empty, for booktitle and editor,using the
+ BibTeX directory similar to the current one. The search is done for exact
+ cite ID, and for title and author field values, or, if empty, for booktitle
+ and editor,using the
\htmlonly
<a href="http://arxiv.org/abs/0705.0751v1" target="_blank">approximate string</a>
\endhtmlonly
@@ -336,11 +337,11 @@
included in Qt > 4.4.0 library. No special action/flag is needed during
compilation.
- - LZO 2 library and headers, available at
+ - LZO2 library and headers, available at
\htmlonly
<a href="http://www.oberhumer.com/opensource/lzo/" target="_blank">http://www.oberhumer.com/opensource/lzo/</a>.
\endhtmlonly
- If lzo2 was unavailable on a particular platform, type <tt>configure --disable_lzo</tt>
+ If LZO2 were unavailable on a particular platform, type <tt>configure --disable_lzo</tt>
or, equivalently, <tt>qmake -config disable_lzo</tt> before compiling.
- X11 header files if compiling on Unix platforms. Concretely, headers
@@ -1088,6 +1089,7 @@ cb2Bib::cb2Bib(QWidget* parentw) : QMainWindow(parentw)
connect(ui.author, SIGNAL(textChanged(const QString &)), this, SLOT(updateCheckRepeatedAction()));
connect(ui.booktitle, SIGNAL(textChanged(const QString &)), this, SLOT(updateCheckRepeatedAction()));
connect(ui.editor, SIGNAL(textChanged(const QString &)), this, SLOT(updateCheckRepeatedAction()));
+ connect(ui.id, SIGNAL(textChanged(const QString &)), this, SLOT(updateCheckRepeatedAction()));
connect(ui.title, SIGNAL(textChanged(const QString &)), this, SLOT(updateCheckRepeatedAction()));
// cb2Bib Settings
@@ -1295,6 +1297,19 @@ void cb2Bib::on_addBibB_clicked()
return;
}
}
+ QFile bibtexfile(ui.bibtexfile->currentText());
+ bool is_writable;
+ if (bibtexfile.exists())
+ is_writable = bibtexfile.open(QIODevice::WriteOnly | QIODevice::Text | QIODevice::Append);
+ else
+ is_writable = bibtexfile.open(QIODevice::WriteOnly | QIODevice::Text);
+ if (!is_writable)
+ {
+ QMessageBox::information(this, tr("Information - cb2Bib"), tr("Unable to open file %1 for writing.\nError: '%2'.").
+ arg(ui.bibtexfile->currentText()).arg(bibtexfile.errorString()), QMessageBox::Ok);
+ ui.addBibB->setEnabled(_modified);
+ return;
+ }
if (_dropped_document_file.isEmpty() || ui.file->text().isEmpty() || !_settingsP->value("cb2Bib/MovePdf").toBool())
{
_target_document_file.clear();
@@ -2035,7 +2050,8 @@ void cb2Bib::updateCheckRepeatedAction()
{
// Do not use anyAuthor/anyTitle, _bpP->currentReference() might not yet be set
ui.checkRepeatedAction->setVisible(!ui.author->text().isEmpty() || !ui.title->text().isEmpty() ||
- !ui.editor->text().isEmpty() || !ui.booktitle->text().isEmpty());
+ !ui.editor->text().isEmpty() || !ui.booktitle->text().isEmpty() ||
+ !ui.id->text().isEmpty());
}
void cb2Bib::checkRepeated()
@@ -2049,13 +2065,7 @@ bool cb2Bib::isReferenceRepeated()
{
QFileInfo fi(ui.bibtexfile->currentText());
showMessage(tr("Checking for similar references at %1.").arg(fi.absolutePath()));
- bibSearcher searcher(c2b::bibParser());
- searcher.setSearchScope(fi.absoluteFilePath(), fi.absolutePath(), true, false);
- searcher.setSimplifySource(false);
- searcher.setBoolean(true);
- const QString type(searchPattern::type(searchPattern::ApproximateString));
- searcher.addPattern(false, false, type, "all", QChar(), _bpP->currentReference().anyAuthor());
- searcher.addPattern(false, false, type, "all", QChar(), _bpP->currentReference().anyTitle());
+ bibSearcher searcher(_bpP, fi.absolutePath());
searcher.exec();
const bool repeated(searcher.hitsCount() > 0);
if (repeated)
diff --git a/src/cb2Bib.h b/src/cb2Bib.h
index 7e5dac6..0c7001a 100644
--- a/src/cb2Bib.h
+++ b/src/cb2Bib.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef CB2BIB_H
diff --git a/src/clipboardPoll.cpp b/src/clipboardPoll.cpp
index 81b1388..8bcaa60 100644
--- a/src/clipboardPoll.cpp
+++ b/src/clipboardPoll.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* clipboardPoll, modified by Pere Constans for the cb2Bib, 2005
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
*
*
* Author and Copyright (C) 2003 by Lubos Lunak <l.lunak at kde.org>
diff --git a/src/clipboardPoll.h b/src/clipboardPoll.h
index c14acf2..0415d60 100644
--- a/src/clipboardPoll.h
+++ b/src/clipboardPoll.h
@@ -1,7 +1,7 @@
/***************************************************************************
* clipboardPoll, modified by Pere Constans for the cb2Bib, 2005
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
*
*
* Author and Copyright (C) 2003 by Lubos Lunak <l.lunak at kde.org>
diff --git a/src/findDialog.cpp b/src/findDialog.cpp
index c615299..413c495 100644
--- a/src/findDialog.cpp
+++ b/src/findDialog.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
* findDialog was originally adapted from Qt Designer
* Copyright (C) 2001 Trolltech AS. All rights reserved.
diff --git a/src/findDialog.h b/src/findDialog.h
index b0ec88c..53bbbf1 100644
--- a/src/findDialog.h
+++ b/src/findDialog.h
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
* findDialog is adapted from Qt Designer
* Copyright (C) 2001 Trolltech AS. All rights reserved.
diff --git a/src/main.cpp b/src/main.cpp
index ba517de..f2421eb 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "qtsingleapplication/src/qtsingleapplication.h"
diff --git a/src/win/main.cpp b/src/win/main.cpp
index b753438..0fef618 100644
--- a/src/win/main.cpp
+++ b/src/win/main.cpp
@@ -1,7 +1,7 @@
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* constans at molspaces.com
- * cb2Bib version 1.3.3. Licensed under the GNU GPL version 3.
+ * cb2Bib version 1.3.4. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include <QFileInfo>
--
Extract bibliographic references from various sources
More information about the debian-science-commits
mailing list