Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 3108 → Rev 3109

/branches/Version13x/Scribus/scribus/plugins/short-words/scribus-short-words.rc
35,7 → 35,7
## physics and math
cs= kg, g, m, cm, mm, l, hl, s, %,
## misc chars - needs to update "dagger etc."
cs= § , & , $, Kč, *, €,
cs= & , $, Kč, *, €, § ,
## academic titles
cs=ing. ,Ing. ,Dr. ,dr. ,mudr. ,Mudr. ,mgr. ,Mgr. ,
# Czech short words - THE END
96,7 → 96,7
## physics and math
de= t, kg, g, mg, km, m, cm, mm, qm, ha, l, L, hl, HL, cl, dl, min, Min., h, s, Hz, kHz, KHz, MHz, kW, m/s, km/h, MEZ, Mrd., Mio, PS, rm, U/min, v. H., v.H., %,
## Misc
de=d. h. ,d.h. , a. a. O., a.a.O.,à ,& ,§ ,§§ , EUR, USD, DM, A. D. , A.D., a. D., a.D.,Abb. ,Best.-Nr. ,Nr. ,No. , d. Ä.,d.Ä. , d. Gr., d.Gr., d. J., d.J., d. M., d.M., n. M., n.M., n. J., n.J., dgl., et al.,gegr. ,i. J. , i. R., Jh., o. ä., o.ä.,rd. , jun., sen., u. d. M., u.d.M., ü. d. M., ü.d.M., v. Chr., v.Chr., v. J., v.J., v. M., v.M.,
de=d. h. ,d.h. , a. a. O., a.a.O.,à , & ,§ ,§§ , EUR, USD, DM, A. D. , A.D., a. D., a.D.,Abb. ,Best.-Nr. ,Nr. ,No. , d. Ä.,d.Ä. , d. Gr., d.Gr., d. J., d.J., d. M., d.M., n. M., n.M., n. J., n.J., dgl., et al.,gegr. ,i. J. , i. R., Jh., o. ä., o.ä.,rd. , jun., sen., u. d. M., u.d.M., ü. d. M., ü.d.M., v. Chr., v.Chr., v. J., v.J., v. M., v.M.,
#  German short words - THE END
 
 
/branches/Version13x/Scribus/scribus/plugins/short-words/configuration.cpp
59,7 → 59,10
 
f.setName(filename);
if (!f.exists())
{
qDebug("Short Words config file not found");
return QStringList();
}
if (f.open(IO_ReadOnly))
{
QTextStream t(&f);
/branches/Version13x/Scribus/scribus/plugins/short-words/parse.cpp
11,6 → 11,7
*/
 
#include "shortwords.h"
#include "parse.h"
#include "parse.moc"
#include "version.h"
#include "configuration.h"
63,6 → 64,7
for (uint i=0; i<aFrame->MaxChars; ++i)
content += aFrame->itemText.at(i)->ch;
changes = content.contains(UNBREAKABLE_SPACE);
// replace it
for (QStringList::Iterator it = shorts.begin(); it != shorts.end(); ++it)
{
unbreak = (*it);
78,7 → 80,6
pos = rx.search(content, pos);
if ( pos >= 0 )
{
QString s;
//replace + keep word boundaries
content.replace(rx, rx.cap(1) + unbreak + rx.cap(2));
pos += rx.matchedLength();
/branches/Version13x/Scribus/scribus/plugins/short-words/version.h
13,7 → 13,7
#ifndef _SCRIBUS_SHORTVER_H_
#define _SCRIBUS_SHORTVER_H_
 
#define RC_PATH QDir::convertSeparators( ScPaths::instance().pluginDir() + "/scribus-short-words.rc")
#define RC_PATH QDir::convertSeparators( ScPaths::instance().shareDir() + "/plugins/scribus-short-words.rc")
#define RC_PATH_USR QDir::homeDirPath() + QDir::convertSeparators("/.scribus/scribus-short-words.rc")
 
#define UNBREAKABLE_SPACE QString(QChar(29))