From b26c054f51b19f2bf0a23cc7caad589710646308 Mon Sep 17 00:00:00 2001 From: Holger Vogt Date: Sat, 22 Feb 2020 15:50:19 +0100 Subject: [PATCH] replace variable 'gridwidth' by 'xgridwidth' --- examples/utf-8/стекло/ext-utf8-2.cir | 4 ++-- examples/utf-8/стекло/ext-utf8-3.cir | 4 ++-- examples/utf-8/стекло/ext-utf8-c.cir | 4 ++-- examples/utf-8/стекло/ext-utf8-c2.cir | 4 ++-- examples/utf-8/стекло/ext-utf8-c4.cir | 4 ++-- examples/utf-8/стекло/있어요/ext-utf8-3.cir | 4 ++-- src/frontend/plotting/gnuplot.c | 2 +- src/frontend/plotting/x11.c | 2 +- src/frontend/postsc.c | 2 +- src/frontend/wdisp/windisp.c | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/examples/utf-8/стекло/ext-utf8-2.cir b/examples/utf-8/стекло/ext-utf8-2.cir index e12d0cb08..194e77fe0 100644 --- a/examples/utf-8/стекло/ext-utf8-2.cir +++ b/examples/utf-8/стекло/ext-utf8-2.cir @@ -15,7 +15,7 @@ set wfont_size=18 setcs xfont='Noto Sans Chinese' *set xfont_size=18 -set gridwidth=4 +set xgridwidth=4 set xbrushwidth=1 plot y vs x xlabel 'Labellisé X' ylabel 'Labellisé Y: ÜüÖöÄäÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜÜ' title 'Titré' @@ -23,7 +23,7 @@ plot y vs x xlabel '我能吞下玻璃而不伤身体' ylabel 'Я могу ес * With Linux the next one requires: export LC_CTYPE ="de_DE.UTF-8" gnuplot test.gn y vs x xlabel 'Labellisé X' ylabel 'tüTÄtö Äü @µ€~' title 'ฉันกินกระจกได้ แต่มันไม่ทำให้ฉันเจ็บ ' -set gridwidth=1 +set xgridwidth=1 set xbrushwidth=4 plot y vs x+0.001 xlabel 'Labellisé X' ylabel 'Labellisé Y' title 'Titré 私はガラスを食べられます。それは私を傷つけません' loglog diff --git a/examples/utf-8/стекло/ext-utf8-3.cir b/examples/utf-8/стекло/ext-utf8-3.cir index d1b46d0e9..4fe53fc3b 100644 --- a/examples/utf-8/стекло/ext-utf8-3.cir +++ b/examples/utf-8/стекло/ext-utf8-3.cir @@ -23,7 +23,7 @@ set wfont_size=18 setcs xfont='Noto Sans' *set xfont_size=18 -set gridwidth=4 +set xgridwidth=4 set xbrushwidth=1 *hardcopy @@ -36,7 +36,7 @@ if $oscompiled = 6 endif gnuplot test.gn y vs x xlabel 'Labellisé X' ylabel 'tüTÄtö Äü @µ€~' title 'ฉันกินกระจกได้ แต่มันไม่ทำให้ฉันเจ็บ ' -set gridwidth=1 +set xgridwidth=1 set xbrushwidth=4 plot y vs x+0.001 xlabel 'Labellisé X' ylabel 'Labellisé Y' title 'Titré 私はガラスを食べられます。それは私を傷つけません' loglog diff --git a/examples/utf-8/стекло/ext-utf8-c.cir b/examples/utf-8/стекло/ext-utf8-c.cir index 149977a56..a4b336463 100644 --- a/examples/utf-8/стекло/ext-utf8-c.cir +++ b/examples/utf-8/стекло/ext-utf8-c.cir @@ -17,7 +17,7 @@ set wfont_size=18 setcs xfont='Noto Sans' *set xfont_size=18 -set gridwidth=4 +set xgridwidth=4 set xbrushwidth=1 set color0=white set color2=brown @@ -29,7 +29,7 @@ plot y vs x xlabel '我能吞下玻璃而不伤身体' ylabel 'Я могу ес set color0=Blue set color1=Yellow set color2=Lime -set gridwidth=1 +set xgridwidth=1 set xbrushwidth=4 plot y vs x+0.001 xlabel 'Labellisé X' ylabel 'Labellisé Y' title 'Titré 私はガラスを食べられます。それは私を傷つけません' loglog unset color1 diff --git a/examples/utf-8/стекло/ext-utf8-c2.cir b/examples/utf-8/стекло/ext-utf8-c2.cir index 08eea2af8..d1ae08e3b 100644 --- a/examples/utf-8/стекло/ext-utf8-c2.cir +++ b/examples/utf-8/стекло/ext-utf8-c2.cir @@ -17,7 +17,7 @@ set wfont_size=18 setcs xfont='Noto Sans' *set xfont_size=18 -set gridwidth=4 +set xgridwidth=4 set xbrushwidth=1 set color0=white *set color2=brown @@ -30,7 +30,7 @@ plot y vs x xlabel '我能吞下玻璃而不伤身体' ylabel 'Я могу ес set color0=Blue set color1=Yellow set color2=rgb:00/FF/00 -set gridwidth=1 +set xgridwidth=1 set xbrushwidth=4 plot y vs x+0.001 xlabel 'Labellisé X' ylabel 'Labellisé Y' title 'Titré 私はガラスを食べられます。それは私を傷つけません' loglog unset color1 diff --git a/examples/utf-8/стекло/ext-utf8-c4.cir b/examples/utf-8/стекло/ext-utf8-c4.cir index a2bdabaa6..8543156dd 100644 --- a/examples/utf-8/стекло/ext-utf8-c4.cir +++ b/examples/utf-8/стекло/ext-utf8-c4.cir @@ -11,7 +11,7 @@ setcs xfont='Noto Sans CJK JP' *setcs xfont='맑은 고딕' set xfont_size=20 -set gridwidth=1 +set xgridwidth=1 set xbrushwidth=8 set color2=rgbd:0/126/0 set color0=blue @@ -22,7 +22,7 @@ set color2=rgbd:0/0/255 set color1=rgb:0/0/0 set color0=white set xbrushwidth=4 -set gridwidth=2 +set xgridwidth=2 set nolegend plot y vs x xlabel '나는 유리를 먹을 수 있어요' ylabel 'それは私を傷つけません' title ' أنا قادر على أكل الزجاج و هذا لا يؤلمني.' echo 나는 유리를 먹을 수 있어요. 그래도 아프지 않아요 diff --git a/examples/utf-8/стекло/있어요/ext-utf8-3.cir b/examples/utf-8/стекло/있어요/ext-utf8-3.cir index aa6305b8e..e3c17ad71 100644 --- a/examples/utf-8/стекло/있어요/ext-utf8-3.cir +++ b/examples/utf-8/стекло/있어요/ext-utf8-3.cir @@ -15,7 +15,7 @@ set wfont_size=18 setcs xfont='Noto Sans CJK JP Medium' *set xfont_size=16 -set gridwidth=4 +set xgridwidth=4 set xbrushwidth=1 set nolegend @@ -27,7 +27,7 @@ plot y vs x xlabel '我能吞下玻璃而不伤身体' ylabel 'Я могу * With Linux the next one requires: export LC_CTYPE ="de_DE.UTF-8" **gnuplot test.gn y vs x xlabel 'Labellisé X' ylabel 'tüTÄtö Äü @µ€~' title 'ฉันกินกระจกได้ แต่มันไม่ทำให้ฉันเจ็บ ' -set gridwidth=1 +set xgridwidth=1 set xbrushwidth=4 **plot y vs x+0.001 xlabel 'Labellisé X' ylabel 'Labellisé Y' title 'Titré 私はガラスを食べられます。それは私を傷つけません' loglog diff --git a/src/frontend/plotting/gnuplot.c b/src/frontend/plotting/gnuplot.c index 9420a31aa..a99b1e56b 100644 --- a/src/frontend/plotting/gnuplot.c +++ b/src/frontend/plotting/gnuplot.c @@ -113,7 +113,7 @@ void ft_gnuplot(double *xlims, double *ylims, if (linewidth < 1) linewidth = 1; /* get linewidth for grid from .spiceinit */ - if (!cp_getvar("gridwidth", CP_NUM, &gridlinewidth, 0)) + if (!cp_getvar("xgridwidth", CP_NUM, &gridlinewidth, 0)) gridlinewidth = 1; if (gridlinewidth < 1) gridlinewidth = 1; diff --git a/src/frontend/plotting/x11.c b/src/frontend/plotting/x11.c index 370b3bdb6..8a88ce270 100644 --- a/src/frontend/plotting/x11.c +++ b/src/frontend/plotting/x11.c @@ -569,7 +569,7 @@ X11_NewViewport(GRAPH *graph) gcvalues.line_width = graph->graphwidth = linewidth; /* get linewidth information from .spiceinit or .control section */ - if (!cp_getvar("gridwidth", CP_NUM, &gridlinewidth, 0)) + if (!cp_getvar("xgridwidth", CP_NUM, &gridlinewidth, 0)) gridlinewidth = MW_LINEWIDTH; if (gridlinewidth < 0) gridlinewidth = MW_LINEWIDTH; diff --git a/src/frontend/postsc.c b/src/frontend/postsc.c index ec07a60eb..d7e0da70c 100644 --- a/src/frontend/postsc.c +++ b/src/frontend/postsc.c @@ -182,7 +182,7 @@ int PS_Init(void) linewidth = 0; /* get linewidth for grid from spinit */ - if (!cp_getvar("gridwidth", CP_REAL, &gridlinewidth, 0)) + if (!cp_getvar("xgridwidth", CP_REAL, &gridlinewidth, 0)) gridlinewidth = linewidth; if (gridlinewidth < 0) gridlinewidth = 0; diff --git a/src/frontend/wdisp/windisp.c b/src/frontend/wdisp/windisp.c index 8ea6824d2..9ed9df0df 100644 --- a/src/frontend/wdisp/windisp.c +++ b/src/frontend/wdisp/windisp.c @@ -781,7 +781,7 @@ int WIN_NewViewport(GRAPH *graph) graph->graphwidth = linewidth; /* get linewidth information from .spiceinit or .control section */ - if (!cp_getvar("gridwidth", CP_NUM, &gridlinewidth, 0)) + if (!cp_getvar("xgridwidth", CP_NUM, &gridlinewidth, 0)) gridlinewidth = 0; if (gridlinewidth < 0) gridlinewidth = 0;