uwestoehr | 1 Sep 14:19 2011

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

Author: uwestoehr
Date: Thu Sep  1 14:19:36 2011
New Revision: 39578
URL: http://www.lyx.org/trac/changeset/39578

Log:
i18n.inc: correct version number

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

Modified: www-user/trunk/farm/cookbook/LyX/i18n.inc
==============================================================================
--- www-user/trunk/farm/cookbook/LyX/i18n.inc	Wed Aug 31 23:08:45 2011	(r39577)
+++ www-user/trunk/farm/cookbook/LyX/i18n.inc	Thu Sep  1 14:19:36 2011	(r39578)
 <at>  <at>  -1,6 +1,6  <at>  <at> 
 <?php
 // The current version
-$lyx_version = "2.1.0svn";
+$lyx_version = "2.0.1";
 // The branch tag
 $branch_tag = "branches/BRANCH_2_0_X";

Modified: www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc
==============================================================================
--- www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc	Wed Aug 31 23:08:45 2011	(r39577)
+++ www-user/trunk/farm/cookbook/LyX/i18n_trunk.inc	Thu Sep  1 14:19:36 2011	(r39578)
 <at>  <at>  -1,6 +1,6  <at>  <at> 
 <?php
(Continue reading)

rgheck | 2 Sep 20:40 2011

r39579 - in lyx-devel/trunk/src: . frontends/qt4

Author: rgheck
Date: Fri Sep  2 20:40:06 2011
New Revision: 39579
URL: http://www.lyx.org/trac/changeset/39579

Log:
Fix bug #7751: Sort the modules and formats by translated string.

Modified:
   lyx-devel/trunk/src/ModuleList.cpp
   lyx-devel/trunk/src/frontends/qt4/GuiSendto.cpp

Modified: lyx-devel/trunk/src/ModuleList.cpp
==============================================================================
--- lyx-devel/trunk/src/ModuleList.cpp	Thu Sep  1 14:19:36 2011	(r39578)
+++ lyx-devel/trunk/src/ModuleList.cpp	Fri Sep  2 20:40:06 2011	(r39579)
 <at>  <at>  -18,6 +18,7  <at>  <at> 

 #include "support/debug.h"
 #include "support/FileName.h"
+#include "support/gettext.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"

 <at>  <at>  -112,18 +113,19  <at>  <at> 
 	return true;
 }

+
 // used when sorting the module list.
(Continue reading)

forenr | 3 Sep 18:10 2011

r39580 - lyx-devel/trunk/src/support/mythes

Author: forenr
Date: Sat Sep  3 18:10:07 2011
New Revision: 39580
URL: http://www.lyx.org/trac/changeset/39580

Log:
Fix compile error with gcc 4.5.3 when using the included mythes library:
../../src/support/mythes/mythes.hxx:25:9: error: ‘FILE’ does not name a type
../../src/support/mythes/mythes.hxx:55:22: error: ‘FILE’ has not been declared

Modified:
   lyx-devel/trunk/src/support/mythes/mythes.hxx

Modified: lyx-devel/trunk/src/support/mythes/mythes.hxx
==============================================================================
--- lyx-devel/trunk/src/support/mythes/mythes.hxx	Fri Sep  2 20:40:06 2011	(r39579)
+++ lyx-devel/trunk/src/support/mythes/mythes.hxx	Sat Sep  3 18:10:07 2011	(r39580)
 <at>  <at>  -1,6 +1,8  <at>  <at> 
 #ifndef _MYTHES_HXX_
 #define _MYTHES_HXX_
 
+#include <cstdio>
+
 // some maximum sizes for buffers
 #define MAX_WD_LEN 200
 #define MAX_LN_LEN 16384

jrioux | 3 Sep 22:27 2011

r39581 - lyx-devel/trunk/development/Win32/packaging/installer/setup

Author: jrioux
Date: Sat Sep  3 22:27:31 2011
New Revision: 39581
URL: http://www.lyx.org/trac/changeset/39581

Log:
Fix bug #7608 (Wrong path separator used for Inkscape on Windows)

Modified:
   lyx-devel/trunk/development/Win32/packaging/installer/setup/configure.nsh

Modified: lyx-devel/trunk/development/Win32/packaging/installer/setup/configure.nsh
==============================================================================
--- lyx-devel/trunk/development/Win32/packaging/installer/setup/configure.nsh	Sat Sep  3
18:10:07 2011	(r39580)
+++ lyx-devel/trunk/development/Win32/packaging/installer/setup/configure.nsh	Sat Sep  3
22:27:31 2011	(r39581)
 <at>  <at>  -140,13 +140,6  <at>  <at> 
    		  \format "pdf2" "pdf" "PDF (pdflatex)" "F" "pdfview" "" "document,vector,menu=export"$\r$\n\
 		  \format "pdf" "pdf" "PDF (ps2pdf)" "P" "pdfview" "" "document,vector,menu=export"$\r$\n'
   ${endif}
-  # if a SVG to PDF converter was found (e.g. Inkscape)
-  ${if} $SVGPath != ""
-   FileWrite $R1 '\format "svg" "svg" "SVG" "" "inkscape --file=$$$$i" "inkscape --file=$$$$i" "vector"$\r$\n\
-   		  \converter "svg" "png" "inkscape --without-gui --file=$$$$i --export-png=$$$$o" ""$\r$\n\
-		  \converter "svg" "pdf" "inkscape --file=$$$$p/$$$$i --export-area-drawing --without-gui
--export-pdf=$$$$p/$$$$o" ""$\r$\n\
-		  \converter "svg" "eps" "inkscape --file=$$$$p/$$$$i --export-area-drawing --without-gui
--export-eps=$$$$p/$$$$o" ""$\r$\n'
-  ${endif}
(Continue reading)

uwestoehr | 5 Sep 08:09 2011

r39582 - in lyx-devel/trunk/development/Win32/packaging/installer: include setup

Author: uwestoehr
Date: Mon Sep  5 08:09:13 2011
New Revision: 39582
URL: http://www.lyx.org/trac/changeset/39582

Log:
installer:
- fix 2 uninstaller issues
- remove support for AFPL Ghostscript (license clash)
- only install Ghostscript if not already installed
- in case there are several Ghostscript installations, use the newest one
- remove an unused variable

Modified:
   lyx-devel/trunk/development/Win32/packaging/installer/include/LaTeX.nsh
   lyx-devel/trunk/development/Win32/packaging/installer/include/detection.nsh
   lyx-devel/trunk/development/Win32/packaging/installer/include/variables.nsh
   lyx-devel/trunk/development/Win32/packaging/installer/setup/configure.nsh
   lyx-devel/trunk/development/Win32/packaging/installer/setup/install.nsh
   lyx-devel/trunk/development/Win32/packaging/installer/setup/uninstall.nsh

Modified: lyx-devel/trunk/development/Win32/packaging/installer/include/LaTeX.nsh
==============================================================================
--- lyx-devel/trunk/development/Win32/packaging/installer/include/LaTeX.nsh	Sat Sep  3 22:27:31 2011	(r39581)
+++ lyx-devel/trunk/development/Win32/packaging/installer/include/LaTeX.nsh	Mon Sep  5 08:09:13 2011	(r39582)
 <at>  <at>  -99,10 +99,6  <at>  <at> 
   ${andif} $LaTeXName != "MiKTeX 2.9"
    StrCpy $LaTeXName "TeXLive"
   ${endif}
-  
(Continue reading)

uwestoehr | 5 Sep 08:59 2011

r39583 - lyx-devel/trunk/development/Win32/packaging/installer/gui

Author: uwestoehr
Date: Mon Sep  5 08:59:18 2011
New Revision: 39583
URL: http://www.lyx.org/trac/changeset/39583

Log:
installer: fix loading of the LaTeX selection page

Modified:
   lyx-devel/trunk/development/Win32/packaging/installer/gui/LaTeXFolder.nsh

Modified: lyx-devel/trunk/development/Win32/packaging/installer/gui/LaTeXFolder.nsh
==============================================================================
--- lyx-devel/trunk/development/Win32/packaging/installer/gui/LaTeXFolder.nsh	Mon Sep  5
08:09:13 2011	(r39582)
+++ lyx-devel/trunk/development/Win32/packaging/installer/gui/LaTeXFolder.nsh	Mon Sep  5
08:59:18 2011	(r39583)
 <at>  <at>  -1,29 +1,29  <at>  <at> 
 Function LatexFolder

-  !insertmacro INSTALLOPTIONS_EXTRACT "gui\io_latex.ini"
+  !insertmacro INSTALLOPTIONS_EXTRACT_AS "gui\io_latex.ini" "io_latex.ini"
   # generate the installer page
   !insertmacro MUI_HEADER_TEXT "$(EnterLaTeXHeader1)" "$(EnterLaTeXHeader2)"
   ${if} $LatexName != ""
-   !insertmacro INSTALLOPTIONS_WRITE "gui\io_latex.ini" "Field 1" "Text" "$(EnterLaTeXFolder)"
+   !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 1" "Text" "$(EnterLaTeXFolder)"
   ${else}
-   !insertmacro INSTALLOPTIONS_WRITE "gui\io_latex.ini" "Field 1" "Text" "$(EnterLaTeXFolderNone)"
+   !insertmacro INSTALLOPTIONS_WRITE "io_latex.ini" "Field 1" "Text" "$(EnterLaTeXFolderNone)"
(Continue reading)

uwestoehr | 5 Sep 09:20 2011

r39584 - lyx-devel/trunk/development/Win32/packaging/installer/include

Author: uwestoehr
Date: Mon Sep  5 09:20:53 2011
New Revision: 39584
URL: http://www.lyx.org/trac/changeset/39584

Log:
installer:
- fix bug that LyX's LaTeX files were tried to install although the user denied to use LaTeX.nsh
- propose to add a desktop item for LyX (can be switched off by the user)

Modified:
   lyx-devel/trunk/development/Win32/packaging/installer/include/LaTeX.nsh
   lyx-devel/trunk/development/Win32/packaging/installer/include/init.nsh

Modified: lyx-devel/trunk/development/Win32/packaging/installer/include/LaTeX.nsh
==============================================================================
--- lyx-devel/trunk/development/Win32/packaging/installer/include/LaTeX.nsh	Mon Sep  5 08:59:18 2011	(r39583)
+++ lyx-devel/trunk/development/Win32/packaging/installer/include/LaTeX.nsh	Mon Sep  5 09:20:53 2011	(r39584)
 <at>  <at>  -146,6 +146,8  <at>  <at> 
  # installs the LaTeX class files that are delivered with LyX
  # and enable MiKTeX's automatic package installation

+ # install LyX's LaTeX class and style files
+ ${if} $PathLaTeX != ""
   ${if} $MultiUser.Privileges != "Admin"
   ${orif} $MultiUser.Privileges != "Power"
    StrCpy $PathLaTeXLocal "$PathLaTeX" -11 # delete "\miktex\bin"
 <at>  <at>  -170,6 +172,7  <at>  <at> 
    ${endif}
    Pop $UpdateFNDBReturn # Return value
(Continue reading)

rgheck | 5 Sep 17:04 2011

r39585 - lyx-devel/tags/lyx-2_0_1

Author: rgheck
Date: Mon Sep  5 17:04:11 2011
New Revision: 39585
URL: http://www.lyx.org/trac/changeset/39585

Log:
This is LyX 2.0.1.

Added:
   lyx-devel/tags/lyx-2_0_1/   (props changed)
      - copied from r39584, lyx-devel/branches/BRANCH_2_0_X/

rgheck | 5 Sep 17:05 2011

r39586 - lyx-devel/branches/BRANCH_2_0_X

Author: rgheck
Date: Mon Sep  5 17:05:20 2011
New Revision: 39586
URL: http://www.lyx.org/trac/changeset/39586

Log:
Open 2.0.2svn.

Modified:
   lyx-devel/branches/BRANCH_2_0_X/configure.ac

Modified: lyx-devel/branches/BRANCH_2_0_X/configure.ac
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/configure.ac	Mon Sep  5 17:04:11 2011	(r39585)
+++ lyx-devel/branches/BRANCH_2_0_X/configure.ac	Mon Sep  5 17:05:20 2011	(r39586)
 <at>  <at>  -1,8 +1,8  <at>  <at> 
 dnl Process with autoconf to generate configure script   -*- sh -*-

-AC_INIT(LyX,2.0.1,[lyx-devel <at> lists.lyx.org],[lyx])
+AC_INIT(LyX,2.0.2svn,[lyx-devel <at> lists.lyx.org],[lyx])
 # Use ISO format only. The frontend needs to parse this
-AC_SUBST(LYX_DATE, ["2011-08-31"])
+AC_SUBST(LYX_DATE, ["2011-09-05"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
 AC_CONFIG_HEADERS([config.h])

rgheck | 5 Sep 17:08 2011

r39587 - in lyx-devel/tags: lyx-2_0_1 lyx_2_0_1

Author: rgheck
Date: Mon Sep  5 17:08:39 2011
New Revision: 39587
URL: http://www.lyx.org/trac/changeset/39587

Log:
Fix tag.

Added:
   lyx-devel/tags/lyx_2_0_1/   (props changed)
      - copied from r39586, lyx-devel/tags/lyx-2_0_1/
Deleted:
   lyx-devel/tags/lyx-2_0_1/


Gmane