From 7af24747ec15e6fca7d63a08a059d9b1c409e8d3 Mon Sep 17 00:00:00 2001 From: h_vogt Date: Sun, 6 Mar 2011 23:48:35 +0000 Subject: [PATCH] bug no. 3201331 --- ChangeLog | 3 +++ src/frontend/inpcom.c | 45 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5966233df..2c25abfb8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ +2011-03-07 Holger Vogt + * inpcom.c: bug no. 3201331 fixed + 2011-03-04 Robert Larice * src/spicelib/devices/isrc/isrcdefs.h : bug fix, isrc polarity inversion diff --git a/src/frontend/inpcom.c b/src/frontend/inpcom.c index c4df23d3a..939aa3a40 100644 --- a/src/frontend/inpcom.c +++ b/src/frontend/inpcom.c @@ -110,6 +110,7 @@ static char* inp_remove_ws( char *s ); static void inp_compat(struct line *deck); static void inp_bsource_compat(struct line *deck); + /*-------------------------------------------------------------------------* * This routine reads a line (of arbitrary length), up to a '\n' or 'EOF' * * and returns a pointer to the resulting null terminated string. * @@ -1204,6 +1205,8 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name, bool c /* only the last title line remains valid */ if (new_title != NULL) tfree(new_title); new_title = copy(s); + if (s=strstr(new_title, "\n")) + *s = ' '; *buffer = '*'; /* change .TITLE line to comment line */ } @@ -1655,6 +1658,7 @@ inp_readall(FILE *fp, struct line **data, int call_depth, char *dir_name, bool c inp_fix_gnd_name(working); inp_chk_for_multi_in_vcvs(working, &line_number); + if (cp_getvar("addcontrol", CP_BOOL, NULL)) inp_add_control_section(working, &line_number); inp_compat_mode = ngspice_compat_mode() ; @@ -3580,6 +3584,47 @@ inp_split_multi_param_lines( struct line *deck, int line_num ) return line_num; } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + /* pspice compatibility: ECOMP 3 0 TABLE {V(1,2)} = (-1MV 0V) (1MV, 10V) -->