CVS checkin messages

Jean-Marc Lasgouttes | 1 Dec 2011 14:44

Re: r40282 - lyx-devel/trunk/po

Le 25/11/2011 23:55, lasgouttes <at> lyx.org a écrit :
> Author: lasgouttes
> Date: Fri Nov 25 23:55:02 2011
> New Revision: 40282
> URL: http://www.lyx.org/trac/changeset/40282
>
> Log:
> Package.cpp is not autogenerated anymore, there is no need to skip it.

Richard, can I backport this to branch?

JMarc

lasgouttes | 1 Dec 2011 14:50

r40328 - in lyx-devel/branches/BRANCH_2_0_X: . lib/scripts

Author: lasgouttes
Date: Thu Dec  1 14:50:08 2011
New Revision: 40328
URL: http://www.lyx.org/trac/changeset/40328

Log:
- Fix Sweave support for document encoding with R >= 2.13.1 (bug 7876).
(backport from trunk)

Modified:
   lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxsweave.R
   lyx-devel/branches/BRANCH_2_0_X/status.20x

Modified: lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxsweave.R
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxsweave.R	Wed Nov 30 23:06:10 2011	(r40327)
+++ lyx-devel/branches/BRANCH_2_0_X/lib/scripts/lyxsweave.R	Thu Dec  1 14:50:08 2011	(r40328)
 <at>  <at>  -14,6 +14,7  <at>  <at> 
 # argument 4 is the original document directory

 .cmdargs <- commandArgs(trailingOnly=TRUE)
+.doc.enc <- .cmdargs[3]

 # check whether Sweave.sty is seen by LaTeX. if it is not, we will
 # copy it alongside the .tex file (in general in the temporary
 <at>  <at>  -26,10 +27,6  <at>  <at> 
     dirname(.cmdargs[2]), overwrite=TRUE)
 }

-# set default encoding for input and output files; .orig.enc is used in

(Continue reading)

lasgouttes | 1 Dec 2011 16:11

r40329 - in lyx-devel/branches/BRANCH_2_0_X: . po

Author: lasgouttes
Date: Thu Dec  1 16:11:05 2011
New Revision: 40329
URL: http://www.lyx.org/trac/changeset/40329

Log:
No need to skip Package.cpp

Modified:
   lyx-devel/branches/BRANCH_2_0_X/po/Rules-lyx
   lyx-devel/branches/BRANCH_2_0_X/status.20x

Modified: lyx-devel/branches/BRANCH_2_0_X/po/Rules-lyx
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/po/Rules-lyx	Thu Dec  1 14:50:08 2011	(r40328)
+++ lyx-devel/branches/BRANCH_2_0_X/po/Rules-lyx	Thu Dec  1 16:11:05 2011	(r40329)
 <at>  <at>  -12,7 +12,6  <at>  <at> 
 	rm -f $ <at> -t \
 	&& ( cd $(top_srcdir); \
 	     grep -l "_(\".*\")" `find src \( -name '*.h' -o -name '*.cpp' -o -name '*.cpp.in' \) -print` |\
-	     grep -v -e "src/support/Package.cpp$$" |\
 	     sort | uniq ) > $ <at> -t \
 	&& mv $ <at> -t $ <at> 

Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x	Thu Dec  1 14:50:08 2011	(r40328)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x	Thu Dec  1 16:11:05 2011	(r40329)
 <at>  <at>  -70,3 +70,4  <at>  <at>

(Continue reading)

rgheck | 2 Dec 2011 20:19

r40330 - in lyx-devel/branches/BRANCH_2_0_X: . src/insets

Author: rgheck
Date: Fri Dec  2 20:19:16 2011
New Revision: 40330
URL: http://www.lyx.org/trac/changeset/40330

Log:
Fix crash when outputting XHTML. Not resetting the paragraphs
was an oversight here. (This was r40068 in trunk, but never got
to branch for some reason.)

Modified:
   lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetBranch.cpp
   lyx-devel/branches/BRANCH_2_0_X/status.20x

Modified: lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetBranch.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetBranch.cpp	Thu Dec  1 16:11:05 2011	(r40329)
+++ lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetBranch.cpp	Fri Dec  2 20:19:16 2011	(r40330)
 <at>  <at>  -230,8 +230,12  <at>  <at> 

 docstring InsetBranch::xhtml(XHTMLStream & xs, OutputParams const & rp) const
 {
-	if (isBranchSelected())
-		xhtmlParagraphs(text(), buffer(), xs, rp);
+	if (isBranchSelected()) {
+		OutputParams newrp = rp;
+		newrp.par_begin = 0;
+		newrp.par_end = text().paragraphs().size();
+		xhtmlParagraphs(text(), buffer(), xs, newrp);
+	}

(Continue reading)

rgheck | 2 Dec 2011 20:19

r40332 - www-user/trunk/farm/cookbook/LyX

Author: rgheck
Date: Fri Dec  2 20:19:57 2011
New Revision: 40332
URL: http://www.lyx.org/trac/changeset/40332

Log:
* i18n.inc: update stats

Modified:
   www-user/trunk/farm/cookbook/LyX/i18n.inc

Modified: www-user/trunk/farm/cookbook/LyX/i18n.inc
==============================================================================
--- www-user/trunk/farm/cookbook/LyX/i18n.inc	Fri Dec  2 20:19:42 2011	(r40331)
+++ www-user/trunk/farm/cookbook/LyX/i18n.inc	Fri Dec  2 20:19:57 2011	(r40332)
 <at>  <at>  -1,6 +1,6  <at>  <at> 
 <?php
 // The current version
-$lyx_version = "2.0.3";
+$lyx_version = "2.0.3svn";
 // The branch tag
 $branch_tag = "branches/BRANCH_2_0_X";

 <at>  <at>  -75,8 +75,8  <at>  <at> 
 array ( 'langcode' => 'ru', "date" => "2010-04-21",
 "msg_tr" => 3809, "msg_fu" => 1089, "msg_nt" => 303,
 "translator" => "Sergey Tereschenko", "email" => "serg ! partizan () gmail ! com"),
-array ( 'langcode' => 'sk', "date" => "2011-11-25",
-"msg_tr" => 5200, "msg_fu" => 1, "msg_nt" => 0,
+array ( 'langcode' => 'sk', "date" => "2011-11-30",

(Continue reading)

rgheck | 2 Dec 2011 20:19

r40331 - lyx-devel/branches/BRANCH_2_0_X/po

Author: rgheck
Date: Fri Dec  2 20:19:42 2011
New Revision: 40331
URL: http://www.lyx.org/trac/changeset/40331

Log:
Remerge strings.

Modified:
   lyx-devel/branches/BRANCH_2_0_X/po/ar.po
   lyx-devel/branches/BRANCH_2_0_X/po/ca.po
   lyx-devel/branches/BRANCH_2_0_X/po/cs.po
   lyx-devel/branches/BRANCH_2_0_X/po/da.po
   lyx-devel/branches/BRANCH_2_0_X/po/de.po
   lyx-devel/branches/BRANCH_2_0_X/po/el.po
   lyx-devel/branches/BRANCH_2_0_X/po/en.po
   lyx-devel/branches/BRANCH_2_0_X/po/es.po
   lyx-devel/branches/BRANCH_2_0_X/po/eu.po
   lyx-devel/branches/BRANCH_2_0_X/po/fi.po
   lyx-devel/branches/BRANCH_2_0_X/po/fr.po
   lyx-devel/branches/BRANCH_2_0_X/po/gl.po
   lyx-devel/branches/BRANCH_2_0_X/po/he.po
   lyx-devel/branches/BRANCH_2_0_X/po/hu.po
   lyx-devel/branches/BRANCH_2_0_X/po/ia.po
   lyx-devel/branches/BRANCH_2_0_X/po/id.po
   lyx-devel/branches/BRANCH_2_0_X/po/it.po
   lyx-devel/branches/BRANCH_2_0_X/po/ja.po
   lyx-devel/branches/BRANCH_2_0_X/po/nb.po
   lyx-devel/branches/BRANCH_2_0_X/po/nn.po
   lyx-devel/branches/BRANCH_2_0_X/po/pl.po

(Continue reading)

rgheck | 2 Dec 2011 22:21

r40333 - lyx-devel/trunk/src

Author: rgheck
Date: Fri Dec  2 22:21:30 2011
New Revision: 40333
URL: http://www.lyx.org/trac/changeset/40333

Log:
Deal with the part of #7872 involving changes of branch activation
from Document>Settings.

Modified:
   lyx-devel/trunk/src/Buffer.cpp
   lyx-devel/trunk/src/BufferView.cpp

Modified: lyx-devel/trunk/src/Buffer.cpp
==============================================================================
--- lyx-devel/trunk/src/Buffer.cpp	Fri Dec  2 20:19:57 2011	(r40332)
+++ lyx-devel/trunk/src/Buffer.cpp	Fri Dec  2 22:21:30 2011	(r40333)
 <at>  <at>  -2102,14 +2102,6  <at>  <at> 
 			enable = params().isExportable("program");
 			break;

-		case LFUN_BRANCH_ACTIVATE: 
-		case LFUN_BRANCH_DEACTIVATE: {
-			BranchList const & branchList = params().branchlist();
-			docstring const branchName = cmd.argument();
-			enable = !branchName.empty() && branchList.find(branchName);
-			break;
-		}
-
 		case LFUN_BRANCH_ADD:

(Continue reading)

rgheck | 2 Dec 2011 22:21

r40334 - lyx-devel/trunk/src/insets

Author: rgheck
Date: Fri Dec  2 22:21:37 2011
New Revision: 40334
URL: http://www.lyx.org/trac/changeset/40334

Log:
Deal with the part of #7872 involving changing branch activation
from the context menu. As mentioned in the FIXME, we cannot now
handle the case where the branches are held in a master buffer.

Modified:
   lyx-devel/trunk/src/insets/InsetBranch.cpp

Modified: lyx-devel/trunk/src/insets/InsetBranch.cpp
==============================================================================
--- lyx-devel/trunk/src/insets/InsetBranch.cpp	Fri Dec  2 22:21:30 2011	(r40333)
+++ lyx-devel/trunk/src/insets/InsetBranch.cpp	Fri Dec  2 22:21:37 2011	(r40334)
 <at>  <at>  -127,19 +127,26  <at>  <at> 
 	case LFUN_BRANCH_ACTIVATE:
 	case LFUN_BRANCH_DEACTIVATE: {
 		Buffer * buf = const_cast<Buffer *>(buffer().masterBuffer());
-		BranchList & branchlist = buf->params().branchlist();
-		Branch * our_branch = branchlist.find(params_.branch);
-		if (!our_branch) {
+		// is the branch in our master buffer?
+		bool branch_in_master = (buf != &buffer());
+
+		Branch * our_branch = buf->params().branchlist().find(params_.branch);
+		if (branch_in_master && !our_branch) {
 			// child only?

(Continue reading)

rgheck | 2 Dec 2011 22:30

r40335 - in lyx-devel/branches/BRANCH_2_0_X/src: . insets

Author: rgheck
Date: Fri Dec  2 22:30:40 2011
New Revision: 40335
URL: http://www.lyx.org/trac/changeset/40335

Log:
Backport fix for #7872.

Modified:
   lyx-devel/branches/BRANCH_2_0_X/src/Buffer.cpp
   lyx-devel/branches/BRANCH_2_0_X/src/BufferView.cpp
   lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetBranch.cpp

Modified: lyx-devel/branches/BRANCH_2_0_X/src/Buffer.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/Buffer.cpp	Fri Dec  2 22:21:37 2011	(r40334)
+++ lyx-devel/branches/BRANCH_2_0_X/src/Buffer.cpp	Fri Dec  2 22:30:40 2011	(r40335)
 <at>  <at>  -2028,14 +2028,6  <at>  <at> 
 			enable = params().isExportable("program");
 			break;

-		case LFUN_BRANCH_ACTIVATE: 
-		case LFUN_BRANCH_DEACTIVATE: {
-			BranchList const & branchList = params().branchlist();
-			docstring const branchName = cmd.argument();
-			enable = !branchName.empty() && branchList.find(branchName);
-			break;
-		}
-
 		case LFUN_BRANCH_ADD:

(Continue reading)

rgheck | 2 Dec 2011 23:27

r40336 - lyx-devel/trunk/src/frontends

Author: rgheck
Date: Fri Dec  2 23:27:09 2011
New Revision: 40336
URL: http://www.lyx.org/trac/changeset/40336

Log:
Cosmetics or style or something.

Modified:
   lyx-devel/trunk/src/frontends/WorkAreaManager.cpp

Modified: lyx-devel/trunk/src/frontends/WorkAreaManager.cpp
==============================================================================
--- lyx-devel/trunk/src/frontends/WorkAreaManager.cpp	Fri Dec  2 22:30:40 2011	(r40335)
+++ lyx-devel/trunk/src/frontends/WorkAreaManager.cpp	Fri Dec  2 23:27:09 2011	(r40336)
 <at>  <at>  -33,7 +33,9  <at>  <at> 

 void WorkAreaManager::redrawAll(bool update_metrics)
 {
-	for (iterator it = work_areas_.begin(); it != work_areas_.end(); ++it)
+	iterator it = work_areas_.begin();
+	iterator const en = work_areas_.end();
+	for (; it != en; ++it)
 		(*it)->redraw(update_metrics);
 }

 <at>  <at>  -48,7 +50,9  <at>  <at> 

 void WorkAreaManager::updateTitles()
 {

(Continue reading)

Group

gmane.editors.lyx.cvs.

Search Archive

Page

1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 24

Articles in period: 236

December 2011

Language

Change language

Options

Current view: Threads only / Showing only 20 lines / Not hiding cited text.
Change to All messages, whole messages, or hide cited text.

Post a message
NNTP Newsgroup
Classic Gmane web interface
XML

XML

RSS Feed
List Information

About Gmane

Recent entries

[LyX master] aa.layout: updated for A&A 8.2 (26 May 2013)
[LyX master] Farsi splash.lyx: remove unnecessary preamble (26 May 2013)
[LyX 2.0.x] Chinese Tutorial.lyx: backport a fix by Jürgen (26 May 2013)
[LyX 2.0.x] aa.layout: fix compilation of the templates/aa.lyx (26 May 2013)
[LyX master] Merge branch 'master' of git.lyx.org:lyx (26 May 2013)
[LyX master] Years forgotten file (26 May 2013)
[LyX master] Header cleanup cont. (26 May 2013)
[LyX master] make Documents folder of disk image optional (25 May 2013)
[LyX master] * sk.po (25 May 2013)
[LyX master] Update it.po (25 May 2013)
[LyX master] Update it.po (25 May 2013)
[LyX master] On Mac, moving down a paragraph should place the cursor a (25 May 2013)
[LyX master] GuiBox.cpp, InsetBox.cpp: fix some wrong logic (25 May 2013)
[LyX master] Merge branch 'master' of git.lyx.org:lyx (25 May 2013)
[LyX master] Fix Chinese Tutorial copilation (25 May 2013)
[LyX master] Fix empty width support for Box inset (24 May 2013)
[LyX features/empty-length] Latest changes from Uwe for tex2lyx and ly (24 May 2013)
[LyX features/empty-length] Latest changes from Uwe for tex2lyx and ly (24 May 2013)
[LyX master] * sk.po (24 May 2013)
[LyX master] Years forgotten files. (24 May 2013)
[LyX master] Header cleanup cont. (24 May 2013)

Archives

211	May 2013
158	April 2013
186	March 2013
256	February 2013
196	January 2013
199	December 2012
199	November 2012
201	October 2012
128	September 2012
70	August 2012
121	July 2012
197	June 2012
181	May 2012
141	April 2012
217	March 2012
120	February 2012
145	January 2012
236	December 2011
212	November 2011
335	October 2011
218	September 2011
178	August 2011
180	July 2011
318	June 2011
357	May 2011
383	April 2011
376	March 2011
426	February 2011
343	January 2011
436	December 2010
686	November 2010
407	October 2010
304	September 2010
214	August 2010
300	July 2010
182	June 2010
174	May 2010
235	April 2010
392	March 2010
274	February 2010
562	January 2010
455	December 2009
428	November 2009
289	October 2009
217	September 2009
428	August 2009
459	July 2009
411	June 2009
436	May 2009
434	April 2009
369	March 2009
365	February 2009
368	January 2009
247	December 2008
567	November 2008
587	October 2008
402	September 2008
293	August 2008
654	July 2008
413	June 2008
477	May 2008
513	April 2008
752	March 2008
654	February 2008
421	January 2008
474	December 2007
611	November 2007
745	October 2007
701	September 2007
696	August 2007
342	July 2007
368	June 2007
493	May 2007
497	April 2007
104	March 2007
285	December 2006
33	June 2006
57	May 2006
3	April 2006
1	March 2006
18	February 2006
97	September 2005
31	August 2005
269	July 2005
103	June 2005
68	May 2005
50	April 2005
25	March 2005

Design

Zawodny | Right Menu | Left Menu

Your Own Design

Paste the URL of your CSS below. Download CSS template