[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lyx-devel
Subject:    Re: German Users Guide for 2.1
From:       Stephan Witt <st.witt () gmx ! net>
Date:       2013-06-27 7:34:57
Message-ID: B3F796C7-C384-4DF7-A4B5-31438011A211 () gmx ! net
[Download RAW message or body]

Am 26.06.2013 um 23:29 schrieb Stephan Witt <st.witt@gmx.net>:

> Am 26.06.2013 um 23:15 schrieb Uwe Stöhr <uwestoehr@web.de>:
> 
> > Am 26.06.2013 11:56, schrieb Stephan Witt:
> > 
> > > I catched a wrong word in Section 2.1.
> > > 
> > > The sentence "Es gibt keinen vertikalen Rollbalken" is wrong.
> > > Obviously it should be "Es gibt keinen horizontalen Rollbalken".
> > 
> > Thanks for the report, I fixed this now.
> > 
> > > I cannot fix it because a change of this word results in a diff of 100% of the \
> > > document.
> > 
> > Then your Git CR-LF settings are incorrect. It should be "AutoCRLF".
> 
> Maybe. I never had this problem with the source code of LyX before.
> 
> Stephan
> 
> > ( http://git-scm.com/book/ch7-1.html#Formatting-and-Whitespace )

I don't think this is the problem.

1. In case I change one line manually the diff is exactly that line.
Example: I added a line with a comment.

$ git diff lib/doc/de/UserGuide.lyx)
diff --git a/lib/doc/de/UserGuide.lyx b/lib/doc/de/UserGuide.lyx
index f16f8af..b9c4e9d 100644
--- a/lib/doc/de/UserGuide.lyx
+++ b/lib/doc/de/UserGuide.lyx
@@ -11,6 +11,7 @@
 % Wenn Probleme beim Exportieren auftreten, können Sie sich
 % an das LyX-Dokumentationsteam wenden.
 % EMail: lyx-docs@lists.lyx.org
+%
 
 % wenn pdflatex benutzt wird:
 \usepackage{ifpdf}
$

So, I conclude the diff was made by the save operation of LyX.
Currently the repository version of the file "lib/doc/de/UserGuide.lyx"
has dos line endings. LyX can read it but it converts it to plain unix
line endings on save. IOW, it saves it with platform related line endings.

I'd rate this as questionable behavior of LyX. For a new file this is ok.
But for an existing file it would be much better to respect the current 
style of line endings the file had when it was read into the buffer.

2. You are a victim of this too.

$ git log lib/doc/de/UserGuide.lyx
...
commit 1fded6e8175e92c1eaa1e85db7c3f8187e47e602
Author: Uwe Stöhr <uwestoehr@lyx.org>
Date:   Sun May 12 12:57:14 2013 +0200

    UserGuide.lyx: next revision step
    
    - sec. 6.7 - 6.13


commit 4b53c0d6c16c82b1b48464d23298dfa725b3d480
Author: Uwe Stöhr <uwestoehr@lyx.org>
Date:   Sat May 4 02:48:54 2013 +0200

    UserGuide.lyx: next revision step
    
    - revised sec. 6 - 6.6
    - describe longest label feature for bibliography environment
...
$ git diff --shortstat 4b53c0d6c16c82b1b48464d23298dfa725b3d480 \
1fded6e8175e92c1eaa1e85db7c3f8187e47e602 lib/doc/de/UserGuide.lyx  1 file changed, \
46104 insertions(+), 45903 deletions(-) $

This change introduced a 100% change from unix line endings to dos line endings.

3. Perhaps this is a regression from 2.0 to 2.1?

Stephan=


[prev in list] [next in list] [prev in thread] [next in thread]