Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2284 → Rev 2285

/branches/Version13x/Scribus/scribus/documentchecker.cpp
71,9 → 71,9
for (uint e = 0; e < currItem->itemText.count(); ++e)
{
uint chr = currItem->itemText.at(e)->ch[0].unicode();
if ((chr == 13) || (chr == 32) || (chr == 29) || (chr == 9))
if ((chr == 13) || (chr == 32) || (chr == 29))
continue;
if (currItem->itemText.at(e)->cstyle & 64)
if ((currItem->itemText.at(e)->cstyle & 64) || (currItem->itemText.at(e)->cstyle & 32))
{
chx = currItem->itemText.at(e)->ch;
if (chx.upper() != currItem->itemText.at(e)->ch)
80,6 → 80,38
chx = chx.upper();
chr = chx[0].unicode();
}
if (chr == 9)
{
for (uint t1 = 0; t1 < currDoc->docParagraphStyles[currItem->itemText.at(e)->cab].TabValues.count(); t1++)
{
if (currDoc->docParagraphStyles[currItem->itemText.at(e)->cab].TabValues[t1].tabFillChar.isNull())
continue;
chx = QString(currDoc->docParagraphStyles[currItem->itemText.at(e)->cab].TabValues[t1].tabFillChar);
if ((currItem->itemText.at(e)->cstyle & 64) || (currItem->itemText.at(e)->cstyle & 32))
{
if (chx.upper() != QString(currDoc->docParagraphStyles[currItem->itemText.at(e)->cab].TabValues[t1].tabFillChar))
chx = chx.upper();
}
chr = chx[0].unicode();
if ((!currItem->itemText.at(e)->cfont->CharWidth.contains(chr)) && (checkerSettings.checkGlyphs))
itemError.insert(1, 0);
}
for (uint t1 = 0; t1 < currItem->TabValues.count(); t1++)
{
if (currItem->TabValues[t1].tabFillChar.isNull())
continue;
chx = QString(currItem->TabValues[t1].tabFillChar);
if ((currItem->itemText.at(e)->cstyle & 64) || (currItem->itemText.at(e)->cstyle & 32))
{
if (chx.upper() != QString(currItem->TabValues[t1].tabFillChar))
chx = chx.upper();
}
chr = chx[0].unicode();
if ((!currItem->itemText.at(e)->cfont->CharWidth.contains(chr)) && (checkerSettings.checkGlyphs))
itemError.insert(1, 0);
}
continue;
}
if (chr == 30)
{
for (uint numco = 0x30; numco < 0x3A; ++numco)
128,9 → 160,9
for (uint e = 0; e < currItem->itemText.count(); ++e)
{
uint chr = currItem->itemText.at(e)->ch[0].unicode();
if ((chr == 13) || (chr == 32) || (chr == 29) || (chr == 9))
if ((chr == 13) || (chr == 32) || (chr == 29))
continue;
if (currItem->itemText.at(e)->cstyle & 64)
if ((currItem->itemText.at(e)->cstyle & 64) || (currItem->itemText.at(e)->cstyle & 32))
{
chx = currItem->itemText.at(e)->ch;
if (chx.upper() != currItem->itemText.at(e)->ch)
137,6 → 169,38
chx = chx.upper();
chr = chx[0].unicode();
}
if (chr == 9)
{
for (uint t1 = 0; t1 < currDoc->docParagraphStyles[currItem->itemText.at(e)->cab].TabValues.count(); t1++)
{
if (currDoc->docParagraphStyles[currItem->itemText.at(e)->cab].TabValues[t1].tabFillChar.isNull())
continue;
chx = QString(currDoc->docParagraphStyles[currItem->itemText.at(e)->cab].TabValues[t1].tabFillChar);
if ((currItem->itemText.at(e)->cstyle & 64) || (currItem->itemText.at(e)->cstyle & 32))
{
if (chx.upper() != QString(currDoc->docParagraphStyles[currItem->itemText.at(e)->cab].TabValues[t1].tabFillChar))
chx = chx.upper();
}
chr = chx[0].unicode();
if ((!currItem->itemText.at(e)->cfont->CharWidth.contains(chr)) && (checkerSettings.checkGlyphs))
itemError.insert(1, 0);
}
for (uint t1 = 0; t1 < currItem->TabValues.count(); t1++)
{
if (currItem->TabValues[t1].tabFillChar.isNull())
continue;
chx = QString(currItem->TabValues[t1].tabFillChar);
if ((currItem->itemText.at(e)->cstyle & 64) || (currItem->itemText.at(e)->cstyle & 32))
{
if (chx.upper() != QString(currItem->TabValues[t1].tabFillChar))
chx = chx.upper();
}
chr = chx[0].unicode();
if ((!currItem->itemText.at(e)->cfont->CharWidth.contains(chr)) && (checkerSettings.checkGlyphs))
itemError.insert(1, 0);
}
continue;
}
if (chr == 30)
{
for (uint numco = 0x30; numco < 0x3A; ++numco)
/branches/Version13x/Scribus/scribus/fileloader.cpp
479,6 → 479,7
doc->toolSettings.magMax = QStoInt(dc.attribute("MAGMAX","3200"));
doc->toolSettings.magStep = QStoInt(dc.attribute("MAGSTEP","25"));
doc->toolSettings.tabFillChar = dc.attribute("TabFill","");
doc->toolSettings.dTabWidth=QStodouble(dc.attribute("TabWidth", "36.0"));
if (dc.hasAttribute("CPICT"))
doc->toolSettings.dBrushPict = dc.attribute("CPICT");
doc->toolSettings.shadePict = QStoInt(dc.attribute("PICTSHADE","100"));
/branches/Version13x/Scribus/scribus/mpalette.h
151,7 → 151,6
QGroupBox* Distance2;
QGroupBox* GroupBoxCM;
QGroupBox* TLines;
QGroupBox* GroupBox3;
QGroupBox* GroupBox3a;
 
QButtonGroup* textFlowsAroundFrame;
417,7 → 416,6
QHBoxLayout* ShapeGroupLayout;
QGridLayout* DistanceLayout;
QGridLayout* DistanceLayout2;
QGridLayout* GroupBox3Layout;
QGridLayout* GroupBox3aLayout;
QVBoxLayout* GroupBoxCMLayout;
QVBoxLayout* textFlowsAroundFrameLayout;
/branches/Version13x/Scribus/scribus/tabtools.h
42,6 → 42,7
QLabel* textLabel3b;
QLabel* textLabel3b2;
QLabel* textLabel3b2t;
QLabel* textLabel3b2t2;
QLabel* textLabel1b;
QLabel* textLabel2b;
QLabel* textLabel4b;
54,6 → 55,7
QComboBox* tabFillCombo;
QLabel* textLabel5b;
MSpinBox* gapText;
MSpinBox* gapTab;
QWidget* subTabShape;
QLabel* textLabel9b;
QLabel* textLabel10b;
/branches/Version13x/Scribus/scribus/mpalette.cpp
445,19 → 445,31
ChBaseTxt->setPixmap(loadIcon("textbase.png"));
layout41->addWidget( ChBaseTxt, 1, 2 );
layout41->addWidget( ChBase, 1, 3 );
 
LineSp = new MSpinBox( page_3, 1 );
layout41->addWidget( LineSp, 2, 1 );
linespacingLabel = new QLabel( "", page_3, "linespacingLabel" );
linespacingLabel->setText("");
linespacingLabel->setPixmap(loadIcon("linespacing.png"));
layout41->addWidget( linespacingLabel, 2, 0 );
Extra = new MSpinBox( page_3, 1 );
layout41->addWidget( Extra, 2, 3 );
trackingLabel = new QLabel( "", page_3, "trackingLabel" );
trackingLabel->setText("");
trackingLabel->setPixmap(loadIcon("textkern.png"));
layout41->addWidget( trackingLabel, 2, 2 );
ChScale = new MSpinBox( 10, 400, page_3, 1 );
ChScale->setValue( 100 );
ScaleTxt = new QLabel("", page_3, "ScaleTxt" );
ScaleTxt->setPixmap(loadIcon("textscaleh.png"));
layout41->addWidget( ScaleTxt, 2, 0 );
layout41->addWidget( ChScale, 2 , 1 );
layout41->addWidget( ScaleTxt, 3, 0 );
layout41->addWidget( ChScale, 3 , 1 );
ChScaleV = new MSpinBox( 10, 400, page_3, 1 );
ChScaleV->setValue( 100 );
ScaleTxtV = new QLabel("", page_3, "ScaleTxtV" );
ScaleTxtV->setPixmap(loadIcon("textscalev.png"));
layout41->addWidget( ScaleTxtV, 2, 2 );
layout41->addWidget( ChScaleV, 2, 3 );
layout41->addWidget( ScaleTxtV, 3, 2 );
layout41->addWidget( ChScaleV, 3, 3 );
 
layout46->addLayout( layout41 );
 
layout23 = new QHBoxLayout( 0, 0, 5, "layout23");
510,27 → 522,6
GroupAlign = new AlignSelect(page_3);
pageLayout_3->addWidget( GroupAlign );
 
GroupBox3 = new QGroupBox( "Custom Spacing", page_3, "GroupBox3" );
GroupBox3->setColumnLayout(0, Qt::Vertical );
GroupBox3->layout()->setSpacing( 2 );
GroupBox3->layout()->setMargin( 5 );
GroupBox3Layout = new QGridLayout( GroupBox3->layout() );
GroupBox3Layout->setAlignment( Qt::AlignLeft );
 
LineSp = new MSpinBox( GroupBox3, 1 );
GroupBox3Layout->addWidget( LineSp, 1, 1 );
 
Extra = new MSpinBox( GroupBox3, 1 );
GroupBox3Layout->addWidget( Extra, 0, 1 );
 
trackingLabel = new QLabel( Extra, "Trac&king:", GroupBox3, "trackingLabel" );
GroupBox3Layout->addWidget( trackingLabel, 0, 0 );
 
linespacingLabel = new QLabel( LineSp, "L&ine Spacing:", GroupBox3, "linespacingLabel" );
GroupBox3Layout->addWidget( linespacingLabel, 1, 0 );
 
pageLayout_3->addWidget( GroupBox3 );
 
GroupBox3aLayout = new QGridLayout( 0, 1, 1, 0, 5, "Layout25");
GroupBox3aLayout->setAlignment( Qt::AlignLeft );
Spal = new Spalette(page_3);
3331,9 → 3322,6
Textflow3->setText(tr("&Use Contour Line"));
ShadeTxt1->setText(tr( "Shade:" ));
ShadeTxt2->setText(tr( "Shade:" ));
GroupBox3->setTitle(tr("Custom Spacing"));
trackingLabel->setText(tr("Trac&king:"));
linespacingLabel->setText(tr("L&ine Spacing:"));
styleLabel->setText(tr("St&yle:"));
langLabel->setText(tr("Lan&guage:"));
FreeScale->setText(tr("&Free Scaling"));
/branches/Version13x/Scribus/scribus/prefs.cpp
1137,6 → 1137,8
tabGuides->baseOffset->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabTools->gapText->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabTools->gapText->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabTools->gapTab->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabTools->gapTab->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
topScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val);
topScratch->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
bottomScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val);
/branches/Version13x/Scribus/scribus/reformdoc.cpp
504,6 → 504,8
tabGuides->baseOffset->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabTools->gapText->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabTools->gapText->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
tabTools->gapTab->getValues(&oldMin, &oldMax, &decimalsOld, &val);
tabTools->gapTab->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
topScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val);
topScratch->setValues(oldMin * invUnitConversion, oldMax * invUnitConversion, decimals, val * invUnitConversion);
bottomScratch->getValues(&oldMin, &oldMax, &decimalsOld, &val);
/branches/Version13x/Scribus/scribus/scribusdoc.cpp
108,6 → 108,7
toolSettings.lowResType = prefsData->toolSettings.lowResType;
toolSettings.dCols = prefsData->toolSettings.dCols;
toolSettings.dGap = prefsData->toolSettings.dGap;
toolSettings.dTabWidth = prefsData->toolSettings.dTabWidth;
toolSettings.dLineArt = PenStyle(prefsData->toolSettings.dLineArt);
toolSettings.dWidth = prefsData->toolSettings.dWidth;
toolSettings.dShadeLine = prefsData->toolSettings.dShadeLine;
/branches/Version13x/Scribus/scribus/scribusXml.cpp
2968,6 → 2968,7
dc.setAttribute("DCOL",doc->toolSettings.dCols);
dc.setAttribute("DGAP",doc->toolSettings.dGap);
dc.setAttribute("TabFill",doc->toolSettings.tabFillChar);
dc.setAttribute("TabWidth",doc->toolSettings.dTabWidth);
dc.setAttribute("AUTHOR",doc->documentInfo.getAuthor());
dc.setAttribute("COMMENTS",doc->documentInfo.getComments());
dc.setAttribute("KEYWORDS",doc->documentInfo.getKeywords());
3451,6 → 3452,7
dc9.setAttribute("StrokeText",Vor->toolSettings.dStrokeText);
dc9.setAttribute("TEXTCOL",Vor->toolSettings.dCols);
dc9.setAttribute("TEXTGAP",Vor->toolSettings.dGap);
dc9.setAttribute("TabWidth",Vor->toolSettings.dTabWidth);
dc9.setAttribute("TabFill",Vor->toolSettings.tabFillChar);
dc9.setAttribute("STIL",Vor->toolSettings.dLineArt);
dc9.setAttribute("STILLINE",Vor->toolSettings.dLstyleLine);
3819,6 → 3821,7
Vorein->toolSettings.dCols = QStoInt(dc.attribute("TEXTCOL", "1"));
Vorein->toolSettings.dGap = QStodouble(dc.attribute("TEXTGAP", "0.0"));
Vorein->toolSettings.tabFillChar = dc.attribute("TabFill", "");
Vorein->toolSettings.dTabWidth = QStodouble(dc.attribute("TabWidth", "36.0"));
Vorein->toolSettings.dLineArt = QStoInt(dc.attribute("STIL"));
Vorein->toolSettings.dLstyleLine = QStoInt(dc.attribute("STILLINE"));
Vorein->toolSettings.dWidth = QStodouble(dc.attribute("WIDTH"));
/branches/Version13x/Scribus/scribus/tabtools.cpp
189,9 → 189,15
tabFillCombo->setEditable(true);
tabFillCombo->setEditText( tr("Custom: "+prefsData->tabFillChar));
}
subTabTextLayout->addMultiCellWidget( tabFillCombo, 4, 4, 1, 3, Qt::AlignLeft );
subTabTextLayout->addWidget( tabFillCombo, 4, 1, Qt::AlignLeft );
textLabel3b2t = new QLabel(tabFillCombo, tr( "Tab Fill Character:" ), subTabText, "textLabel3b2t" );
subTabTextLayout->addWidget( textLabel3b2t, 4, 0 );
gapTab = new MSpinBox( 1, 200, subTabText, precision );
gapTab->setSuffix( unit );
gapTab->setValue(prefsData->dTabWidth * unitRatio);
subTabTextLayout->addWidget( gapTab, 4, 3, Qt::AlignLeft );
textLabel3b2t2 = new QLabel(gapTab, tr( "Tab Width:" ), subTabText, "textLabel3b2t2" );
subTabTextLayout->addWidget( textLabel3b2t2, 4, 2 );
columnsText = new QSpinBox( subTabText, "columnsText" );
columnsText->setMinValue( 1 );
columnsText->setMaxValue(100);
/branches/Version13x/Scribus/scribus/icons/textscaleh.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/textscalev.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/textkern.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/Zeichen.xpm
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/textbase.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/Makefile.am
1,8 → 1,9
EXTRA_DIST = textbase.png textscaleh.png textkern.png textscalev.png wordsOnly.png shadow.png AllCaps.png DrawFrame.xpm DrawImageFrame.xpm DrawPolylineFrame.xpm DrawTable.xpm DrawTextFrame.xpm plugins.png filenew.png fileopen.png editcopy22.png edittrash.png font_otf16.png font_truetype16.png font_type1_16.png font_otf.png font_truetype.png font_type1.png acroread.png checkdoc.png vectorgfx.png ooo_draw.png ooo_writer.png key_bindings.png blend.png hyphenate.png scrap.png misc.png tools.png page.png guides.png font.png screen.png nftabout.xpm nftinfo.xpm dist.png tab.png view.png Kreuz.xpm Bild.xpm Bild16.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift16.xpm Stift.xpm Text.xpm Text16.xpm Unlock.xpm DateiClose.png DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave2.png AppIcon2.png AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline16.png spline.png triangle.png Stiftalt.xpm Stiftalt16.xpm beziertool.png beziertool16.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png ok22.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png frame_table16.png frame_table.png scribusdoc.png documentinfo.png documentinfo32.png filesaveas.png revert.png reload.png compfile.png reload16.png compfile16.png find.png find16.png addf.png removef.png launch.png launch16.png u_undo.png u_redo.png u_undo16.png u_redo16.png u_margins.png u_margins_locked.png u_align.png u_move.png u_resize.png u_rotate.png u_group.png u_fill.png u_shade.png u_lock.png u_unlock.png u_create.png u_delete.png u_fliph.png u_flipv.png u_cut.png u_transp.png u_line.png u_arrow.png u_font.png u_svg.png u_eps.png u_scale_image.png u_shape.png docattributes.png tabtocindex.png colorpicker.png wizard.png
EXTRA_DIST = linespacing.png textbase.png textscaleh.png textkern.png textscalev.png wordsOnly.png shadow.png AllCaps.png DrawFrame.xpm DrawImageFrame.xpm DrawPolylineFrame.xpm DrawTable.xpm DrawTextFrame.xpm plugins.png filenew.png fileopen.png editcopy22.png edittrash.png font_otf16.png font_truetype16.png font_type1_16.png font_otf.png font_truetype.png font_type1.png acroread.png checkdoc.png vectorgfx.png ooo_draw.png ooo_writer.png key_bindings.png blend.png hyphenate.png scrap.png misc.png tools.png page.png guides.png font.png screen.png nftabout.xpm nftinfo.xpm dist.png tab.png view.png Kreuz.xpm Bild.xpm Bild16.xpm Editm.xpm Kreise.xpm Lock.xpm Lupe.xpm Rechtecke.xpm Rotieren.xpm Stift16.xpm Stift.xpm Text.xpm Text16.xpm Unlock.xpm DateiClose.png DateiNeu.xpm DateiOpen.xpm DateiPrint.xpm DateiSave2.png AppIcon2.png AppIcon.png LupeZ.xpm Gross.xpm Klein.xpm DragPix.xpm Rotieren2.xpm HandC.xpm scribus_logo.jpg DateiClos16.png DateiNeu16.png DateiOpen16.png DateiPrint16.png DateiSave16.png editcopy.png editcut.png editdelete.png editpaste.png exit.png doc.png image.png pdf.png postscript.png txt.png Zeichen.xpm Hoch.xpm Kapital.xpm Strike.xpm Tief.xpm Unter.xpm Kern.xpm Spacing.xpm Corner.xpm FlipH.xpm FlipV.xpm Winkel.xpm acrobat.png scribusicon.png text_block.png text_center.png text_left.png text_right.png Text2.xpm spline16.png spline.png triangle.png Stiftalt.xpm Stiftalt16.xpm beziertool.png beziertool16.png AddNode.png DeleteNode.png MoveAsym.png MoveKontrol.png MoveNode.png MoveSym.png BevelJoin.png ButtCap.png MiterJoin.png RoundJoin.png SquareCap.png ResetNode.png RoundCap.png Reset1Node.png BezierClose.png PolyCut.png AddPoint.png DelPoint.png Split.png Deletelayer.png Layervisible.xpm Lowerlayer.png Newlayer.png Raiselayer.png checkbox.png combobox.png listbox.png pushbutton.png textview.png charset.png goto.png document2.png trashcan.png trashcan2.png gohome.png bottom.png down.png top.png up.png irreg.png text_force.png ok.png ok22.png Revers.png hmirror.png vmirror.png shear_right.png shear_left.png shear_up.png shear_down.png Splash.png back.png start.png forward.png finish.png penciladd.png pencilsub.png outlined.png fill.png NoPrint.png unlock.png locked.png signature.png rotate_cw.png rotate_ccw.png crop.png expand.png frameresize.png framenoresize.png testfill.png frame_table16.png frame_table.png scribusdoc.png documentinfo.png documentinfo32.png filesaveas.png revert.png reload.png compfile.png reload16.png compfile16.png find.png find16.png addf.png removef.png launch.png launch16.png u_undo.png u_redo.png u_undo16.png u_redo16.png u_margins.png u_margins_locked.png u_align.png u_move.png u_resize.png u_rotate.png u_group.png u_fill.png u_shade.png u_lock.png u_unlock.png u_create.png u_delete.png u_fliph.png u_flipv.png u_cut.png u_transp.png u_line.png u_arrow.png u_font.png u_svg.png u_eps.png u_scale_image.png u_shape.png docattributes.png tabtocindex.png colorpicker.png wizard.png
 
install-data-local:
$(mkinstalldirs) $(prefix)/share/scribus/icons/
$(mkinstalldirs) $(prefix)/share/pixmaps/
$(INSTALL_DATA) $(srcdir)/linespacing.png $(prefix)/share/scribus/icons/linespacing.png
$(INSTALL_DATA) $(srcdir)/textbase.png $(prefix)/share/scribus/icons/textbase.png
$(INSTALL_DATA) $(srcdir)/textscalev.png $(prefix)/share/scribus/icons/textscalev.png
$(INSTALL_DATA) $(srcdir)/textscaleh.png $(prefix)/share/scribus/icons/textscaleh.png
474,4 → 475,5
-rm -f $(prefix)/share/scribus/icons/textscalev.png
-rm -f $(prefix)/share/scribus/icons/textscaleh.png
-rm -f $(prefix)/share/scribus/icons/textkern.png
-rm -f $(prefix)/share/scribus/icons/linespacing.png
 
/branches/Version13x/Scribus/scribus/scribusstructs.h
396,6 → 396,7
int dCols;
double dGap;
QString tabFillChar;
double dTabWidth;
/* ShapeTool */
QString dPen;
QString dBrush;
/branches/Version13x/Scribus/scribus/pageitem.cpp
691,7 → 691,7
}
chs = hl->csize;
oldCurY = SetZeichAttr(hl, &chs, &chx);
if ((chx == QChar(9)) && (!Doc->RePos) && (!tTabValues[tabCc].tabFillChar.isNull()) && (tabCc < tTabValues.count()))
if ((chx == QChar(9)) && (tTabValues.count() != 0) && (tabCc < tTabValues.count()) && (!tTabValues[tabCc].tabFillChar.isNull()))
{
double wt = Cwidth(Doc, hl->cfont, QString(tTabValues[tabCc].tabFillChar), chs);
int coun = static_cast<int>((hl->xp - tabDist) / wt);
1219,7 → 1219,6
CurX += Doc->docParagraphStyles[hl->cab].Indent;
fBorder = false;
}
StartOfCol = false;
if (RTab)
{
if (((hl->ch == ".") && (TabCode == 2)) || ((hl->ch == ",") && (TabCode == 3)) || (hl->ch == QChar(9)))
1244,13 → 1243,13
{
if ((CurX - ColBound.x()) != 0)
{
if (CurX == ColBound.x() + ceil((CurX-ColBound.x()) / 36.0) * 36.0)
CurX += 36.0;
if (CurX == ColBound.x() + ceil((CurX-ColBound.x()) / Doc->toolSettings.dTabWidth) * Doc->toolSettings.dTabWidth)
CurX += Doc->toolSettings.dTabWidth;
else
CurX = ColBound.x() + ceil((CurX-ColBound.x()) / 36.0) * 36.0;
CurX = ColBound.x() + ceil((CurX-ColBound.x()) / Doc->toolSettings.dTabWidth) * Doc->toolSettings.dTabWidth;
}
else
CurX = ColBound.x() + 36.0;
CurX = ColBound.x() + Doc->toolSettings.dTabWidth;
TabCode = 0;
RTab = false;
}
1271,7 → 1270,7
else
RTab = true;
if (tCurX == oCurX-wide)
CurX = ColBound.x() + ceil((CurX-ColBound.x()) / 36.0) * 36.0;
CurX = ColBound.x() + ceil((CurX-ColBound.x()) / Doc->toolSettings.dTabWidth) * Doc->toolSettings.dTabWidth;
else
CurX = ColBound.x() + tCurX;
}
1669,6 → 1668,24
hl->yp = CurY;
LiList.at(LiList.count()-1)->xco = hl->xp;
LiList.at(LiList.count()-1)->yco = hl->yp;
if ((!AbsHasDrop) && (StartOfCol) && (!Doc->docParagraphStyles[hl->cab].BaseAdj))
{
Zli2 = LiList.at(0);
double firstasce = Zli2->ZFo->numAscent * (Zli2->Siz / 10.0);
double currasce = RealCAscent(Doc, Zli2->ZFo, Zli2->Zeich, Zli2->Siz);
for (uint zc = 0; zc < LiList.count(); ++zc)
{
Zli2 = LiList.at(zc);
currasce = QMAX(currasce, RealCAscent(Doc, Zli2->ZFo, Zli2->Zeich, Zli2->Siz));
}
double adj = firstasce - currasce;
for (uint zc = 0; zc < LiList.count(); ++zc)
{
LiList.at(zc)->yco -= adj;
}
CurY -= adj;
}
StartOfCol = false;
tabDist = ColBound.x();
uint tabCc = 0;
for (uint zc = 0; zc<BuPos3; ++zc)
1714,7 → 1731,7
}
if (!Doc->RePos)
{
if ((Zli2->Zeich == QChar(9)) && (!tTabValues[tabCc].tabFillChar.isNull()) && (tabCc < tTabValues.count()))
if ((Zli2->Zeich == QChar(9)) && (tTabValues.count() != 0) && (tabCc < tTabValues.count()) && (!tTabValues[tabCc].tabFillChar.isNull()))
{
double wt = Cwidth(Doc, Zli2->ZFo, QString(tTabValues[tabCc].tabFillChar), Zli2->Siz);
int coun = static_cast<int>((Zli2->xco - tabDist) / wt);
1815,6 → 1832,24
}
}
}
if ((!AbsHasDrop) && (StartOfCol) && (!Doc->docParagraphStyles[hl->cab].BaseAdj))
{
Zli2 = LiList.at(0);
double firstasce = Zli2->ZFo->numAscent * (Zli2->Siz / 10.0);
double currasce = RealCAscent(Doc, Zli2->ZFo, Zli2->Zeich, Zli2->Siz);
for (uint zc = 0; zc < LiList.count(); ++zc)
{
Zli2 = LiList.at(zc);
currasce = QMAX(currasce, RealCAscent(Doc, Zli2->ZFo, Zli2->Zeich, Zli2->Siz));
}
double adj = firstasce - currasce;
for (uint zc = 0; zc < LiList.count(); ++zc)
{
LiList.at(zc)->yco -= adj;
}
CurY -= adj;
}
StartOfCol = false;
tabDist = ColBound.x();
uint tabCc = 0;
for (uint zc = 0; zc<LiList.count(); ++zc)
1860,7 → 1895,7
}
if (!Doc->RePos)
{
if ((Zli2->Zeich == QChar(9)) && (!tTabValues[tabCc].tabFillChar.isNull()) && (tabCc < tTabValues.count()))
if ((Zli2->Zeich == QChar(9)) && (tTabValues.count() != 0) && (tabCc < tTabValues.count()) && (!tTabValues[tabCc].tabFillChar.isNull()))
{
double wt = Cwidth(Doc, Zli2->ZFo, QString(tTabValues[tabCc].tabFillChar), Zli2->Siz);
int coun = static_cast<int>((Zli2->xco - tabDist) / wt);
/branches/Version13x/Scribus/scribus/tabtypography.cpp
31,7 → 31,7
groupBox1aLayout->addWidget( subScaling, 0, 3, Qt::AlignLeft );
textLabel2a = new QLabel(subScaling, tr( "&Scaling:" ), groupBox1a, "textLabel2a" );
groupBox1aLayout->addWidget( textLabel2a, 0, 2 );
tabTypoLayout->addWidget( groupBox1a, 0, 0 );
tabTypoLayout->addMultiCellWidget( groupBox1a, 0, 0, 0, 1 );
groupBox2a = new QGroupBox( this, "groupBox2a" );
groupBox2a->setColumnLayout(0, Qt::Vertical );
groupBox2a->layout()->setSpacing( 6 );
52,22 → 52,7
groupBox2aLayout->addWidget( superScaling, 0, 3, Qt::AlignLeft );
textLabel4a = new QLabel(superScaling, tr( "S&caling:" ), groupBox2a, "textLabel4a" );
groupBox2aLayout->addWidget( textLabel4a, 0, 2 );
tabTypoLayout->addWidget( groupBox2a, 1, 0 );
groupBox3a = new QGroupBox( this, "groupBox3a" );
groupBox3a->setColumnLayout(0, Qt::Vertical );
groupBox3a->layout()->setSpacing( 6 );
groupBox3a->layout()->setMargin( 11 );
groupBox3a->setTitle( tr( "Small Caps" ) );
groupBox3aLayout = new QGridLayout( groupBox3a->layout() );
groupBox3aLayout->setAlignment( Qt::AlignTop );
capsScaling = new QSpinBox( groupBox3a, "capsScaling" );
capsScaling->setMaxValue( 100 );
capsScaling->setMinValue( 1 );
capsScaling->setSuffix( tr( " %" ) );
groupBox3aLayout->addWidget( capsScaling, 0, 1, Qt::AlignLeft );
textLabel5a = new QLabel(capsScaling, tr( "Sc&aling:" ), groupBox3a, "textLabel5a" );
groupBox3aLayout->addWidget( textLabel5a, 0, 0 );
tabTypoLayout->addWidget( groupBox3a, 2, 0 );
tabTypoLayout->addMultiCellWidget( groupBox2a, 1, 1, 0, 1 );
 
underlineGroup = new QGroupBox( this, "underlineGroup" );
underlineGroup->setTitle( tr( "Underline" ) );
92,7 → 77,7
underlineWidth->setWrapping(true);
underlineWidth->setSpecialValueText( tr( "Auto" ) );
underlineGroupLayout->addWidget( underlineWidth, 0, 3 );
tabTypoLayout->addWidget( underlineGroup, 3, 0 );
tabTypoLayout->addMultiCellWidget( underlineGroup, 2, 2, 0, 1 );
 
strikethruGroup = new QGroupBox( this, "strikethruGroup" );
strikethruGroup->setTitle( tr( "Strikethru" ) );
117,8 → 102,24
strikethruWidth->setSuffix( tr( " %" ) );
strikethruWidth->setSpecialValueText( tr( "Auto" ) );
strikethruGroupLayout->addWidget( strikethruWidth, 0, 3 );
tabTypoLayout->addWidget( strikethruGroup, 4, 0 );
tabTypoLayout->addMultiCellWidget( strikethruGroup, 3, 3, 0, 1 );
 
groupBox3a = new QGroupBox( this, "groupBox3a" );
groupBox3a->setColumnLayout(0, Qt::Vertical );
groupBox3a->layout()->setSpacing( 6 );
groupBox3a->layout()->setMargin( 11 );
groupBox3a->setTitle( tr( "Small Caps" ) );
groupBox3aLayout = new QGridLayout( groupBox3a->layout() );
groupBox3aLayout->setAlignment( Qt::AlignTop );
capsScaling = new QSpinBox( groupBox3a, "capsScaling" );
capsScaling->setMaxValue( 100 );
capsScaling->setMinValue( 1 );
capsScaling->setSuffix( tr( " %" ) );
groupBox3aLayout->addWidget( capsScaling, 0, 1, Qt::AlignLeft );
textLabel5a = new QLabel(capsScaling, tr( "Sc&aling:" ), groupBox3a, "textLabel5a" );
groupBox3aLayout->addWidget( textLabel5a, 0, 0 );
tabTypoLayout->addWidget( groupBox3a, 4, 0 );
 
groupBox4a = new QGroupBox( this, "groupBox3a" );
groupBox4a->setColumnLayout(0, Qt::Vertical );
groupBox4a->layout()->setSpacing( 6 );
133,7 → 134,7
groupBox4aLayout->addWidget( autoLine, 1, 1 );
textLabel8a = new QLabel( autoLine, tr( "Line Spacing:" ), groupBox4a, "textLabel8a" );
groupBox4aLayout->addWidget( textLabel8a, 1, 0 );
tabTypoLayout->addWidget( groupBox4a, 5, 0 );
tabTypoLayout->addWidget( groupBox4a, 4, 1 );
restoreDefaults(prefsData);
QToolTip::add( superDisplacement, tr( "Displacement above the baseline of the font on a line" ) );
QToolTip::add( superScaling, tr( "Relative size of the superscript compared to the normal font" ) );
/branches/Version13x/Scribus/scribus/libpostscript/pslib.cpp
1991,7 → 1991,7
tTabValues = Doc->docParagraphStyles[hl->cab].TabValues;
if (hl->cstyle & 16384)
tabCc = 0;
if (hl->ch == QChar(9))
if ((hl->ch == QChar(9)) && (tTabValues.count() != 0))
{
if ((!tTabValues[tabCc].tabFillChar.isNull()) && (tabCc < tTabValues.count()))
{
/branches/Version13x/Scribus/scribus/scribus.cpp
472,6 → 472,7
Prefs.toolSettings.dPenText = "Black";
Prefs.toolSettings.dStrokeText = "Black";
Prefs.toolSettings.tabFillChar = "";
Prefs.toolSettings.dTabWidth = 36.0;
Prefs.DpapColor = QColor(white);
Prefs.toolSettings.dCols = 1;
Prefs.toolSettings.dGap = 0.0;
3075,6 → 3076,7
doc->toolSettings.dPenText = "None";
doc->toolSettings.dCols = dia->tabTools->columnsText->value();
doc->toolSettings.dGap = dia->tabTools->gapText->value() / doc->unitRatio;
doc->toolSettings.dTabWidth = dia->tabTools->gapTab->value() / doc->unitRatio;
doc->toolSettings.dPen = dia->tabTools->colorComboLineShape->currentText();
if (doc->toolSettings.dPen == tr("None"))
doc->toolSettings.dPen = "None";
8078,6 → 8080,7
Prefs.toolSettings.dStrokeText = "None";
Prefs.toolSettings.dCols = dia->tabTools->columnsText->value();
Prefs.toolSettings.dGap = dia->tabTools->gapText->value() / UmReFaktor;
Prefs.toolSettings.dTabWidth = dia->tabTools->gapTab->value() / UmReFaktor;
Prefs.toolSettings.dBrush = dia->tabTools->comboFillShape->currentText();
if (Prefs.toolSettings.dBrush == tr("None"))
Prefs.toolSettings.dBrush = "None";
10233,6 → 10236,11
if (doc->docParagraphStyles[it->itemText.at(e)->cab].TabValues[t1].tabFillChar.isNull())
continue;
chx = QString(doc->docParagraphStyles[it->itemText.at(e)->cab].TabValues[t1].tabFillChar);
if ((it->itemText.at(e)->cstyle & 64) || (it->itemText.at(e)->cstyle & 32))
{
if (chx.upper() != QString(doc->docParagraphStyles[it->itemText.at(e)->cab].TabValues[t1].tabFillChar))
chx = chx.upper();
}
chr = chx[0].unicode();
gly = it->itemText.at(e)->cfont->GlyphArray[chr].Outlines.copy();
it->itemText.at(e)->cfont->RealGlyphs.insert(chr, gly);
10242,6 → 10250,11
if (it->TabValues[t1].tabFillChar.isNull())
continue;
chx = QString(it->TabValues[t1].tabFillChar);
if ((it->itemText.at(e)->cstyle & 64) || (it->itemText.at(e)->cstyle & 32))
{
if (chx.upper() != QString(it->TabValues[t1].tabFillChar))
chx = chx.upper();
}
chr = chx[0].unicode();
gly = it->itemText.at(e)->cfont->GlyphArray[chr].Outlines.copy();
it->itemText.at(e)->cfont->RealGlyphs.insert(chr, gly);
10293,6 → 10306,11
if (doc->docParagraphStyles[it->itemText.at(e)->cab].TabValues[t1].tabFillChar.isNull())
continue;
chx = QString(doc->docParagraphStyles[it->itemText.at(e)->cab].TabValues[t1].tabFillChar);
if ((it->itemText.at(e)->cstyle & 64) || (it->itemText.at(e)->cstyle & 32))
{
if (chx.upper() != QString(doc->docParagraphStyles[it->itemText.at(e)->cab].TabValues[t1].tabFillChar))
chx = chx.upper();
}
chr = chx[0].unicode();
gly = it->itemText.at(e)->cfont->GlyphArray[chr].Outlines.copy();
it->itemText.at(e)->cfont->RealGlyphs.insert(chr, gly);
10302,6 → 10320,11
if (it->TabValues[t1].tabFillChar.isNull())
continue;
chx = QString(it->TabValues[t1].tabFillChar);
if ((it->itemText.at(e)->cstyle & 64) || (it->itemText.at(e)->cstyle & 32))
{
if (chx.upper() != QString(it->TabValues[t1].tabFillChar))
chx = chx.upper();
}
chr = chx[0].unicode();
gly = it->itemText.at(e)->cfont->GlyphArray[chr].Outlines.copy();
it->itemText.at(e)->cfont->RealGlyphs.insert(chr, gly);
/branches/Version13x/Scribus/scribus/libpdf/pdflib.cpp
2571,7 → 2571,7
tTabValues = doc->docParagraphStyles[hl->cab].TabValues;
if (hl->cstyle & 16384)
tabCc = 0;
if (hl->ch == QChar(9))
if ((hl->ch == QChar(9)) && (tTabValues.count() != 0))
{
if ((!tTabValues[tabCc].tabFillChar.isNull()) && (tabCc < tTabValues.count()))
{