uwestoehr | 1 Oct 2011 03:29
Favicon

r39792 - in lyx-devel/trunk/lib/doc: . de

Author: uwestoehr
Date: Sat Oct  1 03:29:47 2011
New Revision: 39792
URL: http://www.lyx.org/trac/changeset/39792

Log:
- Additional.lyx: minor tweaks
- German Additional.lyx: update to English version, translation of section 8 which hopefully fixes #7748

Modified:
   lyx-devel/trunk/lib/doc/Additional.lyx
   lyx-devel/trunk/lib/doc/de/Additional.lyx

Modified: lyx-devel/trunk/lib/doc/Additional.lyx
==============================================================================
--- lyx-devel/trunk/lib/doc/Additional.lyx	Fri Sep 30 18:05:46 2011	(r39791)
+++ lyx-devel/trunk/lib/doc/Additional.lyx	Sat Oct  1 03:29:47 2011	(r39792)
 <at>  <at>  -22538,7 +22538,11  <at>  <at> 
 \end_layout
 
 \begin_layout Standard
-If you want to have 2 columns in your text, use the style 
+If you want to have 2
+\begin_inset space ~
+\end_inset
+
+columns in your text, use the style 
 \family sans
 Begin Multiple Columns
 \family default
(Continue reading)

spitz | 1 Oct 2011 09:24
Favicon

r39793 - in lyx-devel/branches/BRANCH_2_0_X: . src/insets

Author: spitz
Date: Sat Oct  1 09:24:17 2011
New Revision: 39793
URL: http://www.lyx.org/trac/changeset/39793

Log:
backport r39757:

* Fix merging of cells (multicolumn, multirow) when the first cell in the selection is already a multi-cell
(bug #7792).

Modified:
   lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp
   lyx-devel/branches/BRANCH_2_0_X/status.20x

Modified: lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp	Sat Oct  1 03:29:47 2011	(r39792)
+++ lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp	Sat Oct  1 09:24:17 2011	(r39793)
 <at>  <at>  -5388,10 +5388,27  <at>  <at> 
 	}

 	case Tabular::MULTICOLUMN: {
-		if (tabular.isMultiColumn(cur.idx()))
-			tabularFeatures(cur, Tabular::UNSET_MULTICOLUMN);
-		else
+		if (!cur.selection()) {
+			if (tabular.isMultiColumn(cur.idx()))
+				tabularFeatures(cur, Tabular::UNSET_MULTICOLUMN);
+			else
(Continue reading)

jrioux | 3 Oct 2011 18:35
Favicon

r39794 - lyx-devel/trunk/lib/scripts

Author: jrioux
Date: Mon Oct  3 18:35:25 2011
New Revision: 39794
URL: http://www.lyx.org/trac/changeset/39794

Log:
* lyxpreview_tool.py : Allow to look for commands with arguments.

For example, find_exe(["bibtex -min-crossrefs=7"]) should search for
bibtex and if it is found, return the string "bibtex -min-crossrefs=7".

Modified:
   lyx-devel/trunk/lib/scripts/lyxpreview_tools.py

Modified: lyx-devel/trunk/lib/scripts/lyxpreview_tools.py
==============================================================================
--- lyx-devel/trunk/lib/scripts/lyxpreview_tools.py	Sat Oct  1 09:24:17 2011	(r39793)
+++ lyx-devel/trunk/lib/scripts/lyxpreview_tools.py	Mon Oct  3 18:35:25 2011	(r39794)
 <at>  <at>  -88,7 +88,8  <at>  <at> 
 def find_exe(candidates):
     global extlist, path

-    for prog in candidates:
+    for command in candidates:
+        prog = command.split()[0]
         for directory in path:
             for ext in extlist:
                 full_path = os.path.join(directory, prog + ext)
 <at>  <at>  -97,7 +98,7  <at>  <at> 
                     # have found it). Return just the basename to avoid
(Continue reading)

jrioux | 3 Oct 2011 18:35
Favicon

r39795 - in lyx-devel/trunk: lib/scripts src/graphics

Author: jrioux
Date: Mon Oct  3 18:35:27 2011
New Revision: 39795
URL: http://www.lyx.org/trac/changeset/39795

Log:
lyxpreview: Handle bibtex-generated references and bibliography.

Modified:
   lyx-devel/trunk/lib/scripts/legacy_lyxpreview2ppm.py
   lyx-devel/trunk/lib/scripts/lyxpreview2bitmap.py
   lyx-devel/trunk/lib/scripts/lyxpreview_tools.py
   lyx-devel/trunk/src/graphics/PreviewLoader.cpp

Modified: lyx-devel/trunk/lib/scripts/legacy_lyxpreview2ppm.py
==============================================================================
--- lyx-devel/trunk/lib/scripts/legacy_lyxpreview2ppm.py	Mon Oct  3 18:35:25 2011	(r39794)
+++ lyx-devel/trunk/lib/scripts/legacy_lyxpreview2ppm.py	Mon Oct  3 18:35:27 2011	(r39795)
 <at>  <at>  -81,7 +81,7  <at>  <at> 
 from lyxpreview_tools import copyfileobj, error, filter_pages, find_exe, \
      find_exe_or_terminate, join_metrics_and_rename, latex_commands, \
      latex_file_re, make_texcolor, mkstemp, pdflatex_commands, progress, \
-     run_command, warning, write_metrics_info
+     run_command, run_latex, warning, write_metrics_info

 
 def usage(prog_name):
 <at>  <at>  -290,12 +290,7  <at>  <at> 
         error("Unable to move color info into the latex file")

(Continue reading)

jrioux | 3 Oct 2011 18:35
Favicon

r39796 - lyx-devel/trunk/lib/scripts

Author: jrioux
Date: Mon Oct  3 18:35:29 2011
New Revision: 39796
URL: http://www.lyx.org/trac/changeset/39796

Log:
lyxpreview: Simplify the handling of lilypond-book.

Modified:
   lyx-devel/trunk/lib/scripts/lyxpreview2bitmap.py

Modified: lyx-devel/trunk/lib/scripts/lyxpreview2bitmap.py
==============================================================================
--- lyx-devel/trunk/lib/scripts/lyxpreview2bitmap.py	Mon Oct  3 18:35:27 2011	(r39795)
+++ lyx-devel/trunk/lib/scripts/lyxpreview2bitmap.py	Mon Oct  3 18:35:29 2011	(r39796)
 <at>  <at>  -392,7 +392,8  <at>  <at> 
     latex = find_exe_or_terminate(latex or latex_commands)
     bibtex = find_exe(bibtex or bibtex_commands)
     if lilypond:
-        lilypond_book = find_exe_or_terminate(lilypond_book or ["lilypond-book"])
+        lilypond_book = find_exe_or_terminate(lilypond_book or
+            ["lilypond-book --safe"])

     # These flavors of latex are known to produce pdf output
     pdf_output = latex in pdflatex_commands
 <at>  <at>  -411,19 +412,15  <at>  <at> 
     if lilypond:
         progress("Preprocess the latex file through %s" % lilypond_book)
         if pdf_output:
-            lilypond_book += ' --pdf'
(Continue reading)

jrioux | 3 Oct 2011 18:43
Favicon

r39797 - in lyx-devel/trunk: lib/scripts src/graphics

Author: jrioux
Date: Mon Oct  3 18:43:33 2011
New Revision: 39797
URL: http://www.lyx.org/trac/changeset/39797

Log:
lyxpreview: Simplify the color handling.

Let's have this in trunk for testing. The real difference maker
when it comes to color is whether we use dvipng or ghostscript.

For dvipng:

  - The color info is passed as command-line arguments.

  - The tightpage option is not necessary, and since it adds
    ps specials to the output, we shouldn't use it.

For ghostscript:

  - The color info needs to be in the latex file.

  - The foreground color is set for each preview inset.

  - The background color is set by \pagecolor in the preamble,
    which is understood by pdflatex, but ignored in dvips mode.
    Thus dvips is handled with a ps special.

  - The tightpage option is necessary to crop the images.

(Continue reading)

kornel | 3 Oct 2011 18:49
Favicon

r39798 - in lyx-devel/trunk/src: . client tex2lyx

Author: kornel
Date: Mon Oct  3 18:49:06 2011
New Revision: 39798
URL: http://www.lyx.org/trac/changeset/39798

Log:
Add framework AppKit to cmake as in the automake case (MAC only)

Modified:
   lyx-devel/trunk/src/CMakeLists.txt
   lyx-devel/trunk/src/client/CMakeLists.txt
   lyx-devel/trunk/src/tex2lyx/CMakeLists.txt

Modified: lyx-devel/trunk/src/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/src/CMakeLists.txt	Mon Oct  3 18:43:33 2011	(r39797)
+++ lyx-devel/trunk/src/CMakeLists.txt	Mon Oct  3 18:49:06 2011	(r39798)
 <at>  <at>  -148,7 +148,7  <at>  <at> 
 	if(LYX_COCOA)
 		target_link_libraries(${_lyx} "-framework Cocoa")
 	else()
-		target_link_libraries(${_lyx} "-framework Carbon")
+		target_link_libraries(${_lyx} "-framework AppKit")
 	endif()
 endif()

Modified: lyx-devel/trunk/src/client/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/src/client/CMakeLists.txt	Mon Oct  3 18:43:33 2011	(r39797)
+++ lyx-devel/trunk/src/client/CMakeLists.txt	Mon Oct  3 18:49:06 2011	(r39798)
(Continue reading)

jrioux | 3 Oct 2011 19:47
Favicon

r39799 - in lyx-devel/trunk: development/scons src/tex2lyx

Author: jrioux
Date: Mon Oct  3 19:47:37 2011
New Revision: 39799
URL: http://www.lyx.org/trac/changeset/39799

Log:
tex2lyx : More descriptive --help message and implement --version (#6827).

The init_package before easyParse is necessary to initiate the default
values for userdir and sysdir, which are now part of the help message.
This step would be necessary anyway if we ever internationalize tex2lyx.

Modified:
   lyx-devel/trunk/development/scons/scons_manifest.py
   lyx-devel/trunk/src/tex2lyx/CMakeLists.txt
   lyx-devel/trunk/src/tex2lyx/Makefile.am
   lyx-devel/trunk/src/tex2lyx/tex2lyx.cpp

Modified: lyx-devel/trunk/development/scons/scons_manifest.py
==============================================================================
--- lyx-devel/trunk/development/scons/scons_manifest.py	Mon Oct  3 18:49:06 2011	(r39798)
+++ lyx-devel/trunk/development/scons/scons_manifest.py	Mon Oct  3 19:47:37 2011	(r39799)
 <at>  <at>  -633,6 +633,7  <at>  <at> 
     ModuleList.cpp
     Spacing.cpp
     TextClass.cpp
+    version.cpp
     insets/InsetLayout.cpp
 ''')

(Continue reading)

spitz | 5 Oct 2011 14:57
Favicon

r39800 - lyx-devel/branches/BRANCH_2_0_X/src/insets

Author: spitz
Date: Wed Oct  5 14:57:04 2011
New Revision: 39800
URL: http://www.lyx.org/trac/changeset/39800

Log:
backport r39756: As for setMultiRow, check border status _before_ merging, thus fixing border
allocation problems.

No status entry needed; this is a complementing change to r39755.

Modified:
   lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp
   lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.h

Modified: lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp	Mon Oct  3 19:47:37 2011	(r39799)
+++ lyx-devel/branches/BRANCH_2_0_X/src/insets/InsetTabular.cpp	Wed Oct  5 14:57:04 2011	(r39800)
 <at>  <at>  -1615,7 +1615,8  <at>  <at> 
 }

 
-Tabular::idx_type Tabular::setMultiColumn(idx_type cell, idx_type number)
+Tabular::idx_type Tabular::setMultiColumn(idx_type cell, idx_type number,
+					  bool const right_border)
 {
 	idx_type const col = cellColumn(cell);
 	idx_type const row = cellRow(cell);
 <at>  <at>  -1629,7 +1630,7  <at>  <at> 
(Continue reading)

rgheck | 5 Oct 2011 23:08
Favicon

r39801 - lyx-devel/trunk/src

Author: rgheck
Date: Wed Oct  5 23:08:42 2011
New Revision: 39801
URL: http://www.lyx.org/trac/changeset/39801

Log:
Clean up a bit. These comments are no help here.

Modified:
   lyx-devel/trunk/src/Layout.cpp

Modified: lyx-devel/trunk/src/Layout.cpp
==============================================================================
--- lyx-devel/trunk/src/Layout.cpp	Wed Oct  5 14:57:04 2011	(r39800)
+++ lyx-devel/trunk/src/Layout.cpp	Wed Oct  5 23:08:42 2011	(r39801)
 <at>  <at>  -47,16 +47,11  <at>  <at> 
 	LT_COPYSTYLE,
 	LT_DEPENDSON,
 	LT_OBSOLETEDBY,
-	//LT_EMPTY,
 	LT_END,
-	//LT_ENVIRONMENT_DEFAULT,
-	//LT_FANCYHDR,
-	//LT_FIRST_COUNTER,
 	LT_FONT,
 	LT_FREE_SPACING,
 	LT_PASS_THRU,
 	LT_PARBREAK_IS_NEWLINE,
-	//LT_HEADINGS,
 	LT_ITEMSEP,
(Continue reading)


Gmane