X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=lib%2Fconfigure.m4;h=b3734852a2c9cbc5d41a354cde763a99cd62d460;hb=f7e97284cbbab098cf3bf99976ec8af3146df8d3;hp=0aea284b018c2e7b898b230286d9a78ecf344fa9;hpb=62c0de61f76503b89cb471d4e10f2fd3e77ad176;p=lyx.git

diff --git a/lib/configure.m4 b/lib/configure.m4
index 0aea284b01..b3734852a2 100644
--- a/lib/configure.m4
+++ b/lib/configure.m4
@@ -463,16 +463,16 @@ changequote(,)dnl
 b
 
 :match
-# Remove the \DeclareFOOClass macro and add the correct boolean 
-# at the end of the line telling whether the class is 
+# Remove the \DeclareFOOClass macro and add the correct boolean
+# at the end of the line telling whether the class is
 # available
 s/^.*\DeclareLaTeXClass *\(.*\)/\1 "false"/
 s/^.*\DeclareDocBookClass *\(.*\)/\1 "'$bool_docbook'"/
 s/^.*\DeclareLinuxDocClass *\(.*\)/\1 "'$bool_linuxdoc'"/
-# If the macro had an optional argument with several 
+# If the macro had an optional argument with several
 # parameters, only keep the first one
 s/\[\([^,]*\),[^]]*\]/[\1]/
-# If the macro did not have an optional argument, provide one 
+# If the macro did not have an optional argument, provide one
 # (equal to the class name)
 s/^{/['$class']{/
 # Remove brackets and replace with correctly quoted entries
@@ -552,6 +552,14 @@ changequote(,)dnl
 echo "creating doc/LaTeXConfig.lyx"
 echo "s/@chk_linuxdoc@/$chk_linuxdoc/g" >> chkconfig.sed
 echo "s/@chk_docbook@/$chk_docbook/g" >> chkconfig.sed
+
+if test `uname -s | grep 'MINGW'` ; then
+    # Before running chkconfig.sed, remove the trailing '\r'
+    # characters that can bugger up various versions of sed.
+    tr -d '\r' < chkconfig.sed > chkconfig2.sed
+    mv -f chkconfig2.sed chkconfig.sed
+fi
+
 sed -f chkconfig.sed "${srcdir}"/doc/LaTeXConfig.lyx.in >doc/LaTeXConfig.lyx
 
 ### Let's check whether spaces are allowed in TeX file names
@@ -580,9 +588,9 @@ cat >$outfile <<EOF
 # want to customize LyX, make a copy of the file LYXDIR/lyxrc as
 # ~/.lyx/lyxrc and edit this file instead. Any setting in lyxrc will
 # override the values given here.
-\\Format asciichess asc    "ASCII (chess output)"  "" ""	"$TEXT_EDITOR"
-\\Format asciiimage asc    "ASCII (image)"         "" ""	"$TEXT_EDITOR"
-\\Format asciixfig  asc    "ASCII (xfig output)"   "" ""	"$TEXT_EDITOR"
+\\Format asciichess asc    "Plain text (chess output)"  "" ""	"$TEXT_EDITOR"
+\\Format asciiimage asc    "Plain text (image)"         "" ""	"$TEXT_EDITOR"
+\\Format asciixfig  asc    "Plain text (xfig output)"   "" ""	"$TEXT_EDITOR"
 \\Format agr        agr     GRACE                  "" "$GRACE_VIEWER"	"$GRACE_EDITOR"
 \\Format bmp        bmp     BMP                    "" "$RASTERIMAGE_VIEWER"	"$RASTERIMAGE_EDITOR"
 \\Format date       ""     "date command"          "" ""	""
@@ -615,8 +623,8 @@ cat >$outfile <<EOF
 \\Format pstex      pstex_t PSTEX                  "" ""	""
 \\Format tgif       obj     TGIF                   "" "$TGIF_VIEWER"	"$TGIF_EDITOR"
 \\Format sxw        sxw    "OpenOffice.Org Writer" O  ""	""
-\\Format text       txt     ASCII                  A  ""	"$TEXT_EDITOR"
-\\Format textparagraph txt "ASCII (paragraphs)"    "" ""	"$TEXT_EDITOR"
+\\Format text       txt    "Plain text"            a  ""	"$TEXT_EDITOR"
+\\Format textparagraph txt "Plain text (paragraphs)"    "" ""	"$TEXT_EDITOR"
 \\Format tiff       tif     TIFF                   "" "$RASTERIMAGE_VIEWER"	"$RASTERIMAGE_EDITOR"
 \\Format word       doc     Word                   W  ""	""
 \\Format xbm        xbm     XBM                    "" "$RASTERIMAGE_VIEWER"	"$RASTERIMAGE_EDITOR"