diff options
| -rw-r--r-- | advtrains_line_automation/line_functions.lua | 32 | ||||
| -rw-r--r-- | advtrains_line_automation/station_editor.lua | 5 |
2 files changed, 2 insertions, 35 deletions
diff --git a/advtrains_line_automation/line_functions.lua b/advtrains_line_automation/line_functions.lua index 9000517..2f5cab9 100644 --- a/advtrains_line_automation/line_functions.lua +++ b/advtrains_line_automation/line_functions.lua @@ -37,12 +37,6 @@ local last_passages = {--[[ } ]]} -local diakritika_na_velka = { - ["á"] = "Á", ["ä"] = "Ä", ["č"] = "Č", ["ď"] = "Ď", ["é"] = "É", ["ě"] = "Ě", ["í"] = "Í", ["ĺ"] = "Ĺ", ["ľ"] = "Ľ", - ["ň"] = "Ň", ["ó"] = "Ó", ["ô"] = "Ô", ["ŕ"] = "Ŕ", ["ř"] = "Ř", ["š"] = "Š", ["ť"] = "Ť", ["ú"] = "Ú", ["ů"] = "Ů", - ["ý"] = "Ý", ["ž"] = "Ž", -} - local debug_print_i = 0 -- LOCAL funkce: @@ -64,24 +58,6 @@ local function get_station_name(stn) end al.get_station_name = get_station_name -local function na_velka_pismena(s) - local l = #s - local i = 1 - local res = "" - local c - while i <= l do - c = diakritika_na_velka[s:sub(i, i + 1)] - if c then - res = res .. c - i = i + 2 - else - res = res .. s:sub(i, i) - i = i + 1 - end - end - return string.upper(res) -end - --[[ -- Vrací index následujícího výskytu 'stn' v seznamu zastávek podle linevar_def. -- Vrací i skryté zastávky, ale ne vypnuté. @@ -368,7 +344,6 @@ function al.get_line_display(linevar_def) line_number = true, last_stop = true, last_stop_prefix = "", - last_stop_uppercase = true, })) end @@ -378,7 +353,6 @@ end first_stop = bool or nil, -- zahrnout do popisu název výchozí zastávky? nil => false last_stop = bool or nil, -- zahrnout do popisu název cílové zastávky? nil => true last_stop_prefix = string or nil, -- text před název cílové zastávky; nil => "⇒ " - last_stop_uppercase = bool or nil, -- je-li true, název cílové zastávky se před uvedením převede na velká písmena } ]] function al.get_line_description(linevar_def, options) @@ -396,9 +370,6 @@ function al.get_line_description(linevar_def, options) end if first_stn == last_stn and options.first_stop and (options.last_stop == nil or options.last_stop) then s2 = get_station_name(last_stn) - if options.last_stop_uppercase then - s2 = na_velka_pismena(s2) - end s3 = " (okružní)" else if options.first_stop then @@ -408,9 +379,6 @@ function al.get_line_description(linevar_def, options) end if options.last_stop == nil or options.last_stop then s3 = get_station_name(last_stn) - if options.last_stop_uppercase then - s3 = na_velka_pismena(s3) - end s3 = (options.last_stop_prefix or "⇒ ")..s3 else s3 = "" diff --git a/advtrains_line_automation/station_editor.lua b/advtrains_line_automation/station_editor.lua index fccc357..a456c7e 100644 --- a/advtrains_line_automation/station_editor.lua +++ b/advtrains_line_automation/station_editor.lua @@ -582,8 +582,7 @@ local function get_all_linevars() for stn, stdata in pairs(advtrains.lines.stations) do for linevar, linevar_def in pairs(stdata.linevars or empty_table) do local line, stn = advtrains.lines.linevar_decompose(linevar) - local target_fs = F(advtrains.lines.get_line_description(linevar_def, {line_number = false, last_stop = true, last_stop_prefix = "", - last_stop_uppercase = false})) + local target_fs = F(advtrains.lines.get_line_description(linevar_def, {line_number = false, last_stop = true, last_stop_prefix = ""})) local status_fs if trains_by_linevar[linevar] ~= nil then status_fs = "#00ff00,"..S("in operation") @@ -613,7 +612,7 @@ end local function get_linevars_by_filter(stn_filter, track_filter) local result = {} local empty_table = {} - local line_description_options = {line_number = false, last_stop = true, last_stop_prefix = "", last_stop_uppercase = false} + local line_description_options = {line_number = false, last_stop = true, last_stop_prefix = ""} local trains_by_linevar = advtrains.lines.get_trains_by_linevar() assert(stn_filter) if track_filter == "" then |