The branch, 2.0.x, has been updated.

- Log -----------------------------------------------------------------

commit 0493893fdd00652ae74aff5a815662bf98077d1b
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Tue Nov 20 22:22:52 2012 +0100

    Font.cpp: fix bug #8424 also for branch
    
    - Font.cpp: fix the bug
    - status.20x: fix the formatting/style

diff --git a/src/Font.cpp b/src/Font.cpp
index 9377db7..733f868 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -332,7 +332,7 @@ int Font::latexWriteStartChanges(odocstream & os, 
BufferParams const & bparams,
                }
        }
 
-       // When the current language is Hebrew, Arabic, or Farsi
+       // If the current language is Hebrew, Arabic, or Farsi
        // the numbers are written Left-to-Right. ArabTeX package
        // reorders the number automatically but the packages used
        // for Hebrew and Farsi (Arabi) do not.
@@ -428,7 +428,7 @@ int Font::latexWriteStartChanges(odocstream & os, 
BufferParams const & bparams,
                }
                os << '\\'
                   << LaTeXSizeNames[f.size()]
-                  << ' ';
+                  << '{';
                count += strlen(LaTeXSizeNames[f.size()]) + 2;
        }
        return count;
@@ -513,6 +513,8 @@ int Font::latexWriteEndChanges(otexstream & os, 
BufferParams const & bparams,
                        os << '}';
                        ++count;
                }
+               os << '}';
+               ++count;
        }
 
        // When the current language is Hebrew, Arabic, or Farsi
diff --git a/status.20x b/status.20x
index 745904d..6db007a 100644
--- a/status.20x
+++ b/status.20x
@@ -55,18 +55,18 @@ What's new
 
 * DOCUMENT INPUT/OUTPUT
 
-- Do not let child document's settings override master settings
-  (bug #5941).
+- Do not let child document's settings override master settings (bug 5941).
 
+- Correct output of text in changed font size and with decorations (bug 8424).
 
 
 * USER INTERFACE
 
 - Fix regression in which clicking in the main work area always resets
-  the selected format in View > Source (bug #8411).
+  the selected format in View > Source (bug 8411).
   
 - When selecting text and Insert > Preview, immediately display the
-  preview (bug #8075).
+  preview (bug 8075).
 
 
 * DOCUMENTATION AND LOCALIZATION

-----------------------------------------------------------------------

Summary of changes:
 src/Font.cpp |    6 ++++--
 status.20x   |    8 ++++----
 2 files changed, 8 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to