Imported cb2bib-1.3.6

Summary: Imported cb2bib-1.3.6
Keywords:

Imported cb2bib-1.3.6
into Git repository
parent 796bec90
2010-01-05 RELEASE OF VERSION 1.3.6
2010-01-04 Added 'Fore IJ Last' formatted author recognition
2010-01-02 Minor improvements in journal recognition
2009-12-28 Minor improvements in PubMed XML parser for journal pages and year
2009-12-26 Fixed two cases of author capitalization which conflicted with suffixes and two-letter initials
2009-12-21 Minor improvements in abstract and keywords recognition
2009-12-15 Adapted configure script to Gentoo build descriptions (Thanks to H. Mildenberger and A. K. Huettel)
2009-10-26 RELEASE OF VERSION 1.3.5
2009-10-25 Fixed a regression in single word approximate strings not working for documents
2009-10-21 Fixed wrong automatic extraction for DOIs followed by commas (Thanks to X. Helluy)
......@@ -256,7 +263,7 @@
2007-02-16 Fixed/improved uppercased 'title' capitalization
2006-12-06 RELEASE OF VERSION 0.7.2
2006-12-06 Added choice to write 'title' in double braces
2006-12-06 Fixed pasting of formated text to BibTeX editor
2006-12-06 Fixed pasting of formatted text to BibTeX editor
2006-12-06 Fixed CR regexp in netqinf.txt to not to read HTML-encoded DOI
2006-12-06 Fixed a subtle bug preventing viewers from updating if text was selected
2006-12-06 Added raw, non-preprocessed clipboard view mode (Thanks to M. Wegmann)
......
The cb2Bib. Copyright (C) 2004-2009 by Pere Constans
The cb2Bib. Copyright (C) 2004-2010 by Pere Constans
The cb2Bib includes third party GPL and LGPL code that is copyrighted by others:
......
......@@ -2,7 +2,7 @@
#-------------------------------------------------------------------------------
# c2bciter -- Wrapper for calling cb2Bib Citer
# cb2Bib Tools
# Copyright (C) 2004-2009 by Pere Constans
# Copyright (C) 2004-2010 by Pere Constans
# constans@molspaces.com
#
# Copyright (C) 2009 by Filippo Rusconi
......
......@@ -2,7 +2,7 @@
#-------------------------------------------------------------------------------
# c2bimport -- Script for calling cb2Bib in "Download Reference to cb2Bib" mode
# cb2Bib Tools
# Copyright (C) 2004-2009 by Pere Constans
# Copyright (C) 2004-2010 by Pere Constans
# constans@molspaces.com
#
# Copyright (C) 2009 by Filippo Rusconi
......
......@@ -3,7 +3,7 @@
# bib2pdf -- Script to convert BibTeX files to PDF
# cb2Bib Tools
#
# Copyright (C) 2005-2009 by Pere Constans
# Copyright (C) 2005-2010 by Pere Constans
# constans@molspaces.com
#
# Improvements and modifications:
......
......@@ -3,7 +3,7 @@
# isi2bib -- Script to convert ISI format to BibTeX
# cb2Bib Tools
#
# Copyright (C) 2005-2009 by Pere Constans
# Copyright (C) 2005-2010 by Pere Constans
# constans@molspaces.com
#
# Improvements and modifications:
......
......@@ -3,7 +3,7 @@
# ris2bib -- Script to convert RIS format to BibTeX
# cb2Bib Tools
#
# Copyright (C) 2005-2009 by Pere Constans
# Copyright (C) 2005-2010 by Pere Constans
# constans@molspaces.com
#
# Improvements and modifications:
......
......@@ -7,11 +7,16 @@
# - Manages Installation directory data
# - Runs qmake
#
# Modifications for the cb2Bib Gentoo build descriptions
# by Hugo Mildenberger and Andreas K. Huettel
# Copyright 2009 Hugo Mildenberger and Andreas K. Huettel
# - December 2009: do not use temporary files, fix sed regular
# expression, set both enable/disable for options, and add
# call to qmake option.
#
# Modifications for the cb2Bib Debian distribution package
# by Filippo Rusconi
# Copyright 2009 Filippo Rusconi
#
# - June 2009: replace ' ' with ':' along with use of IFS=: as
# word-splitting delimiter for PATH-related tasks (Thanks Lionel
# Mamane).
......@@ -44,6 +49,7 @@ f_qmake=NO
f_make=NO
f_disable_cbpoll=NO
f_disable_lzo=NO
f_disable_qmake_call=NO
while test -n "$1"; do
case $1 in
......@@ -68,14 +74,29 @@ while test -n "$1"; do
-h | --help | -help)
f_help=y
;;
--disable_cbpoll | -disable_cbpoll)
--enable-cbpoll | -enable-cbpoll)
f_disable_cbpoll=NO
;;
--disable-cbpoll | -disable-cbpoll)
f_disable_cbpoll=y
;;
--disable_lzo | -disable_lzo)
--enable-lzo | -enable-lzo)
f_disable_lzo=NO
;;
--disable-lzo | -disable-lzo)
f_disable_lzo=y
;;
--enable-qmake-call | -enable-qmake-call)
f_disable_qmake_call=NO
;;
--disable-qmake-call | -disable-qmake-call)
f_disable_qmake_call=y
;;
*)
echo $1: unknown argument
echo "-----------------------------------------------------------------------"
echo Error: Unknown argument $1
echo "-----------------------------------------------------------------------"
echo ""
f_help=y
f_error=y
;;
......@@ -92,22 +113,26 @@ Options:
General:
--help Print this help
--qmakepath dir qmake fullpath name
[example: --qmakepath /usr/bin/qmake]
[example: --qmakepath /usr/bin/qmake]
--prefix dir Installation prefix directory
[default: /usr]
[default: /usr]
--bindir dir Executable installation directory
[default: /usr/bin]
[default: /usr/bin]
--datadir dir Data installation directory
[default: /usr/share/bin/cb2bib]
--disable_lzo Disables linking with lzo library
[default: /usr/share/bin/cb2bib]
--enable-lzo Enable linking with lzo library [default]
--disable-lzo Disable linking with lzo library
--enable-qmake-call Enable configure to call qmake [default]
--disable-qmake-call Disable configure to call qmake
Unix/Linux only:
--desktopdatadir dir Desktop data installation directory
[default: /usr/share/applications]
[default: /usr/share/applications]
--icondir dir Icon installation directory
[default: /usr/share/pixmaps]
--disable_cbpoll Disables clipboard poll
[default: /usr/share/pixmaps]
--enable-cbpoll Enable clipboard poll [default]
--disable-cbpoll Disable clipboard poll
EOF
test "$f_error" = y && exit 1
......@@ -139,14 +164,15 @@ echo
echo "-----------------------------------------------------------------------"
echo "cb2Bib Info:"
echo "-----------------------------------------------------------------------"
echo "- This version requires Qt 4.4.0 or later"
echo "- This version requires Qt 4.4.0 or later."
echo " "
echo "- Set the environment variable QTDIR if this script cannot determine"
echo " the right Qt qmake"
echo " the right Qt qmake."
echo "- QTDIR will only be used during configuration; it can later be reset"
echo " to its original value"
echo " to its original value."
echo " "
echo "- Alternatively, set Qt 4.4 qmake's fullpath name with --qmakepath flag"
echo "- Alternatively, set Qt 4.4 qmake's fullpath name with"
echo " --qmakepath flag."
echo "-----------------------------------------------------------------------"
#- check for qt ---------------------------------------------------------------
......@@ -185,7 +211,7 @@ echo "Checking for Qt/qmake:"
echo "If so, set QTDIR environment variable to your Qt root directory."
exit 2
fi
echo "using $f_qmake"
echo "using $f_qmake."
else
echo "Using QTDIR environment variable for Qt directory location."
echo "Checking for Qt tools at $QTDIR..."
......@@ -212,7 +238,7 @@ bin_dirs="/usr/bin:/usr/local/bin:/bin:/sbin:$PATH"
echo
echo "Checking for additional tools:"
echo -n "Checking for make... "
echo -n "Checking for make..."
if test "$f_make" = NO; then
make_names="gmake:make"
make_prog=NO
......@@ -232,61 +258,73 @@ if test "$f_make" = NO; then
fi
if test "$f_make" != NO; then
echo "using $f_make"
echo "using $f_make."
else
echo "not found"
echo "not found."
fi
#- Setting dirs and start qmake -----------------------------------------------
echo
sed 's%^.*cb2bibdata.path .*$%cb2bibdata.path = '$f_datadir'%g' src/src.pro > tmp.pro
sed 's%^.*target.path .*$%target.path = '$f_bindir'%g' tmp.pro > src/src.pro
sed 's%^.*script.path .*$%script.path = '$f_bindir'%g' src/src.pro > tmp.pro
sed 's%^.*desktop.path .*$%desktop.path = '$f_desktopdatadir'%g' tmp.pro > src/src.pro
sed 's%^.*icons.path .*$%icons.path = '$f_icondir'%g' src/src.pro > tmp.pro
mv -f tmp.pro src/src.pro
sed -i -e 's%^.*cb2bibdata\.path .*$%cb2bibdata.path = '$f_datadir'%g' \
-e 's%^.*target\.path .*$%target.path = '$f_bindir'%g' \
-e 's%^.*script\.path .*$%script.path = '$f_bindir'%g' \
-e 's%^.*desktop\.path .*$%desktop.path = '$f_desktopdatadir'%g' \
-e 's%^.*icons\.path .*$%icons.path = '$f_icondir'%g' src/src.pro
sed -i 's%^const QString C2B_DATA_DIR.*$%const QString C2B_DATA_DIR("'$f_datadir'/");%g' src/c2b/cb2bib_parameters.h
f_configs=
if test "$f_disable_cbpoll" = y; then
echo "Setting clipboardPoll disabled"
sed 's% disable_cbpoll%%g' src/src.pro > tmp.pro
sed 's%^CONFIG.*= %CONFIG += disable_cbpoll %g' tmp.pro > src/src.pro
else
echo "Setting clipboardPoll enabled (Unix/Linux only)"
sed 's% disable_cbpoll%%g' src/src.pro > tmp.pro
mv -f tmp.pro src/src.pro
f_configs="$f_configs -config disable_cbpoll"
fi
sed 's%^const QString C2B_DATA_DIR.*$%const QString C2B_DATA_DIR("'$f_datadir'/");%g' src/c2b/cb2bib_parameters.h > tmp.par
mv -f tmp.par src/c2b/cb2bib_parameters.h
f_configs=
if test "$f_disable_lzo" = y; then
echo "Setting lzo disabled"
f_configs="-config disable_lzo"
f_configs="$f_configs -config disable_lzo"
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
if test "$f_disable_qmake_call" = NO; then
if test "$platform" = Darwin; then # Warning: Test for MacOSX/Darwin might be outdated
echo "Running $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
fi
else
echo "Running $f_qmake $f_configs -o Makefile"
"$f_qmake" $f_configs -o Makefile
echo "Writing qmake flags to file 'qmake-additional-args'"
echo $f_configs > qmake-additional-args
fi
echo " "
if test "$f_make" = NO; then
echo "-----------------------------------------------------------------------"
echo "Configuration ended. 'make' not found."
echo "Build toolchain might not be completed."
else
echo "-----------------------------------------------------------------------"
echo "Configuration ended. Type 'make' and 'make install'."
exit 1
else
echo "-----------------------------------------------------------------------"
echo "- NOTE: 'make install' will copy the required runtime files to the"
echo " specified locations. Besides cb2bib binary, 'make install' will copy"
echo " the scripts c2bimport and c2bciter, and will set their executable"
echo " permissions. Also, it will set cb2bib, c2bimport, and c2bciter"
echo " desktop files."
if test "$f_disable_lzo" = NO; then
echo "-----------------------------------------------------------------------"
echo "- NOTE: cb2Bib requires lzo library. If it were unavailable in your"
echo " platform, reconfigure using --disable-lzo."
fi
echo "-----------------------------------------------------------------------"
echo "- NOTE: Type 'make distclean' or, preferably, untar again to set other"
echo " configure flags."
echo "-----------------------------------------------------------------------"
echo " "
echo "-----------------------------------------------------------------------"
echo "- NOTE: cb2Bib requires lzo library. If it were unavailable in your"
echo " platform, reconfigure using --disable_lzo."
if test "$f_disable_qmake_call" = NO; then
echo "Configuration ended. Type 'make' and 'make install'."
else
echo "Configuration ended. Run qmake, and type 'make' and 'make install'."
fi
echo "-----------------------------------------------------------------------"
fi
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "bookmarkPlugin.h"
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BOOKMARKPLUGIN_H
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "c2b.h"
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef C2B_H
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
*
* Class implementation of the approximate search algorithm
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
*
* Class implementation of the approximate search algorithm
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "authorString.h"
......@@ -33,7 +33,7 @@ authorString::authorString()
- Consider composing prefixes <tt>(da|de|dal|del|der|di|do|du|dos|la|le|van|vande|von)</tt>
- Consider composing suffixes <tt>(II|III|Jr)</tt>
- Consider composing suffixes <tt>(II|III|IV|Jr)</tt>
- Some publishers use superscripts to refer to multiple author affiliations.
Text clipboard copying loses superscript formatting. Author strings are
......@@ -202,14 +202,21 @@ QString authorString::toBibTeX(const QString& author, bool full_form)
if (fore_name_parts.count() == 1 && fore_length > 1 &&
!are_authors_in_uppercase && is_uppercase)
{
// Cases Last, FST: Always abbreviated, no call to processFirstMiddle
// Cases 'Last, FST': Always abbreviated, no call to processFirstMiddle
for (int l = 0; l < fore_length; ++l)
author_name += fore_name[l] + ". ";
}
else if (fore_name_parts.count() == 2 && fore_length > 1 && fore_length < 3 && is_current_reversed &&
!are_authors_in_uppercase && is_uppercase)
{
// Cases Last1 Last2, FST: Always abbreviated, no call to processFirstMiddle
// Cases 'Last1 Last2, FST': Always abbreviated, no call to processFirstMiddle
for (int l = 0; l < fore_length; ++l)
author_name += fore_name[l] + ". ";
}
else if (i == 1 && fore_name_parts.count() == 2 && fore_length > 1 && fore_length < 3 && !is_current_reversed &&
!are_authors_in_uppercase && is_uppercase)
{
// Cases 'Fore IJ Last': Process initials
for (int l = 0; l < fore_length; ++l)
author_name += fore_name[l] + ". ";
}
......@@ -269,12 +276,12 @@ QString authorString::processFirstMiddle(const QString& first_middle) const
QString authorString::capitalize(const QString& name) const
{
// Capitalizes Author's Name
// Capitalizes author's name
if (name.isEmpty())
return QString();
QString proc_name(name);
int ii(0);
const int prefixes(proc_name.count(QRegExp(author::prefixes + '_', Qt::CaseInsensitive)));
const int prefixes(proc_name.count(QRegExp(author::prefixes + "_(?!(?:Jr|II|III|IV)\\b)", Qt::CaseInsensitive)));
for (int p = 0; p < prefixes; ++p)
{
const int iin(proc_name.indexOf('_', ii));
......@@ -355,6 +362,7 @@ bool authorString::containLowerCaseLetter(const QString& author) const
QString author_line(author);
author_line.remove(QRegExp("\\band\\b")); // Remove possible 'and' separator
author_line.remove(QRegExp(author::prefixes + '_', Qt::CaseInsensitive)); // Remove possible prefixes
author_line.remove(QRegExp(author::double_initials + '_', Qt::CaseSensitive)); // Remove possible two-letter initials
for (int i = 0; i < author_line.length(); i++)
{
if (author_line.at(i).isLetter())
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef AUTHORSTRING_H
......@@ -32,11 +32,12 @@ static const QRegExp reversed_romance_name_rx("^(?:" + reversed_romance_name + '
// simplifyString
static const QRegExp simplify_string_rx1(QString("%1(?=\\w)").arg(QChar(8217)));
static const QRegExp simplify_string_rx2(QRegExp("\\d\\d+"));
static const QRegExp simplify_string_rx3(QRegExp("\\d(?=\\s\\w\\w)"));
static const QRegExp simplify_string_rx4(QRegExp("\\d[\\*,;][a-z]\\b"));
static const QRegExp simplify_string_rx5(QRegExp("\\d"));
static const QRegExp simplify_string_rx6(QRegExp("[^-',;:\\|/&\\.\\s\\w]"));
static const QRegExp simplify_string_rx2(QRegExp("\'(?!\\w)"));
static const QRegExp simplify_string_rx3(QRegExp("\\d\\d+"));
static const QRegExp simplify_string_rx4(QRegExp("\\d(?=\\s\\w\\w)"));
static const QRegExp simplify_string_rx5(QRegExp("\\d[\\*,;][a-z]\\b"));
static const QRegExp simplify_string_rx6(QRegExp("\\d"));
static const QRegExp simplify_string_rx7(QRegExp("[^-',;:\\|/&\\.\\s\\w]"));
inline QString& simplifyString(QString& author, const bool full = false)
{
if (full) // Characters | and : are used for the encoder
......@@ -45,11 +46,12 @@ inline QString& simplifyString(QString& author, const bool full = false)
author.replace(':', ' ');
}
author.replace(simplify_string_rx1, "\'"); // Normalize apostrophe
author.replace(simplify_string_rx2, "/"); // Break dates, addresses, etc, but remove from author's foot notes.
author.replace(simplify_string_rx3, ","); // Help no-separator designs, and also break zip codes.
author.replace(simplify_string_rx4, " ");
author.remove(simplify_string_rx5); // Better remove if no conflict. It will help to not confuse with chemical formula.
author.replace(simplify_string_rx6, " ");
author.remove(simplify_string_rx2); // Remove spurious apostrophes
author.replace(simplify_string_rx3, "/"); // Break dates, addresses, etc, but remove from author's foot notes.
author.replace(simplify_string_rx4, ","); // Help no-separator designs, and also break zip codes.
author.replace(simplify_string_rx5, " ");
author.remove(simplify_string_rx6); // Better remove if no conflict. It will help to not confuse with chemical formula.
author.replace(simplify_string_rx7, " ");
author = c2bUtils::simplifyString(author);
return author;
}
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "bibExtractor.h"
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BIBEXTRACTOR_H
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "bibParser.h"
......@@ -98,7 +98,7 @@ QString bibParser::parse(const QString& field, const QString& value, const QStri
else if (field == "keywords")
{
v.replace(" - ", ",");
QStringList kl(v.split(QRegExp("[^\\w\\s-]"), QString::SkipEmptyParts));
QStringList kl(v.split(QRegExp("[^\\w\\s-']"), QString::SkipEmptyParts));
kl.removeAll(" ");
v = kl.join(", ");
v.replace(QRegExp("\\s+,"), ",");
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BIBPARSER_H
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "bibPreparser.h"
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BIBPREPARSER_H
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BIBREFERENCE_H
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "bibSearcher.h"
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef BIBSEARCHER_H
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. 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.5");
const QString C2B_VERSION("1.3.6");
// File Manager Client
#ifdef Q_WS_X11
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "cb2bib_utilities.h"
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef CB2BIB_UTILITIES_H
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "compositePattern.h"
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef COMPOSITEPATTERN_H
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "coreBibParser.h"
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#ifndef COREBIBPARSER_H
......
/***************************************************************************
* Copyright (C) 2004-2009 by Pere Constans
* Copyright (C) 2004-2010 by Pere Constans
* constans@molspaces.com
* cb2Bib version 1.3.5. Licensed under the GNU GPL version 3.
* cb2Bib version 1.3.6. Licensed under the GNU GPL version 3.
* See the LICENSE file that comes with this distribution.
***************************************************************************/
#include "document.h"
......@@ -97,10 +97,10 @@ QString document::toString()
// Join hyphenated words
doc.remove(QRegExp("-\\s*[\\n\\r]\\s*(?=\\w)"));
doc.replace(QRegExp("[\\n\\r]"), " ");
// Unify apostrophe
doc.replace(QChar(8216), '\'');
doc.replace(QChar(8217), '\'');
}
// Unify apostrophe
doc.replace(QChar(8216), '\'');
doc.replace(QChar(8217), '\'');
// Unify comma
doc.replace(QChar(65292), ',');