forenr | 1 Jan 2011 20:19
Favicon

r37059 - in lyx-devel/trunk: development/scons lib lib/images/math lib/ui src/frontends/qt4

Author: forenr
Date: Sat Jan  1 20:19:32 2011
New Revision: 37059
URL: http://www.lyx.org/trac/changeset/37059

Log:
Revert r36465 and r36467. Soon to be replaced by proper code for correctly
show on screen italic uppercase greek letters.

Deleted:
   lyx-devel/trunk/lib/images/math/varDelta.png
   lyx-devel/trunk/lib/images/math/varGamma.png
   lyx-devel/trunk/lib/images/math/varLambda.png
   lyx-devel/trunk/lib/images/math/varOmega.png
   lyx-devel/trunk/lib/images/math/varPsi.png
   lyx-devel/trunk/lib/images/math/varUpsilon.png
   lyx-devel/trunk/lib/images/math/varXi.png
   lyx-devel/trunk/lib/images/math/varphi2.png
   lyx-devel/trunk/lib/images/math/varpi2.png
   lyx-devel/trunk/lib/images/math/varsigma2.png
   lyx-devel/trunk/lib/images/math/vartheta2.png
Modified:
   lyx-devel/trunk/development/scons/scons_manifest.py
   lyx-devel/trunk/lib/Makefile.am
   lyx-devel/trunk/lib/ui/stdtoolbars.inc
   lyx-devel/trunk/src/frontends/qt4/GuiApplication.cpp

Modified: lyx-devel/trunk/development/scons/scons_manifest.py
==============================================================================
--- lyx-devel/trunk/development/scons/scons_manifest.py	Fri Dec 31 16:07:03 2010	(r37058)
(Continue reading)

forenr | 1 Jan 2011 20:24
Favicon

r37060 - lyx-devel/trunk/src/mathed

Author: forenr
Date: Sat Jan  1 20:24:16 2011
New Revision: 37060
URL: http://www.lyx.org/trac/changeset/37060

Log:
Correctly show in italic shape the uppercase greek letters inserted in
a \mathit inset.

Modified:
   lyx-devel/trunk/src/mathed/InsetMathSymbol.cpp

Modified: lyx-devel/trunk/src/mathed/InsetMathSymbol.cpp
==============================================================================
--- lyx-devel/trunk/src/mathed/InsetMathSymbol.cpp	Sat Jan  1 20:19:32 2011	(r37059)
+++ lyx-devel/trunk/src/mathed/InsetMathSymbol.cpp	Sat Jan  1 20:24:16 2011	(r37060)
 <at>  <at>  -60,8 +60,12  <at>  <at> 
 	//	<< "' drawn as: '" << sym_->draw
 	//	<< "'" << endl;

+	bool const italic_upcase_greek = sym_->inset == "cmr" &&
+					 sym_->extra == "mathalpha" &&
+					 mi.base.fontname == "mathit";
+	docstring const font = italic_upcase_greek ? from_ascii("cmm") : sym_->inset;
 	int const em = mathed_char_width(mi.base.font, 'M');
-	FontSetChanger dummy(mi.base, sym_->inset);
+	FontSetChanger dummy(mi.base, font);
 	mathed_string_dim(mi.base.font, sym_->draw, dim);
 	docstring::const_reverse_iterator rit = sym_->draw.rbegin();
 	kerning_ = mathed_char_kerning(mi.base.font, *rit);
(Continue reading)

forenr | 2 Jan 2011 01:42
Favicon

r37061 - lyx-devel/trunk/po

Author: forenr
Date: Sun Jan  2 01:42:52 2011
New Revision: 37061
URL: http://www.lyx.org/trac/changeset/37061

Log:
Solve shortcut clash in it.po

Modified:
   lyx-devel/trunk/po/it.po

Modified: lyx-devel/trunk/po/it.po
==============================================================================
--- lyx-devel/trunk/po/it.po	Sat Jan  1 20:24:16 2011	(r37060)
+++ lyx-devel/trunk/po/it.po	Sun Jan  2 01:42:52 2011	(r37061)
 <at>  <at>  -17430,7 +17430,7  <at>  <at> 

 #: lib/configure.py:506
 msgid "Sweave|S"
-msgstr "Sweave|S"
+msgstr "Sweave|w"

 #: lib/configure.py:507
 msgid "LilyPond music"

switt | 2 Jan 2011 12:31
Favicon

r37062 - lyx-devel/trunk/src

Author: switt
Date: Sun Jan  2 12:31:28 2011
New Revision: 37062
URL: http://www.lyx.org/trac/changeset/37062

Log:
#7201 return "correct" wrong spelled word when before a dot - exclude the dot from spell checker result

Modified:
   lyx-devel/trunk/src/Paragraph.cpp

Modified: lyx-devel/trunk/src/Paragraph.cpp
==============================================================================
--- lyx-devel/trunk/src/Paragraph.cpp	Sun Jan  2 01:42:52 2011	(r37061)
+++ lyx-devel/trunk/src/Paragraph.cpp	Sun Jan  2 12:31:28 2011	(r37062)
 <at>  <at>  -3634,6 +3634,11  <at>  <at> 
 					LYXERR(Debug::GUI, "misspelled word is correct with dot: \"" <<
 					   word << "\" [" <<
 					   from << ".." << to << "]");
+				} else {
+					// spell check with dot appended failed
+					// restore original word/lang value
+					word = asString(from, to, AS_STR_INSETS | AS_STR_SKIPDELETE);
+					wl = WordLangTuple(word, lang);
 				}
 			}
 		}

vfr | 2 Jan 2011 13:07
Favicon

r37063 - lyx-devel/trunk/src

Author: vfr
Date: Sun Jan  2 13:07:33 2011
New Revision: 37063
URL: http://www.lyx.org/trac/changeset/37063

Log:
Fix bug #7200: Crash when replacing newline by InsetQuote.

We have to call cap::replaceSelection before determining whether we can insert an InsetQuote or a normal quote.

At least we should have updated the par variable after calling cap::replaceSelection, because the
paragraph might have been deleted.

Modified:
   lyx-devel/trunk/src/Text3.cpp

Modified: lyx-devel/trunk/src/Text3.cpp
==============================================================================
--- lyx-devel/trunk/src/Text3.cpp	Sun Jan  2 12:31:28 2011	(r37062)
+++ lyx-devel/trunk/src/Text3.cpp	Sun Jan  2 13:07:33 2011	(r37063)
 <at>  <at>  -1348,33 +1348,37  <at>  <at> 
 	}

 	case LFUN_QUOTE_INSERT: {
-		Paragraph & par = cur.paragraph();
+		// this avoids a double undo
+		// FIXME: should not be needed, ideally
+		if (!cur.selection())
+			cur.recordUndo();
+		cap::replaceSelection(cur);
(Continue reading)

baum | 2 Jan 2011 16:39
Favicon

r37064 - in lyx-devel/trunk: lib src/tex2lyx src/tex2lyx/test

Author: baum
Date: Sun Jan  2 16:39:48 2011
New Revision: 37064
URL: http://www.lyx.org/trac/changeset/37064

Log:
Improve tex2lyx roundtrip of test-insets.tex:
- Replace special verbatim commands by standard LaTeX, since it would be
  extremely difficult to make tex2lyx understand them)
- Comment duplicated \bibliography{xampl}, since LaTeX cannot handle two
  \bibliography calls
- Fix a regression with spaces after commands, introduced in r36943
- Parse \multicolumn with space/comments between two arguments correctly
- Parse optional arguments correctly if there are space or comments between
  the command and the argument
- Remove duplicate "LyX" phrase handling (I overlooked that in r37052)
- Add new commands created with \let to the list of known commands. This is
  needed to parse the arguments correctly

Modified:
   lyx-devel/trunk/lib/syntax.default
   lyx-devel/trunk/src/tex2lyx/Parser.cpp
   lyx-devel/trunk/src/tex2lyx/Parser.h
   lyx-devel/trunk/src/tex2lyx/table.cpp
   lyx-devel/trunk/src/tex2lyx/test/test-insets.tex
   lyx-devel/trunk/src/tex2lyx/text.cpp

Modified: lyx-devel/trunk/lib/syntax.default
==============================================================================
--- lyx-devel/trunk/lib/syntax.default	Sun Jan  2 13:07:33 2011	(r37063)
(Continue reading)

baum | 2 Jan 2011 17:54
Favicon

r37065 - lyx-devel/trunk/src/tex2lyx

Author: baum
Date: Sun Jan  2 17:54:58 2011
New Revision: 37065
URL: http://www.lyx.org/trac/changeset/37065

Log:
tex2lyx: Do not swallow a user defined \parindent

Modified:
   lyx-devel/trunk/src/tex2lyx/preamble.cpp

Modified: lyx-devel/trunk/src/tex2lyx/preamble.cpp
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/preamble.cpp	Sun Jan  2 16:39:48 2011	(r37064)
+++ lyx-devel/trunk/src/tex2lyx/preamble.cpp	Sun Jan  2 17:54:58 2011	(r37065)
 <at>  <at>  -179,6 +179,7  <at>  <at> 
 string h_tocdepth                = "3";
 string h_paragraph_separation    = "indent";
 string h_defskip                 = "medskip";
+string h_paragraph_indentation   = "default";
 string h_quotes_language         = "english";
 string h_papercolumns            = "1";
 string h_papersides              = string();
 <at>  <at>  -604,9 +605,12  <at>  <at> 
 	   << h_margins
 	   << "\\secnumdepth " << h_secnumdepth << "\n"
 	   << "\\tocdepth " << h_tocdepth << "\n"
-	   << "\\paragraph_separation " << h_paragraph_separation << "\n"
-	   << "\\defskip " << h_defskip << "\n"
-	   << "\\quotes_language " << h_quotes_language << "\n"
(Continue reading)

baum | 2 Jan 2011 19:16
Favicon

r37066 - lyx-devel/trunk/src/tex2lyx

Author: baum
Date: Sun Jan  2 19:16:23 2011
New Revision: 37066
URL: http://www.lyx.org/trac/changeset/37066

Log:
Fix wrong setting of bibinset options if \cite{*} was found.
Improve heuristic for outputting \bibliographystyle: Now it is suppressed
if \bibliography follows immediately, since LyX adds it automatically in that
case.

Modified:
   lyx-devel/trunk/src/tex2lyx/Parser.cpp
   lyx-devel/trunk/src/tex2lyx/Parser.h
   lyx-devel/trunk/src/tex2lyx/text.cpp

Modified: lyx-devel/trunk/src/tex2lyx/Parser.cpp
==============================================================================
--- lyx-devel/trunk/src/tex2lyx/Parser.cpp	Sun Jan  2 17:54:58 2011	(r37065)
+++ lyx-devel/trunk/src/tex2lyx/Parser.cpp	Sun Jan  2 19:16:23 2011	(r37066)
 <at>  <at>  -276,6 +276,19  <at>  <at> 
 }

 
+void Parser::pushPosition()
+{
+	positions_.push_back(pos_);
+}
+
+
(Continue reading)

spitz | 3 Jan 2011 10:49
Favicon

r37067 - lyx-devel/trunk/po

Author: spitz
Date: Mon Jan  3 10:49:25 2011
New Revision: 37067
URL: http://www.lyx.org/trac/changeset/37067

Log:
nn.po: update by Ingar.

Modified:
   lyx-devel/trunk/po/nn.po

Modified: lyx-devel/trunk/po/nn.po
==============================================================================
--- lyx-devel/trunk/po/nn.po	Sun Jan  2 19:16:23 2011	(r37066)
+++ lyx-devel/trunk/po/nn.po	Mon Jan  3 10:49:25 2011	(r37067)
 <at>  <at>  -4,20 +4,20  <at>  <at> 
 #
 # Lars Gullik Bjønnes <larsbj <at> lyx.org>, 1999.
 # Ingar Pareliussen <ingar.pareliussen <at> samfundet.no>, 2003,2005,2006, 2006, 2007, 2010.
-# Ingar Pareliussen <ingar.pareliussen <at> _dmmh_no>, 2010.
+# Ingar Pareliussen <ingar.pareliussen <at> _dmmh_no>, 2010, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
 "Report-Msgid-Bugs-To: lyx-devel <at> lists.lyx.org\n"
 "POT-Creation-Date: 2010-12-28 23:31+0100\n"
-"PO-Revision-Date: 2010-11-20 20:04+0100\n"
+"PO-Revision-Date: 2011-01-02 19:39+0100\n"
 "Last-Translator: Ingar Pareliussen <ingar.pareliussen <at> _dmmh_no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn <at> lister.ping.uio.no>\n"
(Continue reading)

vfr | 3 Jan 2011 12:42
Favicon

r37068 - lyx-devel/trunk/src/frontends/qt4

Author: vfr
Date: Mon Jan  3 12:42:01 2011
New Revision: 37068
URL: http://www.lyx.org/trac/changeset/37068

Log:
Remove GuiToolbar::allowauto_ and define this property in the Toolbars.h::Visibility enum. 

Now, there is the bug that autoallow is incorrectly set to true when visibility_ has the
Visibility::SAMEROW flag. One shouldn't use >= on an enum (GuiToolbar::setVisibility), as newly added
items will exhibit unexpected behaviour.

Modified:
   lyx-devel/trunk/src/frontends/qt4/GuiToolbar.cpp
   lyx-devel/trunk/src/frontends/qt4/GuiToolbar.h
   lyx-devel/trunk/src/frontends/qt4/Toolbars.h

Modified: lyx-devel/trunk/src/frontends/qt4/GuiToolbar.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/qt4/GuiToolbar.cpp	Mon Jan  3 10:49:25 2011	(r37067)
+++ lyx-devel/trunk/src/frontends/qt4/GuiToolbar.cpp	Mon Jan  3 12:42:01 2011	(r37068)
 <at>  <at>  -53,8 +53,7  <at>  <at> 

 GuiToolbar::GuiToolbar(ToolbarInfo const & tbinfo, GuiView & owner)
 	: QToolBar(toqstr(tbinfo.gui_name), &owner), visibility_(0),
-	  allowauto_(false), owner_(owner), command_buffer_(0),
-	  tbinfo_(tbinfo), filled_(false)
+	  owner_(owner), command_buffer_(0), tbinfo_(tbinfo), filled_(false)
 {
 	setIconSize(owner.iconSize());
(Continue reading)


Gmane