date:20120526

master (trunk?) not compilable

2012-05-26 Thread Kornel Benko

This is on ubuntu 12.04

...
cd /usr/BUILD/BuildLyxGit/src/frontends/qt4  /usr/bin/c++   -DUSE_ENCHANT=1 
-DQT_GENUINE_STR -DLYX_BUILD_QT4_FRONTEND -Wall -Wunused-parameter 
-fno-strict-aliasing  -Wall -Wunused-parameter -O3 -DNDEBUG 
-I/usr/BUILD/BuildLyxGit -I/usr/src/lyx/lyx-git/src -I/usr/include/enchant 
-I/usr/src/lyx/lyx-git/po -I/usr/src/lyx/lyx-git/boost 
-I/usr/src/lyx/lyx-git/src/frontends -I/usr/src/lyx/lyx-git/src/frontends/qt4 
-I/usr/include/qt4 -I/usr/include/qt4/Qt -I/usr/share/qt4/mkspecs/default 
-I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui 
-I/usr/include/qt4/Qt3Support -I/usr/include/qt4/QtDesigner 
-I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtOpenGL 
-I/usr/include/qt4/QtSql -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtSvg 
-I/usr/include/qt4/QtUiTools -I/usr/include/qt4/QtTest 
-I/usr/BUILD/BuildLyxGit/src/frontends/qt4-DBOOST_USER_CONFIG=config.h 
-o CMakeFiles/frontend_qt4.dir/GuiWorkArea.cpp.o -c 
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiWorkArea.cpp
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiWorkArea.cpp: In member function 
‘virtual void lyx::frontend::TabWorkArea::paintEvent(QPaintEvent*)’:
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiWorkArea.cpp:1566:3: error: 
‘QStylePainter’ was not declared in this scope
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiWorkArea.cpp:1566:17: error: expected 
‘;’ before ‘p’
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiWorkArea.cpp:1572:3: error: ‘p’ was 
not declared in this scope
make[2]: *** [src/frontends/qt4/CMakeFiles/frontend_qt4.dir/GuiWorkArea.cpp.o] 
Error 1
make[2]: Leaving directory `/usr/BUILD/BuildLyxGit'
make[1]: *** [src/frontends/qt4/CMakeFiles/frontend_qt4.dir/all] Error 2
make[1]: Leaving directory `/usr/BUILD/BuildLyxGit'
make: *** [all] Error 2
...
class QStylePainter defined in /usr/include/qt4/Qt/qstylepainter.h, which is 
included by /usr/include/qt4/Qt/QtGui

Korneldiff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 362f062..aa39f99 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -70,6 +70,7 @@
 #include QToolButton
 #include QToolTip
 #include QMenuBar
+#include QtGui
 
 #include support/bind.h
 


signature.asc
Description: This is a digitally signed message part.

Re: Upgrade Qt to 4.8?

2012-05-26 Thread Stephan Witt

Am 26.05.2012 um 03:01 schrieb Jerry:

 
 On May 24, 2012, at 8:26 PM, Jerry wrote:
 
 What would be the effects if any on LyX by upgrading my Qt installation from 
 4.7 to 4.8?

I tried it as it came out. It was not better then 4.7. 
The LyX.app bundle has it's own private Qt-Frameworks and is independent of 
your system Qt-Installation, AFAIK.

Stephan

Re: annoying behavior of Lyx 2.02+ -- Language toggle

2012-05-26 Thread Ronen Abravanel

Patch for LyXAction.cpp attached. (i also added example for inserting
graphics using inset-inset

On Fri, May 25, 2012 at 3:42 PM, Jean-Marc Lasgouttes lasgout...@lyx.orgwrote:

 Le 25/05/2012 13:21, Ronen Abravanel a écrit :

  I added an optional set argument to LFUN_LANGUAGE and fixed the menu
 entery.

 Anythhing else? Should I fix the LFUN documentation?


 Good. I would handle the case where no language is given to reset to
 default language (this is what is done with the layout lfun). This allows
 to to have a keybinding for resetting the langage.

 Yes, in LyXAction.cpp

 JMarc




language_toggle_LyXAction_cpp.patch
Description: Binary data

Re: [LyX master] Fix macro termination in IPA inset if next character uses a TIPA shortcut

2012-05-26 Thread Richard Heck


On 05/26/2012 10:36 AM, Juergen Spitzmueller wrote:

The branch, master, has been updated.

- Log -

commit 6ddcfb87e4b3c4e21c4ea6b84b4162d2d7c537e8
Author: Juergen Spitzmuellersp...@lyx.org
Date:   Sat May 26 16:36:24 2012 +0200

 Fix macro termination in IPA inset if next character uses a TIPA shortcut

Is this needed for branch? If so, it looks fine to me.

rh


diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8b09952..afcf5ac 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1275,8 +1275,15 @@ void Paragraph::Private::latexSpecialChar(otexstream  
os,
string script;
pairdocstring, bool  latex = encoding.latexChar(c);
docstring nextlatex;
-   if (next != '\0'  next != META_INSET)
+   bool nexttipas = false;
+   string nexttipashortcut;
+   if (next != '\0'  next != META_INSET) {
nextlatex = encoding.latexChar(next).first;
+   if (runparams.inIPA) {
+   nexttipashortcut = 
Encodings::TIPAShortcut(next);
+   nexttipas = !nexttipashortcut.empty();
+   }
+   }
bool tipas = false;
if (runparams.inIPA) {
string const tipashortcut = Encodings::TIPAShortcut(c);
@@ -1291,9 +1298,11 @@ void Paragraph::Private::latexSpecialChar(otexstream  
os,
column += writeScriptChars(os, latex.first,
running_change, encoding, i) - 1;
else if (latex.second
- !prefixIs(nextlatex, '\\')
- !prefixIs(nextlatex, '{')
- !prefixIs(nextlatex, '}')
+ ((!prefixIs(nextlatex, '\\')
+ !prefixIs(nextlatex, '{')
+ !prefixIs(nextlatex, '}'))
+|| (nexttipas
+ !prefixIs(from_ascii(nexttipashortcut), '\\')))
  !tipas) {
// Prevent eating of a following
// space or command corruption by

---

Summary of changes:
  src/Paragraph.cpp |   17 +
  1 files changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive

Re: [LyX master] lyx2lyx/lyx_2_1.py: fix #8172

2012-05-26 Thread Richard Heck


On 05/26/2012 01:00 PM, Uwe Stöhr wrote:

The branch, master, has been updated.

- Log -

commit 7b680058756b4d80e741faa4bdafe894bc06360d
Author: Uwe StÃ¶hruwesto...@lyx.org
Date:   Sat May 26 19:00:03 2012 +0200

 lyx2lyx/lyx_2_1.py: fix #8172

Should be fine for branch, too.

rh


diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index bbd9b3c..84bf2bc 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -347,27 +347,28 @@ def convert_use_packages(document):
  use_xxx yyy =  use_package xxx yyy
  packages = [amsmath, esint, mathdots, mhchem, undertilde]
  for p in packages:
-i = find_token(document.header, \\use_%s % p , 0)
+i = find_token(document.header, \\use_%s % p, 0)
  if i != -1:
-value = get_value(document.header, \\use_%s % p , i)
+value = get_value(document.header, \\use_%s % p, i)
  document.header[i] = \\use_package %s %s % (p, value)


  def revert_use_packages(document):
  use_package xxx yyy =  use_xxx yyy
-packages = {amsmath:1, esint:1, mathdots:1, mhchem:1, 
undertilde:1}
+packages = [amsmath, esint, mathdots, mhchem, undertilde]
  # the order is arbitrary for the use_package version, and not all 
packages need to be given.
  # Ensure a complete list and correct order (important for older LyX 
versions and especially lyx2lyx)
-j = -1
-for p in packages.keys():
+j = 0
+for p in packages:
  regexp = re.compile(r'(\\use_package\s+%s)' % p)
-i = find_re(document.header, regexp, 0)
+i = find_re(document.header, regexp, j)
  if i != -1:
-value = get_value(document.header, \\use_package , i).split()[1]
+value = get_value(document.header, \\use_package %s % p, 
i).split()[1]
+document.warning(str(value))
  del document.header[i]
  j = i
-for (p, v) in packages.items():
-document.header.insert(j, \\use_%s %s  % (p, value))
+document.header.insert(j, \\use_%s %s  % (p, value))
+document.warning(str(value))
  j = j + 1



---

Summary of changes:
  lib/lyx2lyx/lyx_2_1.py |   19 ++-
  1 files changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive

Re: Upgrade Qt to 4.8?

2012-05-26 Thread Jerry


On May 26, 2012, at 6:47 AM, Stephan Witt wrote:

 Am 26.05.2012 um 03:01 schrieb Jerry:
 
 
 On May 24, 2012, at 8:26 PM, Jerry wrote:
 
 What would be the effects if any on LyX by upgrading my Qt installation 
 from 4.7 to 4.8?
 
 I tried it as it came out. It was not better then 4.7. 
 The LyX.app bundle has it's own private Qt-Frameworks and is independent of 
 your system Qt-Installation, AFAIK.

Oh--thanks! That information seems useful. 8^)
 
 Stephan

Re: [LyX master] lyx2lyx/lyx_2_1.py: fix #8172

2012-05-26 Thread Uwe Stöhr


Am 26.05.2012 21:51, schrieb Richard Heck:


lyx2lyx/lyx_2_1.py: fix #8172

Should be fine for branch, too.


This was a 2.1-only bug and fix.

regards Uwe

Re: Website translated pages flag pointers

2012-05-26 Thread Uwe Stöhr


Christian or whoever currently maintains our Webpage Wiki,

can you please have a look at this issue?:

On 03.05.2012 16:39, wrote Jean-Pierre Chrétien:


While translating the last change in

http://www.lyx.org/PressAboutLyX

in the French corresponding page, I see that the French flag at the top of the 
page points on

http://www.lyx.org/WebFr.PageActions

instead of

http://www.lyx.org/WebFr.PressAboutLyX

This is not specific to French, nor to the requested page: other flags behave 
alike in every page of
the website.

The language selector (leftmost button) works however all right.

no longer possible to upload files to the LyX Wiki

2012-05-26 Thread Uwe Stöhr


Hello Christian or whoever has th power to maintain our Wiki,

it is no longer possible to upload files to the LyX Wiki. Clicking at the upper left on Upload and 
manage files I'm forwarded to

http://wiki.lyx.org/ipfm/index.php?dir=/
But then nothing happens instead of displaying the login screen for the ifpm 
file managing system.

Could you please have a look?

thanks and regards
Uwe

master (trunk?) not compilable

2012-05-26 Thread Kornel Benko

This is on ubuntu 12.04

...
cd /usr/BUILD/BuildLyxGit/src/frontends/qt4 && /usr/bin/c++   -DUSE_ENCHANT=1 
-DQT_GENUINE_STR -DLYX_BUILD_QT4_FRONTEND -Wall -Wunused-parameter 
-fno-strict-aliasing  -Wall -Wunused-parameter -O3 -DNDEBUG 
-I/usr/BUILD/BuildLyxGit -I/usr/src/lyx/lyx-git/src -I/usr/include/enchant 
-I/usr/src/lyx/lyx-git/po -I/usr/src/lyx/lyx-git/boost 
-I/usr/src/lyx/lyx-git/src/frontends -I/usr/src/lyx/lyx-git/src/frontends/qt4 
-I/usr/include/qt4 -I/usr/include/qt4/Qt -I/usr/share/qt4/mkspecs/default 
-I/usr/include/qt4/QtCore -I/usr/include/qt4/QtGui 
-I/usr/include/qt4/Qt3Support -I/usr/include/qt4/QtDesigner 
-I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtOpenGL 
-I/usr/include/qt4/QtSql -I/usr/include/qt4/QtXml -I/usr/include/qt4/QtSvg 
-I/usr/include/qt4/QtUiTools -I/usr/include/qt4/QtTest 
-I/usr/BUILD/BuildLyxGit/src/frontends/qt4-DBOOST_USER_CONFIG="" 
-o CMakeFiles/frontend_qt4.dir/GuiWorkArea.cpp.o -c 
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiWorkArea.cpp
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiWorkArea.cpp: In member function 
‘virtual void lyx::frontend::TabWorkArea::paintEvent(QPaintEvent*)’:
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiWorkArea.cpp:1566:3: error: 
‘QStylePainter’ was not declared in this scope
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiWorkArea.cpp:1566:17: error: expected 
‘;’ before ‘p’
/usr/src/lyx/lyx-git/src/frontends/qt4/GuiWorkArea.cpp:1572:3: error: ‘p’ was 
not declared in this scope
make[2]: *** [src/frontends/qt4/CMakeFiles/frontend_qt4.dir/GuiWorkArea.cpp.o] 
Error 1
make[2]: Leaving directory `/usr/BUILD/BuildLyxGit'
make[1]: *** [src/frontends/qt4/CMakeFiles/frontend_qt4.dir/all] Error 2
make[1]: Leaving directory `/usr/BUILD/BuildLyxGit'
make: *** [all] Error 2
...
class QStylePainter defined in "/usr/include/qt4/Qt/qstylepainter.h", which is 
included by "/usr/include/qt4/Qt/QtGui"

Korneldiff --git a/src/frontends/qt4/GuiWorkArea.cpp b/src/frontends/qt4/GuiWorkArea.cpp
index 362f062..aa39f99 100644
--- a/src/frontends/qt4/GuiWorkArea.cpp
+++ b/src/frontends/qt4/GuiWorkArea.cpp
@@ -70,6 +70,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "support/bind.h"
 


signature.asc
Description: This is a digitally signed message part.

Re: Upgrade Qt to 4.8?

2012-05-26 Thread Stephan Witt

Am 26.05.2012 um 03:01 schrieb Jerry:

> 
> On May 24, 2012, at 8:26 PM, Jerry wrote:
> 
>> What would be the effects if any on LyX by upgrading my Qt installation from 
>> 4.7 to 4.8?

I tried it as it came out. It was not better then 4.7. 
The LyX.app bundle has it's own private Qt-Frameworks and is independent of 
your system Qt-Installation, AFAIK.

Stephan

Re: annoying behavior of Lyx 2.02+ -- Language toggle

2012-05-26 Thread Ronen Abravanel

Patch for LyXAction.cpp attached. (i also added example for inserting
graphics using inset-inset

On Fri, May 25, 2012 at 3:42 PM, Jean-Marc Lasgouttes wrote:

> Le 25/05/2012 13:21, Ronen Abravanel a écrit :
>
>  I added an optional "set" argument to LFUN_LANGUAGE and fixed the menu
>> entery.
>>
>> Anythhing else? Should I fix the LFUN documentation?
>>
>
> Good. I would handle the case where no language is given to reset to
> default language (this is what is done with the "layout" lfun). This allows
> to to have a keybinding for resetting the langage.
>
> Yes, in LyXAction.cpp
>
> JMarc
>
>


language_toggle_LyXAction_cpp.patch
Description: Binary data

Re: [LyX master] Fix macro termination in IPA inset if next character uses a TIPA shortcut

2012-05-26 Thread Richard Heck


On 05/26/2012 10:36 AM, Juergen Spitzmueller wrote:

The branch, master, has been updated.

- Log -

commit 6ddcfb87e4b3c4e21c4ea6b84b4162d2d7c537e8
Author: Juergen Spitzmueller
Date:   Sat May 26 16:36:24 2012 +0200

 Fix macro termination in IPA inset if next character uses a TIPA shortcut

Is this needed for branch? If so, it looks fine to me.

rh


diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 8b09952..afcf5ac 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -1275,8 +1275,15 @@ void Paragraph::Private::latexSpecialChar(otexstream&  
os,
string script;
pair  latex = encoding.latexChar(c);
docstring nextlatex;
-   if (next != '\0'&&  next != META_INSET)
+   bool nexttipas = false;
+   string nexttipashortcut;
+   if (next != '\0'&&  next != META_INSET) {
nextlatex = encoding.latexChar(next).first;
+   if (runparams.inIPA) {
+   nexttipashortcut = 
Encodings::TIPAShortcut(next);
+   nexttipas = !nexttipashortcut.empty();
+   }
+   }
bool tipas = false;
if (runparams.inIPA) {
string const tipashortcut = Encodings::TIPAShortcut(c);
@@ -1291,9 +1298,11 @@ void Paragraph::Private::latexSpecialChar(otexstream&  
os,
column += writeScriptChars(os, latex.first,
running_change, encoding, i) - 1;
else if (latex.second
-   &&  !prefixIs(nextlatex, '\\')
-   &&  !prefixIs(nextlatex, '{')
-   &&  !prefixIs(nextlatex, '}')
+   &&  ((!prefixIs(nextlatex, '\\')
+   &&  !prefixIs(nextlatex, '{')
+   &&  !prefixIs(nextlatex, '}'))
+|| (nexttipas
+   &&  !prefixIs(from_ascii(nexttipashortcut), '\\')))
&&  !tipas) {
// Prevent eating of a following
// space or command corruption by

---

Summary of changes:
  src/Paragraph.cpp |   17 +
  1 files changed, 13 insertions(+), 4 deletions(-)


hooks/post-receive

Re: [LyX master] lyx2lyx/lyx_2_1.py: fix #8172

2012-05-26 Thread Richard Heck


On 05/26/2012 01:00 PM, Uwe Stöhr wrote:

The branch, master, has been updated.

- Log -

commit 7b680058756b4d80e741faa4bdafe894bc06360d
Author: Uwe StÃ¶hr
Date:   Sat May 26 19:00:03 2012 +0200

 lyx2lyx/lyx_2_1.py: fix #8172

Should be fine for branch, too.

rh


diff --git a/lib/lyx2lyx/lyx_2_1.py b/lib/lyx2lyx/lyx_2_1.py
index bbd9b3c..84bf2bc 100644
--- a/lib/lyx2lyx/lyx_2_1.py
+++ b/lib/lyx2lyx/lyx_2_1.py
@@ -347,27 +347,28 @@ def convert_use_packages(document):
  "use_xxx yyy =>  use_package xxx yyy"
  packages = ["amsmath", "esint", "mathdots", "mhchem", "undertilde"]
  for p in packages:
-i = find_token(document.header, "\\use_%s" % p , 0)
+i = find_token(document.header, "\\use_%s" % p, 0)
  if i != -1:
-value = get_value(document.header, "\\use_%s" % p , i)
+value = get_value(document.header, "\\use_%s" % p, i)
  document.header[i] = "\\use_package %s %s" % (p, value)


  def revert_use_packages(document):
  "use_package xxx yyy =>  use_xxx yyy"
-packages = {"amsmath":"1", "esint":"1", "mathdots":"1", "mhchem":"1", 
"undertilde":"1"}
+packages = ["amsmath", "esint", "mathdots", "mhchem", "undertilde"]
  # the order is arbitrary for the use_package version, and not all 
packages need to be given.
  # Ensure a complete list and correct order (important for older LyX 
versions and especially lyx2lyx)
-j = -1
-for p in packages.keys():
+j = 0
+for p in packages:
  regexp = re.compile(r'(\\use_package\s+%s)' % p)
-i = find_re(document.header, regexp, 0)
+i = find_re(document.header, regexp, j)
  if i != -1:
-value = get_value(document.header, "\\use_package" , i).split()[1]
+value = get_value(document.header, "\\use_package %s" % p, 
i).split()[1]
+document.warning(str(value))
  del document.header[i]
  j = i
-for (p, v) in packages.items():
-document.header.insert(j, "\\use_%s %s"  % (p, value))
+document.header.insert(j, "\\use_%s %s"  % (p, value))
+document.warning(str(value))
  j = j + 1



---

Summary of changes:
  lib/lyx2lyx/lyx_2_1.py |   19 ++-
  1 files changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive

Re: Upgrade Qt to 4.8?

2012-05-26 Thread Jerry


On May 26, 2012, at 6:47 AM, Stephan Witt wrote:

> Am 26.05.2012 um 03:01 schrieb Jerry:
> 
>> 
>> On May 24, 2012, at 8:26 PM, Jerry wrote:
>> 
>>> What would be the effects if any on LyX by upgrading my Qt installation 
>>> from 4.7 to 4.8?
> 
> I tried it as it came out. It was not better then 4.7. 
> The LyX.app bundle has it's own private Qt-Frameworks and is independent of 
> your system Qt-Installation, AFAIK.

Oh--thanks! That information seems useful. 8^)
> 
> Stephan

Re: [LyX master] lyx2lyx/lyx_2_1.py: fix #8172

2012-05-26 Thread Uwe Stöhr


Am 26.05.2012 21:51, schrieb Richard Heck:


lyx2lyx/lyx_2_1.py: fix #8172

Should be fine for branch, too.


This was a 2.1-only bug and fix.

regards Uwe

Re: Website translated pages flag pointers

2012-05-26 Thread Uwe Stöhr


Christian or whoever currently maintains our Webpage Wiki,

can you please have a look at this issue?:

On 03.05.2012 16:39, wrote Jean-Pierre Chrétien:


While translating the last change in

http://www.lyx.org/PressAboutLyX

in the French corresponding page, I see that the French flag at the top of the 
page points on

http://www.lyx.org/WebFr.PageActions

instead of

http://www.lyx.org/WebFr.PressAboutLyX

This is not specific to French, nor to the requested page: other flags behave 
alike in every page of
the website.

The language selector (leftmost button) works however all right.

no longer possible to upload files to the LyX Wiki

2012-05-26 Thread Uwe Stöhr


Hello Christian or whoever has th power to maintain our Wiki,

it is no longer possible to upload files to the LyX Wiki. Clicking at the upper left on "Upload and 
manage files" I'm forwarded to

http://wiki.lyx.org/ipfm/index.php?dir=/
But then nothing happens instead of displaying the login screen for the ifpm 
file managing system.

Could you please have a look?

thanks and regards
Uwe

master (trunk?) not compilable

Re: Upgrade Qt to 4.8?

Re: annoying behavior of Lyx 2.02+ -- Language toggle

Re: [LyX master] Fix macro termination in IPA inset if next character uses a TIPA shortcut

Re: [LyX master] lyx2lyx/lyx_2_1.py: fix #8172

Re: Upgrade Qt to 4.8?

Re: [LyX master] lyx2lyx/lyx_2_1.py: fix #8172

Re: Website translated pages flag pointers

no longer possible to upload files to the LyX Wiki

master (trunk?) not compilable

Re: Upgrade Qt to 4.8?

Re: annoying behavior of Lyx 2.02+ -- Language toggle

Re: [LyX master] Fix macro termination in IPA inset if next character uses a TIPA shortcut

Re: [LyX master] lyx2lyx/lyx_2_1.py: fix #8172

Re: Upgrade Qt to 4.8?

Re: [LyX master] lyx2lyx/lyx_2_1.py: fix #8172

Re: Website translated pages flag pointers

no longer possible to upload files to the LyX Wiki

18 matches

Site Navigation

Mail list logo

Footer information