[LyX master] Fix Chinese Tutorial copilation

2013-05-25 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit c8000f90171fe9128e4a420a57a3437419786eb5
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sat May 25 11:48:38 2013 +0200

Fix Chinese Tutorial copilation

diff --git a/lib/doc/zh_CN/Tutorial.lyx b/lib/doc/zh_CN/Tutorial.lyx
index d99f13f..b876148 100644
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@@ -113,7 +113,6 @@ status collapsed
 \begin_layout Plain Layout
 对这个中文版有任何话想说请 Email 到 
 \family typewriter
-\lang english
 
 \begin_inset CommandInset href
 LatexCommand href
@@ -124,7 +123,6 @@ type mailto:;
 
 
 \family default
-\lang chinese-simplified
 。
 \end_layout
 

---

Summary of changes:
 lib/doc/zh_CN/Tutorial.lyx |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Merge branch 'master' of git.lyx.org:lyx

2013-05-25 Thread Uwe Stöhr 
The branch, master, has been updated.

- Log -

commit 92a2e179035a9c67bb042a3b6eac00a72d1ef862
Merge: 472732f c8000f9
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sat May 25 13:52:38 2013 +0200

Merge branch 'master' of git.lyx.org:lyx


commit 472732f92d7287c47ff1003094df5f6826c15c2e
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sat May 25 13:52:09 2013 +0200

GuiBox.cpp: addendum to [f04c7711/lyxgit]

- this was forgotten to commit;
(without this we would get invalid LaTeX code when changing in the box 
dialog a makebox without a width to a minipage and press apply - a makebox 
required to specify a width, at least an invisible one like 0cm)

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index 90f5659..afca9ab 100644
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -378,6 +378,9 @@ docstring GuiBox::dialogToParams() const
params.width = Length(value.toDouble(), Length::IN);
} else {
params.special = none;
+   // we must specify a valid length in this case
+   if (value.isEmpty())
+   widthED-setText(0);
params.width = Length(widgetsToLength(widthED, 
widthUnitsLC));
}
} else {

---

Summary of changes:
 src/frontends/qt4/GuiBox.cpp |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] GuiBox.cpp, InsetBox.cpp: fix some wrong logic

2013-05-25 Thread Uwe Stöhr 
The branch, master, has been updated.

- Log -

commit 427aeff90fdb9ff5a698c73b72240467611c9f04
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sat May 25 15:07:17 2013 +0200

GuiBox.cpp, InsetBox.cpp: fix some wrong logic

- InsetBox.cpp:
 a framebox without inner box and without a width is \fbox
 a framebox with inner box is also \fbox
 a framebox without inner box and with width is \framebox

- GuiBox.cpp: the width checkbox must be checked if there is width

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index afca9ab..d3bd8e8 100644
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -128,7 +128,7 @@ void GuiBox::on_innerBoxCO_activated(int /* index */)
// the width can only be selected for makebox or framebox
widthCB-setEnabled(itype == makebox
|| (outer == Boxed  itype == none));
-   widthCB-setChecked(itype != none  !widthCB-isEnabled());
+   widthCB-setChecked(!widthED-text().isEmpty());
// except for frameless and boxed, the width cannot be specified if
// there is no inner box
bool const width_enabled =
@@ -313,8 +313,7 @@ void GuiBox::paramsToDialog(Inset const * inset)
lengthToWidgets(widthED, widthUnitsLC,
params.width, default_unit);
} else {
-   if (widthCB-isEnabled())
-   widthCB-setChecked(true);
+   widthCB-setChecked(true);
lengthToWidgets(widthED, widthUnitsLC,
params.width, default_unit);
QString const special = toqstr(params.special);
diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index a07df27..30c2386 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -317,9 +317,9 @@ void InsetBox::latex(otexstream  os, OutputParams const  
runparams) const
os  \\begin{framed}%\n;
break;
case Boxed:
-   if (width_string.empty()) {
-   os  \\framebox;
+   if (!width_string.empty()) {
if (!params_.inner_box) {
+   os  \\framebox;
// Special widths, see usrguide sec. 3.5
// FIXME UNICODE
if (params_.special != none) {
@@ -331,7 +331,8 @@ void InsetBox::latex(otexstream  os, OutputParams const  
runparams) const
']';
if (params_.hor_pos != 'c')
os  [  params_.hor_pos  ];
-   }
+   } else
+   os  \\fbox;
} else
os  \\fbox;
os  {;

---

Summary of changes:
 src/frontends/qt4/GuiBox.cpp |5 ++---
 src/insets/InsetBox.cpp  |7 ---
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Re: [LyX master] GuiBox.cpp, InsetBox.cpp: fix some wrong logic

2013-05-25 Thread Jean-Marc Lasgouttes 

Le 25/05/13 15:07, Uwe Stöhr   a écrit :

The branch, master, has been updated.

- Log -

commit 427aeff90fdb9ff5a698c73b72240467611c9f04
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sat May 25 15:07:17 2013 +0200

 GuiBox.cpp, InsetBox.cpp: fix some wrong logic

 - InsetBox.cpp:
  a framebox without inner box and without a width is \fbox
  a framebox with inner box is also \fbox
  a framebox without inner box and with width is \framebox

 - GuiBox.cpp: the width checkbox must be checked if there is width


This last point makes me wonder why the checkbox is useful...

JMarc

[LyX master] On Mac, moving down a paragraph should place the cursor at the end of the current paragraph (unless it's already there, in which case it should move to the end of the next paragraph). Cha

2013-05-25 Thread Stephan Witt 
The branch, master, has been updated.

- Log -

commit 75c631df7f1124b6bf53f48f8d82ecb42fdb9c52
Author: Stephan Witt sw...@lyx.org
Date:   Sat May 25 18:02:21 2013 +0200

On Mac, moving down a paragraph should place the cursor at the end of the 
current paragraph
(unless it's already there, in which case it should move to the end of the 
next paragraph).
Change the preference setting name (mac_like_word_movement to 
mac_like_cursor_movement)
to better reflect its function.

Patch and description from Bennett Helm

diff --git a/development/MacOSX/lyxrc.dist.in b/development/MacOSX/lyxrc.dist.in
index 598d8a3..43d353f 100644
--- a/development/MacOSX/lyxrc.dist.in
+++ b/development/MacOSX/lyxrc.dist.in
@@ -28,7 +28,7 @@
 \screen_font_sans Helvetica
 \screen_font_typewriter Courier
 \open_buffers_in_tabs false
-\mac_like_word_movement true
+\mac_like_cursor_movement true
 
 \scroll_wheel_zoom off
 
diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 662f650..a3d4c43 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -57,6 +57,9 @@
 #   Add option to use the system's theme icons
 #   No conversion necessary.
 
+# Incremented to format 13, by bh
+#   Rename mac_like_word_movement to mac_like_cursor_movement
+
 import re
 
 ###
@@ -290,6 +293,8 @@ def remove_default_language(line):
return no_match
return (True, )
 
+def mac_cursor_movement(line):
+   return simple_renaming(line, \\mac_like_word_movement, 
\\mac_like_cursor_movement)
 
 # End conversions for LyX 2.0 to 2.1
 
@@ -313,5 +318,6 @@ conversions = [
[ 9, [ remove_default_language ]],
[ 10, []],
[ 11, [split_pdf_format]],
-   [ 12, []]
+   [ 12, []],
+   [ 13, [mac_cursor_movement]]
 ]
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index d270b0e..6c7809c 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -55,7 +55,7 @@ namespace os = support::os;
 
 namespace {
 
-static unsigned int const LYXRC_FILEFORMAT = 12; // vfr: System theme's icons
+static unsigned int const LYXRC_FILEFORMAT = 13; // vfr: System theme's icons
 
 // when adding something to this array keep it sorted!
 LexerKeyword lyxrcTags[] = {
@@ -134,7 +134,7 @@ LexerKeyword lyxrcTags[] = {
{ \\language_package_selection, LyXRC::RC_LANGUAGE_PACKAGE_SELECTION 
},
{ \\load_session, LyXRC::RC_LOADSESSION },
{ \\mac_dontswap_ctrl_meta, LyXRC::RC_MAC_DONTSWAP_CTRL_META },
-   { \\mac_like_word_movement, LyXRC::RC_MAC_LIKE_WORD_MOVEMENT },
+   { \\mac_like_cursor_movement, LyXRC::RC_MAC_LIKE_CURSOR_MOVEMENT },
{ \\macro_edit_style, LyXRC::RC_MACRO_EDIT_STYLE },
{ \\make_backup, LyXRC::RC_MAKE_BACKUP },
{ \\mark_foreign_language, LyXRC::RC_MARK_FOREIGN_LANGUAGE },
@@ -331,7 +331,7 @@ void LyXRC::setDefaults()
scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL;
paragraph_markers = false;
mac_dontswap_ctrl_meta = false;
-   mac_like_word_movement = false;
+   mac_like_cursor_movement = false;
macro_edit_style = MACRO_EDIT_INLINE_BOX;
dialogs_iconify_with_main = false;
preview = PREVIEW_OFF;
@@ -931,8 +931,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer  lexrc, bool 
check_format)
lexrc  mac_dontswap_ctrl_meta;
break;
 
-   case RC_MAC_LIKE_WORD_MOVEMENT:
-   lexrc  mac_like_word_movement;
+   case RC_MAC_LIKE_CURSOR_MOVEMENT:
+   lexrc  mac_like_cursor_movement;
break;
 
case RC_MACRO_EDIT_STYLE:
@@ -1784,12 +1784,12 @@ void LyXRC::write(ostream  os, bool 
ignore_system_lyxrc, string const  name) c
}
if (tag != RC_LAST)
break;
-   case RC_MAC_LIKE_WORD_MOVEMENT:
+   case RC_MAC_LIKE_CURSOR_MOVEMENT:
if (ignore_system_lyxrc ||
-   mac_like_word_movement
-   != system_lyxrc.mac_like_word_movement) {
-   os  \\mac_like_word_movement 
-   convertstring(mac_like_word_movement)  '\n';
+   mac_like_cursor_movement
+   != system_lyxrc.mac_like_cursor_movement) {
+   os  \\mac_like_cursor_movement 
+   convertstring(mac_like_cursor_movement)  '\n';
}
if (tag != RC_LAST)
break;
@@ -2967,7 +2967,7 @@ void actOnUpdatedPrefs(LyXRC const  lyxrc_orig, LyXRC 
const  lyxrc_new)
case LyXRC::RC_LANGUAGE_PACKAGE_SELECTION:
case LyXRC::RC_LYXRCFORMAT:
case LyXRC::RC_MAC_DONTSWAP_CTRL_META:
-   case LyXRC::RC_MAC_LIKE_WORD_MOVEMENT:
+   case

Re: [LyX master] GuiBox.cpp, InsetBox.cpp: fix some wrong logic

2013-05-25 Thread Uwe Stöhr 

Am 25.05.2013 16:16, schrieb Jean-Marc Lasgouttes:


 - GuiBox.cpp: the width checkbox must be checked if there is width


This last point makes me wonder why the checkbox is useful...


It is necessary to decide if you want to use a width for plain (framed) boxes (to get \fbox or 
\mbox). For all other boxes you cannot chose but have to specify a width. Therefore the checkbox is 
then checked, no matter that it is then also disabled.


regards Uwe

[LyX master] Update it.po

2013-05-25 Thread Enrico Forestieri 
The branch, master, has been updated.

- Log -

commit d0cd9d53288c04da992033b0ee5cf1bbea97ce51
Author: Enrico Forestieri for...@lyx.org
Date:   Sat May 25 18:32:05 2013 +0200

Update it.po

diff --git a/po/it.po b/po/it.po
index 7672612..bf9abc2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@ msgid 
 msgstr 
 Project-Id-Version: it\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
-POT-Creation-Date: 2013-05-22 07:51+0200\n
-PO-Revision-Date: 2013-05-25 18:13+0100\n
+POT-Creation-Date: 2013-05-25 18:24+0200\n
+PO-Revision-Date: 2013-05-25 18:31+0100\n
 Last-Translator: Enrico Forestieri for...@lyx.org\n
 Language-Team: italiano i...@li.org\n
 Language: it\n
@@ -15,7 +15,7 @@ msgstr 
 Content-Type: text/plain; charset=UTF-8\n
 Content-Transfer-Encoding: 8bit\n
 X-Generator: KBabel 1.10.2\n
-X-Poedit-Basepath: /usr/local/src/lyx/lyx-devel\n
+X-Poedit-Basepath: C:/cygwin/usr/local/src/lyx/lyx-devel\n
 X-Poedit-SourceCharset: iso-8859-1\n
 
 #: src/frontends/qt4/ui/AboutUi.ui:32
@@ -59,7 +59,7 @@ msgstr Compilazione
 #: src/frontends/qt4/ui/ThesaurusUi.ui:138
 #: src/frontends/qt4/ui/WrapUi.ui:173
 #: src/frontends/qt4/GuiParagraph.cpp:161
-#: src/frontends/qt4/GuiView.cpp:2528
+#: src/frontends/qt4/GuiView.cpp:2529
 msgid Close
 msgstr Chiudi
 
@@ -516,8 +516,8 @@ msgstr Casella interna -- necessaria per larghezze fisse 
ed interruzioni di lin
 #: src/frontends/qt4/ui/TabularUi.ui:1218
 #: src/frontends/qt4/ui/TabularUi.ui:1266
 #: src/frontends/qt4/GuiBox.cpp:229
-#: src/frontends/qt4/GuiBox.cpp:358
-#: src/frontends/qt4/GuiBox.cpp:444
+#: src/frontends/qt4/GuiBox.cpp:359
+#: src/frontends/qt4/GuiBox.cpp:445
 #: src/frontends/qt4/GuiDocument.cpp:117
 #: src/frontends/qt4/GuiGraphics.cpp:580
 #: src/frontends/qt4/GuiMathMatrix.cpp:33
@@ -527,14 +527,14 @@ msgid None
 msgstr Nessuno
 
 #: src/frontends/qt4/ui/BoxUi.ui:282
-#: src/frontends/qt4/GuiBox.cpp:360
-#: src/frontends/qt4/GuiBox.cpp:447
+#: src/frontends/qt4/GuiBox.cpp:361
+#: src/frontends/qt4/GuiBox.cpp:448
 #: src/insets/InsetBox.cpp:136
 msgid Parbox
 msgstr Parbox
 
 #: src/frontends/qt4/ui/BoxUi.ui:287
-#: src/frontends/qt4/GuiBox.cpp:448
+#: src/frontends/qt4/GuiBox.cpp:449
 #: src/insets/InsetBox.cpp:140
 msgid Minipage
 msgstr Minipagina
@@ -641,17 +641,17 @@ msgstr Aggiungi tutti
 #: src/frontends/qt4/GuiDocument.cpp:2087
 #: src/frontends/qt4/GuiParagraph.cpp:69
 #: src/frontends/qt4/GuiParagraph.cpp:159
-#: src/frontends/qt4/GuiView.cpp:2141
-#: src/frontends/qt4/GuiView.cpp:2292
-#: src/frontends/qt4/GuiView.cpp:2316
-#: src/frontends/qt4/GuiView.cpp:2330
-#: src/frontends/qt4/GuiView.cpp:2429
-#: src/frontends/qt4/GuiView.cpp:2473
-#: src/frontends/qt4/GuiView.cpp:2723
-#: src/frontends/qt4/GuiView.cpp:2730
-#: src/frontends/qt4/GuiView.cpp:2829
-#: src/frontends/qt4/GuiView.cpp:2857
-#: src/frontends/qt4/GuiView.cpp:3475
+#: src/frontends/qt4/GuiView.cpp:2142
+#: src/frontends/qt4/GuiView.cpp:2293
+#: src/frontends/qt4/GuiView.cpp:2317
+#: src/frontends/qt4/GuiView.cpp:2331
+#: src/frontends/qt4/GuiView.cpp:2430
+#: src/frontends/qt4/GuiView.cpp:2474
+#: src/frontends/qt4/GuiView.cpp:2724
+#: src/frontends/qt4/GuiView.cpp:2731
+#: src/frontends/qt4/GuiView.cpp:2830
+#: src/frontends/qt4/GuiView.cpp:2858
+#: src/frontends/qt4/GuiView.cpp:3476
 #: src/insets/InsetBibtex.cpp:152
 msgid Cancel
 msgstr Cancella
@@ -3416,8 +3416,8 @@ msgid Skip trailing non-word characters
 msgstr Salta in avanti alla fine di una parola invece che all'inizio della 
successiva
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:100
-msgid Use Mac-style for cursor moving between words
-msgstr Movimento cursore tra parole in stile MacOS
+msgid Use Mac-style cursor movement
+msgstr Movimento cursore in stile MacOS
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:107
 msgid Sort environments alphabetically
@@ -4189,9 +4189,9 @@ msgid Alternative language:
 msgstr Lingua alternativa:
 
 #: src/frontends/qt4/ui/PrefsUi.ui:70
-#: src/frontends/qt4/GuiView.cpp:2723
-#: src/frontends/qt4/GuiView.cpp:2730
-#: src/frontends/qt4/GuiView.cpp:2829
+#: src/frontends/qt4/GuiView.cpp:2724
+#: src/frontends/qt4/GuiView.cpp:2731
+#: src/frontends/qt4/GuiView.cpp:2830
 msgid Save
 msgstr Salva
 
@@ -4883,8 +4883,8 @@ msgstr Ripeti questa riga come intestazione per ogni 
pagina (eccetto la prima)
 #: src/frontends/qt4/ui/TabularUi.ui:1445
 #: src/frontends/qt4/ui/TabularUi.ui:1476
 #: src/frontends/qt4/ui/TabularUi.ui:1514
-#: src/frontends/qt4/GuiToolbar.cpp:396
-#: src/frontends/qt4/GuiToolbar.cpp:405
+#: src/frontends/qt4/GuiToolbar.cpp:397
+#: src/frontends/qt4/GuiToolbar.cpp:406
 msgid on
 msgstr attivo
 
@@ -5726,6 +5726,7 @@ msgstr Titolo
 #: lib/layouts/sigplanconf.layout:127
 #: lib/layouts/svprobth.layout:89
 #: lib/layouts/aapaper.inc:9
+#: lib/layouts/acm-sigs.inc:10
 #: lib/layouts/scrclass.inc:182
 #: lib/layouts/svcommon.inc:332
 msgid Subtitle
@@ -6140,6 +6141,8 @@ msgstr Bibliografia
 #:

Re: [LyX master] GuiBox.cpp, InsetBox.cpp: fix some wrong logic

2013-05-25 Thread Jean-Marc Lasgouttes 

Le 25/05/13 18:15, Uwe Stöhr a écrit :

Am 25.05.2013 16:16, schrieb Jean-Marc Lasgouttes:


 - GuiBox.cpp: the width checkbox must be checked if there is width


This last point makes me wonder why the checkbox is useful...


It is necessary to decide if you want to use a width for plain (framed)
boxes (to get \fbox or \mbox). For all other boxes you cannot chose but
have to specify a width. Therefore the checkbox is then checked, no
matter that it is then also disabled.


What is the difference between having the checkbox unchecked and having 
it checked but leaving the width empty?


JMarc

[LyX master] * sk.po

2013-05-25 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit 2897003f22a598bda6fc08b6691097edf9f972b3
Author: Kornel Benko kor...@lyx.org
Date:   Sat May 25 19:02:27 2013 +0200

* sk.po

diff --git a/po/sk.po b/po/sk.po
index 654717c..ee95fca 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid 
 msgstr 
 Project-Id-Version: LyX-2.1\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
-POT-Creation-Date: 2013-05-24 10:05+0200\n
+POT-Creation-Date: 2013-05-25 18:56+0200\n
 PO-Revision-Date: 2013-01-16 12:46+0100\n
 Last-Translator: Kornel Benko kor...@lyx.org\n
 Language-Team: Slovak lyx-d...@lists.lyx.org\n
@@ -3292,8 +3292,8 @@ msgid Skip trailing non-word characters
 msgstr Vynechať bočné písmená nepatriace k slovu
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:100
-msgid Use Mac-style for cursor moving between words
-msgstr Použiť MAC-štýl na posun kurzora medzi slovami
+msgid Use Mac-style cursor movement
+msgstr Použiť MAC-štýl na posun kurzora
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:107
 msgid Sort environments alphabetically
@@ -23732,8 +23732,8 @@ msgid Make Apple key act as Meta and Control key as 
Ctrl.
 msgstr Prehoď Apple klávesu na Meta a Kontrol klávesu na Ctrl.
 
 #: src/LyXRC.cpp:3149
-msgid Use the Mac OS X conventions for the word-level cursor movement
-msgstr Použiť dohody Mac OS X pre pohyb kurzoru po slovách
+msgid Use the Mac OS X conventions for cursor movement
+msgstr Použiť dohody Mac OS X pre pohyb kurzoru
 
 #: src/LyXRC.cpp:3153
 msgid 
@@ -32086,3 +32086,9 @@ msgstr Neznámy používateľ
 
 #~ msgid Built on %1$s, %2$s
 #~ msgstr Zostavený %1$s, %2$s
+
+#~ msgid Use Mac-style for cursor moving between words
+#~ msgstr Použiť MAC-štýl na posun kurzora medzi slovami
+
+#~ msgid Use the Mac OS X conventions for the word-level cursor movement
+#~ msgstr Použiť dohody Mac OS X pre pohyb kurzoru po slovách

---

Summary of changes:
 po/sk.po |   16 +++-
 1 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Re: [LyX master] GuiBox.cpp, InsetBox.cpp: fix some wrong logic

2013-05-25 Thread Uwe Stöhr 

Am 25.05.2013 18:49, schrieb Jean-Marc Lasgouttes:


What is the difference between having the checkbox unchecked and having it 
checked but leaving the
width empty?
As I wrote in my commit most box constructs need a width. The checkbox allows you to decide not to 
use a given width and, more important, informs you that you have for some box constructs a choice 
between an explicit width and no explicit width.


regards Uwe

[LyX master] make Documents folder of disk image optional

2013-05-25 Thread Stephan Witt 
The branch, master, has been updated.

- Log -

commit 1197cf062b335f91b55eb7eabcb0924d38fa03fa
Author: Stephan Witt sw...@lyx.org
Date:   Sat May 25 20:16:10 2013 +0200

make Documents folder of disk image optional

diff --git a/development/LyX-Mac-binary-release.sh 
b/development/LyX-Mac-binary-release.sh
index 32e4b7c..75cd83e 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -792,6 +792,7 @@ set_bundle_display_options() {
LYX_Y_POSITION=$Y_POSITION
APP_X_POSITION=$((3 * X_BOUNDS / 4))
APP_Y_POSITION=$Y_POSITION
+   WITH_DOCUMENTS=$(test -d ${1}/Documents  echo true || echo false)
osascript -EOF
tell application Finder
 set f to POSIX file (${1} as string) as alias
@@ -807,11 +808,13 @@ set_bundle_display_options() {
 delay 1 -- sync
 set icon size of the icon view options of container window to 64
 set arrangement of the icon view options of container window to 
not arranged
-set position of item Documents to {$LYX_X_POSITION,0}
+if ${WITH_DOCUMENTS} then
+   set position of item Documents to {$LYX_X_POSITION,0}
+end if
 set position of item ${LyxName}.app to 
{$LYX_X_POSITION,$LYX_Y_POSITION}
 set position of item Applications to 
{$APP_X_POSITION,$APP_Y_POSITION}
 set background picture of the icon view options\
-   of container window to file 
background.png of folder Pictures
+   of container window to file background.png of folder 
Pictures
 set the bounds of the container window to {0, 0, $X_BOUNDS, 
$Y_BOUNDS}
 update without registering applications
 delay 5 -- sync

---

Summary of changes:
 development/LyX-Mac-binary-release.sh |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Header cleanup cont.

2013-05-25 Thread Pavel Sanda 
The branch, master, has been updated.

- Log -

commit 0ce10160daadc904ab1221eaeef0d005694f0f0c
Author: Pavel Sanda sa...@lyx.org
Date:   Sat May 25 16:38:20 2013 -0700

Header cleanup cont.

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index a239fb9..f648362 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -31,6 +31,7 @@
 #include output_xhtml.h
 #include OutputParams.h
 #include Paragraph.h
+#include ParIterator.h
 #include TextClass.h
 #include TextMetrics.h
 #include TocBackend.h
diff --git a/src/mathed/InsetMathDiagram.h b/src/mathed/InsetMathDiagram.h
index 62b0efd..1e44863 100644
--- a/src/mathed/InsetMathDiagram.h
+++ b/src/mathed/InsetMathDiagram.h
@@ -13,7 +13,6 @@
 #ifndef MATH_DIAGRAM_H
 #define MATH_DIAGRAM_H
 
-#include Length.h
 #include InsetMathGrid.h
 
 
diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 0284e6e..af00eaf 100644
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -14,7 +14,6 @@
 
 #include InsetMathGrid.h
 
-#include Color.h
 #include DocIterator.h
 #include OutputEnums.h
 
diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index 99537d8..a503fb9 100644
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -14,9 +14,6 @@
 
 #include InsetMath.h
 
-// FIXME: remove
-#include support/docstring.h
-
 #include map
 
 namespace lyx {
diff --git a/src/mathed/MacroTable.h b/src/mathed/MacroTable.h
index 8b9b38a..3a1fed4 100644
--- a/src/mathed/MacroTable.h
+++ b/src/mathed/MacroTable.h
@@ -16,7 +16,6 @@
 #include DocIterator.h
 
 #include support/docstring.h
-#include support/types.h
 
 #include map
 #include set
diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h
index 9bb7cfb..61f82e9 100644
--- a/src/mathed/MathMacroTemplate.h
+++ b/src/mathed/MathMacroTemplate.h
@@ -17,8 +17,6 @@
 #include MacroTable.h
 #include MathData.h
 
-#include support/types.h
-
 
 namespace lyx {
 
diff --git a/src/mathed/MathParser.h b/src/mathed/MathParser.h
index c4ae6f8..745b038 100644
--- a/src/mathed/MathParser.h
+++ b/src/mathed/MathParser.h
@@ -15,7 +15,6 @@
 
 #include MathParser_flags.h
 
-#include support/types.h
 #include support/docstring.h
 
 
diff --git a/src/output_latex.h b/src/output_latex.h
index 89f8ac6..1f3afff 100644
--- a/src/output_latex.h
+++ b/src/output_latex.h
@@ -16,8 +16,6 @@
 
 #include support/docstream.h
 #include Layout.h
-#include Paragraph.h
-#include ParIterator.h
 #include ParagraphList.h
 
 
diff --git a/src/sgml.h b/src/sgml.h
index ed0f140..551972d 100644
--- a/src/sgml.h
+++ b/src/sgml.h
@@ -13,7 +13,6 @@
 #ifndef SGML_H
 #define SGML_H
 
-#include support/types.h
 #include support/docstring.h
 
 namespace lyx {

---

Summary of changes:
 src/insets/InsetCaption.cpp|1 +
 src/mathed/InsetMathDiagram.h  |1 -
 src/mathed/InsetMathHull.h |1 -
 src/mathed/InsetMathNest.h |3 ---
 src/mathed/MacroTable.h|1 -
 src/mathed/MathMacroTemplate.h |2 --
 src/mathed/MathParser.h|1 -
 src/output_latex.h |2 --
 src/sgml.h |1 -
 9 files changed, 1 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Years forgotten file

2013-05-25 Thread Pavel Sanda 
The branch, master, has been updated.

- Log -

commit f75becdc4e8f02085212e6d2b016c76dc76c5980
Author: Pavel Sanda sa...@lyx.org
Date:   Sat May 25 16:40:19 2013 -0700

Years forgotten file

diff --git a/src/Makefile.am b/src/Makefile.am
index fc4a5fe..b40d4e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -498,7 +498,6 @@ HEADERFILESMATHED = \
mathed/MathCompletionList.h \
mathed/MathExtern.h \
mathed/MathFactory.h \
-   mathed/MathGridInfo.h \
mathed/MathMacro.h \
mathed/MathMacroArgument.h \
mathed/MacroTable.h \
diff --git a/src/mathed/MathGridInfo.h b/src/mathed/MathGridInfo.h
deleted file mode 100644
index 07ba78a..000
--- a/src/mathed/MathGridInfo.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-/**
- * \file MathGridInfo.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author André Pönitz
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef MATH_GRIDINFO_H
-#define MATH_GRIDINFO_H
-
-#include string
-
-
-namespace lyx {
-
-
-class ColInfo
-{
-public:
-   ColInfo() : align('c'), rightline(0), leftline(false) {}
-   char   align;  // column alignment
-   docstring width;  // column width
-   docstring special;// special column alignment
-   intrightline;  // a line on the right?
-   bool   leftline;
-};
-
-
-class RowInfo
-{
-public:
-   RowInfo() : topline(false), bottomline(false) {}
-   bool topline; // horizontal line above
-   int  bottomline;  // horizontal line below
-};
-
-
-class CellInfo
-{
-public:
-   CellInfo()
-   : multi(0), leftline(false), rightline(false),
-  topline(false), bottomline(false)
-   {}
-
-   docstring content;// cell content
-   int multi; // multicolumn flag
-   char align;// cell alignment
-   bool leftline; // do we have a line on the left?
-   bool rightline;// do we have a line on the right?
-   bool topline;// do we have a line above?
-   bool bottomline;   // do we have a line below?
-};
-
-
-inline char const * verbose_align(char c)
-{
-   return c == 'c' ? center : c == 'r' ? right : c == 'l' ? left : 
none;
-}
-
-
-
-} // namespace lyx
-
-#endif

---

Summary of changes:
 src/Makefile.am   |1 -
 src/mathed/MathGridInfo.h |   69 -
 2 files changed, 0 insertions(+), 70 deletions(-)
 delete mode 100644 src/mathed/MathGridInfo.h


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Merge branch 'master' of git.lyx.org:lyx

2013-05-25 Thread Uwe Stöhr 
The branch, master, has been updated.

- Log -

commit 586124c6a7bbad3d28bb756622613334da4a9a23
Merge: 5002ef3 f75becd
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun May 26 03:05:28 2013 +0200

Merge branch 'master' of git.lyx.org:lyx


commit 5002ef33f03fdd5a7e401b6dd36285e2e4dee004
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun May 26 03:04:59 2013 +0200

aa: fix compilation of the templates/aa.lyx

- aa already loads inputenc

diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 5decd34..57f6c80 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aa]{Astronomy  Astrophysics}
+#  \DeclareLaTeXClass[aa,answers.sty]{Astronomy  Astrophysics}
 #  \DeclareCategory{Articles}
 #
 # Author: Peter Sütterlin p...@uni-sw.gwdg.de
@@ -24,6 +24,8 @@ SecNumDepth 3
 TocDepth0
 PageStyle   Plain
 
+# Pre-loaded packages
+Provides inputenc  1
 
 Style Standard
Category  MainText
diff --git a/lib/templates/aa.lyx b/lib/templates/aa.lyx
index 240f7ae..09d03fb 100644
--- a/lib/templates/aa.lyx
+++ b/lib/templates/aa.lyx
@@ -8,9 +8,9 @@
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding auto
+\inputencoding default
 \fontencoding global
-\font_roman times
+\font_roman default
 \font_sans default
 \font_typewriter default
 \font_default_family default

---

Summary of changes:
 lib/layouts/aa.layout |4 +++-
 lib/templates/aa.lyx  |4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX 2.0.x] aa.layout: fix compilation of the templates/aa.lyx

2013-05-25 Thread Uwe Stöhr 
The branch, 2.0.x, has been updated.

- Log -

commit 03b93bb5bddf9e141225d840aad52ed1050fe73d
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun May 26 03:34:09 2013 +0200

aa.layout: fix compilation of the templates/aa.lyx

- aa already loads inputenc
- also add a required package

diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index cfecf83..65bc47b 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aa]{article (AA)}
+#  \DeclareLaTeXClass[aa,answers.sty]{article (AA)}
 #
 # Author: Peter Sütterlin p...@uni-sw.gwdg.de
 # Author: Jürgen Spitzmüller sp...@lyx.org
@@ -23,6 +23,8 @@ SecNumDepth 3
 TocDepth0
 PageStyle   Plain
 
+# Pre-loaded packages
+Provides inputenc  1
 
 Style Standard
MarginStatic
diff --git a/lib/templates/aa.lyx b/lib/templates/aa.lyx
index 240f7ae..09d03fb 100644
--- a/lib/templates/aa.lyx
+++ b/lib/templates/aa.lyx
@@ -8,9 +8,9 @@
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding auto
+\inputencoding default
 \fontencoding global
-\font_roman times
+\font_roman default
 \font_sans default
 \font_typewriter default
 \font_default_family default
diff --git a/status.20x b/status.20x
index 338d74f..11a91d5 100644
--- a/status.20x
+++ b/status.20x
@@ -70,6 +70,7 @@ What's new
 
 * DOCUMENTATION AND LOCALIZATION
 
+- Make the AA template file compilable.
 - Make the AEA template file compilable.
 - Make the landslide example file compilable.
 

---

Summary of changes:
 lib/layouts/aa.layout |4 +++-
 lib/templates/aa.lyx  |4 ++--
 status.20x|1 +
 3 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX 2.0.x] Chinese Tutorial.lyx: backport a fix by Jürgen

2013-05-25 Thread Uwe Stöhr 
The branch, 2.0.x, has been updated.

- Log -

commit bfa2829d4798e03412dac7467336ce978654f18a
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun May 26 03:38:55 2013 +0200

Chinese Tutorial.lyx: backport a fix by Jürgen

diff --git a/lib/doc/zh_CN/Tutorial.lyx b/lib/doc/zh_CN/Tutorial.lyx
index d99f13f..b876148 100644
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@@ -113,7 +113,6 @@ status collapsed
 \begin_layout Plain Layout
 对这个中文版有任何话想说请 Email 到 
 \family typewriter
-\lang english
 
 \begin_inset CommandInset href
 LatexCommand href
@@ -124,7 +123,6 @@ type mailto:;
 
 
 \family default
-\lang chinese-simplified
 。
 \end_layout
 
diff --git a/status.20x b/status.20x
index 11a91d5..0cb733b 100644
--- a/status.20x
+++ b/status.20x
@@ -73,6 +73,8 @@ What's new
 - Make the AA template file compilable.
 - Make the AEA template file compilable.
 - Make the landslide example file compilable.
+- Fix problem that the Chinese Tutorial could not be viewed as PDF on
+  some systems. 
 
 
 * LYXHTML

---

Summary of changes:
 lib/doc/zh_CN/Tutorial.lyx |2 --
 status.20x |2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Farsi splash.lyx: remove unnecessary preamble

2013-05-25 Thread Uwe Stöhr 
The branch, master, has been updated.

- Log -

commit 70b1bc5fc906e6d5337354009a0e43cbc4d5769c
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun May 26 05:04:18 2013 +0200

Farsi splash.lyx: remove unnecessary preamble

diff --git a/lib/examples/fa/splash.lyx b/lib/examples/fa/splash.lyx
index 98edf4f..171c83b 100644
--- a/lib/examples/fa/splash.lyx
+++ b/lib/examples/fa/splash.lyx
@@ -3,10 +3,6 @@
 \begin_document
 \begin_header
 \textclass article
-\begin_preamble
-\usepackage[LFE,LAE]{fontenc}
-\usepackage{babel}\TOCLanguage{farsi}
-\end_preamble
 \use_default_options false
 \maintain_unincluded_children false
 \language farsi

---

Summary of changes:
 lib/examples/fa/splash.lyx |4 
 1 files changed, 0 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] aa.layout: updated for AA 8.2

2013-05-25 Thread Uwe Stöhr 
The branch, master, has been updated.

- Log -

commit e28625160a5078ffb37fc27ad3906edf5a73a31f
Author: Uwe Stöhr uwesto...@lyx.org
Date:   Sun May 26 05:29:24 2013 +0200

aa.layout: updated for AA 8.2

diff --git a/development/FORMAT b/development/FORMAT
index 58f9016..fedfd43 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,10 @@ adjustments are made to tex2lyx and bugs are fixed in 
lyx2lyx.
 
 ---
 
+2013-05-26 Uwe Stöhr uwesto...@web.de
+   * Format incremented to 472: added 2 new abstract styles to the
+ aa.layout file
+
 2013-05-16 Julien Rioux jri...@lyx.org
* Format incremented to 471
  New \cite_engine_type default. The default citation
diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 57f6c80..9d11762 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -15,93 +15,31 @@
 # 2008-06-09  Implement \inst and \email as char styles,
 # implement paragraph style keywords
 # 2008-10-26  Updated for aa.cls version 6.1
+# 2013-05-26  Updated for aa.cls version 8.2
 
 
 Format 45
-Columns 2
-Sides   2
-SecNumDepth 3
-TocDepth0
-PageStyle   Plain
+Columns2
+Sides  2
+SecNumDepth3
+TocDepth   0
+PageStyle  Plain
 
 # Pre-loaded packages
 Provides inputenc  1
 
 Style Standard
-   Category  MainText
-   MarginStatic
-   LatexType Paragraph
-   LatexName dummy
-   ParIndent MM
-   ParSkip   0.4
-   Align Block
-   AlignPossible Block, Left, Right, Center
-   LabelType No_Label
+   CategoryMainText
+   Margin  Static
+   LatexType   Paragraph
+   LatexName   dummy
+   ParIndent   MM
+   ParSkip 0.4
+   Align   Block
+   AlignPossible   Block, Left, Right, Center
+   LabelType   No_Label
 End
 
-
-# I want to keep the entries in a logical order.
-# Therefore I'll define the entries first, then fill them
-
-Style Section
-   TocLevel 1
-End
-
-Style Subsection
-   TocLevel 2
-End
-
-Style Subsubsection
-   TocLevel 3
-End
-
-Style Itemize
-End
-
-Style Enumerate
-End
-
-Style Description
-End
-
-Style List
-End
-
-
-Style Title
-End
-
-Style Subtitle
-End
-
-Style Author
-End
-
-Style Address
-End
-
-Style Offprint
-End
-
-Style Mail
-End
-
-Style Date
-End
-
-Style Abstract
-End
-
-Style Acknowledgement
-End
-
-Style Bibliography
-End
-
-
-# OK, now we have a more or less consistent Ordering. Now fill the
-# definitions.  First, the standard includes
-
 Input stdinsets.inc
 Input stdlists.inc
 Input stdsections.inc
@@ -118,318 +56,340 @@ NoStyle Subparagraph
 NoCounter subparagraph
 NoStyle Part
 NoCounter part
+NoStyle Abstract
 
 
 Style Subtitle
-   Margin  Static
-   LatexType   Command
-   InTitle 1
-   LatexName   subtitle
-   CategoryFrontMatter
-   NextNoIndent1
-   ParSkip 0.4
-   ItemSep 0
-   TopSep  1.3
-   BottomSep   1.3
-   ParSep  1
-   Align   Center
-   LabelType   No_Label
+   Margin  Static
+   LatexType   Command
+   InTitle 1
+   LatexName   subtitle
+   CategoryFrontMatter
+   NextNoIndent1
+   ParSkip 0.4
+   ItemSep 0
+   TopSep  1.3
+   BottomSep   1.3
+   ParSep  1
+   Align   Center
+   LabelType   No_Label
Font
- FamilySans
- Size  Larger
- SeriesBold
+ FamilySans
+ Size  Larger
+ SeriesBold
EndFont
 End
 
 
 Style Address
-   LeftMargin  MMM
-   Margin  Static
-   LatexType   Command
-   InTitle 1
-   LatexName   institute
-   CategoryFrontMatter
-   ParSkip 0.4
-   #BottomSep  0.4
-   Align   Left
-   LabelType   No_Label
+   LeftMargin  MMM
+   Margin  Static
+   LatexType   Command
+   InTitle 1
+   LatexName   institute
+   CategoryFrontMatter
+   ParSkip 0.4
+   #BottomSep  0.4
+   Align   Left
+   LabelType   No_Label
Font
- FamilyRoman
- Size  Small
+ FamilyRoman
+ Size  Small

[LyX master] Fix Chinese Tutorial copilation

2013-05-25 Thread Juergen Spitzmueller 
The branch, master, has been updated.

- Log -

commit c8000f90171fe9128e4a420a57a3437419786eb5
Author: Juergen Spitzmueller 
Date:   Sat May 25 11:48:38 2013 +0200

Fix Chinese Tutorial copilation

diff --git a/lib/doc/zh_CN/Tutorial.lyx b/lib/doc/zh_CN/Tutorial.lyx
index d99f13f..b876148 100644
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@@ -113,7 +113,6 @@ status collapsed
 \begin_layout Plain Layout
 对这个中文版有任何话想说请 Email 到 
 \family typewriter
-\lang english
 
 \begin_inset CommandInset href
 LatexCommand href
@@ -124,7 +123,6 @@ type "mailto:;
 
 
 \family default
-\lang chinese-simplified
 。
 \end_layout
 

---

Summary of changes:
 lib/doc/zh_CN/Tutorial.lyx |2 --
 1 files changed, 0 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Merge branch 'master' of git.lyx.org:lyx

2013-05-25 Thread Uwe Stöhr 
The branch, master, has been updated.

- Log -

commit 92a2e179035a9c67bb042a3b6eac00a72d1ef862
Merge: 472732f c8000f9
Author: Uwe Stöhr 
Date:   Sat May 25 13:52:38 2013 +0200

Merge branch 'master' of git.lyx.org:lyx


commit 472732f92d7287c47ff1003094df5f6826c15c2e
Author: Uwe Stöhr 
Date:   Sat May 25 13:52:09 2013 +0200

GuiBox.cpp: addendum to [f04c7711/lyxgit]

- this was forgotten to commit;
(without this we would get invalid LaTeX code when changing in the box 
dialog a makebox without a width to a minipage and press apply - a makebox 
required to specify a width, at least an invisible one like "0cm")

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index 90f5659..afca9ab 100644
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -378,6 +378,9 @@ docstring GuiBox::dialogToParams() const
params.width = Length(value.toDouble(), Length::IN);
} else {
params.special = "none";
+   // we must specify a valid length in this case
+   if (value.isEmpty())
+   widthED->setText("0");
params.width = Length(widgetsToLength(widthED, 
widthUnitsLC));
}
} else {

---

Summary of changes:
 src/frontends/qt4/GuiBox.cpp |3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] GuiBox.cpp, InsetBox.cpp: fix some wrong logic

2013-05-25 Thread Uwe Stöhr 
The branch, master, has been updated.

- Log -

commit 427aeff90fdb9ff5a698c73b72240467611c9f04
Author: Uwe Stöhr 
Date:   Sat May 25 15:07:17 2013 +0200

GuiBox.cpp, InsetBox.cpp: fix some wrong logic

- InsetBox.cpp:
 a framebox without inner box and without a width is \fbox
 a framebox with inner box is also \fbox
 a framebox without inner box and with width is \framebox

- GuiBox.cpp: the width checkbox must be checked if there is width

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index afca9ab..d3bd8e8 100644
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -128,7 +128,7 @@ void GuiBox::on_innerBoxCO_activated(int /* index */)
// the width can only be selected for makebox or framebox
widthCB->setEnabled(itype == "makebox"
|| (outer == "Boxed" && itype == "none"));
-   widthCB->setChecked(itype != "none" && !widthCB->isEnabled());
+   widthCB->setChecked(!widthED->text().isEmpty());
// except for frameless and boxed, the width cannot be specified if
// there is no inner box
bool const width_enabled =
@@ -313,8 +313,7 @@ void GuiBox::paramsToDialog(Inset const * inset)
lengthToWidgets(widthED, widthUnitsLC,
params.width, default_unit);
} else {
-   if (widthCB->isEnabled())
-   widthCB->setChecked(true);
+   widthCB->setChecked(true);
lengthToWidgets(widthED, widthUnitsLC,
params.width, default_unit);
QString const special = toqstr(params.special);
diff --git a/src/insets/InsetBox.cpp b/src/insets/InsetBox.cpp
index a07df27..30c2386 100644
--- a/src/insets/InsetBox.cpp
+++ b/src/insets/InsetBox.cpp
@@ -317,9 +317,9 @@ void InsetBox::latex(otexstream & os, OutputParams const & 
runparams) const
os << "\\begin{framed}%\n";
break;
case Boxed:
-   if (width_string.empty()) {
-   os << "\\framebox";
+   if (!width_string.empty()) {
if (!params_.inner_box) {
+   os << "\\framebox";
// Special widths, see usrguide sec. 3.5
// FIXME UNICODE
if (params_.special != "none") {
@@ -331,7 +331,8 @@ void InsetBox::latex(otexstream & os, OutputParams const & 
runparams) const
   << ']';
if (params_.hor_pos != 'c')
os << "[" << params_.hor_pos << "]";
-   }
+   } else
+   os << "\\fbox";
} else
os << "\\fbox";
os << "{";

---

Summary of changes:
 src/frontends/qt4/GuiBox.cpp |5 ++---
 src/insets/InsetBox.cpp  |7 ---
 2 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Re: [LyX master] GuiBox.cpp, InsetBox.cpp: fix some wrong logic

2013-05-25 Thread Jean-Marc Lasgouttes 

Le 25/05/13 15:07, Uwe Stöhr   a écrit :

The branch, master, has been updated.

- Log -

commit 427aeff90fdb9ff5a698c73b72240467611c9f04
Author: Uwe Stöhr 
Date:   Sat May 25 15:07:17 2013 +0200

 GuiBox.cpp, InsetBox.cpp: fix some wrong logic

 - InsetBox.cpp:
  a framebox without inner box and without a width is \fbox
  a framebox with inner box is also \fbox
  a framebox without inner box and with width is \framebox

 - GuiBox.cpp: the width checkbox must be checked if there is width


This last point makes me wonder why the checkbox is useful...

JMarc

[LyX master] On Mac, moving down a paragraph should place the cursor at the end of the current paragraph (unless it's already there, in which case it should move to the end of the next paragraph). Cha

2013-05-25 Thread Stephan Witt 
The branch, master, has been updated.

- Log -

commit 75c631df7f1124b6bf53f48f8d82ecb42fdb9c52
Author: Stephan Witt 
Date:   Sat May 25 18:02:21 2013 +0200

On Mac, moving down a paragraph should place the cursor at the end of the 
current paragraph
(unless it's already there, in which case it should move to the end of the 
next paragraph).
Change the preference setting name (mac_like_word_movement to 
mac_like_cursor_movement)
to better reflect its function.

Patch and description from Bennett Helm

diff --git a/development/MacOSX/lyxrc.dist.in b/development/MacOSX/lyxrc.dist.in
index 598d8a3..43d353f 100644
--- a/development/MacOSX/lyxrc.dist.in
+++ b/development/MacOSX/lyxrc.dist.in
@@ -28,7 +28,7 @@
 \screen_font_sans "Helvetica"
 \screen_font_typewriter "Courier"
 \open_buffers_in_tabs false
-\mac_like_word_movement true
+\mac_like_cursor_movement true
 
 \scroll_wheel_zoom "off"
 
diff --git a/lib/scripts/prefs2prefs_prefs.py b/lib/scripts/prefs2prefs_prefs.py
index 662f650..a3d4c43 100644
--- a/lib/scripts/prefs2prefs_prefs.py
+++ b/lib/scripts/prefs2prefs_prefs.py
@@ -57,6 +57,9 @@
 #   Add option to use the system's theme icons
 #   No conversion necessary.
 
+# Incremented to format 13, by bh
+#   Rename mac_like_word_movement to mac_like_cursor_movement
+
 import re
 
 ###
@@ -290,6 +293,8 @@ def remove_default_language(line):
return no_match
return (True, "")
 
+def mac_cursor_movement(line):
+   return simple_renaming(line, "\\mac_like_word_movement", 
"\\mac_like_cursor_movement")
 
 # End conversions for LyX 2.0 to 2.1
 
@@ -313,5 +318,6 @@ conversions = [
[ 9, [ remove_default_language ]],
[ 10, []],
[ 11, [split_pdf_format]],
-   [ 12, []]
+   [ 12, []],
+   [ 13, [mac_cursor_movement]]
 ]
diff --git a/src/LyXRC.cpp b/src/LyXRC.cpp
index d270b0e..6c7809c 100644
--- a/src/LyXRC.cpp
+++ b/src/LyXRC.cpp
@@ -55,7 +55,7 @@ namespace os = support::os;
 
 namespace {
 
-static unsigned int const LYXRC_FILEFORMAT = 12; // vfr: System theme's icons
+static unsigned int const LYXRC_FILEFORMAT = 13; // vfr: System theme's icons
 
 // when adding something to this array keep it sorted!
 LexerKeyword lyxrcTags[] = {
@@ -134,7 +134,7 @@ LexerKeyword lyxrcTags[] = {
{ "\\language_package_selection", LyXRC::RC_LANGUAGE_PACKAGE_SELECTION 
},
{ "\\load_session", LyXRC::RC_LOADSESSION },
{ "\\mac_dontswap_ctrl_meta", LyXRC::RC_MAC_DONTSWAP_CTRL_META },
-   { "\\mac_like_word_movement", LyXRC::RC_MAC_LIKE_WORD_MOVEMENT },
+   { "\\mac_like_cursor_movement", LyXRC::RC_MAC_LIKE_CURSOR_MOVEMENT },
{ "\\macro_edit_style", LyXRC::RC_MACRO_EDIT_STYLE },
{ "\\make_backup", LyXRC::RC_MAKE_BACKUP },
{ "\\mark_foreign_language", LyXRC::RC_MARK_FOREIGN_LANGUAGE },
@@ -331,7 +331,7 @@ void LyXRC::setDefaults()
scroll_wheel_zoom = SCROLL_WHEEL_ZOOM_CTRL;
paragraph_markers = false;
mac_dontswap_ctrl_meta = false;
-   mac_like_word_movement = false;
+   mac_like_cursor_movement = false;
macro_edit_style = MACRO_EDIT_INLINE_BOX;
dialogs_iconify_with_main = false;
preview = PREVIEW_OFF;
@@ -931,8 +931,8 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool 
check_format)
lexrc >> mac_dontswap_ctrl_meta;
break;
 
-   case RC_MAC_LIKE_WORD_MOVEMENT:
-   lexrc >> mac_like_word_movement;
+   case RC_MAC_LIKE_CURSOR_MOVEMENT:
+   lexrc >> mac_like_cursor_movement;
break;
 
case RC_MACRO_EDIT_STYLE:
@@ -1784,12 +1784,12 @@ void LyXRC::write(ostream & os, bool 
ignore_system_lyxrc, string const & name) c
}
if (tag != RC_LAST)
break;
-   case RC_MAC_LIKE_WORD_MOVEMENT:
+   case RC_MAC_LIKE_CURSOR_MOVEMENT:
if (ignore_system_lyxrc ||
-   mac_like_word_movement
-   != system_lyxrc.mac_like_word_movement) {
-   os << "\\mac_like_word_movement "
-  << convert(mac_like_word_movement) << '\n';
+   mac_like_cursor_movement
+   != system_lyxrc.mac_like_cursor_movement) {
+   os << "\\mac_like_cursor_movement "
+  << convert(mac_like_cursor_movement) << '\n';
}
if (tag != RC_LAST)
break;
@@ -2967,7 +2967,7 @@ void actOnUpdatedPrefs(LyXRC const & lyxrc_orig, LyXRC 
const & lyxrc_new)
case LyXRC::RC_LANGUAGE_PACKAGE_SELECTION:
case LyXRC::RC_LYXRCFORMAT:
case LyXRC::RC_MAC_DONTSWAP_CTRL_META:
-   case

Re: [LyX master] GuiBox.cpp, InsetBox.cpp: fix some wrong logic

2013-05-25 Thread Uwe Stöhr 

Am 25.05.2013 16:16, schrieb Jean-Marc Lasgouttes:


 - GuiBox.cpp: the width checkbox must be checked if there is width


This last point makes me wonder why the checkbox is useful...


It is necessary to decide if you want to use a width for plain (framed) boxes (to get \fbox or 
\mbox). For all other boxes you cannot chose but have to specify a width. Therefore the checkbox is 
then checked, no matter that it is then also disabled.


regards Uwe

[LyX master] Update it.po

2013-05-25 Thread Enrico Forestieri 
The branch, master, has been updated.

- Log -

commit d0cd9d53288c04da992033b0ee5cf1bbea97ce51
Author: Enrico Forestieri 
Date:   Sat May 25 18:32:05 2013 +0200

Update it.po

diff --git a/po/it.po b/po/it.po
index 7672612..bf9abc2 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2013-05-22 07:51+0200\n"
-"PO-Revision-Date: 2013-05-25 18:13+0100\n"
+"POT-Creation-Date: 2013-05-25 18:24+0200\n"
+"PO-Revision-Date: 2013-05-25 18:31+0100\n"
 "Last-Translator: Enrico Forestieri \n"
 "Language-Team: italiano \n"
 "Language: it\n"
@@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.10.2\n"
-"X-Poedit-Basepath: /usr/local/src/lyx/lyx-devel\n"
+"X-Poedit-Basepath: C:/cygwin/usr/local/src/lyx/lyx-devel\n"
 "X-Poedit-SourceCharset: iso-8859-1\n"
 
 #: src/frontends/qt4/ui/AboutUi.ui:32
@@ -59,7 +59,7 @@ msgstr "Compilazione"
 #: src/frontends/qt4/ui/ThesaurusUi.ui:138
 #: src/frontends/qt4/ui/WrapUi.ui:173
 #: src/frontends/qt4/GuiParagraph.cpp:161
-#: src/frontends/qt4/GuiView.cpp:2528
+#: src/frontends/qt4/GuiView.cpp:2529
 msgid ""
 msgstr ""
 
@@ -516,8 +516,8 @@ msgstr "Casella interna -- necessaria per larghezze fisse 
ed interruzioni di lin
 #: src/frontends/qt4/ui/TabularUi.ui:1218
 #: src/frontends/qt4/ui/TabularUi.ui:1266
 #: src/frontends/qt4/GuiBox.cpp:229
-#: src/frontends/qt4/GuiBox.cpp:358
-#: src/frontends/qt4/GuiBox.cpp:444
+#: src/frontends/qt4/GuiBox.cpp:359
+#: src/frontends/qt4/GuiBox.cpp:445
 #: src/frontends/qt4/GuiDocument.cpp:117
 #: src/frontends/qt4/GuiGraphics.cpp:580
 #: src/frontends/qt4/GuiMathMatrix.cpp:33
@@ -527,14 +527,14 @@ msgid "None"
 msgstr "Nessuno"
 
 #: src/frontends/qt4/ui/BoxUi.ui:282
-#: src/frontends/qt4/GuiBox.cpp:360
-#: src/frontends/qt4/GuiBox.cpp:447
+#: src/frontends/qt4/GuiBox.cpp:361
+#: src/frontends/qt4/GuiBox.cpp:448
 #: src/insets/InsetBox.cpp:136
 msgid "Parbox"
 msgstr "Parbox"
 
 #: src/frontends/qt4/ui/BoxUi.ui:287
-#: src/frontends/qt4/GuiBox.cpp:448
+#: src/frontends/qt4/GuiBox.cpp:449
 #: src/insets/InsetBox.cpp:140
 msgid "Minipage"
 msgstr "Minipagina"
@@ -641,17 +641,17 @@ msgstr "Aggiungi "
 #: src/frontends/qt4/GuiDocument.cpp:2087
 #: src/frontends/qt4/GuiParagraph.cpp:69
 #: src/frontends/qt4/GuiParagraph.cpp:159
-#: src/frontends/qt4/GuiView.cpp:2141
-#: src/frontends/qt4/GuiView.cpp:2292
-#: src/frontends/qt4/GuiView.cpp:2316
-#: src/frontends/qt4/GuiView.cpp:2330
-#: src/frontends/qt4/GuiView.cpp:2429
-#: src/frontends/qt4/GuiView.cpp:2473
-#: src/frontends/qt4/GuiView.cpp:2723
-#: src/frontends/qt4/GuiView.cpp:2730
-#: src/frontends/qt4/GuiView.cpp:2829
-#: src/frontends/qt4/GuiView.cpp:2857
-#: src/frontends/qt4/GuiView.cpp:3475
+#: src/frontends/qt4/GuiView.cpp:2142
+#: src/frontends/qt4/GuiView.cpp:2293
+#: src/frontends/qt4/GuiView.cpp:2317
+#: src/frontends/qt4/GuiView.cpp:2331
+#: src/frontends/qt4/GuiView.cpp:2430
+#: src/frontends/qt4/GuiView.cpp:2474
+#: src/frontends/qt4/GuiView.cpp:2724
+#: src/frontends/qt4/GuiView.cpp:2731
+#: src/frontends/qt4/GuiView.cpp:2830
+#: src/frontends/qt4/GuiView.cpp:2858
+#: src/frontends/qt4/GuiView.cpp:3476
 #: src/insets/InsetBibtex.cpp:152
 msgid ""
 msgstr ""
@@ -3416,8 +3416,8 @@ msgid "Skip trailing non-word characters"
 msgstr "Salta in avanti alla fine di una parola invece che all'inizio della 
successiva"
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:100
-msgid "Use Mac-style for cursor moving between "
-msgstr "Movimento cursore tra  in stile MacOS"
+msgid "Use M cursor movement"
+msgstr "Mo cursore in stile MacOS"
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:107
 msgid "Sort  alphabetically"
@@ -4189,9 +4189,9 @@ msgid "Al language:"
 msgstr "Lingua al:"
 
 #: src/frontends/qt4/ui/PrefsUi.ui:70
-#: src/frontends/qt4/GuiView.cpp:2723
-#: src/frontends/qt4/GuiView.cpp:2730
-#: src/frontends/qt4/GuiView.cpp:2829
+#: src/frontends/qt4/GuiView.cpp:2724
+#: src/frontends/qt4/GuiView.cpp:2731
+#: src/frontends/qt4/GuiView.cpp:2830
 msgid ""
 msgstr ""
 
@@ -4883,8 +4883,8 @@ msgstr "Ripeti questa riga come intestazione per ogni 
pagina (eccetto la prima)"
 #: src/frontends/qt4/ui/TabularUi.ui:1445
 #: src/frontends/qt4/ui/TabularUi.ui:1476
 #: src/frontends/qt4/ui/TabularUi.ui:1514
-#: src/frontends/qt4/GuiToolbar.cpp:396
-#: src/frontends/qt4/GuiToolbar.cpp:405
+#: src/frontends/qt4/GuiToolbar.cpp:397
+#: src/frontends/qt4/GuiToolbar.cpp:406
 msgid "on"
 msgstr "attivo"
 
@@ -5726,6 +5726,7 @@ msgstr "Titolo"
 #: lib/layouts/sigplanconf.layout:127
 #: lib/layouts/svprobth.layout:89
 #: lib/layouts/aapaper.inc:9
+#: lib/layouts/acm-sigs.inc:10
 #: lib/layouts/scrclass.inc:182
 #: lib/layouts/svcommon.inc:332
 msgid "Subtitle"
@@ -6140,6 +6141,8 @@ msgstr "Bibliografia"
 #:

Re: [LyX master] GuiBox.cpp, InsetBox.cpp: fix some wrong logic

2013-05-25 Thread Jean-Marc Lasgouttes 

Le 25/05/13 18:15, Uwe Stöhr a écrit :

Am 25.05.2013 16:16, schrieb Jean-Marc Lasgouttes:


 - GuiBox.cpp: the width checkbox must be checked if there is width


This last point makes me wonder why the checkbox is useful...


It is necessary to decide if you want to use a width for plain (framed)
boxes (to get \fbox or \mbox). For all other boxes you cannot chose but
have to specify a width. Therefore the checkbox is then checked, no
matter that it is then also disabled.


What is the difference between having the checkbox unchecked and having 
it checked but leaving the width empty?


JMarc

[LyX master] * sk.po

2013-05-25 Thread Kornel Benko 
The branch, master, has been updated.

- Log -

commit 2897003f22a598bda6fc08b6691097edf9f972b3
Author: Kornel Benko 
Date:   Sat May 25 19:02:27 2013 +0200

* sk.po

diff --git a/po/sk.po b/po/sk.po
index 654717c..ee95fca 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.1\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2013-05-24 10:05+0200\n"
+"POT-Creation-Date: 2013-05-25 18:56+0200\n"
 "PO-Revision-Date: 2013-01-16 12:46+0100\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
@@ -3292,8 +3292,8 @@ msgid "Skip trailing non-word characters"
 msgstr "Vynechať bočné písmená nepatriace k slovu"
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:100
-msgid "Use Mac-style for cursor moving between "
-msgstr "Použiť štýl na posun kurzora medzi slovami"
+msgid "Use M cursor movement"
+msgstr "Použiť štýl na posun kurzora"
 
 #: src/frontends/qt4/ui/PrefEditUi.ui:107
 msgid "Sort  alphabetically"
@@ -23732,8 +23732,8 @@ msgid "Make Apple key act as Meta and Control key as 
Ctrl."
 msgstr "Prehoď Apple klávesu na Meta a Kontrol klávesu na Ctrl."
 
 #: src/LyXRC.cpp:3149
-msgid "Use the Mac OS X conventions for the word-level cursor movement"
-msgstr "Použiť dohody Mac OS X pre pohyb kurzoru po slovách"
+msgid "Use the Mac OS X conventions for cursor movement"
+msgstr "Použiť dohody Mac OS X pre pohyb kurzoru"
 
 #: src/LyXRC.cpp:3153
 msgid ""
@@ -32086,3 +32086,9 @@ msgstr "Neznámy používateľ"
 
 #~ msgid "Built on %1$s, %2$s"
 #~ msgstr "Zostavený %1$s, %2$s"
+
+#~ msgid "Use Mac-style for cursor moving between "
+#~ msgstr "Použiť štýl na posun kurzora medzi slovami"
+
+#~ msgid "Use the Mac OS X conventions for the word-level cursor movement"
+#~ msgstr "Použiť dohody Mac OS X pre pohyb kurzoru po slovách"

---

Summary of changes:
 po/sk.po |   16 +++-
 1 files changed, 11 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Re: [LyX master] GuiBox.cpp, InsetBox.cpp: fix some wrong logic

2013-05-25 Thread Uwe Stöhr 

Am 25.05.2013 18:49, schrieb Jean-Marc Lasgouttes:


What is the difference between having the checkbox unchecked and having it 
checked but leaving the
width empty?
As I wrote in my commit most box constructs need a width. The checkbox allows you to decide not to 
use a given width and, more important, informs you that you have for some box constructs a choice 
between an explicit width and no explicit width.


regards Uwe

[LyX master] make Documents folder of disk image optional

2013-05-25 Thread Stephan Witt 
The branch, master, has been updated.

- Log -

commit 1197cf062b335f91b55eb7eabcb0924d38fa03fa
Author: Stephan Witt 
Date:   Sat May 25 20:16:10 2013 +0200

make Documents folder of disk image optional

diff --git a/development/LyX-Mac-binary-release.sh 
b/development/LyX-Mac-binary-release.sh
index 32e4b7c..75cd83e 100644
--- a/development/LyX-Mac-binary-release.sh
+++ b/development/LyX-Mac-binary-release.sh
@@ -792,6 +792,7 @@ set_bundle_display_options() {
LYX_Y_POSITION=$Y_POSITION
APP_X_POSITION=$((3 * X_BOUNDS / 4))
APP_Y_POSITION=$Y_POSITION
+   WITH_DOCUMENTS=$(test -d "${1}/Documents" && echo true || echo false)
osascript <<-EOF
tell application "Finder"
 set f to POSIX file ("${1}" as string) as alias
@@ -807,11 +808,13 @@ set_bundle_display_options() {
 delay 1 -- sync
 set icon size of the icon view options of container window to 64
 set arrangement of the icon view options of container window to 
not arranged
-set position of item "Documents" to {$LYX_X_POSITION,0}
+if ${WITH_DOCUMENTS} then
+   set position of item "Documents" to {$LYX_X_POSITION,0}
+end if
 set position of item "${LyxName}.app" to 
{$LYX_X_POSITION,$LYX_Y_POSITION}
 set position of item "Applications" to 
{$APP_X_POSITION,$APP_Y_POSITION}
 set background picture of the icon view options\
-   of container window to file 
"background.png" of folder "Pictures"
+   of container window to file "background.png" of folder 
"Pictures"
 set the bounds of the container window to {0, 0, $X_BOUNDS, 
$Y_BOUNDS}
 update without registering applications
 delay 5 -- sync

---

Summary of changes:
 development/LyX-Mac-binary-release.sh |7 +--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Header cleanup cont.

2013-05-25 Thread Pavel Sanda 
The branch, master, has been updated.

- Log -

commit 0ce10160daadc904ab1221eaeef0d005694f0f0c
Author: Pavel Sanda 
Date:   Sat May 25 16:38:20 2013 -0700

Header cleanup cont.

diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index a239fb9..f648362 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -31,6 +31,7 @@
 #include "output_xhtml.h"
 #include "OutputParams.h"
 #include "Paragraph.h"
+#include "ParIterator.h"
 #include "TextClass.h"
 #include "TextMetrics.h"
 #include "TocBackend.h"
diff --git a/src/mathed/InsetMathDiagram.h b/src/mathed/InsetMathDiagram.h
index 62b0efd..1e44863 100644
--- a/src/mathed/InsetMathDiagram.h
+++ b/src/mathed/InsetMathDiagram.h
@@ -13,7 +13,6 @@
 #ifndef MATH_DIAGRAM_H
 #define MATH_DIAGRAM_H
 
-#include "Length.h"
 #include "InsetMathGrid.h"
 
 
diff --git a/src/mathed/InsetMathHull.h b/src/mathed/InsetMathHull.h
index 0284e6e..af00eaf 100644
--- a/src/mathed/InsetMathHull.h
+++ b/src/mathed/InsetMathHull.h
@@ -14,7 +14,6 @@
 
 #include "InsetMathGrid.h"
 
-#include "Color.h"
 #include "DocIterator.h"
 #include "OutputEnums.h"
 
diff --git a/src/mathed/InsetMathNest.h b/src/mathed/InsetMathNest.h
index 99537d8..a503fb9 100644
--- a/src/mathed/InsetMathNest.h
+++ b/src/mathed/InsetMathNest.h
@@ -14,9 +14,6 @@
 
 #include "InsetMath.h"
 
-// FIXME: remove
-#include "support/docstring.h"
-
 #include 
 
 namespace lyx {
diff --git a/src/mathed/MacroTable.h b/src/mathed/MacroTable.h
index 8b9b38a..3a1fed4 100644
--- a/src/mathed/MacroTable.h
+++ b/src/mathed/MacroTable.h
@@ -16,7 +16,6 @@
 #include "DocIterator.h"
 
 #include "support/docstring.h"
-#include "support/types.h"
 
 #include 
 #include 
diff --git a/src/mathed/MathMacroTemplate.h b/src/mathed/MathMacroTemplate.h
index 9bb7cfb..61f82e9 100644
--- a/src/mathed/MathMacroTemplate.h
+++ b/src/mathed/MathMacroTemplate.h
@@ -17,8 +17,6 @@
 #include "MacroTable.h"
 #include "MathData.h"
 
-#include "support/types.h"
-
 
 namespace lyx {
 
diff --git a/src/mathed/MathParser.h b/src/mathed/MathParser.h
index c4ae6f8..745b038 100644
--- a/src/mathed/MathParser.h
+++ b/src/mathed/MathParser.h
@@ -15,7 +15,6 @@
 
 #include "MathParser_flags.h"
 
-#include "support/types.h"
 #include "support/docstring.h"
 
 
diff --git a/src/output_latex.h b/src/output_latex.h
index 89f8ac6..1f3afff 100644
--- a/src/output_latex.h
+++ b/src/output_latex.h
@@ -16,8 +16,6 @@
 
 #include "support/docstream.h"
 #include "Layout.h"
-#include "Paragraph.h"
-#include "ParIterator.h"
 #include "ParagraphList.h"
 
 
diff --git a/src/sgml.h b/src/sgml.h
index ed0f140..551972d 100644
--- a/src/sgml.h
+++ b/src/sgml.h
@@ -13,7 +13,6 @@
 #ifndef SGML_H
 #define SGML_H
 
-#include "support/types.h"
 #include "support/docstring.h"
 
 namespace lyx {

---

Summary of changes:
 src/insets/InsetCaption.cpp|1 +
 src/mathed/InsetMathDiagram.h  |1 -
 src/mathed/InsetMathHull.h |1 -
 src/mathed/InsetMathNest.h |3 ---
 src/mathed/MacroTable.h|1 -
 src/mathed/MathMacroTemplate.h |2 --
 src/mathed/MathParser.h|1 -
 src/output_latex.h |2 --
 src/sgml.h |1 -
 9 files changed, 1 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Years forgotten file

2013-05-25 Thread Pavel Sanda 
The branch, master, has been updated.

- Log -

commit f75becdc4e8f02085212e6d2b016c76dc76c5980
Author: Pavel Sanda 
Date:   Sat May 25 16:40:19 2013 -0700

Years forgotten file

diff --git a/src/Makefile.am b/src/Makefile.am
index fc4a5fe..b40d4e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -498,7 +498,6 @@ HEADERFILESMATHED = \
mathed/MathCompletionList.h \
mathed/MathExtern.h \
mathed/MathFactory.h \
-   mathed/MathGridInfo.h \
mathed/MathMacro.h \
mathed/MathMacroArgument.h \
mathed/MacroTable.h \
diff --git a/src/mathed/MathGridInfo.h b/src/mathed/MathGridInfo.h
deleted file mode 100644
index 07ba78a..000
--- a/src/mathed/MathGridInfo.h
+++ /dev/null
@@ -1,69 +0,0 @@
-// -*- C++ -*-
-/**
- * \file MathGridInfo.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author André Pönitz
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef MATH_GRIDINFO_H
-#define MATH_GRIDINFO_H
-
-#include 
-
-
-namespace lyx {
-
-
-class ColInfo
-{
-public:
-   ColInfo() : align('c'), rightline(0), leftline(false) {}
-   char   align;  // column alignment
-   docstring width;  // column width
-   docstring special;// special column alignment
-   intrightline;  // a line on the right?
-   bool   leftline;
-};
-
-
-class RowInfo
-{
-public:
-   RowInfo() : topline(false), bottomline(false) {}
-   bool topline; // horizontal line above
-   int  bottomline;  // horizontal line below
-};
-
-
-class CellInfo
-{
-public:
-   CellInfo()
-   : multi(0), leftline(false), rightline(false),
-  topline(false), bottomline(false)
-   {}
-
-   docstring content;// cell content
-   int multi; // multicolumn flag
-   char align;// cell alignment
-   bool leftline; // do we have a line on the left?
-   bool rightline;// do we have a line on the right?
-   bool topline;// do we have a line above?
-   bool bottomline;   // do we have a line below?
-};
-
-
-inline char const * verbose_align(char c)
-{
-   return c == 'c' ? "center" : c == 'r' ? "right" : c == 'l' ? "left" : 
"none";
-}
-
-
-
-} // namespace lyx
-
-#endif

---

Summary of changes:
 src/Makefile.am   |1 -
 src/mathed/MathGridInfo.h |   69 -
 2 files changed, 0 insertions(+), 70 deletions(-)
 delete mode 100644 src/mathed/MathGridInfo.h


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Merge branch 'master' of git.lyx.org:lyx

2013-05-25 Thread Uwe Stöhr 
The branch, master, has been updated.

- Log -

commit 586124c6a7bbad3d28bb756622613334da4a9a23
Merge: 5002ef3 f75becd
Author: Uwe Stöhr 
Date:   Sun May 26 03:05:28 2013 +0200

Merge branch 'master' of git.lyx.org:lyx


commit 5002ef33f03fdd5a7e401b6dd36285e2e4dee004
Author: Uwe Stöhr 
Date:   Sun May 26 03:04:59 2013 +0200

aa: fix compilation of the templates/aa.lyx

- aa already loads inputenc

diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 5decd34..57f6c80 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aa]{Astronomy & Astrophysics}
+#  \DeclareLaTeXClass[aa,answers.sty]{Astronomy & Astrophysics}
 #  \DeclareCategory{Articles}
 #
 # Author: Peter Sütterlin 
@@ -24,6 +24,8 @@ SecNumDepth 3
 TocDepth0
 PageStyle   Plain
 
+# Pre-loaded packages
+Provides inputenc  1
 
 Style Standard
Category  MainText
diff --git a/lib/templates/aa.lyx b/lib/templates/aa.lyx
index 240f7ae..09d03fb 100644
--- a/lib/templates/aa.lyx
+++ b/lib/templates/aa.lyx
@@ -8,9 +8,9 @@
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding auto
+\inputencoding default
 \fontencoding global
-\font_roman times
+\font_roman default
 \font_sans default
 \font_typewriter default
 \font_default_family default

---

Summary of changes:
 lib/layouts/aa.layout |4 +++-
 lib/templates/aa.lyx  |4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX 2.0.x] aa.layout: fix compilation of the templates/aa.lyx

2013-05-25 Thread Uwe Stöhr 
The branch, 2.0.x, has been updated.

- Log -

commit 03b93bb5bddf9e141225d840aad52ed1050fe73d
Author: Uwe Stöhr 
Date:   Sun May 26 03:34:09 2013 +0200

aa.layout: fix compilation of the templates/aa.lyx

- aa already loads inputenc
- also add a required package

diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index cfecf83..65bc47b 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -1,5 +1,5 @@
 #% Do not delete the line below; configure depends on this
-#  \DeclareLaTeXClass[aa]{article (A)}
+#  \DeclareLaTeXClass[aa,answers.sty]{article (A)}
 #
 # Author: Peter Sütterlin 
 # Author: Jürgen Spitzmüller 
@@ -23,6 +23,8 @@ SecNumDepth 3
 TocDepth0
 PageStyle   Plain
 
+# Pre-loaded packages
+Provides inputenc  1
 
 Style Standard
MarginStatic
diff --git a/lib/templates/aa.lyx b/lib/templates/aa.lyx
index 240f7ae..09d03fb 100644
--- a/lib/templates/aa.lyx
+++ b/lib/templates/aa.lyx
@@ -8,9 +8,9 @@
 \maintain_unincluded_children false
 \language english
 \language_package default
-\inputencoding auto
+\inputencoding default
 \fontencoding global
-\font_roman times
+\font_roman default
 \font_sans default
 \font_typewriter default
 \font_default_family default
diff --git a/status.20x b/status.20x
index 338d74f..11a91d5 100644
--- a/status.20x
+++ b/status.20x
@@ -70,6 +70,7 @@ What's new
 
 * DOCUMENTATION AND LOCALIZATION
 
+- Make the AA template file compilable.
 - Make the AEA template file compilable.
 - Make the landslide example file compilable.
 

---

Summary of changes:
 lib/layouts/aa.layout |4 +++-
 lib/templates/aa.lyx  |4 ++--
 status.20x|1 +
 3 files changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX 2.0.x] Chinese Tutorial.lyx: backport a fix by Jürgen

2013-05-25 Thread Uwe Stöhr 
The branch, 2.0.x, has been updated.

- Log -

commit bfa2829d4798e03412dac7467336ce978654f18a
Author: Uwe Stöhr 
Date:   Sun May 26 03:38:55 2013 +0200

Chinese Tutorial.lyx: backport a fix by Jürgen

diff --git a/lib/doc/zh_CN/Tutorial.lyx b/lib/doc/zh_CN/Tutorial.lyx
index d99f13f..b876148 100644
--- a/lib/doc/zh_CN/Tutorial.lyx
+++ b/lib/doc/zh_CN/Tutorial.lyx
@@ -113,7 +113,6 @@ status collapsed
 \begin_layout Plain Layout
 对这个中文版有任何话想说请 Email 到 
 \family typewriter
-\lang english
 
 \begin_inset CommandInset href
 LatexCommand href
@@ -124,7 +123,6 @@ type "mailto:;
 
 
 \family default
-\lang chinese-simplified
 。
 \end_layout
 
diff --git a/status.20x b/status.20x
index 11a91d5..0cb733b 100644
--- a/status.20x
+++ b/status.20x
@@ -73,6 +73,8 @@ What's new
 - Make the AA template file compilable.
 - Make the AEA template file compilable.
 - Make the landslide example file compilable.
+- Fix problem that the Chinese Tutorial could not be viewed as PDF on
+  some systems. 
 
 
 * LYXHTML

---

Summary of changes:
 lib/doc/zh_CN/Tutorial.lyx |2 --
 status.20x |2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Farsi splash.lyx: remove unnecessary preamble

2013-05-25 Thread Uwe Stöhr 
The branch, master, has been updated.

- Log -

commit 70b1bc5fc906e6d5337354009a0e43cbc4d5769c
Author: Uwe Stöhr 
Date:   Sun May 26 05:04:18 2013 +0200

Farsi splash.lyx: remove unnecessary preamble

diff --git a/lib/examples/fa/splash.lyx b/lib/examples/fa/splash.lyx
index 98edf4f..171c83b 100644
--- a/lib/examples/fa/splash.lyx
+++ b/lib/examples/fa/splash.lyx
@@ -3,10 +3,6 @@
 \begin_document
 \begin_header
 \textclass article
-\begin_preamble
-\usepackage[LFE,LAE]{fontenc}
-\usepackage{babel}\TOCLanguage{farsi}
-\end_preamble
 \use_default_options false
 \maintain_unincluded_children false
 \language farsi

---

Summary of changes:
 lib/examples/fa/splash.lyx |4 
 1 files changed, 0 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] aa.layout: updated for A 8.2

2013-05-25 Thread Uwe Stöhr 
The branch, master, has been updated.

- Log -

commit e28625160a5078ffb37fc27ad3906edf5a73a31f
Author: Uwe Stöhr 
Date:   Sun May 26 05:29:24 2013 +0200

aa.layout: updated for A 8.2

diff --git a/development/FORMAT b/development/FORMAT
index 58f9016..fedfd43 100644
--- a/development/FORMAT
+++ b/development/FORMAT
@@ -11,6 +11,10 @@ adjustments are made to tex2lyx and bugs are fixed in 
lyx2lyx.
 
 ---
 
+2013-05-26 Uwe Stöhr 
+   * Format incremented to 472: added 2 new abstract styles to the
+ aa.layout file
+
 2013-05-16 Julien Rioux 
* Format incremented to 471
  New \cite_engine_type default. The default citation
diff --git a/lib/layouts/aa.layout b/lib/layouts/aa.layout
index 57f6c80..9d11762 100644
--- a/lib/layouts/aa.layout
+++ b/lib/layouts/aa.layout
@@ -15,93 +15,31 @@
 # 2008-06-09  Implement \inst and \email as char styles,
 # implement paragraph style keywords
 # 2008-10-26  Updated for aa.cls version 6.1
+# 2013-05-26  Updated for aa.cls version 8.2
 
 
 Format 45
-Columns 2
-Sides   2
-SecNumDepth 3
-TocDepth0
-PageStyle   Plain
+Columns2
+Sides  2
+SecNumDepth3
+TocDepth   0
+PageStyle  Plain
 
 # Pre-loaded packages
 Provides inputenc  1
 
 Style Standard
-   Category  MainText
-   MarginStatic
-   LatexType Paragraph
-   LatexName dummy
-   ParIndent MM
-   ParSkip   0.4
-   Align Block
-   AlignPossible Block, Left, Right, Center
-   LabelType No_Label
+   CategoryMainText
+   Margin  Static
+   LatexType   Paragraph
+   LatexName   dummy
+   ParIndent   MM
+   ParSkip 0.4
+   Align   Block
+   AlignPossible   Block, Left, Right, Center
+   LabelType   No_Label
 End
 
-
-# I want to keep the entries in a logical order.
-# Therefore I'll define the entries first, then fill them
-
-Style Section
-   TocLevel 1
-End
-
-Style Subsection
-   TocLevel 2
-End
-
-Style Subsubsection
-   TocLevel 3
-End
-
-Style Itemize
-End
-
-Style Enumerate
-End
-
-Style Description
-End
-
-Style List
-End
-
-
-Style Title
-End
-
-Style Subtitle
-End
-
-Style Author
-End
-
-Style Address
-End
-
-Style Offprint
-End
-
-Style Mail
-End
-
-Style Date
-End
-
-Style Abstract
-End
-
-Style Acknowledgement
-End
-
-Style Bibliography
-End
-
-
-# OK, now we have a more or less consistent Ordering. Now fill the
-# definitions.  First, the standard includes
-
 Input stdinsets.inc
 Input stdlists.inc
 Input stdsections.inc
@@ -118,318 +56,340 @@ NoStyle Subparagraph
 NoCounter subparagraph
 NoStyle Part
 NoCounter part
+NoStyle Abstract
 
 
 Style Subtitle
-   Margin  Static
-   LatexType   Command
-   InTitle 1
-   LatexName   subtitle
-   CategoryFrontMatter
-   NextNoIndent1
-   ParSkip 0.4
-   ItemSep 0
-   TopSep  1.3
-   BottomSep   1.3
-   ParSep  1
-   Align   Center
-   LabelType   No_Label
+   Margin  Static
+   LatexType   Command
+   InTitle 1
+   LatexName   subtitle
+   CategoryFrontMatter
+   NextNoIndent1
+   ParSkip 0.4
+   ItemSep 0
+   TopSep  1.3
+   BottomSep   1.3
+   ParSep  1
+   Align   Center
+   LabelType   No_Label
Font
- FamilySans
- Size  Larger
- SeriesBold
+ FamilySans
+ Size  Larger
+ SeriesBold
EndFont
 End
 
 
 Style Address
-   LeftMargin  MMM
-   Margin  Static
-   LatexType   Command
-   InTitle 1
-   LatexName   institute
-   CategoryFrontMatter
-   ParSkip 0.4
-   #BottomSep  0.4
-   Align   Left
-   LabelType   No_Label
+   LeftMargin  MMM
+   Margin  Static
+   LatexType   Command
+   InTitle 1
+   LatexName   institute
+   CategoryFrontMatter
+   ParSkip 0.4
+   #BottomSep  0.4
+   Align   Left
+   LabelType   No_Label
Font
- FamilyRoman
- Size  Small
+ FamilyRoman
+ Size  Small