Jenkins build is back to normal : Build branch "master" » ubuntu-xenial-qt4-autotools #255

2017-06-10 Thread ci-lyx 
https://ci.inria.fr/lyx/job/build-master-head/job/ubuntu-xenial-qt4-autotools/255/

Re: [LyX/master] Use otexstringstream for the captions of InsetCaptionables

2017-06-10 Thread Enrico Forestieri 
On Sun, Jun 11, 2017 at 01:08:34AM +0200, Enrico Forestieri wrote:

> On Mon, Oct 17, 2016 at 00:16:21AM +0200, Guillaume Munch wrote:
> 
> > commit 676a0639c505d52336e3228c44c2515ccbbaf34a
> > Author: Guillaume Munch 
> > Date:   Sat Sep 24 00:49:00 2016 +0200
> > 
> > Use otexstringstream for the captions of InsetCaptionables
> > 
> > * Enable TexRow for InsetListings caption.
> > 
> > * Move getCaption* from InsetText to InsetCaptionable.
> > 
> > * Clean-up caption generation for InsetFloat.
> [...]
> > @@ -420,7 +417,11 @@ docstring InsetListings::getCaption(OutputParams const 
> > & runparams) const
> > // NOTE that } is not allowed in blah2.
> > regex const reg("(.*)label\\{(.*?)\\}(.*)");
> > string const new_cap("$1$3},label={$2");
> > -   return from_utf8(regex_replace(to_utf8(cap), reg, new_cap));
> > +   // TexString validity: the substitution preserves the number of 
> > newlines.
> > +   // Moreover we assume that $2 does not contain newlines, so that the 
> > texrow
> > +   // information remains accurate.
> > +   cap.str = from_utf8(regex_replace(to_utf8(cap.str), reg, new_cap));
> > +   return cap;
> >  }
> >  
> >  
> 
> This commit broke the caption handling in InsetListings. For example,
> the document attached at #9382:
> https://www.lyx.org/trac/raw-attachment/ticket/9382/problem.20_nopreamble.lyx
> now fails to compile. It can be compiled again with the attached patch,
> which is not the right one, of course.

The attached patch should instead work always, or almost so.

-- 
Enrico
diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index b847131f57..cf5892edec 100644
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -515,7 +515,11 @@ TexString InsetListings::getCaption(OutputParams const & 
runparams) const
// TexString validity: the substitution preserves the number of 
newlines.
// Moreover we assume that $2 does not contain newlines, so that the 
texrow
// information remains accurate.
-   cap.str = from_utf8(regex_replace(to_utf8(cap.str), reg, new_cap));
+   // Replace '\n' with an improbable character from Private Use Area-A
+   // and then return to '\n' after the regex replacement.
+   docstring const capstr = subst(cap.str, char_type('\n'), 0xd);
+   cap.str = subst(from_utf8(regex_replace(to_utf8(capstr), reg, new_cap)),
+   0xd, char_type('\n'));
return cap;
 }

Re: [LyX/master] Use otexstringstream for the captions of InsetCaptionables

2017-06-10 Thread Enrico Forestieri 
On Mon, Oct 17, 2016 at 00:16:21AM +0200, Guillaume Munch wrote:

> commit 676a0639c505d52336e3228c44c2515ccbbaf34a
> Author: Guillaume Munch 
> Date:   Sat Sep 24 00:49:00 2016 +0200
> 
> Use otexstringstream for the captions of InsetCaptionables
> 
> * Enable TexRow for InsetListings caption.
> 
> * Move getCaption* from InsetText to InsetCaptionable.
> 
> * Clean-up caption generation for InsetFloat.
[...]
> @@ -420,7 +417,11 @@ docstring InsetListings::getCaption(OutputParams const & 
> runparams) const
>   // NOTE that } is not allowed in blah2.
>   regex const reg("(.*)label\\{(.*?)\\}(.*)");
>   string const new_cap("$1$3},label={$2");
> - return from_utf8(regex_replace(to_utf8(cap), reg, new_cap));
> + // TexString validity: the substitution preserves the number of 
> newlines.
> + // Moreover we assume that $2 does not contain newlines, so that the 
> texrow
> + // information remains accurate.
> + cap.str = from_utf8(regex_replace(to_utf8(cap.str), reg, new_cap));
> + return cap;
>  }
>  
>  

This commit broke the caption handling in InsetListings. For example,
the document attached at #9382:
https://www.lyx.org/trac/raw-attachment/ticket/9382/problem.20_nopreamble.lyx
now fails to compile. It can be compiled again with the attached patch,
which is not the right one, of course.

-- 
Enrico
diff --git a/src/insets/InsetListings.cpp b/src/insets/InsetListings.cpp
index b847131f57..43b5a65342 100644
--- a/src/insets/InsetListings.cpp
+++ b/src/insets/InsetListings.cpp
@@ -515,7 +515,8 @@ TexString InsetListings::getCaption(OutputParams const & 
runparams) const
// TexString validity: the substitution preserves the number of 
newlines.
// Moreover we assume that $2 does not contain newlines, so that the 
texrow
// information remains accurate.
-   cap.str = from_utf8(regex_replace(to_utf8(cap.str), reg, new_cap));
+   string const capstr = subst(to_utf8(cap.str), '\n', '@');
+   cap.str = from_utf8(subst(regex_replace(capstr, reg, new_cap), '@', 
'\n'));
return cap;
 }

Re: #9373: Windows build does not use std::regex

2017-06-10 Thread Scott Kostyshak 
On Sat, Jun 10, 2017 at 08:00:45PM +0200, Kornel Benko wrote:

> Ha!
> Someone changed the protocol from http:// to https://, and I had to enable 
> cookies there too.
> Now login works again.

Ah that's good to know if anyone else has the problem.

Scott


signature.asc
Description: PGP signature

Re: #9373: Windows build does not use std::regex

2017-06-10 Thread Kornel Benko 
Am Samstag, 10. Juni 2017 um 12:20:24, schrieb Kornel Benko 
> Am Samstag, 10. Juni 2017 um 10:04:48, schrieb LyX Ticket Tracker 
> 
> > #9373: Windows build does not use std::regex
> > +-
> >  Reporter:  baum|   Owner:  lasgouttes
> >  Type:  defect  |  Status:  new
> >  Priority:  normal  |   Milestone:  2.3.0
> > Component:  build   | Version:  2.2.0dev
> >  Severity:  minor   |  Resolution:
> >  Keywords:  os=windows  |
> > +-
> > 
> > Comment (by lasgouttes):
> > 
> >  Making boost:regex the default ? Probably if it is not yet the case.
> >  Unless we have fixed our problematic refers.
> > 
> 
> All of sudden I cannot login on lyx-trac.
> Therefore I respond here.

Ha!
Someone changed the protocol from http:// to https://, and I had to enable 
cookies there too.
Now login works again.

> Yes, boost regex is the default for Windows.
> 
Kornel 

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

string freeze for master

2017-06-10 Thread Scott Kostyshak 
An email to translators regarding the 2.3.0 release is going to be sent
soon, so if you need to make any commits that change strings, please
push them as soon as possible.

Scott


signature.asc
Description: PGP signature

Re: Copying translations from 2.2.x to master?

2017-06-10 Thread Scott Kostyshak 
On Sat, Jun 10, 2017 at 10:34:51AM +0200, Georg Baum wrote:
> Scott Kostyshak wrote:
> 
> > On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote:
> > 
> >> Unless someone has a different idea, I will replace the Windows
> >> linebreaks with non-Windows linebreaks, update the strings on master,
> >> and try the mergepo.py call above again.
> > 
> > After Kornel's fixes to the Windows linebreaks, I tried mergepo.py again
> > but it did not update any translations.
> > 
> > Any other ideas?
> 
> Which translation updates do you expect? It seems that they are pretty much 
> in sync.

I just expected that there was something that I or someone else had to
do. I didn't know it had already been done.

> I get the attached diff when running
> 
> python -tt development/tools/mergepo.py ../lyx-2.2-git/po
> 
> from within the master branch.
> 
> 
> 
> Georg
> 
> PS: Sorry for being so unresponsive, still busy.

No problem, thanks for the response and good luck with the busyness.

Scott

Re: Copying translations from 2.2.x to master?

2017-06-10 Thread Scott Kostyshak 
On Sat, Jun 10, 2017 at 10:29:04AM +0200, Uwe Stöhr wrote:
> Hi Scott, I am still away for another week. I already transferred the po 
> files from 2.2.x to master for all active translations .

Great, thank you!

> So please don't touch the po files in master.

OK.

> The translators will be informed

By whom? I was going to send an email, but do you prefer to do it? That
would probably be best since you know more about this than I do. Either
way is fine with me. I just want to know who has the responsibility.
Is 2 weeks a good time to give them for a deadline?

> that they only need to translate the giles in master for LyX 2.3. 

And what about the docs? Will you send an email about that also?

Scott

Re: #10119: Shortcut Control-M

2017-06-10 Thread Scott Kostyshak 
On Sat, Jun 10, 2017 at 03:36:28PM +0200, Stephan Witt wrote:
> Am 09.06.2017 um 23:09 schrieb Scott Kostyshak :
> > 
> > On Fri, Jun 09, 2017 at 10:17:25PM +0200, Stephan Witt wrote:
> > 
> >> Sorry, I don’t have the time right now, but I should have answered.
> > 
> > No problem at all, thanks for the response. Now that I've bugged you
> > about it I can take it off my todo list :)
> 
> I gave it a try and it’s as bad as I was fearing…
> 
> The mixture of different changes of build environments is causing trouble.
> I’m unable to compile most of the versions between 2.1.5 and 2.2.3 on my 
> Macbook with 10.12 SDK.
> 
> I get errors and have to skip bisect.
> 
> Either this:
> 
> In file included from /Users/stephan/git/lyx/src/support/debug.cpp:21:
> /Users/stephan/git/lyx/src/support/../support/regex.h:16:12: fatal error: 
> 'regex' file not found
> #  include 
> 
> or this:
> make[4]: *** No rule to make target `ConsoleApplicationPrivate.h', needed by 
> `moc_ConsoleApplicationPrivate.cpp'.  Stop.
> 
> After doing this 8 times I’m giving up.

Ouch, that is frustrating. Sorry for asking you to do that. I appreciate
your trying, Stephan. Let's forget about this issue then and assume it
was a change in Qt until we receive evidence otherwise.

Scott

Re: 2.3.0alpha1 tar balls are available

2017-06-10 Thread Scott Kostyshak 
On Sat, Jun 10, 2017 at 06:35:13PM +0200, Jean-Pierre Chrétien wrote:

> > Jean-Pierre, do you still get these warnings on current master?
> 
> Those in insets/InsetSpecialChar.cpp disappeared, but these remain :
> 
> ../../../master/3rdparty/mythes/1.2.5/mythes.cxx: In member function ‘int
> MyThes::thInitialize(const char*, const char*)’:
> ../../../master/3rdparty/mythes/1.2.5/mythes.cxx:51:29: warning: comparison
> between signed and unsigned integer expressions [-Wsign-compare]
>  if (idxsz <= 0 || idxsz > std::numeric_limits::max() /
> sizeof(sizeof(char*))) {
>  ^
> ../../../master/3rdparty/mythes/1.2.5/mythes.cxx: In member function ‘int
> MyThes::Lookup(const char*, int, mentry**)’:
> ../../../master/3rdparty/mythes/1.2.5/mythes.cxx:179:36: warning: comparison
> between signed and unsigned integer expressions [-Wsign-compare]
>  if (nmeanings < 0 || nmeanings > std::numeric_limits::max() /
> sizeof(mentry))

I'm not sure we should change this for the included 3rd party libraries
so we might just have to live with them.

> ^
> ../../master/src/insets/InsetListingsParams.cpp: In constructor
> ‘lyx::{anonymous}::ParValidator::ParValidator()’:
> ../../master/src/insets/InsetListingsParams.cpp:297:1: note: variable
> tracking size limit exceeded with -fvar-tracking-assignments, retrying
> without
>  ParValidator::ParValidator()
>  ^

>From what I understand [1], this is not serious.

Thanks for checking, Jean-Pierre.

Scott

[1]
https://stackoverflow.com/questions/23499909/adjust-variable-tracking-assignment-length

Re: #9373: Windows build does not use std::regex

2017-06-10 Thread Scott Kostyshak 
On Sat, Jun 10, 2017 at 12:20:24PM +0200, Kornel Benko wrote:

> All of sudden I cannot login on lyx-trac.

Strange. I am automatically logged on and I'm afraid to logout to test
if I can log back in. I guess try again in a day and if there is still a
problem then we need to figure out what's going on.

> Therefore I respond here.
> 
> Yes, boost regex is the default for Windows.

OK so there is nothing we need to do for 2.3.0?
Should I retarget to 2.4.0?

Scott

Translation of Listings in layouttranslations (was : [LyX/master] Overtake layout translations from fi.po, ja.po, zh_CN.po)

2017-06-10 Thread Jean-Pierre Chrétien 

Le 08/06/2017 à 18:11, Kornel Benko a écrit :

Am Donnerstag, 8. Juni 2017 um 02:34:46, schrieb Pavel Sanda 

Kornel Benko wrote:

commit 6a4a88e98afbb9555f502d6aebef1f0ae84cff31
Author: Kornel Benko 
Date:   Wed Jun 7 18:27:32 2017 +0200

Overtake layout translations from fi.po, ja.po, zh_CN.po


I guess you should make the translators aware of these changes
(if they were aware that those changes will be changed in pdf output).


Yes, I will.

Dear Translators, could you please check that the changes in 
lib/layouttranslations
are correct in respect to pdf-output?


French does not seem to be concerned by this call, but I reviewed one more time 
the file and I have a doubt about the translation of


"Listings[[List of Listings]]"

Does this refer to the word "Listings" as it appears in the List of Listings (as 
the double brackets indicate usually in the po file), or to the "List of 
Listings" phrase itself ?


My current transltion is

"Listings[[List of Listings]]" "Liste des listings"

Maybe I should change this to

"Listings[[List of Listings]]" "Listings"

BTW, the translation seems inconsistent in this respect along the different 
languages, as far as I can understand.


--
Jean-Pierre

Re: 2.3.0alpha1 tar balls are available

2017-06-10 Thread Jean-Pierre Chrétien 

Le 09/06/2017 à 19:06, Scott Kostyshak a écrit :

On Tue, May 02, 2017 at 11:21:38AM +0200, Jean-Pierre Chrétien wrote:

Le 24/04/2017 à 07:41, Scott Kostyshak a écrit :


The tar balls and sig files are here:

  ftp://ftp.lyx.org/pub/lyx/devel/lyx-2.3/lyx-2.3.0alpha1

Non-packagers, please do a quick test of compilation (from the tar ball)
and basic functionality on your platform, and let us know how it goes.


I get these warnings with Debian Jessie

1.2.5/mythes.cxx: In member function ‘int MyThes::thInitialize(const char*,
const char*)’:
1.2.5/mythes.cxx:51:29: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
 if (idxsz <= 0 || idxsz > std::numeric_limits::max() /
sizeof(sizeof(char*))) {
 ^
1.2.5/mythes.cxx: In member function ‘int MyThes::Lookup(const char*, int,
mentry**)’:
1.2.5/mythes.cxx:179:36: warning: comparison between signed and unsigned
integer expressions [-Wsign-compare]
 if (nmeanings < 0 || nmeanings > std::numeric_limits::max() /
sizeof(mentry))
^
insets/InsetListingsParams.cpp: In constructor
‘lyx::{anonymous}::ParValidator::ParValidator()’:
insets/InsetListingsParams.cpp:297:1: note: variable tracking size limit
exceeded with -fvar-tracking-assignments, retrying without
 ParValidator::ParValidator()
 ^
insets/InsetSpecialChar.cpp: In member function ‘virtual lyx::docstring
lyx::InsetSpecialChar::toolTip(const lyx::BufferView&, int, int) const’:
insets/InsetSpecialChar.cpp:92:9: warning: enumeration value ‘LDOTS’ not
handled in switch [-Wswitch]
  switch (kind_) {
 ^
insets/InsetSpecialChar.cpp:92:9: warning: enumeration value
‘MENU_SEPARATOR’ not handled in switch [-Wswitch]
insets/InsetSpecialChar.cpp:92:9: warning: enumeration value ‘PHRASE_LYX’
not handled in switch [-Wswitch]
insets/InsetSpecialChar.cpp:92:9: warning: enumeration value ‘PHRASE_TEX’
not handled in switch [-Wswitch]
insets/InsetSpecialChar.cpp:92:9: warning: enumeration value
‘PHRASE_LATEX2E’ not handled in switch [-Wswitch]
insets/InsetSpecialChar.cpp:92:9: warning: enumeration value ‘PHRASE_LATEX’
not handled in switch [-Wswitch]


Configuration
  Host type:   x86_64-pc-linux-gnu
  Special build flags:  build=prerelease std-regex warnings assertions
use-hunspell
  Bundled libraries:boost mythes
  C++ Compiler:g++ (4.9.2)
  C++ Compiler flags:   -Wall -Wextra -g -O2 -std=c++14
  C++ Compiler user flags:
  Linker flags:
  Linker user flags:
  Qt Frontend:
  Qt version:  4.8.6
  Packaging:   posix
  LyX binary dir:  /usr/local/bin
  LyX files dir:   /usr/local/share/lyx-2.3.0alpha1


Jean-Pierre, do you still get these warnings on current master?


Those in insets/InsetSpecialChar.cpp disappeared, but these remain :

../../../master/3rdparty/mythes/1.2.5/mythes.cxx: In member function ‘int 
MyThes::thInitialize(const char*, const char*)’:
../../../master/3rdparty/mythes/1.2.5/mythes.cxx:51:29: warning: comparison 
between signed and unsigned integer expressions [-Wsign-compare]
 if (idxsz <= 0 || idxsz > std::numeric_limits::max() / 
sizeof(sizeof(char*))) {

 ^
../../../master/3rdparty/mythes/1.2.5/mythes.cxx: In member function ‘int 
MyThes::Lookup(const char*, int, mentry**)’:
../../../master/3rdparty/mythes/1.2.5/mythes.cxx:179:36: warning: comparison 
between signed and unsigned integer expressions [-Wsign-compare]
 if (nmeanings < 0 || nmeanings > std::numeric_limits::max() / 
sizeof(mentry))

^
../../master/src/insets/InsetListingsParams.cpp: In constructor 
‘lyx::{anonymous}::ParValidator::ParValidator()’:
../../master/src/insets/InsetListingsParams.cpp:297:1: note: variable tracking 
size limit exceeded with -fvar-tracking-assignments, retrying without

 ParValidator::ParValidator()
 ^
--
Jean-Pierre

Build failed in Jenkins: Build branch "master" » ubuntu-xenial-qt4-autotools #254

2017-06-10 Thread ci-lyx 
https://ci.inria.fr/lyx/job/build-master-head/job/ubuntu-xenial-qt4-autotools/254/Changes:

[spitz] Correct restoration of citation style selection between engine switches

--
[...truncated 592 lines...]
  CXX  trivstring.o
  CXX  userinfo.o
  CXX  unicode.o
  AR   liblyxsupport.a
make[5]: Leaving directory '/build/workspace/src/support'
make[4]: Leaving directory '/build/workspace/src/support'
Making all in frontends
make[4]: Entering directory '/build/workspace/src/frontends'
Making all in qt4
make[5]: Entering directory '/build/workspace/src/frontends/qt4'
  GEN  ui_AboutUi.h
  GEN  ui_BibitemUi.h
  GEN  ui_BiblioUi.h
  GEN  ui_BibtexAddUi.h
  GEN  ui_BibtexUi.h
  GEN  ui_BoxUi.h
  GEN  ui_BranchesUi.h
  GEN  ui_BranchesUnknownUi.h
  GEN  ui_BranchUi.h
  GEN  ui_BulletsUi.h
  GEN  ui_ChangesUi.h
  GEN  ui_CharacterUi.h
  GEN  ui_CitationUi.h
  GEN  ui_ColorUi.h
  GEN  ui_CompareUi.h
  GEN  ui_CompareHistoryUi.h
  GEN  ui_DelimiterUi.h
  GEN  ui_DocumentUi.h
  GEN  ui_ErrorListUi.h
  GEN  ui_ERTUi.h
  GEN  ui_ExternalUi.h
  GEN  ui_FindAndReplaceUi.h
  GEN  ui_FloatPlacementUi.h
  GEN  ui_FontUi.h
  GEN  ui_GraphicsUi.h
  GEN  ui_HSpaceUi.h
  GEN  ui_HyperlinkUi.h
  GEN  ui_IncludeUi.h
  GEN  ui_IndexUi.h
  GEN  ui_IndicesUi.h
  GEN  ui_InfoUi.h
  GEN  ui_InsetParamsUi.h
  GEN  ui_LabelUi.h
  GEN  ui_LanguageUi.h
  GEN  ui_LaTeXUi.h
  GEN  ui_LineUi.h
  GEN  ui_ListingsUi.h
  GEN  ui_ListingsSettingsUi.h
  GEN  ui_LocalLayoutUi.h
  GEN  ui_LogUi.h
  GEN  ui_MarginsUi.h
  GEN  ui_MasterChildUi.h
  GEN  ui_MathMatrixUi.h
  GEN  ui_MathsUi.h
  GEN  ui_ModulesUi.h
  GEN  ui_NomenclUi.h
  GEN  ui_NoteUi.h
  GEN  ui_NumberingUi.h
  GEN  ui_OutputUi.h
  GEN  ui_PageLayoutUi.h
  GEN  ui_ParagraphUi.h
  GEN  ui_PDFSupportUi.h
  GEN  ui_PhantomUi.h
  GEN  ui_PreambleUi.h
  GEN  ui_PrefColorsUi.h
  GEN  ui_PrefCompletionUi.h
  GEN  ui_PrefConvertersUi.h
  GEN  ui_PrefDocHandlingUi.h
  GEN  ui_PrefOutputUi.h
  GEN  ui_PrefDisplayUi.h
  GEN  ui_PrefEditUi.h
  GEN  ui_PrefFileformatsUi.h
  GEN  ui_PrefIdentityUi.h
  GEN  ui_PrefInputUi.h
  GEN  ui_PrefLanguageUi.h
  GEN  ui_PrefLatexUi.h
  GEN  ui_PrefPathsUi.h
  GEN  ui_PrefScreenFontsUi.h
  GEN  ui_PrefShortcutsUi.h
  GEN  ui_PrefSpellcheckerUi.h
  GEN  ui_PrefsUi.h
  GEN  ui_PrefUi.h
  GEN  ui_PrintindexUi.h
  GEN  ui_PrintNomenclUi.h
  GEN  ui_ProgressViewUi.h
  GEN  ui_RefUi.h
  GEN  ui_SearchUi.h
  GEN  ui_SendtoUi.h
  GEN  ui_ShortcutUi.h
  GEN  ui_ShowFileUi.h
  GEN  ui_SpellcheckerUi.h
  GEN  ui_SymbolsUi.h
  GEN  ui_TabularCreateUi.h
  GEN  ui_TabularUi.h
  GEN  ui_TexinfoUi.h
  GEN  ui_TextLayoutUi.h
  GEN  ui_ThesaurusUi.h
  GEN  ui_TocUi.h
  GEN  ui_ToggleWarningUi.h
  GEN  ui_ViewSourceUi.h
  GEN  ui_VSpaceUi.h
  GEN  ui_WorkAreaUi.h
  GEN  ui_WrapUi.h
  GEN  moc_Action.cpp
  GEN  moc_BulletsModule.cpp
  GEN  moc_CategorizedCombo.cpp
  GEN  moc_CustomizedWidgets.cpp
  GEN  moc_DialogView.cpp
  GEN  moc_DockView.cpp
  GEN  moc_EmptyTable.cpp
  GEN  moc_FancyLineEdit.cpp
  GEN  moc_FindAndReplace.cpp
  GEN  moc_FloatPlacement.cpp
  GEN  moc_GuiAbout.cpp
  GEN  moc_GuiApplication.cpp
  GEN  moc_GuiBibitem.cpp
  GEN  moc_GuiBibtex.cpp
  GEN  moc_GuiBox.cpp
  GEN  moc_GuiBranches.cpp
  GEN  moc_GuiBranch.cpp
  GEN  moc_GuiChanges.cpp
  GEN  moc_GuiCharacter.cpp
  GEN  moc_GuiCitation.cpp
  GEN  moc_GuiClipboard.cpp
  GEN  moc_GuiCommandBuffer.cpp
  GEN  moc_GuiCommandEdit.cpp
  GEN  moc_GuiCompare.cpp
  GEN  moc_GuiCompareHistory.cpp
  GEN  moc_GuiCompleter.cpp
  GEN  moc_GuiDelimiter.cpp
  GEN  moc_GuiDialog.cpp
  GEN  moc_GuiDocument.cpp
  GEN  moc_GuiErrorList.cpp
  GEN  moc_GuiERT.cpp
  GEN  moc_GuiExternal.cpp
  GEN  moc_GuiGraphics.cpp
  GEN  moc_GuiHSpace.cpp
  GEN  moc_GuiHyperlink.cpp
  GEN  moc_GuiInclude.cpp
  GEN  moc_GuiIndex.cpp
  GEN  moc_GuiIndices.cpp
  GEN  moc_GuiInfo.cpp
  GEN  moc_GuiLabel.cpp
  GEN  moc_GuiLine.cpp
  GEN  moc_GuiListings.cpp
  GEN  moc_GuiLog.cpp
  GEN  moc_GuiMathMatrix.cpp
  GEN  moc_GuiNomenclature.cpp
  GEN  moc_GuiNote.cpp
  GEN  moc_GuiParagraph.cpp
  GEN  moc_GuiPhantom.cpp
  GEN  moc_GuiPrefs.cpp
  GEN  moc_GuiPrintindex.cpp
  GEN  moc_GuiPrintNomencl.cpp
  GEN  moc_GuiProgress.cpp
  GEN  moc_GuiProgressView.cpp
  GEN  moc_GuiRef.cpp
  GEN  moc_GuiSearch.cpp
  GEN  moc_GuiSelection.cpp
  GEN  moc_GuiSelectionManager.cpp
  GEN  moc_GuiSendto.cpp
  GEN

Re: #10119: Shortcut Control-M

2017-06-10 Thread Stephan Witt 
Am 09.06.2017 um 23:09 schrieb Scott Kostyshak :
> 
> On Fri, Jun 09, 2017 at 10:17:25PM +0200, Stephan Witt wrote:
> 
>> Sorry, I don’t have the time right now, but I should have answered.
> 
> No problem at all, thanks for the response. Now that I've bugged you
> about it I can take it off my todo list :)

I gave it a try and it’s as bad as I was fearing…

The mixture of different changes of build environments is causing trouble.
I’m unable to compile most of the versions between 2.1.5 and 2.2.3 on my 
Macbook with 10.12 SDK.

I get errors and have to skip bisect.

Either this:

In file included from /Users/stephan/git/lyx/src/support/debug.cpp:21:
/Users/stephan/git/lyx/src/support/../support/regex.h:16:12: fatal error: 
'regex' file not found
#  include 

or this:
make[4]: *** No rule to make target `ConsoleApplicationPrivate.h', needed by 
`moc_ConsoleApplicationPrivate.cpp'.  Stop.

After doing this 8 times I’m giving up.

Stephan

> 
> Scott

Re: #9373: Windows build does not use std::regex

2017-06-10 Thread Kornel Benko 
Am Samstag, 10. Juni 2017 um 10:04:48, schrieb LyX Ticket Tracker 
> #9373: Windows build does not use std::regex
> +-
>  Reporter:  baum|   Owner:  lasgouttes
>  Type:  defect  |  Status:  new
>  Priority:  normal  |   Milestone:  2.3.0
> Component:  build   | Version:  2.2.0dev
>  Severity:  minor   |  Resolution:
>  Keywords:  os=windows  |
> +-
> 
> Comment (by lasgouttes):
> 
>  Making boost:regex the default ? Probably if it is not yet the case.
>  Unless we have fixed our problematic refers.
> 

All of sudden I cannot login on lyx-trac.
Therefore I respond here.

Yes, boost regex is the default for Windows.

Kornel 

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

Re: Copying translations from 2.2.x to master?

2017-06-10 Thread Kornel Benko 
Am Samstag, 10. Juni 2017 um 10:41:43, schrieb Georg Baum 

> Kornel Benko wrote:
> 
> > Am Sonntag, 4. Juni 2017 um 10:33:02, schrieb Scott Kostyshak
> > 
> >> On Sun, Jun 04, 2017 at 12:17:27PM +0200, Kornel Benko wrote:
> >> 
> >> > > Unless someone has a different idea, I will replace the Windows
> >> > > linebreaks with non-Windows linebreaks, update the strings on master,
> >> > > and try the mergepo.py call above again.
> 
> If there are windows line breaks again someone uses a misconfigured git 
> client or does stuff behind the back of git. The settings in the 
> .gitattributes file ensure that .po files are always stored using unix line 
> ends in git, and using native OS line ends in working directories.

It was not line endings in the file but extra  inside a line
Example:
#: src/frontends/qt4/ui/BiblioUi.ui:244 
src/frontends/qt4/ui/ColorUi.ui:73
The line end was  as expected (not a windows )

> >> > I made a perl-script for this purpose (created and used for commit
> >> > 52eee8e). Should I add it to repo?
> >> 
> >> For the purpose of fixing the linebreaks
> > 
> > This one.
> 
> I would suggest to use git correctly instead of fixing broken line ends 
> again and again, producing huge nonsense diffs. We had this discussion 
> several times in the past.
>

Maybe a problem in merging and pushing from windows.
Scenario to merge:
#: src/frontends/qt4/ui/BiblioUi.ui:244
with
#: src/frontends/qt4/ui/ColorUi.ui:73
results in
#: src/frontends/qt4/ui/BiblioUi.ui:244 
src/frontends/qt4/ui/ColorUi.ui:73
and after push the last  is converted to 

> Georg
> 

Kornel

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

Re: Copying translations from 2.2.x to master?

2017-06-10 Thread Georg Baum 
Kornel Benko wrote:

> Am Sonntag, 4. Juni 2017 um 10:33:02, schrieb Scott Kostyshak
> 
>> On Sun, Jun 04, 2017 at 12:17:27PM +0200, Kornel Benko wrote:
>> 
>> > > Unless someone has a different idea, I will replace the Windows
>> > > linebreaks with non-Windows linebreaks, update the strings on master,
>> > > and try the mergepo.py call above again.

If there are windows line breaks again someone uses a misconfigured git 
client or does stuff behind the back of git. The settings in the 
.gitattributes file ensure that .po files are always stored using unix line 
ends in git, and using native OS line ends in working directories.

>> > I made a perl-script for this purpose (created and used for commit
>> > 52eee8e). Should I add it to repo?
>> 
>> For the purpose of fixing the linebreaks
> 
> This one.

I would suggest to use git correctly instead of fixing broken line ends 
again and again, producing huge nonsense diffs. We had this discussion 
several times in the past.


Georg

Re: Copying translations from 2.2.x to master?

2017-06-10 Thread Georg Baum 
Scott Kostyshak wrote:

> On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote:
> 
>> Unless someone has a different idea, I will replace the Windows
>> linebreaks with non-Windows linebreaks, update the strings on master,
>> and try the mergepo.py call above again.
> 
> After Kornel's fixes to the Windows linebreaks, I tried mergepo.py again
> but it did not update any translations.
> 
> Any other ideas?

Which translation updates do you expect? It seems that they are pretty much 
in sync. I get the attached diff when running

python -tt development/tools/mergepo.py ../lyx-2.2-git/po

from within the master branch.



Georg

PS: Sorry for being so unresponsive, still busy.
diff --git a/po/ar.po b/po/ar.po
index 0830149..35c26b1 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -1085,9 +1085,8 @@ msgid "Selected :"
 msgstr "الاستشهادات المحد&دة:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "ته&يئة"
+msgstr "تهيئة"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st:"
diff --git a/po/ca.po b/po/ca.po
index 8e0d184..97611a8 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1126,7 +1126,6 @@ msgid "Selected :"
 msgstr "Citacions :"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "S'està donant format"
 
diff --git a/po/cs.po b/po/cs.po
index 87ace39..e038f6d 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1098,7 +1098,6 @@ msgid "Selected :"
 msgstr "é citace:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formátování"
 
diff --git a/po/da.po b/po/da.po
index d2c32af..57fb17f 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1105,7 +1105,6 @@ msgid "Selected :"
 msgstr " referencer:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formatering"
 
diff --git a/po/el.po b/po/el.po
index 56d5b8d..f20d50e 100644
--- a/po/el.po
+++ b/po/el.po
@@ -1105,7 +1105,6 @@ msgid "Selected :"
 msgstr "&Επιλεγμένες Παραπομπές:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Μορφοποίηση"
 
diff --git a/po/es.po b/po/es.po
index 0a9179a..293b9b2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1093,9 +1093,8 @@ msgid "Selected :"
 msgstr "Citas :"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "For"
+msgstr "Formato"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st:"
diff --git a/po/eu.po b/po/eu.po
index 4d127bb..c294207 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -1108,7 +1108,6 @@ msgid "Selected :"
 msgstr " aipamenak:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formatua ematea"
 
diff --git a/po/gl.po b/po/gl.po
index 5b6d619..f2649fe 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -1125,7 +1125,6 @@ msgid "Selected :"
 msgstr "Citas seleccio:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formato"
 
diff --git a/po/he.po b/po/he.po
index d1bf07e..b0ada0f 100644
--- a/po/he.po
+++ b/po/he.po
@@ -1106,7 +1106,6 @@ msgid "Selected :"
 msgstr "מובאות נבחרות:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "עיצוב"
 
diff --git a/po/hu.po b/po/hu.po
index d361e52..6bc8f9d 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1099,7 +1099,6 @@ msgid "Selected :"
 msgstr "Kiválasztott ások:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Formátum"
 
diff --git a/po/ia.po b/po/ia.po
index 9de3029..30a2bda 100644
--- a/po/ia.po
+++ b/po/ia.po
@@ -1090,9 +1090,8 @@ msgid "Selected :"
 msgstr "Citationes :"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "For"
+msgstr "Formattation"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st:"
diff --git a/po/id.po b/po/id.po
index cb03aa2..045746a 100644
--- a/po/id.po
+++ b/po/id.po
@@ -1102,7 +1102,6 @@ msgid "Selected :"
 msgstr "A yang Dipilih:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Pemformatan"
 
diff --git a/po/ko.po b/po/ko.po
index febc114..75809f8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1093,7 +1093,6 @@ msgid "Selected :"
 msgstr "선택된 인용():"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "형틀 짜기(Formatting)"
 
diff --git a/po/nb.po b/po/nb.po
index 3f06ac2..6ad7721 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1086,9 +1086,8 @@ msgid "Selected :"
 msgstr "Valgt referanser:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
-msgstr "For"
+msgstr "Formatering"
 
 #: src/frontends/qt4/ui/CitationUi.ui:279
 msgid "Citation st:"
diff --git a/po/nl.po b/po/nl.po
index 0844c26..cf4fb40 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1110,7 +1110,6 @@ msgid "Selected :"
 msgstr " literatuurverwijzingen:"
 
 #: src/frontends/qt4/ui/CitationUi.ui:269
-#, fuzzy
 msgid "Formatting"
 msgstr "Opmaak"
 
diff --git

Re: Copying translations from 2.2.x to master?

2017-06-10 Thread Uwe Stöhr 
Hi Scott, I am still away for another week. I already transferred the po files 
from 2.2.x to master for all active translations . So please don't touch the po 
files in master. The translators will be informed that they only need to 
translate the giles in master for LyX 2.3. 

Regards Uwe  

  Original Message  
From: Scott Kostyshak
Sent: Freitag, 9. Juni 2017 20:28
To: LyX Developers; Uwe Stöhr; Georg Baum
Subject: Re: Copying translations from 2.2.x to master?

On Sat, Jun 03, 2017 at 08:07:39PM -0400, Scott Kostyshak wrote:
> On Mon, May 29, 2017 at 11:09:55PM -0400, Scott Kostyshak wrote:
> > Uwe,
> > 
> > Do you have time to copy the translations from 2.2.x to master? From
> > what I understand, you've done this in the past.
> > 
> > If Uwe doesn't have time, hopefully someone else can help or can tell me
> > what I should do.
> 
> I think Uwe is very busy. Does anyone else know how to do this? I'm not
> sure what to do.
> 
> I imagine I also need to solve the Windows linebreaks issue [1] before
> proceeding?
> 
> Georg, is your mergepo.py script meant for this purpose? I tested it by
> checking out zh_CN.po and de.po from 2.2.x, putting them in a directory
> ~/Desktop/2.2.x, and running
> 
> ./mergepo.py ~/Desktop/2.2.x
> 
> But it appears that nothing was updated:
> 
> Merging /home/scott/Desktop/2.2.x/de.po into ../../po/de.po: Updated 0
> translations with minimal diff.
> 
> Merging /home/scott/Desktop/2.2.x/zh_CN.po into ../../po/zh_CN.po:
> Updated 0 translations with minimal diff.
> 
> Unless someone has a different idea, I will replace the Windows
> linebreaks with non-Windows linebreaks, update the strings on master,
> and try the mergepo.py call above again.

Kornel has fixed the linebreaks issue, but mergepo.py still doesn't give
any output for me.

Uwe or Georg, you might be too busy to work on the issue yourself, but
can you describe some detailed steps for what I should do to merge the
2.2.x translations to master?

Scott

Jenkins build is back to normal : Build branch "master" » ubuntu-xenial-qt4-autotools #253

2017-06-10 Thread ci-lyx 
https://ci.inria.fr/lyx/job/build-master-head/job/ubuntu-xenial-qt4-autotools/253/