Bug 11851 fixed: Default EOL under Mac should be LF 39/10539/3
Calixte DENIZET [Tue, 19 Feb 2013 14:26:14 +0000 (15:26 +0100)]
Change-Id: I8cd246f2ec082968e79e4e10229ddf467a21cf74

scilab/CHANGES_5.4.X
scilab/modules/scinotes/etc/XConfiguration-scinotes.xsl
scilab/modules/scinotes/src/java/org/scilab/modules/scinotes/SciNotesOptions.java

index e5989ff..e7a0a1d 100644 (file)
@@ -256,6 +256,8 @@ Bug fixes
 
 * Bug #11814 fixed - Fix a typo in one of the titles of CACSD.
 
+* Bug #11851 fixed - Default EOL under Mac should be LF.
+
 * Bug #11931 fixed - In graphics, white space was not used as default thousand
                      separator.
 
index 3cfd627..eae6476 100644 (file)
                                         <xsl:text>Windows (CR+LF)</xsl:text>
                                         
                                     </xsl:when>
-                                    
-                                    <xsl:when test="$OS='Mac'">
-                                        
-                                        <xsl:text>Mac OS (CR)</xsl:text>
-                                        
-                                    </xsl:when>
-                                    
                                     <xsl:otherwise>
                                         
                                         <xsl:text>Unix (LF)</xsl:text>
                         
                     </option>
                     
-                    <option value="Mac OS (CR)">
-                        
-                        <xsl:if test="$eol='Mac OS (CR)'">
-                            
-                            <xsl:attribute name="selected">selected</xsl:attribute>
-                            
-                        </xsl:if>
-                        
-                    </option>
-                    
                 </Select>
                 
             </Grid>
index 98a7a76..10f3fff 100644 (file)
@@ -73,17 +73,12 @@ public class SciNotesOptions {
                 case WINDOWS:
                     this.eol = ScilabDocument.EOLWIN;
                     break;
-                case MAC:
-                    this.eol = ScilabDocument.EOLMAC;
-                    break;
                 default:
                     this.eol = ScilabDocument.EOLUNIX;
                     break;
                 }
             } else if (eol.startsWith("Windows")) {
                 this.eol = ScilabDocument.EOLWIN;
-            } else if (eol.startsWith("Mac")) {
-                this.eol = ScilabDocument.EOLMAC;
             } else {
                 this.eol = ScilabDocument.EOLUNIX;
             }