date:20121124

[LyX master] Some cosmetics in preparation of major revisions

2012-11-24 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 3d636c2a337e53e547d0947241b8160083e44d9b
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sat Nov 24 10:32:48 2012 +0100

Some cosmetics in preparation of major revisions

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 95f705f..a04d48b 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -1,16 +1,21 @@
 #% Do not delete the line below; configure depends on this
 #  
\DeclareLaTeXClass[beamer,amssymb.sty,hyperref.sty,pgf.sty,xcolor.sty,xxcolor.sty]{Beamer}
 #  \DeclareCategory{Presentations}
-# Author : Till Tantau tan...@users.sourceforge.net
+# Original Author: Till Tantau tan...@users.sourceforge.net
+# Revised and extended by JÃ¼rgen SpitzmÃ¼ller sp...@lyx.org, Uwe StÃ¶hr 
uwesto...@lyx.org,
+#   Richard Heck rgh...@lyx.org, Martin Vermeer martin.verm...@hut.fi and 
probably others.
 
-# $Header: /cvsroot/latex-beamer/latex-beamer/lyx/layouts/beamer.layout,v 1.16 
2004/10/07 20:53:07 tantau Exp $
 
-# Includes
 Format 41
+
+#
+# GLOBAL SETTINGS
+#
+
+# Includes
 Input stdcounters.inc
 Input stdinsets.inc
 
-
 # General textclass parameters
 Columns1
 Sides  1
@@ -30,8 +35,24 @@ DefaultFont
   ColorNone
 EndFont
 
+# To give users the choice of a title frame with and without
+# head-/footline, we define our own maketitle command
+TitleLaTeXName makebeamertitle
+AddToPreamble
+  % this default might be overridden by plain title style
+  \newcommand\makebeamertitle{\frame{\maketitle}}%
+  \AtBeginDocument{%
+\let\origtableofcontents=\tableofcontents
+
\def\tableofcontents{\@ifnextchar[{\origtableofcontents}{\gobbletableofcontents}}
+\def\gobbletableofcontents#1{\origtableofcontents}
+  }
+EndPreamble
+
+
+#
+# STANDARD STYLE
+#
 
-# Standard style definition
 Style Standard
   Category MainText
   Margin   Static
@@ -44,16 +65,19 @@ Style Standard
   LabelTypeNo_Label
 End
 
-# List section
-# Itemize style definition
+
+#
+# LISTS
+#
+
 Style Itemize
   Category List
   Margin   Static
   LatexTypeItem_Environment
   LatexNameitemize
   Argument 1
-LabelString   Overlay Specifications|S
-Tooltip   Overlay specifications for this list
+LabelStringOverlay Specifications|S
+TooltipOverlay specifications for this list
   EndArgument
   NextNoIndent 1
   LeftMargin   MMN
@@ -66,19 +90,18 @@ Style Itemize
   LabelTypeItemize
 End
 
-# Enumerate style definition
 Style Enumerate
   Category List
   Margin   Static
   LatexTypeItem_Environment
   LatexNameenumerate
   Argument 1
-LabelString   Overlay Specifications|S
-Tooltip   Overlay specifications for this list
+LabelStringOverlay Specifications|S
+TooltipOverlay specifications for this list
   EndArgument
   Argument 2
-LabelString   Mini template
-Tooltip   Mini template for this List
+LabelStringMini template
+TooltipMini template for this List
   EndArgument
   NextNoIndent 1
   LeftMargin   MMN
@@ -93,19 +116,18 @@ Style Enumerate
   RefPrefixenu
 End
 
-# Description style definition
 Style Description
   Category List
   Margin   First_Dynamic
   LatexTypeItem_environment
   LatexNamedescription
   Argument 1
-LabelString   Overlay Specifications|S
-Tooltip   Overlay specifications for this list
+LabelStringOverlay Specifications|S
+TooltipOverlay specifications for this list
   EndArgument
   Argument 2
-LabelString   Longest label|s
-Tooltip   The longest label in this list
+LabelStringLongest label|s
+TooltipThe longest label in this list
   EndArgument
   NextNoIndent 1
   LeftMargin   MM
@@ -122,16 +144,19 @@ Style Description
   EndFont
 End
 
-# Sectioning section
-# Part style definition
+
+#
+# SECTIONING
+#
+
 Style Part
   Category Section
   Margin   Dynamic
   LatexTypeCommand
   LatexNamepart
   Argument 1
-LabelString   Short Title|S
-Tooltip   The part as it appears in the table of contents/running 
headers
+LabelStringShort Title|S
+TooltipThe part as it appears in the table of contents/running 
headers
   EndArgument
   NeedProtect  1
   NextNoIndent 1
@@ -144,21 +169,17 @@ Style Part
   LabelTypeStatic
   LabelString  Part
   RefPrefixpart
-
-  # standard font definition
   Font 
 Family Roman
 Series Bold
 Size   Huge
   EndFont
-
   LabelFont
 Color  Latex
   EndFont
   TocLevel 0
 End
 
-# Section style definition
 Style Section
   Category Section
   Margin   First_Dynamic
@@ -177,16 +198,14 @@ Style Section
   LabelString  Section

[LyX master] Update email address

2012-11-24 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 1e9907557aa3d549776ee0066d40c03bc1398cae
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sat Nov 24 10:46:55 2012 +0100

Update email address

diff --git a/lib/layouts/article-beamer.layout 
b/lib/layouts/article-beamer.layout
index 90b98a1..a142fa7 100644
--- a/lib/layouts/article-beamer.layout
+++ b/lib/layouts/article-beamer.layout
@@ -1,7 +1,7 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass[article,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer 
Article (Standard Class)}
 #  \DeclareCategory{Articles}
-# Author: JÃ¼rgen SpitzmÃ¼ller j.spitzmuel...@gmx.de
+# Author: JÃ¼rgen SpitzmÃ¼ller sp...@lyx.org
 
 Format 41
 
diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 6f00a04..1704b2e 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -2,7 +2,7 @@
 #  \DeclareLaTeXClass[memoir]{Memoir}
 #  \DeclareCategory{Books}
 # Memoir textclass definition file
-# Author: JÃ¼rgen SpitzmÃ¼ller spitzmuel...@gmx.de
+# Author: JÃ¼rgen SpitzmÃ¼ller sp...@lyx.org
 # Improvements by: Bennett Helm bennett.h...@fandm.edu
 # feel free to contribute missing features!
 
diff --git a/lib/layouts/scrarticle-beamer.layout 
b/lib/layouts/scrarticle-beamer.layout
index 72b5e0b..e6a1d93 100644
--- a/lib/layouts/scrarticle-beamer.layout
+++ b/lib/layouts/scrarticle-beamer.layout
@@ -1,7 +1,7 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass[scrartcl,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer 
Article (KOMA-Script)}
 #  \DeclareCategory{Articles}
-# Author : JÃ¼rgen SpitzmÃ¼ller j.spitzmuel...@gmx.de
+# Author: JÃ¼rgen SpitzmÃ¼ller sp...@lyx.org
 
 Format 41
 
diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 3ad2071..3aa001e 100644
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -2,7 +2,7 @@
 # Base definitions for the KOMA script layouts.
 # Bernd Rellermeyer 100.41...@germanynet.de, 1998/7/23.
 # Update for Koma Script Release =2.8q
-# Juergen Spitzmueller j.spitzmuel...@gmx.de, 2003/2/08.
+# Juergen Spitzmueller sp...@lyx.org, 2003/2/08.
 # Mapped List to Labeling
 # Guenter Milde milde users.berlios.de, 2009-02-02
 # Labeling is now used also in non-KOMA classes
diff --git a/lib/layouts/scrlttr2.layout b/lib/layouts/scrlttr2.layout
index f890067..49eec3a 100644
--- a/lib/layouts/scrlttr2.layout
+++ b/lib/layouts/scrlttr2.layout
@@ -2,7 +2,7 @@
 #  \DeclareLaTeXClass{KOMA-Script Letter (V. 2)}
 #  \DeclareCategory{Letters}
 # KOMA scrlettr2 textclass definition file.
-# Juergen Spitzmueller j.spitzmuel...@gmx.de, 2003/2/17.
+# Juergen Spitzmueller sp...@lyx.org, 2003/2/17.
 # Uwe StÃ¶hr uwesto...@web.de, 2008/2/03.
 
 Format 41

---

Summary of changes:
 lib/layouts/article-beamer.layout|2 +-
 lib/layouts/memoir.layout|2 +-
 lib/layouts/scrarticle-beamer.layout |2 +-
 lib/layouts/scrclass.inc |2 +-
 lib/layouts/scrlttr2.layout  |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] sk.po: Inset arguments strings

2012-11-24 Thread Kornel Benko

The branch, master, has been updated.

- Log -

commit 00ac4748c37809ae28dac9f234c26ce4fff6b91a
Author: Kornel Benko kor...@lyx.org
Date:   Sat Nov 24 15:05:01 2012 +0100

sk.po: Inset arguments strings

diff --git a/po/sk.po b/po/sk.po
index ad4a028..f0ded15 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid 
 msgstr 
 Project-Id-Version: LyX-2.1\n
 Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n
-POT-Creation-Date: 2012-11-08 10:16+0100\n
-PO-Revision-Date: 2012-10-19 09:05+0200\n
+POT-Creation-Date: 2012-11-24 10:16+0100\n
+PO-Revision-Date: 2012-11-24 13:21+0100\n
 Last-Translator: Kornel Benko kor...@lyx.org\n
 Language-Team: Slovak lyx-d...@lists.lyx.org\n
 Language: sk\n
@@ -1113,7 +1113,7 @@ msgstr Chyby:
 
 #: src/frontends/qt4/ui/ErrorListUi.ui:53
 msgid Description:
-msgstr Popis:
+msgstr Opis:
 
 #: src/frontends/qt4/ui/ErrorListUi.ui:83
 msgid Open the LaTeX Log File dialog
@@ -1160,7 +1160,7 @@ msgstr LaTeX- a LyX- voÄ¾by
 
 #: src/frontends/qt4/ui/ExternalUi.ui:144
 msgid LaTeX Options
-msgstr LaTeX VoÄ¾by
+msgstr VoÄ¾by LaTeX
 
 #: src/frontends/qt4/ui/ExternalUi.ui:162
 msgid Option:
@@ -1431,7 +1431,7 @@ msgstr PouÅ¾iÅ¥ Å¡tandardnÃ© umiestÅovanie
 
 #: src/frontends/qt4/ui/FloatPlacementUi.ui:43
 msgid Advanced Placement Options
-msgstr RozÅ¡ÃrenÃ© voÄ¾by umiestÅovania
+msgstr VoÄ¾by RozÅ¡ÃrenÃ© UmiestÅovanie
 
 #: src/frontends/qt4/ui/FloatPlacementUi.ui:55
 msgid Top of page
@@ -2544,7 +2544,7 @@ msgstr TriediÅ¥ ako:
 
 #: src/frontends/qt4/ui/NomenclUi.ui:38
 msgid Description:
-msgstr Popis:
+msgstr Opis:
 
 #: src/frontends/qt4/ui/NomenclUi.ui:48
 msgid Symbol:
@@ -2618,7 +2618,7 @@ msgstr VlastnÃ© makro do preambuly LaTeXu
 
 #: src/frontends/qt4/ui/OutputUi.ui:113
 msgid XHTML Output Options
-msgstr VÃ½chodzie VoÄ¾by pre XHTML
+msgstr VoÄ¾by VÃ½chodzie XHTML
 
 #: src/frontends/qt4/ui/OutputUi.ui:122
 msgid Whether to comply strictly with XHTML 1.1.
@@ -3685,7 +3685,7 @@ msgstr KniÅ¾nice pre hunspell:
 
 #: src/frontends/qt4/ui/PrefPrinterUi.ui:41
 msgid Printer Command Options
-msgstr VoÄ¾by prÃkazu pre tlaÄiareÅ
+msgstr VoÄ¾by PrÃkaz Pre TlaÄiareÅ
 
 #: src/frontends/qt4/ui/PrefPrinterUi.ui:69
 msgid Extension to be used when printing to file.
@@ -5787,6 +5787,14 @@ msgstr malÃ© pÃsmenÃ¡
 msgid Author
 msgstr Autor
 
+#: lib/layouts/IEEEtran.layout:121 lib/layouts/beamer.layout:906
+msgid Short Author|S
+msgstr Skratka Autora
+
+#: lib/layouts/IEEEtran.layout:122
+msgid A short version of the author name
+msgstr SkrÃ¡tenÃ¡ verzia mena autora
+
 #: lib/layouts/IEEEtran.layout:134
 msgid Special Paper Notice
 msgstr Å peciÃ¡lna ÄlÃ¡nkovÃ¡ PoznÃ¡mka
@@ -5865,6 +5873,14 @@ msgstr BackMatter
 msgid Appendix
 msgstr PrÃloha
 
+#: lib/layouts/IEEEtran.layout:243
+msgid Appendix Title
+msgstr Titul pre prÃlohu
+
+#: lib/layouts/IEEEtran.layout:244
+msgid Optional title of the appendix
+msgstr NepovinnÃ½ titul pre prÃlohu
+
 #: lib/layouts/IEEEtran.layout:242 lib/layouts/aa.layout:94
 #: lib/layouts/aa.layout:381 lib/layouts/aapaper.layout:106
 #: lib/layouts/aapaper.layout:220 lib/layouts/achemso.layout:238
@@ -5911,6 +5927,14 @@ msgid Biography
 msgstr Å½ivotopis
 
 #: lib/layouts/IEEEtran.layout:278
+msgid Biography Photo
+msgstr Å½ivotopisFotka
+
+#: lib/layouts/IEEEtran.layout:279
+msgid Insert a photo to your biography
+msgstr VloÅ¾iÅ¥ fotku ku Å¾ivotopisu
+
+#: lib/layouts/IEEEtran.layout:278
 msgid Biography without photo
 msgstr Å½ivotopis bez fotky
 
@@ -5918,6 +5942,15 @@ msgstr Å½ivotopis bez fotky
 msgid BiographyNoPhoto
 msgstr Å½ivotopisBezFotky
 
+#: lib/layouts/IEEEtran.layout:306 lib/layouts/siamltex.layout:162
+#: lib/layouts/theorems-proof.inc:20
+msgid Alternative Proof String
+msgstr AlternatÃva pre dÃ´kaz
+
+#: lib/layouts/IEEEtran.layout:307 lib/layouts/siamltex.layout:163
+msgid An alternative proof string
+msgstr AlternatÃvny reÅ¥azec dÃ´kazu
+
 #: lib/layouts/IEEEtran.layout:306 lib/layouts/beamer.layout:1094
 #: lib/layouts/foils.layout:281 lib/layouts/llncs.layout:379
 #: lib/layouts/siamltex.layout:170 lib/layouts/svmono.layout:85
@@ -6021,7 +6054,7 @@ msgstr ÄÃslovanie
 #: lib/layouts/stdlists.inc:57 lib/layouts/svcommon.inc:588
 #: lib/ui/stdtoolbars.inc:116
 msgid Description
-msgstr Popis
+msgstr Opis
 
 #: lib/layouts/aa.layout:63 lib/layouts/aapaper.layout:57
 #: lib/layouts/aastex.layout:92 lib/layouts/beamer.layout:47
@@ -6304,6 +6337,14 @@ msgstr Popis obrÃ¡zka
 msgid Fig. ---
 msgstr Fig. ---
 
+#: lib/ui/stdmenus.inc:375
+msgid Short Title|S
+msgstr KrÃ¡tky Titul
+
+#: lib/layouts/aastex.layout:624
+msgid The caption as it appears in the list of figures
+msgstr Popis ako sa zobrazÃ v zozname obrÃ¡zkov
+
 #: lib/layouts/aastex.layout:637
 msgid Facility:
 msgstr Zariadenie:
@@ -6312,33 +6353,26 @@ msgstr Zariadenie:
 msgid Obj:
 msgstr Obj:
 
+#: lib/layouts/aastex.layout:669 lib/layouts/aastex.layout:699
+msgid Recognized Name
+msgstr RozpoznanÃ© meno

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

2012-11-24 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit f90a396488fda1f915af83f6584e6025ff69f486
Merge: a41bdfa 00ac474
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sat Nov 24 15:46:37 2012 +0100

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


commit a41bdfa4536b3f5a2daab8ce949b94199df5b943
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sat Nov 24 15:46:20 2012 +0100

Missing pieces for InsetLayout arguments

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 768..9f1deb9 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -469,6 +469,8 @@ InsetLayout Info:shortcuts
 End
 
 InsetLayout Caption
+   LaTeXTypecommand
+   LatexNamecaption
Argument 1
LabelString   Short Title|S
Tooltip   The caption as it appears in the list of 
figures/tables
diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index a637d90..22548a4 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -227,11 +227,7 @@ void InsetCaption::latex(otexstream  os,
// FIXME: actually, it is moving only when there is no
// optional argument.
runparams.moving_arg = true;
-   os  \\caption;
-   getOptArg(os, runparams);
-   os  '{';
InsetText::latex(os, runparams);
-   os  }\n;
runparams_in.encoding = runparams.encoding;
 }
 
@@ -280,13 +276,6 @@ void InsetCaption::getArgument(otexstream  os,
 }
 
 
-void InsetCaption::getOptArg(otexstream  os,
-   OutputParams const  runparams) const
-{
-   latexArgInsets(paragraphs()[0], os, runparams, getLayout().latexargs());
-}
-
-
 int InsetCaption::getCaptionAsPlaintext(odocstream  os,
OutputParams const  runparams) const
 {
diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index dc28873..d446da8 100644
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -28,8 +28,6 @@ public:
docstring layoutName() const;
/// return the mandatory argument (LaTeX format) only
void getArgument(otexstream  os, OutputParams const ) const;
-   /// return the optional argument(s) only
-   void getOptArg(otexstream  os, OutputParams const ) const;
/// return the caption text
int getCaptionAsPlaintext(odocstream  os, OutputParams const ) const;
/// return the caption text as HTML
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 06644ad..7432f5a 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -436,6 +436,7 @@ void InsetText::latex(otexstream  os, OutputParams const  
runparams) const
if (runparams.moving_arg)
os  \\protect;
os  '\\'  from_utf8(il.latexname());
+   getOptArg(os, runparams);
if (!il.latexparam().empty())
os  from_utf8(il.latexparam());
os  '{';
@@ -590,6 +591,12 @@ docstring InsetText::insetAsXHTML(XHTMLStream  xs, 
OutputParams const  rp,
return docstring();
 }
 
+void InsetText::getOptArg(otexstream  os,
+   OutputParams const  runparams) const
+{
+   latexArgInsets(paragraphs()[0], os, runparams, getLayout().latexargs());
+}
+
 
 void InsetText::cursorPos(BufferView const  bv,
CursorSlice const  sl, bool boundary, int  x, int  y) const
diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 0110adf..4fb9fc3 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -93,6 +93,9 @@ public:
   XHTMLOptions) const;
///
void validate(LaTeXFeatures  features) const;
+   
+   /// return the optional argument(s) only
+   void getOptArg(otexstream  os, OutputParams const ) const;
 
/// return x,y of given position relative to the inset's baseline
void cursorPos(BufferView const  bv, CursorSlice const  sl,

---

Summary of changes:
 lib/layouts/stdinsets.inc   |2 ++
 src/insets/InsetCaption.cpp |   11 ---
 src/insets/InsetCaption.h   |2 --
 src/insets/InsetText.cpp|7 +++
 src/insets/InsetText.h  |3 +++
 5 files changed, 12 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Fix splitting of layout string

2012-11-24 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 4b4e9560d11519bee146d52a7b3a0717cc2f7db1
Author: Juergen Spitzmueller sp...@lyx.org
Date:   Sat Nov 24 16:46:44 2012 +0100

Fix splitting of layout string

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index 80b69e0..d971a16 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -95,9 +95,10 @@ void InsetArgument::updateBuffer(ParIterator const  it, 
UpdateType utype)
Layout::LaTeXArgMap::const_iterator const lait =
args.find(convertunsigned int(name_));
if (lait != args.end()) {
-   docstring label;
-   
support::rsplit(translateIfPossible((*lait).second.labelstring), label, '|');
-   labelstring_ = label;
+   docstring label = 
translateIfPossible((*lait).second.labelstring);
+   docstring striplabel;
+   support::rsplit(label, striplabel, '|');
+   labelstring_ = striplabel.empty() ? label: striplabel;
tooltip_ = translateIfPossible((*lait).second.tooltip);
} else {
labelstring_ = _(Unknown Argument);

---

Summary of changes:
 src/insets/InsetArgument.cpp |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] moderncv.layout: shorten the label strings

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit cc3286782e8b0417a9ab1ecdcb21e92926f5d895
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sat Nov 24 17:15:19 2012 +0100

moderncv.layout: shorten the label strings

- IEEEtran.layout: some whitespace fixes

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index 9917b91..833e3ab 100644
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -39,7 +39,7 @@ Style Standard
   ParIndentMM
   ParSkip  0.4
   AlignBlock
-  AlignPossible Block, Left, Right, Center
+  AlignPossibleBlock, Left, Right, Center
   LabelTypeNo_Label
 End
 
@@ -314,10 +314,10 @@ Style Proof
   BottomSep0.7
   ParSep   0.3
   AlignBlock
-  AlignPossible Block, Left
-  LabelTypeStatic
-  LabelString  Proof.
-  EndLabelType Filled_Box
+  AlignPossibleBlock, Left
+  LabelTypeStatic
+  LabelString  Proof.
+  EndLabelType Filled_Box
   Font
 Shape  Up
 Size   Normal
diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 629955c..cdef775 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -114,8 +114,8 @@ Style Item
LatexName   cvitem
Argument 1
  Mandatory 1
- LabelString   Item summary
- Tooltip   item summary
+ LabelString   Summary
+ Tooltip   Summary
EndArgument
ParSkip 0.4
Align   Block
@@ -136,13 +136,13 @@ Style ItemWithComment
ResetArgs   1
Argument 1
  Mandatory 1
- LabelString   Item summary
- Tooltip   Item summary
+ LabelString   Summary
+ Tooltip   Summary
EndArgument
Argument 2
  Mandatory 1
- LabelString   Item text
- Tooltip   Item text
+ LabelString   Text
+ Tooltip   Text
EndArgument
 End
 
@@ -160,18 +160,18 @@ Style DoubleItem
KeepEmpty   1
Argument 1
  Mandatory 1
- LabelString   Left item summary
- Tooltip   Left item summary
+ LabelString   Left summary
+ Tooltip   Left summary
EndArgument
Argument 2
  Mandatory 1
- LabelString   Left item text
- Tooltip   Left item text
+ LabelString   Left text
+ Tooltip   Left text
EndArgument
Argument 3
  Mandatory 1
- LabelString   Right item summary
- Tooltip   Right item summary
+ LabelString   Right summary
+ Tooltip   Right summary
EndArgument
 End
 
@@ -335,8 +335,8 @@ Style Enclosing
CopyStyle   Opening
LatexName   enclosure
Argument 1
- LabelString   Alternative enclosing name
- Tooltip   Alternative enclosing name
+ LabelString   Alternative name
+ Tooltip   Alternative instead of 'Enclosure'
EndArgument
LabelSepxx
LabelType   Static

---

Summary of changes:
 lib/layouts/IEEEtran.layout |   10 +-
 lib/layouts/moderncv.layout |   28 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Revert achemso: update

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 94dbd82cfca96ea951e328c47fdc6a59aa50f9e2
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sat Nov 24 17:26:00 2012 +0100

Revert achemso: update

This reverts commit f4b218df408839e8966adb03ee8ddda7b433b7ec.

diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout
index 218a9ca..f61dd92 100644
--- a/lib/layouts/achemso.layout
+++ b/lib/layouts/achemso.layout
@@ -52,6 +52,77 @@ NoStyle Chapter
 NoCounter chapter
 NoStyle Chapter*
 
+Style Title
+  Margin   Static
+  LatexTypeCommand
+  Category FrontMatter
+  InTitle  1
+  InPreamble   1
+  LatexNametitle
+  ParSkip  0.4
+  ItemSep  0
+  TopSep   0
+  BottomSep1
+  ParSep   1
+  AlignCenter
+  LabelTypeNo_Label
+  Font
+Family Sans
+Size   Largest
+  EndFont
+  HTMLTag  h1
+  HTMLTitletrue
+  Argument 1
+LabelStringShort Title|S
+TooltipShort title which appears in the running headers
+  EndArgument
+End  
+
+Style Author
+  LatexTypecommand
+  LatexNameauthor
+  InTitle  1
+  InPreamble   1
+  AlignCenter
+  Font
+Family Sans
+Size   Large
+  EndFont
+End
+
+Style Email
+  CopyStyleAuthor
+  LatexNameemail
+End
+
+Style Affiliation
+  CopyStyleAuthor
+  LatexNameaffiliation
+  Argument 1
+LabelStringShort Affiliation|S
+TooltipShort version of the affiliation
+  EndArgument
+End
+
+Style Alt_Affiliation
+  CopyStyleAuthor
+  LatexNamealtaffiliation
+End
+
+Style Also_Affiliation
+  CopyStyleAuthor
+  LatexNamealsoaffiliation
+End
+
+Style Fax
+  CopyStyleAuthor
+  LatexNamefax
+End
+
+Style Phone
+  CopyStyleAuthor
+  LatexNamephone
+End
 
 Float
Typescheme

---

Summary of changes:
 lib/layouts/achemso.layout |   71 
 1 files changed, 71 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX 2.0.x] IEEEtran.layout: some more whitespace

2012-11-24 Thread Uwe Stöhr

The branch, 2.0.x, has been updated.

- Log -

commit 978482f7000121b27865dd9d36b4a34af01de110
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sat Nov 24 17:29:01 2012 +0100

IEEEtran.layout: some more whitespace

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index cd2247b..58b82db 100644
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -38,7 +38,7 @@ Style Standard
   ParIndentMM
   ParSkip  0.4
   AlignBlock
-  AlignPossible Block, Left, Right, Center
+  AlignPossibleBlock, Left, Right, Center
   LabelTypeNo_Label
 End
 
@@ -278,7 +278,7 @@ End
 Style Biography_without_photo
   CopyStyleBiography
   LaTeXNameIEEEbiographynophoto
-  OptionalArgs 0
+  OptionalArgs 0
 End
 
 Style BiographyNoPhoto
@@ -301,7 +301,7 @@ Style Proof
   BottomSep0.7
   ParSep   0.3
   AlignBlock
-  AlignPossible Block, Left
+  AlignPossibleBlock, Left
   LabelTypeStatic
   LabelString  Proof.
   EndLabelType Filled_Box

---

Summary of changes:
 lib/layouts/IEEEtran.layout |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Rescue monolithic build after 32fde61c8f17d524.

2012-11-24 Thread Pavel Sanda

The branch, master, has been updated.

- Log -

commit ad42e885e684cc440493b510e4ee786ab6b01fd2
Author: Pavel Sanda sa...@lyx.org
Date:   Sat Nov 24 17:48:47 2012 +0100

Rescue monolithic build after 32fde61c8f17d524.

diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
b/src/frontends/qt4/CategorizedCombo.cpp
index 878d277..327059f 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -34,10 +34,11 @@
 #include QStandardItemModel
 #include QTextFrame
 
-using namespace std;
-using namespace lyx;
 using namespace lyx::support;
 
+namespace lyx {
+namespace frontend {
+
 
 class CCItemDelegate : public QItemDelegate {
 public:
@@ -128,13 +129,13 @@ struct CategorizedCombo::Private
 };
 
 
-static QString category(QAbstractItemModel const  model, int row)
+static QString categoryCC(QAbstractItemModel const  model, int row)
 {
return model.data(model.index(row, 2), Qt::DisplayRole).toString();
 }
 
 
-static int headerHeight(QStyleOptionViewItem const  opt)
+static int headerHeightCC(QStyleOptionViewItem const  opt)
 {
return opt.fontMetrics.height();
 }
@@ -148,10 +149,10 @@ void CCItemDelegate::paint(QPainter * painter, 
QStyleOptionViewItem const  opti
// default background
painter-fillRect(opt.rect, opt.palette.color(QPalette::Base));
 
-   QString cat = category(*index.model(), index.row());
+   QString cat = categoryCC(*index.model(), index.row());
 
// not the same as in the previous line?
-   if (index.row() == 0 || cat != category(*index.model(), index.row() - 
1)) {
+   if (index.row() == 0 || cat != categoryCC(*index.model(), index.row() - 
1)) {
painter-save();
 
// draw unselected background
@@ -162,10 +163,10 @@ void CCItemDelegate::paint(QPainter * painter, 
QStyleOptionViewItem const  opti
 
// draw category header
drawCategoryHeader(painter, opt, 
-   category(*index.model(), index.row()));
+   categoryCC(*index.model(), index.row()));
 
// move rect down below header
-   opt.rect.setTop(opt.rect.top() + headerHeight(opt));
+   opt.rect.setTop(opt.rect.top() + headerHeightCC(opt));
 
painter-restore();
}
@@ -216,9 +217,9 @@ QSize CCItemDelegate::sizeHint(QStyleOptionViewItem const  
opt,
/// So we tweak this value accordingly. It's not nice, but the
/// only possible way it seems.
// Add space for the category headers here
-   QString cat = category(*index.model(), index.row());
-   if (index.row() == 0 || cat != category(*index.model(), index.row() - 
1)) {
-   size.setHeight(size.height() + headerHeight(opt));
+   QString cat = categoryCC(*index.model(), index.row());
+   if (index.row() == 0 || cat != categoryCC(*index.model(), index.row() - 
1)) {
+   size.setHeight(size.height() + headerHeightCC(opt));
}
 
return size;
@@ -289,7 +290,7 @@ QString CCItemDelegate::underlineFilter(QString const  s) 
const
 }
 
 
-static QString charFilterRegExp(QString const  filter)
+static QString charFilterRegExpCC(QString const  filter)
 {
QString re;
for (int i = 0; i  filter.length(); ++i) {
@@ -314,7 +315,7 @@ void CategorizedCombo::Private::setFilter(QString const  s)
lastSel_ = filterModel_-mapToSource(filterModel_-index(sel, 
0)).row();
 
filter_ = s;
-   filterModel_-setFilterRegExp(charFilterRegExp(filter_));
+   filterModel_-setFilterRegExp(charFilterRegExpCC(filter_));
countCategories();

// restore old selection
@@ -583,5 +584,8 @@ QString const  CategorizedCombo::filter() const
return d-filter_;
 }
 
+}  // namespace frontend
+}  // namespace lyx
+
 
 #include moc_CategorizedCombo.cpp
diff --git a/src/frontends/qt4/CategorizedCombo.h 
b/src/frontends/qt4/CategorizedCombo.h
index bb28db9..b2e5c7f 100644
--- a/src/frontends/qt4/CategorizedCombo.h
+++ b/src/frontends/qt4/CategorizedCombo.h
@@ -22,6 +22,9 @@
 #include QComboBox
 
 
+namespace lyx {
+namespace frontend {
+
 class CCItemDelegate;
 
 /**
@@ -72,4 +75,7 @@ private:
 };
 
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // LYX_CATEGORIZEDCOMBO_H
diff --git a/src/frontends/qt4/ui/LaTeXUi.ui b/src/frontends/qt4/ui/LaTeXUi.ui
index 3420810..8c1c5ab 100644
--- a/src/frontends/qt4/ui/LaTeXUi.ui
+++ b/src/frontends/qt4/ui/LaTeXUi.ui
@@ -26,7 +26,7 @@
number6/number
   /property
   item row=0 column=0
-   widget class=CategorizedCombo name=classCO
+   widget class=lyx::frontend::CategorizedCombo name=classCO
 property name=maxVisibleItems
  number20/number
 /property

---

Summary of changes:

[LyX master] achemso: complete revision for achemso 3.7c

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 5adec11005c26655dc186bb037822115309200de
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sat Nov 24 19:24:06 2012 +0100

achemso: complete revision for achemso 3.7c

diff --git a/lib/examples/achemso.lyx b/lib/examples/achemso.lyx
index 9f3439d..903563f 100644
--- a/lib/examples/achemso.lyx
+++ b/lib/examples/achemso.lyx
@@ -1,45 +1,13 @@
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 413
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 446
 \begin_document
 \begin_header
 \textclass achemso
 \begin_preamble
-% Each author should be given as a separate \author command.
-%
-% Corresponding authors should have an e-mail given after the author
-% name as an \email command.
-%
-% The affiliation of authors is given after the authors; each
-% \affiliation command applies to all preceding authors not already
-% assigned an affiliation.
-%
-% The affiliation takes an option argument for the short name.  This
-% will typically be something like University of Somewhere.
-%
-% Notice that \alsoaffiliation is used when one (or more) authors work
-% at multiple institutions, while \altaffiliation is intended for previous
-% addresses (or other notes). Only \affiliation applies to multiple
-% authors: both \alsoaffiliation and \altaffiliation are set on a per
-% author basis.
-
-\author{Author Person}
-\author{Second Bloke}
-\email{second.bloke@some.place}
-\affiliation[University of Sometown]{University of Somewhere, Sometown, USA}
-\altaffiliation{Previous address: Minute University, Nowhereville, USA}
-\author{Indus Trialguy}
-\email{i.trial...@sponsor.co}
-\affiliation[SponsoCo]{Research Department, SponsorCo, BigCity, USA}
-\alsoaffiliation{University of Somewhere, Sometown, USA}
-
-% A short title can be given as a *suggestion* for running headers.
-\title[\texttt{achemso} demonstration]
-{A demonstration of the \textsf{achemso} \LaTeX class}
-
-% Some journals require a list of abbreviations or keywords to be
-% supplied.
-\abbreviations{IR,NMR,UV}
-\keywords{American Chemical Society, \LaTeX}
+% If issues arise when submitting your manuscript, you may want to
+% un-comment the next line. This provides information on the
+% version of every file you have used.
+%\listfiles
 \end_preamble
 \options journal=jacsat,manuscript=article
 \use_default_options false
@@ -54,13 +22,13 @@ theorems-ams
 \font_roman default
 \font_sans default
 \font_typewriter default
+\font_math auto
 \font_default_family default
 \use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
-
 \graphics default
 \default_output_format default
 \output_sync 0
@@ -71,15 +39,21 @@ theorems-ams
 \use_hyperref false
 \papersize default
 \use_geometry false
-\use_amsmath 0
-\use_esint 0
-\use_mhchem 1
-\use_mathdots 1
+\use_package amsmath 0
+\use_package amssymb 0
+\use_package esint 0
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package undertilde 0
 \cite_engine basic
+\cite_engine_type numerical
+\biblio_style plain
 \use_bibtopic false
 \use_indices false
 \paperorientation portrait
 \suppress_date false
+\justification true
 \use_refstyle 0
 \index Index
 \shortcut idx
@@ -137,8 +111,36 @@ status open
 \series bold
 Note:
 \series default
- The author, affiliation, email addresses, and the document title have to
- be set up in the LaTeX preamble of this document!
+ The journal where you want to submit is specified in the document class
+ options of this file.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Title
+A demonstration of the achemso LaTeX class
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+
+\family sans
+achemso
+\family default
+ demonstration
+\end_layout
+
+\end_inset
+
+
+\begin_inset Foot
+status open
+
+\begin_layout Plain Layout
+A footnote for the title
 \end_layout
 
 \end_inset
@@ -146,17 +148,100 @@ Note:
 
 \end_layout
 
+\begin_layout Author
+Andrew N.
+ Other
+\end_layout
+
+\begin_layout Alt Affiliation
+A shared footnote
+\end_layout
+
+\begin_layout Author
+Fred T.
+ Secondauthor
+\end_layout
+
+\begin_layout Affiliation
+Current address: Some other place, OthertÃ¶wn, Germany
+\end_layout
+
+\begin_layout Author
+I.
+ Ken Groupleader
+\end_layout
+
+\begin_layout Affiliation
+A shared footnote
+\end_layout
+
+\begin_layout Email
+i.k.grouplea...@unknown.uu
+\end_layout
+
+\begin_layout Phone
++123 (0)123 4445556
+\end_layout
+
+\begin_layout Fax
++123 (0)123 4445557
+\end_layout
+
 \begin_layout Standard
 \begin_inset Note Note
 status open
 
 \begin_layout Plain Layout
+The affiliation of authors is given after the authors; each 
+\family sans
+Affiliation
+\family default
+ applies to all preceding authors not already assigned an affiliation.
+\end_layout
+
+\begin_layout Plain Layout
+
+\family sans
+Altaffiliation

[LyX master] modernCV: support for preamble setup

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 1d777eeec110e03929bacc952ef410afaceffa71
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sun Nov 25 00:44:57 2012 +0100

modernCV: support for preamble setup

- now all personal info can be specified the LyX way, only the package 
loading and some special settings remain in the preamble

- achemso.layout: a whitespace fix

diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx
index b945153..f0f6328 100644
--- a/lib/examples/modernCV.lyx
+++ b/lib/examples/modernCV.lyx
@@ -4,10 +4,6 @@
 \begin_header
 \textclass moderncv
 \begin_preamble
-% required
-\moderncvstyle{casual} % possible styles are 'casual' (default), 'classic', 
'oldstyle' and 'banking'
-\moderncvcolor{blue} % possible colors are 'blue' (default), 'orange', 
'green', 'red', 'purple', 'grey' and 'black'
-
 %\renewcommand{\familydefault}{\sfdefault}% to set the default font; use 
'\sfdefault' for the default sans serif font, '\rmdefault' for the default 
roman one, or any tex font name
 %\nopagenumbers{} % uncomment to suppress 
automatic page numbering for CVs longer than one page
 
@@ -15,41 +11,6 @@
 \usepackage[scale=0.75]{geometry}
 %\setlength{\hintscolumnwidth}{3cm}   % if you want to change the 
width of the column with the dates
 %\setlength{\makecvtitlenamewidth}{10cm}  % for the 'classic' style, if 
you want to force the width allocated to your name and avoid line breaks. be 
careful though, the length is normally calculated to avoid any overlap with 
your personal info; use this at your own typographical risks...
-
-% required
-\firstname{Paul}
-% required
-\familyname{Testman}
-
-% optional, remove the line if not wanted
-\title{Curriculum Vitae}
-
-% optional
-% \address{street and number}{postcode city}
-\address{Teststreet 17}{0 Nicecity -- Switzerland}
-
-% optional
-\mobile{+43(0)999 888}
-% optional
-\phone{+43(0)999 }
-% optional
-\fax{+43(0)999 }
-% optional
-\email{test...@testman.xx}
-% optional
-\homepage{www.johndoe.com}
-% optional
-\extrainfo{www.lyx.org}
-
-% optional
-% \photo[height][thickness]{name}
-% 'height' is the height the picture is resized to
-% 'thickness' is the thickness of the surrounding frame
-% 'name' is the name of the picture file
-\photo[64pt][0.4pt]{CV-image}
-
-% optional
-\quote{You only live twice. (an optional quote)}
 \end_preamble
 \use_default_options false
 \maintain_unincluded_children false
@@ -119,12 +80,43 @@
 status open
 
 \begin_layout Plain Layout
-
+The moderncv class offers lots of customization possibilities; some are
+ explained in the preamble of this document; for more information look at
+ the documentation of the LaTeX-package 
 \series bold
-Note:
+moderncv
 \series default
- The personal data like your name, image, address, etc.
- are set in the document preamble.
+:
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Flex URL
+status open
+
+\begin_layout Plain Layout
+
+http://mirrors.ctan.org/macros/latex/contrib/moderncv/examples/template.tex
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout CVStyle
+casual
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+required, possible styles are 'casual' (default), 'classic', 'oldstyle'
+ and 'banking'
 \end_layout
 
 \end_inset
@@ -132,33 +124,111 @@ Note:
 
 \end_layout
 
+\begin_layout CVColor
+blue
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+required, possible colors are 'blue' (default), 'orange', 'green', 'red',
+ 'purple', 'grey' and 'black'
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout FirstName
+Paul
+\end_layout
+
+\begin_layout FamilyName
+Testman
+\end_layout
+
+\begin_layout Title
+Curriculum Vitae
+\end_layout
+
 \begin_layout Standard
 \begin_inset Note Note
 status open
 
 \begin_layout Plain Layout
-The moderncv class offers lots of customization possibilities; some are
- explained in the preamble of this document; for more information look at
- the documentation of the LaTeX-package 
-\series bold
-moderncv
-\series default
-:
-\begin_inset Newline newline
+The following personal entries are optional.
+\end_layout
+
 \end_inset
 
 
-\begin_inset Flex URL
+\end_layout
+
+\begin_layout Address
+\begin_inset Argument 1
 status open
 
 \begin_layout Plain Layout
+Teststreet 17
+\end_layout
 
-http://mirrors.ctan.org/macros/latex/contrib/moderncv/examples/template.tex
+\end_inset
+
+0 Nicecity -- Switzerland
+\end_layout
+
+\begin_layout Mobile
++43(0)999 888
+\end_layout
+
+\begin_layout Phone
++43(0)999 
+\end_layout
+
+\begin_layout Fax
++43(0)999 
+\end_layout
+
+\begin_layout Email
+test...@testman.xx
+\end_layout
+
+\begin_layout Homepage
+www.johndoe.com
+\end_layout
+
+\begin_layout ExtraInfo
+www.lyx.org
+\end_layout
+
+\begin_layout Photo
+\begin_inset Argument 1
+status open
+

[LyX master] installer: translations by Szőke

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 7a7fe95f33873b34891af088a19fa4fa05eb0e5d
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sun Nov 25 01:12:56 2012 +0100

installer: translations by SzÅke

diff --git a/development/Win32/packaging/installer/ChangeLog.txt 
b/development/Win32/packaging/installer/ChangeLog.txt
index 2e936ac..74ead31 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -6,7 +6,7 @@
then use this installer.)
 - updated thesaurus for Slovenian
   (need to reinstall LyX to benefit from this)
-- updated Indonesian translation of the installer messages
+- updated Hungarian and Indonesian translation of the installer messages
 
 
 Changelog for LyX-205-4:
diff --git a/development/Win32/packaging/installer/lang/hungarian.nsh 
b/development/Win32/packaging/installer/lang/hungarian.nsh
index 7e32ab8..49f8ee2 100644
--- a/development/Win32/packaging/installer/lang/hungarian.nsh
+++ b/development/Win32/packaging/installer/lang/hungarian.nsh
@@ -1,32 +1,38 @@
+/*
+LyX Installer Language File
+Language: Hungarian
+Author: Szõke Sándor
+*/
+
 !insertmacro LANGFILE_EXT Hungarian
 
-${LangFileString} TEXT_INSTALL_CURRENTUSER (Installed for Current User)
+${LangFileString} TEXT_INSTALL_CURRENTUSER (Telepítve az aktuális 
felhasználónak)
 
 ${LangFileString} TEXT_WELCOME A varázsló segítségével tudja telepíteni a 
LyX-et.$\r$\n\
$\r$\n\
$_CLICK
 
-${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB Updating MiKTeX filename 
database...
-${LangFileString} TEXT_CONFIGURE_LYX Configuring LyX ($LaTeXInstalled may 
download missing packages, this can take some time) ...
-${LangFileString} TEXT_CONFIGURE_PYTHON Compiling Python scripts...
+${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB MiKTeX filenév adatbázis 
frissítése...
+${LangFileString} TEXT_CONFIGURE_LYX LyX beállítása ($LaTeXInstalled 
letöltheti a hiányzó csomagokat, ez eltarthat egy ideig) ...
+${LangFileString} TEXT_CONFIGURE_PYTHON Python parancsfájlok fordítása...
 
-${LangFileString} TEXT_FINISH_DESKTOP Create desktop shortcut
-${LangFileString} TEXT_FINISH_WEBSITE Visit lyx.org for the latest news, 
support and tips
+${LangFileString} TEXT_FINISH_DESKTOP Indítóikon létrehozása Asztalon
+${LangFileString} TEXT_FINISH_WEBSITE Látogasson el a lyx.org oldalra az 
aktuális hírekért, támogatásért és tippekért
 
 ${LangFileString} FileTypeTitle LyX-dokumentum
 
 ${LangFileString} SecInstJabRefTitle JabRef
 ${LangFileString} SecAllUsersTitle Telepítés minden felhasználónak
 ${LangFileString} SecFileAssocTitle Fájltársítások
-${LangFileString} SecDesktopTitle Parancsikon asztalra
+${LangFileString} SecDesktopTitle Parancsikon Asztalra
 
 ${LangFileString} SecCoreDescription A LyX futtatásához szükséges fájlok.
 ${LangFileString} SecInstJabRefDescription Irodalomjegyzék-hivatkozás 
szerkesztõ és kezelõ BibTeX fájlokhoz.
 ${LangFileString} SecAllUsersDescription Minden felhasználónak telepítsem 
vagy csak az aktuálisnak?
 ${LangFileString} SecFileAssocDescription A .lyx kiterjesztéssel rendelkezõ 
fájlok megnyitása automatikusan a LyX-el történjen.
-${LangFileString} SecDesktopDescription LyX-ikon elhelyezése az asztalon.
-${LangFileString} SecDictionariesDescription Spell-checker dictionaries that 
can be downloaded and installed.
-${LangFileString} SecThesaurusDescription Thesaurus dictionaries that can be 
downloaded and installed.
+${LangFileString} SecDesktopDescription LyX-ikon elhelyezése az Asztalon.
+${LangFileString} SecDictionariesDescription Helyesírás-ellenõrzõ szótárak, 
amiket letölthet és telepíthet.
+${LangFileString} SecThesaurusDescription Szinoníma-szótárak, amiket 
letölthet és telepíthet.
 
 ${LangFileString} EnterLaTeXHeader1 'LaTeX-disztribúció'
 ${LangFileString} EnterLaTeXHeader2 'Adja meg a LaTeX-disztribúciót, amit a 
LyX-nek használnia kell.'
@@ -46,15 +52,15 @@ ${LangFileString} DontUseLaTeX Ne haszn
 ${LangFileString} InvalidLaTeXFolder 'Nem találom a $\latex.exe$\ fájlt, a 
megadott helyen.'
 
 ${LangFileString} LatexInfo 'A $\MiKteX$\ LaTeX-disztribúció telepítõjének 
indítása következik.$\r$\n\
-   A program telepítéséhez addig nyomkodja a 
$\Következõ$\ gombot a telepítõ ablakában, amíg a telepítés el nem 
kezd?dik.$\r$\n\
+   A program telepítéséhez addig nyomkodja a 
$\Következõ$\ gombot a telepítõ ablakában, amíg a telepítés el nem 
kezdõdik.$\r$\n\
$\r$\n\
!!! Kérem használja a MikTeX-telepítõ 
alapértelmezett opcióit!!!'
 ${LangFileString} LatexError1 'Nem találtam LaTeX-disztribúciót!$\r$\n\
A LyX nem használható egy LaTeX-disztibúció 
nélkül,(mint például a $\MiKTeX$\)!$\r$\n\
Ezért a telepítés nem folytatható!'

[LyX 2.0.x] fix bug #8223 also for branch

2012-11-24 Thread Uwe Stöhr

The branch, 2.0.x, has been updated.

- Log -

commit 79a8c0d2a9582c6623d6d0a739920ef0a3eca005
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sun Nov 25 02:21:13 2012 +0100

fix bug #8223 also for branch

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 0089a0e..9ca67c0 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -3727,8 +3727,16 @@ void parse_text(Parser  p, ostream  os, unsigned 
flags, bool outer,
} else {
string special = p.getFullOpt();
special += p.getOpt();
-   parse_outer_box(p, os, FLAG_ITEM, outer,
-   context, t.cs(), special);
+   // LyX does not yet support \framebox without 
any option
+   if (!special.empty())
+   parse_outer_box(p, os, FLAG_ITEM, outer,
+   context, t.cs(), special);
+   else {
+   eat_whitespace(p, os, context, false);
+   handle_ert(os, \\framebox{, context);
+   parse_text(p, os, FLAG_ITEM, outer, 
context);
+   handle_ert(os, }, context);
+   }
}
}
 
diff --git a/status.20x b/status.20x
index fca87b0..bf4b797 100644
--- a/status.20x
+++ b/status.20x
@@ -87,6 +87,7 @@ What's new
 
 * TEX2LYX
 
+- correct import of the command \framebox (bug 8223).
 
 
 * ADVANCED FIND AND REPLACE

---

Summary of changes:
 src/tex2lyx/text.cpp |   12 ++--
 status.20x   |1 +
 2 files changed, 11 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX 2.0.x] IEEEtran.lyx: fix a typo and remove unnecessary ERT

2012-11-24 Thread Uwe Stöhr

The branch, 2.0.x, has been updated.

- Log -

commit ebbd54a991bf2fc2ceae4188a391498511c537ca
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sun Nov 25 04:07:41 2012 +0100

IEEEtran.lyx: fix a typo and remove unnecessary ERT

diff --git a/lib/templates/IEEEtran.lyx b/lib/templates/IEEEtran.lyx
index 5040be9..4054147 100644
--- a/lib/templates/IEEEtran.lyx
+++ b/lib/templates/IEEEtran.lyx
@@ -393,7 +393,7 @@ Introduction
 
 \begin_layout Standard
 \begin_inset Note Note
-status collapsed
+status open
 
 \begin_layout Plain Layout
 The 
@@ -402,12 +402,15 @@ The
 \backslash
 IEEEPARstart
 \series default
- command is needed in the first paragraph fo the document.
+ command is needed in the first paragraph of the document.
 \end_layout
 
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
 \begin_inset ERT
 status collapsed
 
@@ -468,7 +471,7 @@ Methodology
 
 \begin_layout Theorem
 \begin_inset Argument
-status collapsed
+status open
 
 \begin_layout Plain Layout
 Theorem name
@@ -684,32 +687,25 @@ options IEEEtran
 \end_layout
 
 \begin_layout Biography
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-{
-\end_layout
+\begin_inset Graphics
+   filename ../examples/CV-image.png
+   width 1in
+   height 1.25in
+   keepAspectRatio
+   clip
 
 \end_inset
 
-Your Name
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
 
-}
 \end_layout
 
 \end_inset
 
- All about you and the what your interests are.
-\begin_inset Argument
-status open
 
-\begin_layout Plain Layout
 \begin_inset ERT
 status collapsed
 
@@ -720,17 +716,7 @@ status collapsed
 
 \end_inset
 
-
-\begin_inset Graphics
-   filename ../examples/CV-image.png
-   width 1in
-   height 1.25in
-   keepAspectRatio
-   clip
-
-\end_inset
-
-
+Your Name
 \begin_inset ERT
 status collapsed
 
@@ -741,12 +727,7 @@ status collapsed
 
 \end_inset
 
-
-\end_layout
-
-\end_inset
-
-
+ All about you and the what your interests are.
 \end_layout
 
 \begin_layout --Separator--

---

Summary of changes:
 lib/templates/IEEEtran.lyx |   51 +--
 1 files changed, 16 insertions(+), 35 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] IEEEtran.layout: adjust tooltips

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 4202d90c7ed7830d073371eae277338351edbe8e
Author: Uwe StÃ¶hr uwesto...@lyx.org
Date:   Sun Nov 25 04:12:12 2012 +0100

IEEEtran.layout: adjust tooltips

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index 833e3ab..0ce9fc6 100644
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -11,7 +11,7 @@
 
 Format 41
 
-Sides  1
+Sides  1
 SecNumDepth3
 TocDepth   3
 DefaultStyle   Standard
@@ -240,9 +240,9 @@ Style Appendix
   LatexNameappendix
   LabelString  Appendix
   Argument 1
-LabelStringAppendix Title
-TooltipOptional title of the appendix
- EndArgument
+LabelStringShort Title
+TooltipShort title for the appendix
+  EndArgument
 End
 
 
@@ -275,8 +275,8 @@ Style Biography
   LaTeXNameIEEEbiography
   Category BackMatter
   Argument 1
-LabelStringBiography Photo
-TooltipInsert a photo to your biography
+LabelStringPhoto
+TooltipOptional photo for biography
   EndArgument
   AlignBlock
   TextFont

---

Summary of changes:
 lib/layouts/IEEEtran.layout |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Some cosmetics in preparation of major revisions

2012-11-24 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 3d636c2a337e53e547d0947241b8160083e44d9b
Author: Juergen Spitzmueller 
Date:   Sat Nov 24 10:32:48 2012 +0100

Some cosmetics in preparation of major revisions

diff --git a/lib/layouts/beamer.layout b/lib/layouts/beamer.layout
index 95f705f..a04d48b 100644
--- a/lib/layouts/beamer.layout
+++ b/lib/layouts/beamer.layout
@@ -1,16 +1,21 @@
 #% Do not delete the line below; configure depends on this
 #  
\DeclareLaTeXClass[beamer,amssymb.sty,hyperref.sty,pgf.sty,xcolor.sty,xxcolor.sty]{Beamer}
 #  \DeclareCategory{Presentations}
-# Author : Till Tantau 
+# Original Author: Till Tantau 
+# Revised and extended by JÃ¼rgen SpitzmÃ¼ller , Uwe StÃ¶hr 
,
+#   Richard Heck , Martin Vermeer  and 
probably others.
 
-# $Header: /cvsroot/latex-beamer/latex-beamer/lyx/layouts/beamer.layout,v 1.16 
2004/10/07 20:53:07 tantau Exp $
 
-# Includes
 Format 41
+
+#
+# GLOBAL SETTINGS
+#
+
+# Includes
 Input stdcounters.inc
 Input stdinsets.inc
 
-
 # General textclass parameters
 Columns1
 Sides  1
@@ -30,8 +35,24 @@ DefaultFont
   ColorNone
 EndFont
 
+# To give users the choice of a title frame with and without
+# head-/footline, we define our own maketitle command
+TitleLaTeXName makebeamertitle
+AddToPreamble
+  % this default might be overridden by plain title style
+  \newcommand\makebeamertitle{\frame{\maketitle}}%
+  \AtBeginDocument{%
+\let\origtableofcontents=\tableofcontents
+
\def\tableofcontents{\@ifnextchar[{\origtableofcontents}{\gobbletableofcontents}}
+\def\gobbletableofcontents#1{\origtableofcontents}
+  }
+EndPreamble
+
+
+#
+# STANDARD STYLE
+#
 
-# Standard style definition
 Style Standard
   Category MainText
   Margin   Static
@@ -44,16 +65,19 @@ Style Standard
   LabelTypeNo_Label
 End
 
-# List section
-# Itemize style definition
+
+#
+# LISTS
+#
+
 Style Itemize
   Category List
   Margin   Static
   LatexTypeItem_Environment
   LatexNameitemize
   Argument 1
-LabelString   "Overlay Specifications|S"
-Tooltip   "Overlay specifications for this list"
+LabelString"Overlay Specifications|S"
+Tooltip"Overlay specifications for this list"
   EndArgument
   NextNoIndent 1
   LeftMargin   MMN
@@ -66,19 +90,18 @@ Style Itemize
   LabelTypeItemize
 End
 
-# Enumerate style definition
 Style Enumerate
   Category List
   Margin   Static
   LatexTypeItem_Environment
   LatexNameenumerate
   Argument 1
-LabelString   "Overlay Specifications|S"
-Tooltip   "Overlay specifications for this list"
+LabelString"Overlay Specifications|S"
+Tooltip"Overlay specifications for this list"
   EndArgument
   Argument 2
-LabelString   "Mini template"
-Tooltip   "Mini template for this List"
+LabelString"Mini template"
+Tooltip"Mini template for this List"
   EndArgument
   NextNoIndent 1
   LeftMargin   MMN
@@ -93,19 +116,18 @@ Style Enumerate
   RefPrefixenu
 End
 
-# Description style definition
 Style Description
   Category List
   Margin   First_Dynamic
   LatexTypeItem_environment
   LatexNamedescription
   Argument 1
-LabelString   "Overlay Specifications|S"
-Tooltip   "Overlay specifications for this list"
+LabelString"Overlay Specifications|S"
+Tooltip"Overlay specifications for this list"
   EndArgument
   Argument 2
-LabelString   "Longest label|s"
-Tooltip   "The longest label in this list"
+LabelString"Longest label|s"
+Tooltip"The longest label in this list"
   EndArgument
   NextNoIndent 1
   LeftMargin   MM
@@ -122,16 +144,19 @@ Style Description
   EndFont
 End
 
-# Sectioning section
-# Part style definition
+
+#
+# SECTIONING
+#
+
 Style Part
   Category Section
   Margin   Dynamic
   LatexTypeCommand
   LatexNamepart
   Argument 1
-LabelString   "Short Title|S"
-Tooltip   "The part as it appears in the table of contents/running 
headers"
+LabelString"Short Title|S"
+Tooltip"The part as it appears in the table of contents/running 
headers"
   EndArgument
   NeedProtect  1
   NextNoIndent 1
@@ -144,21 +169,17 @@ Style Part
   LabelTypeStatic
   LabelString  "Part"
   RefPrefixpart
-
-  # standard font definition
   Font 
 Family Roman
 Series Bold
 Size   Huge
   EndFont
-
   LabelFont
 Color  Latex
   EndFont
   TocLevel 0
 End
 
-# Section style definition
 Style Section
   Category Section
   Margin   First_Dynamic
@@ -177,16

[LyX master] Update email address

2012-11-24 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 1e9907557aa3d549776ee0066d40c03bc1398cae
Author: Juergen Spitzmueller 
Date:   Sat Nov 24 10:46:55 2012 +0100

Update email address

diff --git a/lib/layouts/article-beamer.layout 
b/lib/layouts/article-beamer.layout
index 90b98a1..a142fa7 100644
--- a/lib/layouts/article-beamer.layout
+++ b/lib/layouts/article-beamer.layout
@@ -1,7 +1,7 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass[article,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer 
Article (Standard Class)}
 #  \DeclareCategory{Articles}
-# Author: JÃ¼rgen SpitzmÃ¼ller 
+# Author: JÃ¼rgen SpitzmÃ¼ller 
 
 Format 41
 
diff --git a/lib/layouts/memoir.layout b/lib/layouts/memoir.layout
index 6f00a04..1704b2e 100644
--- a/lib/layouts/memoir.layout
+++ b/lib/layouts/memoir.layout
@@ -2,7 +2,7 @@
 #  \DeclareLaTeXClass[memoir]{Memoir}
 #  \DeclareCategory{Books}
 # Memoir textclass definition file
-# Author: JÃ¼rgen SpitzmÃ¼ller 
+# Author: JÃ¼rgen SpitzmÃ¼ller 
 # Improvements by: Bennett Helm 
 # feel free to contribute missing features!
 
diff --git a/lib/layouts/scrarticle-beamer.layout 
b/lib/layouts/scrarticle-beamer.layout
index 72b5e0b..e6a1d93 100644
--- a/lib/layouts/scrarticle-beamer.layout
+++ b/lib/layouts/scrarticle-beamer.layout
@@ -1,7 +1,7 @@
 #% Do not delete the line below; configure depends on this
 #  \DeclareLaTeXClass[scrartcl,beamerarticle.sty,keyval.sty,pgf.sty]{Beamer 
Article (KOMA-Script)}
 #  \DeclareCategory{Articles}
-# Author : JÃ¼rgen SpitzmÃ¼ller 
+# Author: JÃ¼rgen SpitzmÃ¼ller 
 
 Format 41
 
diff --git a/lib/layouts/scrclass.inc b/lib/layouts/scrclass.inc
index 3ad2071..3aa001e 100644
--- a/lib/layouts/scrclass.inc
+++ b/lib/layouts/scrclass.inc
@@ -2,7 +2,7 @@
 # Base definitions for the KOMA script layouts.
 # Bernd Rellermeyer <100.41...@germanynet.de>, 1998/7/23.
 # Update for Koma Script Release >=2.8q
-# Juergen Spitzmueller , 2003/2/08.
+# Juergen Spitzmueller , 2003/2/08.
 # Mapped List to Labeling
 # Guenter Milde , 2009-02-02
 # Labeling is now used also in non-KOMA classes
diff --git a/lib/layouts/scrlttr2.layout b/lib/layouts/scrlttr2.layout
index f890067..49eec3a 100644
--- a/lib/layouts/scrlttr2.layout
+++ b/lib/layouts/scrlttr2.layout
@@ -2,7 +2,7 @@
 #  \DeclareLaTeXClass{KOMA-Script Letter (V. 2)}
 #  \DeclareCategory{Letters}
 # KOMA scrlettr2 textclass definition file.
-# Juergen Spitzmueller , 2003/2/17.
+# Juergen Spitzmueller , 2003/2/17.
 # Uwe StÃ¶hr , 2008/2/03.
 
 Format 41

---

Summary of changes:
 lib/layouts/article-beamer.layout|2 +-
 lib/layouts/memoir.layout|2 +-
 lib/layouts/scrarticle-beamer.layout |2 +-
 lib/layouts/scrclass.inc |2 +-
 lib/layouts/scrlttr2.layout  |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] sk.po: Inset arguments strings

2012-11-24 Thread Kornel Benko

The branch, master, has been updated.

- Log -

commit 00ac4748c37809ae28dac9f234c26ce4fff6b91a
Author: Kornel Benko 
Date:   Sat Nov 24 15:05:01 2012 +0100

sk.po: Inset arguments strings

diff --git a/po/sk.po b/po/sk.po
index ad4a028..f0ded15 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LyX-2.1\n"
 "Report-Msgid-Bugs-To: lyx-de...@lists.lyx.org\n"
-"POT-Creation-Date: 2012-11-08 10:16+0100\n"
-"PO-Revision-Date: 2012-10-19 09:05+0200\n"
+"POT-Creation-Date: 2012-11-24 10:16+0100\n"
+"PO-Revision-Date: 2012-11-24 13:21+0100\n"
 "Last-Translator: Kornel Benko \n"
 "Language-Team: Slovak \n"
 "Language: sk\n"
@@ -1113,7 +1113,7 @@ msgstr ":"
 
 #: src/frontends/qt4/ui/ErrorListUi.ui:53
 msgid "Description:"
-msgstr "Popis:"
+msgstr "Opis:"
 
 #: src/frontends/qt4/ui/ErrorListUi.ui:83
 msgid "Open the LaTeX Log File dialog"
@@ -1160,7 +1160,7 @@ msgstr "LaTe a LyX- voÄ¾by"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:144
 msgid "LaTeX Options"
-msgstr "LaTeX VoÄ¾by"
+msgstr "VoÄ¾by LaTeX"
 
 #: src/frontends/qt4/ui/ExternalUi.ui:162
 msgid "O:"
@@ -1431,7 +1431,7 @@ msgstr "PouÅ¾iÅ¥ Å¡tanÃ© umiestÅovanie"
 
 #: src/frontends/qt4/ui/FloatPlacementUi.ui:43
 msgid "Advanced Placement Options"
-msgstr "RozÅ¡ÃrenÃ© voÄ¾by umiestÅovania"
+msgstr "VoÄ¾by RozÅ¡ÃrenÃ© UmiestÅovanie"
 
 #: src/frontends/qt4/ui/FloatPlacementUi.ui:55
 msgid " of page"
@@ -2544,7 +2544,7 @@ msgstr "Å¥ ako:"
 
 #: src/frontends/qt4/ui/NomenclUi.ui:38
 msgid ":"
-msgstr ":"
+msgstr "O:"
 
 #: src/frontends/qt4/ui/NomenclUi.ui:48
 msgid ":"
@@ -2618,7 +2618,7 @@ msgstr "VlastnÃ© makro do preambuly LaTeXu"
 
 #: src/frontends/qt4/ui/OutputUi.ui:113
 msgid "XHTML Output Options"
-msgstr "VÃ½chodzie VoÄ¾by pre XHTML"
+msgstr "VoÄ¾by VÃ½chodzie XHTML"
 
 #: src/frontends/qt4/ui/OutputUi.ui:122
 msgid "Whether to comply strictly with XHTML 1.1."
@@ -3685,7 +3685,7 @@ msgstr "KniÅ¾nice pre :"
 
 #: src/frontends/qt4/ui/PrefPrinterUi.ui:41
 msgid "Printer Command Options"
-msgstr "VoÄ¾by prÃkazu pre tlaÄiareÅ"
+msgstr "VoÄ¾by PrÃkaz Pre TlaÄiareÅ"
 
 #: src/frontends/qt4/ui/PrefPrinterUi.ui:69
 msgid "Extension to be used when printing to file."
@@ -5787,6 +5787,14 @@ msgstr "malÃ© pÃsmenÃ¡"
 msgid "Author"
 msgstr "Autor"
 
+#: lib/layouts/IEEEtran.layout:121 lib/layouts/beamer.layout:906
+msgid "Short Author|S"
+msgstr "Skratka Autora"
+
+#: lib/layouts/IEEEtran.layout:122
+msgid "A short version of the author name"
+msgstr "SkrÃ¡tenÃ¡ verzia mena autora"
+
 #: lib/layouts/IEEEtran.layout:134
 msgid "Special Paper Notice"
 msgstr "Å peciÃ¡lna ÄlÃ¡nkovÃ¡ PoznÃ¡mka"
@@ -5865,6 +5873,14 @@ msgstr "BackMatter"
 msgid "Appendix"
 msgstr "PrÃloha"
 
+#: lib/layouts/IEEEtran.layout:243
+msgid "Appendix Title"
+msgstr "Titul pre prÃlohu"
+
+#: lib/layouts/IEEEtran.layout:244
+msgid "Optional title of the appendix"
+msgstr "NepovinnÃ½ titul pre prÃlohu"
+
 #: lib/layouts/IEEEtran.layout:242 lib/layouts/aa.layout:94
 #: lib/layouts/aa.layout:381 lib/layouts/aapaper.layout:106
 #: lib/layouts/aapaper.layout:220 lib/layouts/achemso.layout:238
@@ -5911,6 +5927,14 @@ msgid "Biography"
 msgstr "Å½ivotopis"
 
 #: lib/layouts/IEEEtran.layout:278
+msgid "Biography Photo"
+msgstr "Å½ivotopisFotka"
+
+#: lib/layouts/IEEEtran.layout:279
+msgid "Insert a photo to your biography"
+msgstr "VloÅ¾iÅ¥ fotku ku Å¾ivotopisu"
+
+#: lib/layouts/IEEEtran.layout:278
 msgid "Biography without photo"
 msgstr "Å½ivotopis bez fotky"
 
@@ -5918,6 +5942,15 @@ msgstr "Å½ivotopis bez fotky"
 msgid "BiographyNoPhoto"
 msgstr "Å½ivotopisBezFotky"
 
+#: lib/layouts/IEEEtran.layout:306 lib/layouts/siamltex.layout:162
+#: lib/layouts/theorems-proof.inc:20
+msgid "Alternative Proof String"
+msgstr "AlternatÃva pre dÃ´kaz"
+
+#: lib/layouts/IEEEtran.layout:307 lib/layouts/siamltex.layout:163
+msgid "An alternative proof string"
+msgstr "AlternatÃvny reÅ¥azec dÃ´kazu"
+
 #: lib/layouts/IEEEtran.layout:306 lib/layouts/beamer.layout:1094
 #: lib/layouts/foils.layout:281 lib/layouts/llncs.layout:379
 #: lib/layouts/siamltex.layout:170 lib/layouts/svmono.layout:85
@@ -6021,7 +6054,7 @@ msgstr "ÄÃslovanie"
 #: lib/layouts/stdlists.inc:57 lib/layouts/svcommon.inc:588
 #: lib/ui/stdtoolbars.inc:116
 msgid "Description"
-msgstr "Popis"
+msgstr "Opis"
 
 #: lib/layouts/aa.layout:63 lib/layouts/aapaper.layout:57
 #: lib/layouts/aastex.layout:92 lib/layouts/beamer.layout:47
@@ -6304,6 +6337,14 @@ msgstr "Popis obrÃ¡zka"
 msgid "Fig. ---"
 msgstr "Fig. ---"
 
+#: lib/ui/stdmenus.inc:375
+msgid "Short Title|S"
+msgstr "KrÃ¡tky Titul"
+
+#: lib/layouts/aastex.layout:624
+msgid "The caption as it appears in the list of figures"
+msgstr "Popis ako sa zobrazÃ v zozname obrÃ¡zkov"
+
 #: lib/layouts/aastex.layout:637
 msgid "Facility:"
 msgstr "Zariadenie:"
@@ -6312,33 +6353,26 @@ msgstr "Zariadenie:"
 msgid "Obj:"

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

2012-11-24 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit f90a396488fda1f915af83f6584e6025ff69f486
Merge: a41bdfa 00ac474
Author: Juergen Spitzmueller 
Date:   Sat Nov 24 15:46:37 2012 +0100

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


commit a41bdfa4536b3f5a2daab8ce949b94199df5b943
Author: Juergen Spitzmueller 
Date:   Sat Nov 24 15:46:20 2012 +0100

Missing pieces for InsetLayout arguments

diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc
index 768..9f1deb9 100644
--- a/lib/layouts/stdinsets.inc
+++ b/lib/layouts/stdinsets.inc
@@ -469,6 +469,8 @@ InsetLayout Info:shortcuts
 End
 
 InsetLayout Caption
+   LaTeXTypecommand
+   LatexNamecaption
Argument 1
LabelString   "Short Title|S"
Tooltip   "The caption as it appears in the list of 
figures/tables"
diff --git a/src/insets/InsetCaption.cpp b/src/insets/InsetCaption.cpp
index a637d90..22548a4 100644
--- a/src/insets/InsetCaption.cpp
+++ b/src/insets/InsetCaption.cpp
@@ -227,11 +227,7 @@ void InsetCaption::latex(otexstream & os,
// FIXME: actually, it is moving only when there is no
// optional argument.
runparams.moving_arg = true;
-   os << "\\caption";
-   getOptArg(os, runparams);
-   os << '{';
InsetText::latex(os, runparams);
-   os << "}\n";
runparams_in.encoding = runparams.encoding;
 }
 
@@ -280,13 +276,6 @@ void InsetCaption::getArgument(otexstream & os,
 }
 
 
-void InsetCaption::getOptArg(otexstream & os,
-   OutputParams const & runparams) const
-{
-   latexArgInsets(paragraphs()[0], os, runparams, getLayout().latexargs());
-}
-
-
 int InsetCaption::getCaptionAsPlaintext(odocstream & os,
OutputParams const & runparams) const
 {
diff --git a/src/insets/InsetCaption.h b/src/insets/InsetCaption.h
index dc28873..d446da8 100644
--- a/src/insets/InsetCaption.h
+++ b/src/insets/InsetCaption.h
@@ -28,8 +28,6 @@ public:
docstring layoutName() const;
/// return the mandatory argument (LaTeX format) only
void getArgument(otexstream & os, OutputParams const &) const;
-   /// return the optional argument(s) only
-   void getOptArg(otexstream & os, OutputParams const &) const;
/// return the caption text
int getCaptionAsPlaintext(odocstream & os, OutputParams const &) const;
/// return the caption text as HTML
diff --git a/src/insets/InsetText.cpp b/src/insets/InsetText.cpp
index 06644ad..7432f5a 100644
--- a/src/insets/InsetText.cpp
+++ b/src/insets/InsetText.cpp
@@ -436,6 +436,7 @@ void InsetText::latex(otexstream & os, OutputParams const & 
runparams) const
if (runparams.moving_arg)
os << "\\protect";
os << '\\' << from_utf8(il.latexname());
+   getOptArg(os, runparams);
if (!il.latexparam().empty())
os << from_utf8(il.latexparam());
os << '{';
@@ -590,6 +591,12 @@ docstring InsetText::insetAsXHTML(XHTMLStream & xs, 
OutputParams const & rp,
return docstring();
 }
 
+void InsetText::getOptArg(otexstream & os,
+   OutputParams const & runparams) const
+{
+   latexArgInsets(paragraphs()[0], os, runparams, getLayout().latexargs());
+}
+
 
 void InsetText::cursorPos(BufferView const & bv,
CursorSlice const & sl, bool boundary, int & x, int & y) const
diff --git a/src/insets/InsetText.h b/src/insets/InsetText.h
index 0110adf..4fb9fc3 100644
--- a/src/insets/InsetText.h
+++ b/src/insets/InsetText.h
@@ -93,6 +93,9 @@ public:
   XHTMLOptions) const;
///
void validate(LaTeXFeatures & features) const;
+   
+   /// return the optional argument(s) only
+   void getOptArg(otexstream & os, OutputParams const &) const;
 
/// return x,y of given position relative to the inset's baseline
void cursorPos(BufferView const & bv, CursorSlice const & sl,

---

Summary of changes:
 lib/layouts/stdinsets.inc   |2 ++
 src/insets/InsetCaption.cpp |   11 ---
 src/insets/InsetCaption.h   |2 --
 src/insets/InsetText.cpp|7 +++
 src/insets/InsetText.h  |3 +++
 5 files changed, 12 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Fix splitting of layout string

2012-11-24 Thread Juergen Spitzmueller

The branch, master, has been updated.

- Log -

commit 4b4e9560d11519bee146d52a7b3a0717cc2f7db1
Author: Juergen Spitzmueller 
Date:   Sat Nov 24 16:46:44 2012 +0100

Fix splitting of layout string

diff --git a/src/insets/InsetArgument.cpp b/src/insets/InsetArgument.cpp
index 80b69e0..d971a16 100644
--- a/src/insets/InsetArgument.cpp
+++ b/src/insets/InsetArgument.cpp
@@ -95,9 +95,10 @@ void InsetArgument::updateBuffer(ParIterator const & it, 
UpdateType utype)
Layout::LaTeXArgMap::const_iterator const lait =
args.find(convert(name_));
if (lait != args.end()) {
-   docstring label;
-   
support::rsplit(translateIfPossible((*lait).second.labelstring), label, '|');
-   labelstring_ = label;
+   docstring label = 
translateIfPossible((*lait).second.labelstring);
+   docstring striplabel;
+   support::rsplit(label, striplabel, '|');
+   labelstring_ = striplabel.empty() ? label: striplabel;
tooltip_ = translateIfPossible((*lait).second.tooltip);
} else {
labelstring_ = _("Unknown Argument");

---

Summary of changes:
 src/insets/InsetArgument.cpp |7 ---
 1 files changed, 4 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] moderncv.layout: shorten the label strings

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit cc3286782e8b0417a9ab1ecdcb21e92926f5d895
Author: Uwe StÃ¶hr 
Date:   Sat Nov 24 17:15:19 2012 +0100

moderncv.layout: shorten the label strings

- IEEEtran.layout: some whitespace fixes

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index 9917b91..833e3ab 100644
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -39,7 +39,7 @@ Style Standard
   ParIndentMM
   ParSkip  0.4
   AlignBlock
-  AlignPossible Block, Left, Right, Center
+  AlignPossibleBlock, Left, Right, Center
   LabelTypeNo_Label
 End
 
@@ -314,10 +314,10 @@ Style Proof
   BottomSep0.7
   ParSep   0.3
   AlignBlock
-  AlignPossible Block, Left
-  LabelTypeStatic
-  LabelString  "Proof."
-  EndLabelType Filled_Box
+  AlignPossibleBlock, Left
+  LabelTypeStatic
+  LabelString  "Proof."
+  EndLabelType Filled_Box
   Font
 Shape  Up
 Size   Normal
diff --git a/lib/layouts/moderncv.layout b/lib/layouts/moderncv.layout
index 629955c..cdef775 100644
--- a/lib/layouts/moderncv.layout
+++ b/lib/layouts/moderncv.layout
@@ -114,8 +114,8 @@ Style Item
LatexName   cvitem
Argument 1
  Mandatory 1
- LabelString   "Item summary"
- Tooltip   "item summary"
+ LabelString   "Summary"
+ Tooltip   "Summary"
EndArgument
ParSkip 0.4
Align   Block
@@ -136,13 +136,13 @@ Style ItemWithComment
ResetArgs   1
Argument 1
  Mandatory 1
- LabelString   "Item summary"
- Tooltip   "Item summary"
+ LabelString   "Summary"
+ Tooltip   "Summary"
EndArgument
Argument 2
  Mandatory 1
- LabelString   "Item text"
- Tooltip   "Item text"
+ LabelString   "Text"
+ Tooltip   "Text"
EndArgument
 End
 
@@ -160,18 +160,18 @@ Style DoubleItem
KeepEmpty   1
Argument 1
  Mandatory 1
- LabelString   "Left item summary"
- Tooltip   "Left item summary"
+ LabelString   "Left summary"
+ Tooltip   "Left summary"
EndArgument
Argument 2
  Mandatory 1
- LabelString   "Left item text"
- Tooltip   "Left item text"
+ LabelString   "Left text"
+ Tooltip   "Left text"
EndArgument
Argument 3
  Mandatory 1
- LabelString   "Right item summary"
- Tooltip   "Right item summary"
+ LabelString   "Right summary"
+ Tooltip   "Right summary"
EndArgument
 End
 
@@ -335,8 +335,8 @@ Style Enclosing
CopyStyle   Opening
LatexName   enclosure
Argument 1
- LabelString   "Alternative enclosing name"
- Tooltip   "Alternative enclosing name"
+ LabelString   "Alternative name"
+ Tooltip   "Alternative instead of 'Enclosure'"
EndArgument
LabelSepxx
LabelType   Static

---

Summary of changes:
 lib/layouts/IEEEtran.layout |   10 +-
 lib/layouts/moderncv.layout |   28 ++--
 2 files changed, 19 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Revert "achemso: update"

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 94dbd82cfca96ea951e328c47fdc6a59aa50f9e2
Author: Uwe StÃ¶hr 
Date:   Sat Nov 24 17:26:00 2012 +0100

Revert "achemso: update"

This reverts commit f4b218df408839e8966adb03ee8ddda7b433b7ec.

diff --git a/lib/layouts/achemso.layout b/lib/layouts/achemso.layout
index 218a9ca..f61dd92 100644
--- a/lib/layouts/achemso.layout
+++ b/lib/layouts/achemso.layout
@@ -52,6 +52,77 @@ NoStyle Chapter
 NoCounter chapter
 NoStyle Chapter*
 
+Style Title
+  Margin   Static
+  LatexTypeCommand
+  Category FrontMatter
+  InTitle  1
+  InPreamble   1
+  LatexNametitle
+  ParSkip  0.4
+  ItemSep  0
+  TopSep   0
+  BottomSep1
+  ParSep   1
+  AlignCenter
+  LabelTypeNo_Label
+  Font
+Family Sans
+Size   Largest
+  EndFont
+  HTMLTag  h1
+  HTMLTitletrue
+  Argument 1
+LabelString"Short Title|S"
+Tooltip"Short title which appears in the running headers"
+  EndArgument
+End  
+
+Style Author
+  LatexTypecommand
+  LatexNameauthor
+  InTitle  1
+  InPreamble   1
+  AlignCenter
+  Font
+Family Sans
+Size   Large
+  EndFont
+End
+
+Style Email
+  CopyStyleAuthor
+  LatexNameemail
+End
+
+Style Affiliation
+  CopyStyleAuthor
+  LatexNameaffiliation
+  Argument 1
+LabelString"Short Affiliation|S"
+Tooltip"Short version of the affiliation"
+  EndArgument
+End
+
+Style Alt_Affiliation
+  CopyStyleAuthor
+  LatexNamealtaffiliation
+End
+
+Style Also_Affiliation
+  CopyStyleAuthor
+  LatexNamealsoaffiliation
+End
+
+Style Fax
+  CopyStyleAuthor
+  LatexNamefax
+End
+
+Style Phone
+  CopyStyleAuthor
+  LatexNamephone
+End
 
 Float
Typescheme

---

Summary of changes:
 lib/layouts/achemso.layout |   71 
 1 files changed, 71 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX 2.0.x] IEEEtran.layout: some more whitespace

2012-11-24 Thread Uwe Stöhr

The branch, 2.0.x, has been updated.

- Log -

commit 978482f7000121b27865dd9d36b4a34af01de110
Author: Uwe StÃ¶hr 
Date:   Sat Nov 24 17:29:01 2012 +0100

IEEEtran.layout: some more whitespace

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index cd2247b..58b82db 100644
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -38,7 +38,7 @@ Style Standard
   ParIndentMM
   ParSkip  0.4
   AlignBlock
-  AlignPossible Block, Left, Right, Center
+  AlignPossibleBlock, Left, Right, Center
   LabelTypeNo_Label
 End
 
@@ -278,7 +278,7 @@ End
 Style Biography_without_photo
   CopyStyleBiography
   LaTeXNameIEEEbiographynophoto
-  OptionalArgs 0
+  OptionalArgs 0
 End
 
 Style BiographyNoPhoto
@@ -301,7 +301,7 @@ Style Proof
   BottomSep0.7
   ParSep   0.3
   AlignBlock
-  AlignPossible Block, Left
+  AlignPossibleBlock, Left
   LabelTypeStatic
   LabelString  "Proof."
   EndLabelType Filled_Box

---

Summary of changes:
 lib/layouts/IEEEtran.layout |6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Rescue monolithic build after 32fde61c8f17d524.

2012-11-24 Thread Pavel Sanda

The branch, master, has been updated.

- Log -

commit ad42e885e684cc440493b510e4ee786ab6b01fd2
Author: Pavel Sanda 
Date:   Sat Nov 24 17:48:47 2012 +0100

Rescue monolithic build after 32fde61c8f17d524.

diff --git a/src/frontends/qt4/CategorizedCombo.cpp 
b/src/frontends/qt4/CategorizedCombo.cpp
index 878d277..327059f 100644
--- a/src/frontends/qt4/CategorizedCombo.cpp
+++ b/src/frontends/qt4/CategorizedCombo.cpp
@@ -34,10 +34,11 @@
 #include 
 #include 
 
-using namespace std;
-using namespace lyx;
 using namespace lyx::support;
 
+namespace lyx {
+namespace frontend {
+
 
 class CCItemDelegate : public QItemDelegate {
 public:
@@ -128,13 +129,13 @@ struct CategorizedCombo::Private
 };
 
 
-static QString category(QAbstractItemModel const & model, int row)
+static QString categoryCC(QAbstractItemModel const & model, int row)
 {
return model.data(model.index(row, 2), Qt::DisplayRole).toString();
 }
 
 
-static int headerHeight(QStyleOptionViewItem const & opt)
+static int headerHeightCC(QStyleOptionViewItem const & opt)
 {
return opt.fontMetrics.height();
 }
@@ -148,10 +149,10 @@ void CCItemDelegate::paint(QPainter * painter, 
QStyleOptionViewItem const & opti
// default background
painter->fillRect(opt.rect, opt.palette.color(QPalette::Base));
 
-   QString cat = category(*index.model(), index.row());
+   QString cat = categoryCC(*index.model(), index.row());
 
// not the same as in the previous line?
-   if (index.row() == 0 || cat != category(*index.model(), index.row() - 
1)) {
+   if (index.row() == 0 || cat != categoryCC(*index.model(), index.row() - 
1)) {
painter->save();
 
// draw unselected background
@@ -162,10 +163,10 @@ void CCItemDelegate::paint(QPainter * painter, 
QStyleOptionViewItem const & opti
 
// draw category header
drawCategoryHeader(painter, opt, 
-   category(*index.model(), index.row()));
+   categoryCC(*index.model(), index.row()));
 
// move rect down below header
-   opt.rect.setTop(opt.rect.top() + headerHeight(opt));
+   opt.rect.setTop(opt.rect.top() + headerHeightCC(opt));
 
painter->restore();
}
@@ -216,9 +217,9 @@ QSize CCItemDelegate::sizeHint(QStyleOptionViewItem const & 
opt,
/// So we tweak this value accordingly. It's not nice, but the
/// only possible way it seems.
// Add space for the category headers here
-   QString cat = category(*index.model(), index.row());
-   if (index.row() == 0 || cat != category(*index.model(), index.row() - 
1)) {
-   size.setHeight(size.height() + headerHeight(opt));
+   QString cat = categoryCC(*index.model(), index.row());
+   if (index.row() == 0 || cat != categoryCC(*index.model(), index.row() - 
1)) {
+   size.setHeight(size.height() + headerHeightCC(opt));
}
 
return size;
@@ -289,7 +290,7 @@ QString CCItemDelegate::underlineFilter(QString const & s) 
const
 }
 
 
-static QString charFilterRegExp(QString const & filter)
+static QString charFilterRegExpCC(QString const & filter)
 {
QString re;
for (int i = 0; i < filter.length(); ++i) {
@@ -314,7 +315,7 @@ void CategorizedCombo::Private::setFilter(QString const & s)
lastSel_ = filterModel_->mapToSource(filterModel_->index(sel, 
0)).row();
 
filter_ = s;
-   filterModel_->setFilterRegExp(charFilterRegExp(filter_));
+   filterModel_->setFilterRegExp(charFilterRegExpCC(filter_));
countCategories();

// restore old selection
@@ -583,5 +584,8 @@ QString const & CategorizedCombo::filter() const
return d->filter_;
 }
 
+}  // namespace frontend
+}  // namespace lyx
+
 
 #include "moc_CategorizedCombo.cpp"
diff --git a/src/frontends/qt4/CategorizedCombo.h 
b/src/frontends/qt4/CategorizedCombo.h
index bb28db9..b2e5c7f 100644
--- a/src/frontends/qt4/CategorizedCombo.h
+++ b/src/frontends/qt4/CategorizedCombo.h
@@ -22,6 +22,9 @@
 #include 
 
 
+namespace lyx {
+namespace frontend {
+
 class CCItemDelegate;
 
 /**
@@ -72,4 +75,7 @@ private:
 };
 
 
+} // namespace frontend
+} // namespace lyx
+
 #endif // LYX_CATEGORIZEDCOMBO_H
diff --git a/src/frontends/qt4/ui/LaTeXUi.ui b/src/frontends/qt4/ui/LaTeXUi.ui
index 3420810..8c1c5ab 100644
--- a/src/frontends/qt4/ui/LaTeXUi.ui
+++ b/src/frontends/qt4/ui/LaTeXUi.ui
@@ -26,7 +26,7 @@
6
   
   
-   
+   
 
  20
 

---

Summary of changes:
 src/frontends/qt4/CategorizedCombo.cpp |   30 +-
 src/frontends/qt4/CategorizedCombo.h   |6 ++
 src/frontends/qt4/ui/LaTeXUi.ui|2 +-
 3 files changed, 24 insertions(+), 14 deletions(-)

[LyX master] achemso: complete revision for achemso 3.7c

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 5adec11005c26655dc186bb037822115309200de
Author: Uwe StÃ¶hr 
Date:   Sat Nov 24 19:24:06 2012 +0100

achemso: complete revision for achemso 3.7c

diff --git a/lib/examples/achemso.lyx b/lib/examples/achemso.lyx
index 9f3439d..903563f 100644
--- a/lib/examples/achemso.lyx
+++ b/lib/examples/achemso.lyx
@@ -1,45 +1,13 @@
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 413
+#LyX 2.1 created this file. For more info see http://www.lyx.org/
+\lyxformat 446
 \begin_document
 \begin_header
 \textclass achemso
 \begin_preamble
-% Each author should be given as a separate \author command.
-%
-% Corresponding authors should have an e-mail given after the author
-% name as an \email command.
-%
-% The affiliation of authors is given after the authors; each
-% \affiliation command applies to all preceding authors not already
-% assigned an affiliation.
-%
-% The affiliation takes an option argument for the short name.  This
-% will typically be something like "University of Somewhere".
-%
-% Notice that \alsoaffiliation is used when one (or more) authors work
-% at multiple institutions, while \altaffiliation is intended for previous
-% addresses (or other notes). Only \affiliation applies to multiple
-% authors: both \alsoaffiliation and \altaffiliation are set on a per
-% author basis.
-
-\author{Author Person}
-\author{Second Bloke}
-\email{second.bloke@some.place}
-\affiliation[University of Sometown]{University of Somewhere, Sometown, USA}
-\altaffiliation{Previous address: Minute University, Nowhereville, USA}
-\author{Indus Trialguy}
-\email{i.trial...@sponsor.co}
-\affiliation[SponsoCo]{Research Department, SponsorCo, BigCity, USA}
-\alsoaffiliation{University of Somewhere, Sometown, USA}
-
-% A short title can be given as a *suggestion* for running headers.
-\title[\texttt{achemso} demonstration]
-{A demonstration of the \textsf{achemso} \LaTeX class}
-
-% Some journals require a list of abbreviations or keywords to be
-% supplied.
-\abbreviations{IR,NMR,UV}
-\keywords{American Chemical Society, \LaTeX}
+% If issues arise when submitting your manuscript, you may want to
+% un-comment the next line. This provides information on the
+% version of every file you have used.
+%\listfiles
 \end_preamble
 \options journal=jacsat,manuscript=article
 \use_default_options false
@@ -54,13 +22,13 @@ theorems-ams
 \font_roman default
 \font_sans default
 \font_typewriter default
+\font_math auto
 \font_default_family default
 \use_non_tex_fonts false
 \font_sc false
 \font_osf false
 \font_sf_scale 100
 \font_tt_scale 100
-
 \graphics default
 \default_output_format default
 \output_sync 0
@@ -71,15 +39,21 @@ theorems-ams
 \use_hyperref false
 \papersize default
 \use_geometry false
-\use_amsmath 0
-\use_esint 0
-\use_mhchem 1
-\use_mathdots 1
+\use_package amsmath 0
+\use_package amssymb 0
+\use_package esint 0
+\use_package mathdots 1
+\use_package mathtools 0
+\use_package mhchem 1
+\use_package undertilde 0
 \cite_engine basic
+\cite_engine_type numerical
+\biblio_style plain
 \use_bibtopic false
 \use_indices false
 \paperorientation portrait
 \suppress_date false
+\justification true
 \use_refstyle 0
 \index Index
 \shortcut idx
@@ -137,8 +111,36 @@ status open
 \series bold
 Note:
 \series default
- The author, affiliation, email addresses, and the document title have to
- be set up in the LaTeX preamble of this document!
+ The journal where you want to submit is specified in the document class
+ options of this file.
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout Title
+A demonstration of the achemso LaTeX class
+\begin_inset Argument 1
+status open
+
+\begin_layout Plain Layout
+
+\family sans
+achemso
+\family default
+ demonstration
+\end_layout
+
+\end_inset
+
+
+\begin_inset Foot
+status open
+
+\begin_layout Plain Layout
+A footnote for the title
 \end_layout
 
 \end_inset
@@ -146,17 +148,100 @@ Note:
 
 \end_layout
 
+\begin_layout Author
+Andrew N.
+ Other
+\end_layout
+
+\begin_layout Alt Affiliation
+A shared footnote
+\end_layout
+
+\begin_layout Author
+Fred T.
+ Secondauthor
+\end_layout
+
+\begin_layout Affiliation
+Current address: Some other place, OthertÃ¶wn, Germany
+\end_layout
+
+\begin_layout Author
+I.
+ Ken Groupleader
+\end_layout
+
+\begin_layout Affiliation
+A shared footnote
+\end_layout
+
+\begin_layout Email
+i.k.grouplea...@unknown.uu
+\end_layout
+
+\begin_layout Phone
++123 (0)123 4445556
+\end_layout
+
+\begin_layout Fax
++123 (0)123 4445557
+\end_layout
+
 \begin_layout Standard
 \begin_inset Note Note
 status open
 
 \begin_layout Plain Layout
+The affiliation of authors is given after the authors; each 
+\family sans
+Affiliation
+\family default
+ applies to all preceding authors not already assigned an affiliation.
+\end_layout
+
+\begin_layout Plain Layout
+
+\family sans
+Altaffiliation

[LyX master] modernCV: support for preamble setup

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 1d777eeec110e03929bacc952ef410afaceffa71
Author: Uwe StÃ¶hr 
Date:   Sun Nov 25 00:44:57 2012 +0100

modernCV: support for preamble setup

- now all personal info can be specified the LyX way, only the package 
loading and some special settings remain in the preamble

- achemso.layout: a whitespace fix

diff --git a/lib/examples/modernCV.lyx b/lib/examples/modernCV.lyx
index b945153..f0f6328 100644
--- a/lib/examples/modernCV.lyx
+++ b/lib/examples/modernCV.lyx
@@ -4,10 +4,6 @@
 \begin_header
 \textclass moderncv
 \begin_preamble
-% required
-\moderncvstyle{casual} % possible styles are 'casual' (default), 'classic', 
'oldstyle' and 'banking'
-\moderncvcolor{blue} % possible colors are 'blue' (default), 'orange', 
'green', 'red', 'purple', 'grey' and 'black'
-
 %\renewcommand{\familydefault}{\sfdefault}% to set the default font; use 
'\sfdefault' for the default sans serif font, '\rmdefault' for the default 
roman one, or any tex font name
 %\nopagenumbers{} % uncomment to suppress 
automatic page numbering for CVs longer than one page
 
@@ -15,41 +11,6 @@
 \usepackage[scale=0.75]{geometry}
 %\setlength{\hintscolumnwidth}{3cm}   % if you want to change the 
width of the column with the dates
 %\setlength{\makecvtitlenamewidth}{10cm}  % for the 'classic' style, if 
you want to force the width allocated to your name and avoid line breaks. be 
careful though, the length is normally calculated to avoid any overlap with 
your personal info; use this at your own typographical risks...
-
-% required
-\firstname{Paul}
-% required
-\familyname{Testman}
-
-% optional, remove the line if not wanted
-\title{Curriculum Vitae}
-
-% optional
-% \address{street and number}{postcode city}
-\address{Teststreet 17}{0 Nicecity -- Switzerland}
-
-% optional
-\mobile{+43(0)999 888}
-% optional
-\phone{+43(0)999 }
-% optional
-\fax{+43(0)999 }
-% optional
-\email{test...@testman.xx}
-% optional
-\homepage{www.johndoe.com}
-% optional
-\extrainfo{www.lyx.org}
-
-% optional
-% \photo[height][thickness]{name}
-% 'height' is the height the picture is resized to
-% 'thickness' is the thickness of the surrounding frame
-% 'name' is the name of the picture file
-\photo[64pt][0.4pt]{CV-image}
-
-% optional
-\quote{"You only live twice." (an optional quote)}
 \end_preamble
 \use_default_options false
 \maintain_unincluded_children false
@@ -119,12 +80,43 @@
 status open
 
 \begin_layout Plain Layout
-
+The moderncv class offers lots of customization possibilities; some are
+ explained in the preamble of this document; for more information look at
+ the documentation of the LaTeX-package 
 \series bold
-Note:
+moderncv
 \series default
- The personal data like your name, image, address, etc.
- are set in the document preamble.
+:
+\begin_inset Newline newline
+\end_inset
+
+
+\begin_inset Flex URL
+status open
+
+\begin_layout Plain Layout
+
+http://mirrors.ctan.org/macros/latex/contrib/moderncv/examples/template.tex
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout CVStyle
+casual
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+required, possible styles are 'casual' (default), 'classic', 'oldstyle'
+ and 'banking'
 \end_layout
 
 \end_inset
@@ -132,33 +124,111 @@ Note:
 
 \end_layout
 
+\begin_layout CVColor
+blue
+\begin_inset Note Note
+status open
+
+\begin_layout Plain Layout
+required, possible colors are 'blue' (default), 'orange', 'green', 'red',
+ 'purple', 'grey' and 'black'
+\end_layout
+
+\end_inset
+
+
+\end_layout
+
+\begin_layout FirstName
+Paul
+\end_layout
+
+\begin_layout FamilyName
+Testman
+\end_layout
+
+\begin_layout Title
+Curriculum Vitae
+\end_layout
+
 \begin_layout Standard
 \begin_inset Note Note
 status open
 
 \begin_layout Plain Layout
-The moderncv class offers lots of customization possibilities; some are
- explained in the preamble of this document; for more information look at
- the documentation of the LaTeX-package 
-\series bold
-moderncv
-\series default
-:
-\begin_inset Newline newline
+The following personal entries are optional.
+\end_layout
+
 \end_inset
 
 
-\begin_inset Flex URL
+\end_layout
+
+\begin_layout Address
+\begin_inset Argument 1
 status open
 
 \begin_layout Plain Layout
+Teststreet 17
+\end_layout
 
-http://mirrors.ctan.org/macros/latex/contrib/moderncv/examples/template.tex
+\end_inset
+
+0 Nicecity -- Switzerland
+\end_layout
+
+\begin_layout Mobile
++43(0)999 888
+\end_layout
+
+\begin_layout Phone
++43(0)999 
+\end_layout
+
+\begin_layout Fax
++43(0)999 
+\end_layout
+
+\begin_layout Email
+test...@testman.xx
+\end_layout
+
+\begin_layout Homepage
+www.johndoe.com
+\end_layout
+
+\begin_layout ExtraInfo
+www.lyx.org
+\end_layout
+
+\begin_layout Photo
+\begin_inset Argument 1
+status open
+

[LyX master] installer: translations by Szőke

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 7a7fe95f33873b34891af088a19fa4fa05eb0e5d
Author: Uwe StÃ¶hr 
Date:   Sun Nov 25 01:12:56 2012 +0100

installer: translations by SzÅke

diff --git a/development/Win32/packaging/installer/ChangeLog.txt 
b/development/Win32/packaging/installer/ChangeLog.txt
index 2e936ac..74ead31 100644
--- a/development/Win32/packaging/installer/ChangeLog.txt
+++ b/development/Win32/packaging/installer/ChangeLog.txt
@@ -6,7 +6,7 @@
then use this installer.)
 - updated thesaurus for Slovenian
   (need to reinstall LyX to benefit from this)
-- updated Indonesian translation of the installer messages
+- updated Hungarian and Indonesian translation of the installer messages
 
 
 Changelog for LyX-205-4:
diff --git a/development/Win32/packaging/installer/lang/hungarian.nsh 
b/development/Win32/packaging/installer/lang/hungarian.nsh
index 7e32ab8..49f8ee2 100644
--- a/development/Win32/packaging/installer/lang/hungarian.nsh
+++ b/development/Win32/packaging/installer/lang/hungarian.nsh
@@ -1,32 +1,38 @@
+/*
+LyX Installer Language File
+Language: Hungarian
+Author: Szõke Sándor
+*/
+
 !insertmacro LANGFILE_EXT "Hungarian"
 
-${LangFileString} TEXT_INSTALL_CURRENTUSER "(Installed for Current User)"
+${LangFileString} TEXT_INSTALL_CURRENTUSER "(Telepítve az aktuális 
felhasználónak)"
 
 ${LangFileString} TEXT_WELCOME "A varázsló segítségével tudja telepíteni a 
LyX-et.$\r$\n\
$\r$\n\
$_CLICK"
 
-${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "Updating MiKTeX filename 
database..."
-${LangFileString} TEXT_CONFIGURE_LYX "Configuring LyX ($LaTeXInstalled may 
download missing packages, this can take some time) ..."
-${LangFileString} TEXT_CONFIGURE_PYTHON "Compiling Python scripts..."
+${LangFileString} TEXT_CONFIGURE_MIKTEXFNDB "MiKTeX filenév adatbázis 
frissítése..."
+${LangFileString} TEXT_CONFIGURE_LYX "LyX beállítása ($LaTeXInstalled 
letöltheti a hiányzó csomagokat, ez eltarthat egy ideig) ..."
+${LangFileString} TEXT_CONFIGURE_PYTHON "Python parancsfájlok fordítása..."
 
-${LangFileString} TEXT_FINISH_DESKTOP "Create desktop shortcut"
-${LangFileString} TEXT_FINISH_WEBSITE "Visit lyx.org for the latest news, 
support and tips"
+${LangFileString} TEXT_FINISH_DESKTOP "Indítóikon létrehozása Asztalon"
+${LangFileString} TEXT_FINISH_WEBSITE "Látogasson el a lyx.org oldalra az 
aktuális hírekért, támogatásért és tippekért"
 
 ${LangFileString} FileTypeTitle "LyX-dokumentum"
 
 ${LangFileString} SecInstJabRefTitle "JabRef"
 ${LangFileString} SecAllUsersTitle "Telepítés minden felhasználónak"
 ${LangFileString} SecFileAssocTitle "Fájltársítások"
-${LangFileString} SecDesktopTitle "Parancsikon asztalra"
+${LangFileString} SecDesktopTitle "Parancsikon Asztalra"
 
 ${LangFileString} SecCoreDescription "A LyX futtatásához szükséges fájlok."
 ${LangFileString} SecInstJabRefDescription "Irodalomjegyzék-hivatkozás 
szerkesztõ és kezelõ BibTeX fájlokhoz."
 ${LangFileString} SecAllUsersDescription "Minden felhasználónak telepítsem 
vagy csak az aktuálisnak?"
 ${LangFileString} SecFileAssocDescription "A .lyx kiterjesztéssel rendelkezõ 
fájlok megnyitása automatikusan a LyX-el történjen."
-${LangFileString} SecDesktopDescription "LyX-ikon elhelyezése az asztalon."
-${LangFileString} SecDictionariesDescription "Spell-checker dictionaries that 
can be downloaded and installed."
-${LangFileString} SecThesaurusDescription "Thesaurus dictionaries that can be 
downloaded and installed."
+${LangFileString} SecDesktopDescription "LyX-ikon elhelyezése az Asztalon."
+${LangFileString} SecDictionariesDescription "Helyesírás-ellenõrzõ szótárak, 
amiket letölthet és telepíthet."
+${LangFileString} SecThesaurusDescription "Szinoníma-szótárak, amiket 
letölthet és telepíthet."
 
 ${LangFileString} EnterLaTeXHeader1 'LaTeX-disztribúció'
 ${LangFileString} EnterLaTeXHeader2 'Adja meg a LaTeX-disztribúciót, amit a 
LyX-nek használnia kell.'
@@ -46,15 +52,15 @@ ${LangFileString} DontUseLaTeX "Ne haszn
 ${LangFileString} InvalidLaTeXFolder 'Nem találom a $\"latex.exe$\" fájlt, a 
megadott helyen.'
 
 ${LangFileString} LatexInfo 'A $\"MiKteX$\" LaTeX-disztribúció telepítõjének 
indítása következik.$\r$\n\
-   A program telepítéséhez addig nyomkodja a 
$\"Következõ$\" gombot a telepítõ ablakában, amíg a telepítés el nem 
kezd?dik.$\r$\n\
+   A program telepítéséhez addig nyomkodja a 
$\"Következõ$\" gombot a telepítõ ablakában, amíg a telepítés el nem 
kezdõdik.$\r$\n\
$\r$\n\
!!! Kérem használja a MikTeX-telepítõ 
alapértelmezett opcióit!!!'
 ${LangFileString} LatexError1 'Nem találtam LaTeX-disztribúciót!$\r$\n\
A LyX nem használható egy LaTeX-disztibúció 
nélkül,(mint például a $\"MiKTeX$\")!$\r$\n\

[LyX 2.0.x] fix bug #8223 also for branch

2012-11-24 Thread Uwe Stöhr

The branch, 2.0.x, has been updated.

- Log -

commit 79a8c0d2a9582c6623d6d0a739920ef0a3eca005
Author: Uwe StÃ¶hr 
Date:   Sun Nov 25 02:21:13 2012 +0100

fix bug #8223 also for branch

diff --git a/src/tex2lyx/text.cpp b/src/tex2lyx/text.cpp
index 0089a0e..9ca67c0 100644
--- a/src/tex2lyx/text.cpp
+++ b/src/tex2lyx/text.cpp
@@ -3727,8 +3727,16 @@ void parse_text(Parser & p, ostream & os, unsigned 
flags, bool outer,
} else {
string special = p.getFullOpt();
special += p.getOpt();
-   parse_outer_box(p, os, FLAG_ITEM, outer,
-   context, t.cs(), special);
+   // LyX does not yet support \framebox without 
any option
+   if (!special.empty())
+   parse_outer_box(p, os, FLAG_ITEM, outer,
+   context, t.cs(), special);
+   else {
+   eat_whitespace(p, os, context, false);
+   handle_ert(os, "\\framebox{", context);
+   parse_text(p, os, FLAG_ITEM, outer, 
context);
+   handle_ert(os, "}", context);
+   }
}
}
 
diff --git a/status.20x b/status.20x
index fca87b0..bf4b797 100644
--- a/status.20x
+++ b/status.20x
@@ -87,6 +87,7 @@ What's new
 
 * TEX2LYX
 
+- correct import of the command \framebox (bug 8223).
 
 
 * ADVANCED FIND AND REPLACE

---

Summary of changes:
 src/tex2lyx/text.cpp |   12 ++--
 status.20x   |1 +
 2 files changed, 11 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX 2.0.x] IEEEtran.lyx: fix a typo and remove unnecessary ERT

2012-11-24 Thread Uwe Stöhr

The branch, 2.0.x, has been updated.

- Log -

commit ebbd54a991bf2fc2ceae4188a391498511c537ca
Author: Uwe StÃ¶hr 
Date:   Sun Nov 25 04:07:41 2012 +0100

IEEEtran.lyx: fix a typo and remove unnecessary ERT

diff --git a/lib/templates/IEEEtran.lyx b/lib/templates/IEEEtran.lyx
index 5040be9..4054147 100644
--- a/lib/templates/IEEEtran.lyx
+++ b/lib/templates/IEEEtran.lyx
@@ -393,7 +393,7 @@ Introduction
 
 \begin_layout Standard
 \begin_inset Note Note
-status collapsed
+status open
 
 \begin_layout Plain Layout
 The 
@@ -402,12 +402,15 @@ The
 \backslash
 IEEEPARstart
 \series default
- command is needed in the first paragraph fo the document.
+ command is needed in the first paragraph of the document.
 \end_layout
 
 \end_inset
 
 
+\end_layout
+
+\begin_layout Standard
 \begin_inset ERT
 status collapsed
 
@@ -468,7 +471,7 @@ Methodology
 
 \begin_layout Theorem
 \begin_inset Argument
-status collapsed
+status open
 
 \begin_layout Plain Layout
 Theorem name
@@ -684,32 +687,25 @@ options "IEEEtran"
 \end_layout
 
 \begin_layout Biography
-\begin_inset ERT
-status collapsed
+\begin_inset Argument
+status open
 
 \begin_layout Plain Layout
-
-{
-\end_layout
+\begin_inset Graphics
+   filename ../examples/CV-image.png
+   width 1in
+   height 1.25in
+   keepAspectRatio
+   clip
 
 \end_inset
 
-Your Name
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
 
-}
 \end_layout
 
 \end_inset
 
- All about you and the what your interests are.
-\begin_inset Argument
-status open
 
-\begin_layout Plain Layout
 \begin_inset ERT
 status collapsed
 
@@ -720,17 +716,7 @@ status collapsed
 
 \end_inset
 
-
-\begin_inset Graphics
-   filename ../examples/CV-image.png
-   width 1in
-   height 1.25in
-   keepAspectRatio
-   clip
-
-\end_inset
-
-
+Your Name
 \begin_inset ERT
 status collapsed
 
@@ -741,12 +727,7 @@ status collapsed
 
 \end_inset
 
-
-\end_layout
-
-\end_inset
-
-
+ All about you and the what your interests are.
 \end_layout
 
 \begin_layout --Separator--

---

Summary of changes:
 lib/templates/IEEEtran.lyx |   51 +--
 1 files changed, 16 insertions(+), 35 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] IEEEtran.layout: adjust tooltips

2012-11-24 Thread Uwe Stöhr

The branch, master, has been updated.

- Log -

commit 4202d90c7ed7830d073371eae277338351edbe8e
Author: Uwe StÃ¶hr 
Date:   Sun Nov 25 04:12:12 2012 +0100

IEEEtran.layout: adjust tooltips

diff --git a/lib/layouts/IEEEtran.layout b/lib/layouts/IEEEtran.layout
index 833e3ab..0ce9fc6 100644
--- a/lib/layouts/IEEEtran.layout
+++ b/lib/layouts/IEEEtran.layout
@@ -11,7 +11,7 @@
 
 Format 41
 
-Sides  1
+Sides  1
 SecNumDepth3
 TocDepth   3
 DefaultStyle   Standard
@@ -240,9 +240,9 @@ Style Appendix
   LatexNameappendix
   LabelString  "Appendix"
   Argument 1
-LabelString"Appendix Title"
-Tooltip"Optional title of the appendix"
- EndArgument
+LabelString"Short Title"
+Tooltip"Short title for the appendix"
+  EndArgument
 End
 
 
@@ -275,8 +275,8 @@ Style Biography
   LaTeXNameIEEEbiography
   Category BackMatter
   Argument 1
-LabelString"Biography Photo"
-Tooltip"Insert a photo to your biography"
+LabelString"Photo"
+Tooltip"Optional photo for biography"
   EndArgument
   AlignBlock
   TextFont

---

Summary of changes:
 lib/layouts/IEEEtran.layout |   12 ++--
 1 files changed, 6 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

[LyX master] Some cosmetics in preparation of major revisions

[LyX master] Update email address

[LyX master] sk.po: Inset arguments strings

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

[LyX master] Fix splitting of layout string

[LyX master] moderncv.layout: shorten the label strings

[LyX master] Revert achemso: update

[LyX 2.0.x] IEEEtran.layout: some more whitespace

[LyX master] Rescue monolithic build after 32fde61c8f17d524.

[LyX master] achemso: complete revision for achemso 3.7c

[LyX master] modernCV: support for preamble setup

[LyX master] installer: translations by Szőke

[LyX 2.0.x] fix bug #8223 also for branch

[LyX 2.0.x] IEEEtran.lyx: fix a typo and remove unnecessary ERT

[LyX master] IEEEtran.layout: adjust tooltips

[LyX master] Some cosmetics in preparation of major revisions

[LyX master] Update email address

[LyX master] sk.po: Inset arguments strings

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

[LyX master] Fix splitting of layout string

[LyX master] moderncv.layout: shorten the label strings

[LyX master] Revert "achemso: update"

[LyX 2.0.x] IEEEtran.layout: some more whitespace

[LyX master] Rescue monolithic build after 32fde61c8f17d524.

[LyX master] achemso: complete revision for achemso 3.7c

[LyX master] modernCV: support for preamble setup

[LyX master] installer: translations by Szőke

[LyX 2.0.x] fix bug #8223 also for branch

[LyX 2.0.x] IEEEtran.lyx: fix a typo and remove unnecessary ERT

[LyX master] IEEEtran.layout: adjust tooltips

30 matches

Site Navigation

Mail list logo

Footer information