The branch, master, has been updated.

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

commit 97bc443584fbe8c3add143241dadb45c14c00743
Author: Georg Baum <[email protected]>
Date:   Thu Feb 28 22:23:23 2013 +0100

    Fix regression of f2d2b7c
    
    Thanks Scott for finding the relevant change set!

diff --git a/src/Encoding.cpp b/src/Encoding.cpp
index 1f7665f..ff83ab8 100644
--- a/src/Encoding.cpp
+++ b/src/Encoding.cpp
@@ -728,6 +728,7 @@ docstring Encodings::fromLaTeXCommand(docstring const & 
cmd, int cmdtype,
                                // after its base
                                symbols += a;
                                symbols += combining->first;
+                               i = j + 1;
                                unicmd_size = 2;
                        }
                }

commit ea4bbece46c4698ab097cf38f0b6e42c6bc496bc
Author: Georg Baum <[email protected]>
Date:   Thu Feb 28 21:06:45 2013 +0100

    Forgotten files.
    
    Kornel, it looks like the cmake update tests method misses these.

diff --git a/src/tex2lyx/test/Dummy Document.lyx b/src/tex2lyx/test/Dummy 
Document.lyx
index 52daa2e..7e48872 100644
--- a/src/tex2lyx/test/Dummy Document.lyx       
+++ b/src/tex2lyx/test/Dummy Document.lyx       
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 463
+\lyxformat 464
 \begin_document
 \begin_header
 \textclass article
@@ -40,6 +40,7 @@
 \use_geometry false
 \use_package amsmath 2
 \use_package amssymb 2
+\use_package cancel 0
 \use_package esint 1
 \use_package mathdots 0
 \use_package mathtools 0
diff --git a/src/tex2lyx/test/DummyDocument.lyx 
b/src/tex2lyx/test/DummyDocument.lyx
index 310e9a7..52478cb 100644
--- a/src/tex2lyx/test/DummyDocument.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 463
+\lyxformat 464
 \begin_document
 \begin_header
 \textclass article
@@ -40,6 +40,7 @@
 \use_geometry false
 \use_package amsmath 2
 \use_package amssymb 2
+\use_package cancel 0
 \use_package esint 1
 \use_package mathdots 0
 \use_package mathtools 0
diff --git a/src/tex2lyx/test/Dummy~Document.lyx 
b/src/tex2lyx/test/Dummy~Document.lyx
index 03ab7be..2a2204a 100644
--- a/src/tex2lyx/test/Dummy~Document.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx
@@ -1,5 +1,5 @@
 #LyX file created by tex2lyx 2.1.0dev
-\lyxformat 463
+\lyxformat 464
 \begin_document
 \begin_header
 \textclass article
@@ -40,6 +40,7 @@
 \use_geometry false
 \use_package amsmath 2
 \use_package amssymb 2
+\use_package cancel 0
 \use_package esint 1
 \use_package mathdots 0
 \use_package mathtools 0

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

Summary of changes:
 src/Encoding.cpp                    |    1 +
 src/tex2lyx/test/Dummy Document.lyx |    3 ++-
 src/tex2lyx/test/DummyDocument.lyx  |    3 ++-
 src/tex2lyx/test/Dummy~Document.lyx |    3 ++-
 4 files changed, 7 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
The LyX Source Repository

Reply via email to