Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2187 → Rev 2188

/branches/Version13x/Scribus/scribus/search.cpp
444,7 → 444,7
}
if (SEffect->isChecked())
{
if ((Item->itemText.at(a)->cstyle & 127) != sEff)
if ((Item->itemText.at(a)->cstyle & 1919) != sEff)
found = false;
}
if (SFill->isChecked())
568,7 → 568,7
found = false;
if ((SFillS->isChecked()) && (hg->cshade != sFillSh))
found = false;
if ((SEffect->isChecked()) && ((hg->cstyle & 127) != sEff))
if ((SEffect->isChecked()) && ((hg->cstyle & 1919) != sEff))
found = false;
if ((SFill->isChecked()) && (hg->ccolor != fCol))
found = false;
604,7 → 604,7
found = false;
if ((SFillS->isChecked()) && (hg->cshade != sFillSh))
found = false;
if ((SEffect->isChecked()) && ((hg->cstyle & 127) != sEff))
if ((SEffect->isChecked()) && ((hg->cstyle & 1919) != sEff))
found = false;
if ((SFill->isChecked()) && (hg->ccolor != fCol))
found = false;
757,7 → 757,7
{
if (Item->itemText.at(a)->cselect)
{
Item->itemText.at(a)->cstyle &= ~127;
Item->itemText.at(a)->cstyle &= ~1919;
Item->itemText.at(a)->cstyle |= s;
}
}
/branches/Version13x/Scribus/scribus/styleselect.cpp
12,12 → 12,27
{
ssLayout = new QHBoxLayout( this, 0, 0, "ssLayout");
 
underlineButton = new QToolButton( this, "underlineButton" );
buttonGroup3 = new QGroupBox( this, "buttonGroup" );
buttonGroup3->setFrameShape( QGroupBox::NoFrame );
buttonGroup3->setTitle("");
buttonGroup3->setColumnLayout(0, Qt::Vertical );
buttonGroup3->layout()->setSpacing( 0 );
buttonGroup3->layout()->setMargin( 0 );
buttonGroup3Layout = new QHBoxLayout( buttonGroup3->layout() );
buttonGroup3Layout->setAlignment( Qt::AlignTop );
underlineButton = new QToolButton( buttonGroup3, "underlineButton" );
underlineButton->setText( "" );
underlineButton->setMaximumSize( QSize( 22, 22 ) );
underlineButton->setPixmap(loadIcon("Unter.xpm"));
underlineButton->setToggleButton( true );
ssLayout->addWidget( underlineButton );
buttonGroup3Layout->addWidget( underlineButton );
underlineWordButton = new QToolButton( buttonGroup3, "underlineButton" );
underlineWordButton->setText( "" );
underlineWordButton->setMaximumSize( QSize( 22, 22 ) );
underlineWordButton->setPixmap(loadIcon("wordsOnly.png"));
underlineWordButton->setToggleButton( true );
buttonGroup3Layout->addWidget( underlineWordButton );
ssLayout->addWidget( buttonGroup3 );
 
buttonGroup = new QGroupBox( this, "buttonGroup" );
buttonGroup->setFrameShape( QGroupBox::NoFrame );
27,7 → 42,6
buttonGroup->layout()->setMargin( 0 );
buttonGroupLayout = new QHBoxLayout( buttonGroup->layout() );
buttonGroupLayout->setAlignment( Qt::AlignTop );
 
subscriptButton = new QToolButton( buttonGroup, "subscriptButton" );
subscriptButton->setText( "" );
subscriptButton->setMaximumSize( QSize( 22, 22 ) );
34,7 → 48,6
subscriptButton->setPixmap(loadIcon("Tief.xpm"));
subscriptButton->setToggleButton( true );
buttonGroupLayout->addWidget( subscriptButton );
 
superscriptButton = new QToolButton( buttonGroup, "superscriptButton" );
superscriptButton->setText( "" );
superscriptButton->setMaximumSize( QSize( 22, 22 ) );
51,7 → 64,6
buttonGroup2->layout()->setMargin( 0 );
buttonGroup2Layout = new QHBoxLayout( buttonGroup2->layout() );
buttonGroup2Layout->setAlignment( Qt::AlignTop );
 
allcapsButton = new QToolButton( buttonGroup2, "allcapsButton" );
allcapsButton->setMaximumSize( QSize( 22, 22 ) );
allcapsButton->setText("");
58,7 → 70,6
allcapsButton->setPixmap(loadIcon("AllCaps.png"));
allcapsButton->setToggleButton( true );
buttonGroup2Layout->addWidget( allcapsButton );
 
smallcapsButton = new QToolButton( buttonGroup2, "smallcapsButton" );
smallcapsButton->setMaximumSize( QSize( 22, 22 ) );
smallcapsButton->setText("");
82,6 → 93,7
ssLayout->addWidget( outlineButton );
 
QToolTip::add( underlineButton, tr( "Underline" ) );
QToolTip::add( underlineWordButton, tr( "Underline Words only" ) );
QToolTip::add( allcapsButton, tr( "All Caps" ) );
QToolTip::add( smallcapsButton, tr( "Small Caps" ) );
QToolTip::add( subscriptButton, tr( "Subscript" ) );
92,6 → 104,7
connect(allcapsButton, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
connect(smallcapsButton, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
connect(underlineButton, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
connect(underlineWordButton, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
connect(subscriptButton, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
connect(strikeoutButton, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
connect(superscriptButton, SIGNAL(clicked()), this, SLOT(setTypeStyle()));
106,6 → 119,7
subscriptButton->setOn(false);
strikeoutButton->setOn(false);
underlineButton->setOn(false);
underlineWordButton->setOn(false);
allcapsButton->setOn(false);
smallcapsButton->setOn(false);
outlineButton->setOn(false);
123,6 → 137,8
allcapsButton->setOn(true);
if (s & 64)
smallcapsButton->setOn(true);
if (s & 512)
underlineWordButton->setOn(true);
}
 
int StyleSelect::getStyle()
142,6 → 158,8
ret |= 32;
if (smallcapsButton->isOn())
ret |= 64;
if (underlineWordButton->isOn())
ret |= 512;
return ret;
}
 
155,6 → 173,10
smallcapsButton->setOn(false);
if (smallcapsButton == sender())
allcapsButton->setOn(false);
if (underlineWordButton == sender())
underlineButton->setOn(false);
if (underlineButton == sender())
underlineWordButton->setOn(false);
emit State(getStyle());
}
 
/branches/Version13x/Scribus/scribus/about.cpp
51,7 → 51,7
tabLayout1->addWidget( pixmapLabel1 );
buildID = new QLabel( tab, "BB" );
buildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1 %2 %3 ").arg("15").arg("May").arg("2005");
QString bu = tr("%1 %2 %3 ").arg("16").arg("May").arg("2005");
#ifdef HAVE_CMS
bu += "C";
#else
/branches/Version13x/Scribus/scribus/story.cpp
1090,7 → 1090,7
chars->at(ca)->csize = hg->csize;
break;
case 4:
chars->at(ca)->cstyle &= ~127;
chars->at(ca)->cstyle &= ~1919;
chars->at(ca)->cstyle |= hg->cstyle;
break;
case 5:
1998,7 → 1998,7
Editor->CurrTextStrokeSh = hg->cshade2;
Editor->CurrFont = hg->cfont;
Editor->CurrFontSize = hg->csize;
Editor->CurrentStyle = hg->cstyle & 127;
Editor->CurrentStyle = hg->cstyle & 1919;
Editor->CurrTextKern = hg->cextra;
Editor->CurrTextScale = hg->cscale;
}
2351,7 → 2351,7
{
chars->at(s)->cfont = doc->docParagraphStyles[Editor->currentParaStyle].Font;
chars->at(s)->csize = doc->docParagraphStyles[Editor->currentParaStyle].FontSize;
chars->at(s)->cstyle &= ~127;
chars->at(s)->cstyle &= ~1919;
chars->at(s)->cstyle |= doc->docParagraphStyles[Editor->currentParaStyle].FontEffect;
chars->at(s)->ccolor = doc->docParagraphStyles[Editor->currentParaStyle].FColor;
chars->at(s)->cshade = doc->docParagraphStyles[Editor->currentParaStyle].FShade;
2367,7 → 2367,7
chars->at(s)->cshade2 = CurrItem->ShTxtStroke;
chars->at(s)->cfont = CurrItem->IFont;
chars->at(s)->csize = CurrItem->ISize;
chars->at(s)->cstyle &= ~127;
chars->at(s)->cstyle &= ~1919;
chars->at(s)->cstyle |= CurrItem->TxTStyle;
}
chars->at(s)->cab = Editor->currentParaStyle;
2465,7 → 2465,7
{
chars->at(s)->cfont = doc->docParagraphStyles[Editor->currentParaStyle].Font;
chars->at(s)->csize = doc->docParagraphStyles[Editor->currentParaStyle].FontSize;
chars->at(s)->cstyle &= ~127;
chars->at(s)->cstyle &= ~1919;
chars->at(s)->cstyle |= doc->docParagraphStyles[Editor->currentParaStyle].FontEffect;
chars->at(s)->ccolor = doc->docParagraphStyles[Editor->currentParaStyle].FColor;
chars->at(s)->cshade = doc->docParagraphStyles[Editor->currentParaStyle].FShade;
2481,7 → 2481,7
chars->at(s)->cshade2 = CurrItem->ShTxtStroke;
chars->at(s)->cfont = CurrItem->IFont;
chars->at(s)->csize = CurrItem->ISize;
chars->at(s)->cstyle &= ~127;
chars->at(s)->cstyle &= ~1919;
chars->at(s)->cstyle |= CurrItem->TxTStyle;
}
chars->at(s)->cab = Editor->currentParaStyle;
/branches/Version13x/Scribus/scribus/icons/wordsOnly.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/icons/shadow.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/icons/shadow.png
Property changes:
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Index: branches/Version13x/Scribus/scribus/icons/Makefile.am
===================================================================
--- branches/Version13x/Scribus/scribus/icons/Makefile.am (revision 2187)
+++ branches/Version13x/Scribus/scribus/icons/Makefile.am (revision 2188)
@@ -1,8 +1,10 @@
-EXTRA_DIST = 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 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 = 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 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)/wordsOnly.png $(prefix)/share/scribus/icons/wordsOnly.png
+ $(INSTALL_DATA) $(srcdir)/shadow.png $(prefix)/share/scribus/icons/shadow.png
$(INSTALL_DATA) $(srcdir)/AllCaps.png $(prefix)/share/scribus/icons/AllCaps.png
$(INSTALL_DATA) $(srcdir)/acrobat.png $(prefix)/share/scribus/icons/acrobat.png
$(INSTALL_DATA) $(srcdir)/acroread.png $(prefix)/share/scribus/icons/acroread.png
@@ -236,6 +238,8 @@
uninstall-local:
-rm -f $(prefix)/share/pixmaps/scribusicon.png
+ -rm -f $(prefix)/share/pixmaps/wordsOnly.png
+ -rm -f $(prefix)/share/pixmaps/shadow.png
-rm -f $(prefix)/share/scribus/icons/AllCaps.png
-rm -f $(prefix)/share/scribus/icons/acrobat.png
-rm -f $(prefix)/share/scribus/icons/acroread.png
/branches/Version13x/Scribus/scribus/icons/AllCaps.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/branches/Version13x/Scribus/scribus/styleselect.h
26,9 → 26,12
QHBoxLayout* ssLayout;
QHBoxLayout* buttonGroupLayout;
QHBoxLayout* buttonGroup2Layout;
QHBoxLayout* buttonGroup3Layout;
QGroupBox* buttonGroup;
QGroupBox* buttonGroup2;
QGroupBox* buttonGroup3;
QToolButton* underlineButton;
QToolButton* underlineWordButton;
QToolButton* subscriptButton;
QToolButton* superscriptButton;
QToolButton* smallcapsButton;
/branches/Version13x/Scribus/scribus/pageitem.cpp
2434,7 → 2434,7
p->setLineWidth(lw);
p->drawLine(FPoint(hl->xco-hl->kern, hl->yco-st), FPoint(hl->xco+hl->wide, hl->yco-st));
}
if (hl->Style & 8)
if ((hl->Style & 8) || ((hl->Style & 512) && (!ccx[0].isSpace())))
{
double st, lw;
if ((Doc->typographicSetttings.valueUnderlinePos != -1) || (Doc->typographicSetttings.valueUnderlineWidth != -1))
/branches/Version13x/Scribus/scribus/actionmanager.cpp
193,6 → 193,7
scrActionGroups->insert("typeEffects", new QActionGroup(ScApp, "typeEffects", false));
scrActions->insert("typeEffectNormal", new ScrAction(ScrAction::DataInt, QIconSet(), "", QKeySequence(), (*scrActionGroups)["typeEffects"], "typeEffectNormal", 0));
scrActions->insert("typeEffectUnderline", new ScrAction(ScrAction::DataInt, QIconSet(), "", QKeySequence(), (*scrActionGroups)["typeEffects"], "typeEffectUnderline", 1));
scrActions->insert("typeEffectUnderlineWords", new ScrAction(ScrAction::DataInt, QIconSet(), "", QKeySequence(), (*scrActionGroups)["typeEffects"], "typeEffectUnderlineWords", 8));
scrActions->insert("typeEffectStrikeThrough", new ScrAction(ScrAction::DataInt, QIconSet(), "", QKeySequence(), (*scrActionGroups)["typeEffects"], "typeEffectStrikeThrough", 2));
scrActions->insert("typeEffectAllCaps", new ScrAction(ScrAction::DataInt, QIconSet(), "", QKeySequence(), (*scrActionGroups)["typeEffects"], "typeEffectAllCaps", 7));
scrActions->insert("typeEffectSmallCaps", new ScrAction(ScrAction::DataInt, QIconSet(), "", QKeySequence(), (*scrActionGroups)["typeEffects"], "typeEffectSmallCaps", 3));
201,6 → 202,7
scrActions->insert("typeEffectOutline", new ScrAction(ScrAction::DataInt, QIconSet(), "", QKeySequence(), (*scrActionGroups)["typeEffects"], "typeEffectOutline", 6));
(*scrActions)["typeEffectNormal"]->setToggleAction(true);
(*scrActions)["typeEffectUnderline"]->setToggleAction(true);
(*scrActions)["typeEffectUnderlineWords"]->setToggleAction(true);
(*scrActions)["typeEffectStrikeThrough"]->setToggleAction(true);
(*scrActions)["typeEffectAllCaps"]->setToggleAction(true);
(*scrActions)["typeEffectSmallCaps"]->setToggleAction(true);
209,6 → 211,7
(*scrActions)["typeEffectOutline"]->setToggleAction(true);
connect( (*scrActions)["typeEffectNormal"], SIGNAL(activatedData(int)), ScApp, SLOT(setItemTypeStyle(int)));
connect( (*scrActions)["typeEffectUnderline"], SIGNAL(activatedData(int)), ScApp, SLOT(setItemTypeStyle(int)));
connect( (*scrActions)["typeEffectUnderlineWords"], SIGNAL(activatedData(int)), ScApp, SLOT(setItemTypeStyle(int)));
connect( (*scrActions)["typeEffectStrikeThrough"], SIGNAL(activatedData(int)), ScApp, SLOT(setItemTypeStyle(int)));
connect( (*scrActions)["typeEffectSmallCaps"], SIGNAL(activatedData(int)), ScApp, SLOT(setItemTypeStyle(int)));
connect( (*scrActions)["typeEffectAllCaps"], SIGNAL(activatedData(int)), ScApp, SLOT(setItemTypeStyle(int)));
773,6 → 776,7
(*scrActions)["shadeOther"]->setMenuText(tr("&Other..."));
(*scrActions)["typeEffectNormal"]->setMenuText(tr("&Normal"));
(*scrActions)["typeEffectUnderline"]->setMenuText(tr("&Underline"));
(*scrActions)["typeEffectUnderlineWords"]->setMenuText(tr("Underline &Words"));
(*scrActions)["typeEffectStrikeThrough"]->setMenuText(tr("&Strike Through"));
(*scrActions)["typeEffectAllCaps"]->setMenuText(tr("&All Caps"));
(*scrActions)["typeEffectSmallCaps"]->setMenuText(tr("Small &Caps"));
/branches/Version13x/Scribus/scribus/libpostscript/pslib.cpp
1393,7 → 1393,7
PS_lineto(hl->xp+Ulen, -hl->yp+Upos);
PS_stroke();
}
if ((hl->cstyle & 8) && (chx != QChar(13)))
if (((hl->cstyle & 8) && (chx != QChar(13))) || ((hl->cstyle & 512) && (!chx[0].isSpace())))
{
double Ulen = Cwidth(Doc, hl->cfont, chx, hl->csize) * (hl->cscale / 100.0);
double Upos, lw, kern;
1924,7 → 1924,7
PS_lineto(hl->xp+Ulen, -hl->yp+Upos);
PS_stroke();
}
if ((hl->cstyle & 8) && (chx != QChar(13)))
if (((hl->cstyle & 8) && (chx != QChar(13))) || ((hl->cstyle & 512) && (!chx[0].isSpace())))
{
double Ulen = Cwidth(Doc, hl->cfont, chx, hl->csize) * (hl->cscale / 100.0);
double Upos, lw, kern;
/branches/Version13x/Scribus/scribus/scribus.cpp
6376,6 → 6376,7
{
scrActions["typeEffectNormal"]->setOn(true);
scrActions["typeEffectUnderline"]->setOn(false);
scrActions["typeEffectUnderlineWords"]->setOn(false);
scrActions["typeEffectStrikeThrough"]->setOn(false);
scrActions["typeEffectSmallCaps"]->setOn(false);
scrActions["typeEffectAllCaps"]->setOn(false);
6394,8 → 6395,14
scrActions["typeEffectAllCaps"]->setOn(false);
if (id == 7)
scrActions["typeEffectSmallCaps"]->setOn(false);
if (id == 8)
scrActions["typeEffectUnderline"]->setOn(false);
if (id == 1)
scrActions["typeEffectUnderlineWords"]->setOn(false);
if (scrActions["typeEffectUnderline"]->isOn())
b |= 8;
if (scrActions["typeEffectUnderlineWords"]->isOn())
b |= 512;
if (scrActions["typeEffectStrikeThrough"]->isOn())
b |= 16;
if (scrActions["typeEffectAllCaps"]->isOn())
6424,6 → 6431,7
scrActions["typeEffectStrikeThrough"]->setOn(c & 16);
scrActions["typeEffectAllCaps"]->setOn(c & 32);
scrActions["typeEffectSmallCaps"]->setOn(c & 64);
scrActions["typeEffectUnderlineWords"]->setOn(c & 512);
emit TextStil(s);
}
 
/branches/Version13x/Scribus/scribus/libpdf/pdflib.cpp
2821,7 → 2821,7
}
}
}
if ((hl->cstyle & 8) && (chx != QChar(13)))
if (((hl->cstyle & 8) && (chx != QChar(13))) || ((hl->cstyle & 512) && (!chx[0].isSpace())))
{
double Ulen = Cwidth(doc, hl->cfont, chx, hl->csize) * (hl->cscale / 100.0);
double Upos, Uwid, kern;