Create Chapter 6 Bullets in Additional.lyx and move the bullet section into it; this...

[lyx.git] / lib / scripts / csv2lyx.py

diff --git a/lib/scripts/csv2lyx.py b/lib/scripts/csv2lyx.py
index 408b2afa7a0dc70aff83e9b4bb954ab9291bc8b3..27063235c9040f4ff1fdaecaa463733b8aa2d0f0 100644 (file)
--- a/lib/scripts/csv2lyx.py
+++ b/lib/scripts/csv2lyx.py
@@ -1,4 +1,3 @@
-#! /usr/bin/env python
 # -*- coding: utf-8 -*-
 
 # file csv2lyx.py
@@ -23,53 +22,77 @@ def error(message):
     sys.stderr.write(message + '\n')
     sys.exit(1)
 
-header = """#csv2lyx created this file
-\lyxformat 276
+header = """#csv2lyx created this file. For more info see http://www.lyx.org/
+\\lyxformat 413
 \\begin_document
 \\begin_header
 \\textclass article
+\\use_default_options true
+\\maintain_unincluded_children false
+\\language english
+\\language_package default
 \\inputencoding auto
+\\fontencoding global
 \\font_roman default
 \\font_sans default
 \\font_typewriter default
 \\font_default_family default
+\\use_non_tex_fonts false
 \\font_sc false
 \\font_osf false
 \\font_sf_scale 100
 \\font_tt_scale 100
+
 \\graphics default
+\\default_output_format default
+\\output_sync 0
+\\bibtex_command default
+\\index_command default
 \\paperfontsize default
+\\use_hyperref false
 \\papersize default
 \\use_geometry false
 \\use_amsmath 1
-\\use_esint 0
+\\use_esint 1
+\\use_mhchem 1
+\\use_mathdots 1
 \\cite_engine basic
 \\use_bibtopic false
+\\use_indices false
 \\paperorientation portrait
+\\suppress_date false
+\\use_refstyle 1
+\\index Index
+\\shortcut idx
+\\color #008000
+\\end_index
 \\secnumdepth 3
 \\tocdepth 3
 \\paragraph_separation indent
-\\defskip medskip
+\\paragraph_indentation default
+\\quotes_language english
 \\papercolumns 1
 \\papersides 1
 \\paperpagestyle default
 \\tracking_changes false
 \\output_changes false
+\\html_math_output 0
+\\html_css_as_file 0
+\\html_be_strict false
 \\end_header
 
 \\begin_body
 
 \\begin_layout Standard
-\\align left
 \\begin_inset Tabular
 <lyxtabular version="3" rows="%d" columns="%d">
-<features>
+<features tabularvalignment="middle">
 """
 
 cell = """<cell alignment="left" valignment="top" usebox="none">
 \\begin_inset Text
 
-\\begin_layout Standard
+\\begin_layout Plain Layout
 %s
 \\end_layout
 
@@ -141,15 +164,21 @@ if options.column_sep == 't':
 
 # when no special column separator is given, try to detect it:
 if options.column_sep and dialect :
-    reader = csv.reader(open(infile, "rb"), dialect = dialect, delimiter = options.column_sep)
+    reader = csv.reader(open(infile, "rU"), dialect = dialect, delimiter = options.column_sep)
 else:
     guesser = csv.Sniffer()
-    input_file = "".join(open(infile,'rb').readlines())
+    input_file = "".join(open(infile,'rU').readlines())
     try:
         dialect = guesser.sniff(input_file)
-        reader = csv.reader(open(infile, "rb"), dialect = dialect)
+        reader = csv.reader(open(infile, "rU"), dialect = dialect)
     except:
-        reader = csv.reader(open(infile, "rb"), dialect = dialect, delimiter =',')
+        # older versions (python < 2.5) of csv have problems (bugs)
+        # that is why we try harder to get a result, this should work on most cases
+        # as it assumes that the separator is a comma (the c in csv :-) )
+        try:
+            reader = csv.reader(open(infile, "rU"), dialect = dialect, delimiter = ',')
+        except:
+            reader = csv.reader(open(infile, "rU"), delimiter = ',')
 
 # read input
 num_cols = 1 # max columns