Skip to content

Commit

Permalink
Merge pull request #3476 from pleroy/3475
Browse files Browse the repository at this point in the history 
Insert zwsp between digits and units to make the selection more user-friendly
  • Loading branch information
@pleroy
pleroy authored Dec 17, 2022
2 parents e1b6ad5 + c314545 commit e949e43
Showing 1 changed file with 38 additions and 36 deletions.
74 changes: 38 additions & 36 deletions ksp_plugin_adapter/time_span.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,11 +52,10 @@ public string Format(bool with_leading_zeroes,
fractional_seconds_digits);
}

public string FormatPositive(
bool with_leading_zeroes,
bool with_seconds,
bool iau_style = false,
int fractional_second_digits = 1) {
public string FormatPositive(bool with_leading_zeroes,
bool with_seconds,
bool iau_style = false,
int fractional_second_digits = 1) {
if (!Split(out int days,
out int hours,
out int minutes,
Expand All @@ -76,23 +75,22 @@ public string FormatPositive(
components.Add(days.ToString("0;0"));
}
if (components.Count > 0) {
components.Add(iau_style ?$"{short_day_symbol}{nbsp}"
:$"{nbsp}{day_symbol}{nbsp}");
components.Add(iau_style
? $"{zwsp}{short_day_symbol}{nbsp}"
: $"{nbsp}{day_symbol}{nbsp}");
}
if (components.Count > 0 || with_leading_zeroes || hours != 0) {
components.Add(day_is_short
? hours.ToString("0;0")
: hours.ToString("00;00"));
components.Add(iau_style ? $"ʰ{nbsp}"
: $"{nbsp}h{nbsp}");
components.Add(iau_style ? $"{zwsp}ʰ{nbsp}" : $"{nbsp}h{nbsp}");
}
if (components.Count > 0 ||
with_leading_zeroes ||
minutes != 0 ||
!with_seconds) {
components.Add(minutes.ToString("00;00"));
components.Add(iau_style ? "ᵐ"
: $"{nbsp}min");
components.Add(iau_style ? $"{zwsp}ᵐ" : $"{nbsp}min");
}
if (with_seconds) {
if (fractional_second_digits > 0) {
Expand All @@ -102,40 +100,41 @@ public string FormatPositive(
seconds.ToString(
$"00.{fractional_format};00.{fractional_format}"),
@"\d{3}(?=\d)",
match => match.Value + "'");;
match => match.Value + "'");
if (iau_style) {
components.Add(nbsp + seconds_field.Replace(".", "ˢ."));
components.Add(nbsp + seconds_field.Replace(".", $"{zwsp}ˢ."));
} else {
components.Add($"{nbsp}{seconds_field}{nbsp}s");
}
} else {
components.Add(iau_style ? $"{nbsp}{seconds:00}ˢ"
: $"{nbsp}{seconds:00}{nbsp}s");
components.Add(iau_style
? $"{nbsp}{seconds:00}{zwsp}ˢ"
: $"{nbsp}{seconds:00}{nbsp}s");
}
}
return string.Join("", components.ToArray());
}

public double total_seconds => seconds_;

public static bool TryParse(string text,
out PrincipiaTimeSpan time_span) {
public static bool TryParse(string text, out PrincipiaTimeSpan time_span) {
time_span = new PrincipiaTimeSpan(double.NaN);
// Using a technology that is customarily used to parse HTML.
// Wrapping the literal in a Regex constructor and then substituting the day
// symbols in order to get VS to syntax highlight the regex.
var regex = new Regex(@"
^[+]?\s*
(?:(?<days>\d+)\s*(?:{day_symbol}|{short_day_symbol})\s*)?
(?:(?<hours>\d+)\s*[hʰ]\s*)?
(?:(?<minutes>\d+)\s*(?:[mᵐ]|min)\s*)?
(?:(?<seconds>[0-9.,']+)\s*[sˢ]\s*|
(?<integer_seconds>[0-9']+)[sˢ][.,]
(?:(?<days>\d+)[\s|{zwsp}]*(?:{day_symbol}|{short_day_symbol})\s*)?
(?:(?<hours>\d+)[\s|{zwsp}]*[hʰ]\s*)?
(?:(?<minutes>\d+)[\s|{zwsp}]*(?:[mᵐ]|min)\s*)?
(?:(?<seconds>[0-9.,']+)[\s|{zwsp}]*[sˢ]\s*|
(?<integer_seconds>[0-9']+)[\s|{zwsp}]*[sˢ][.,]
(?<fractional_seconds>[0-9']+))?$",
RegexOptions.IgnorePatternWhitespace);
RegexOptions.IgnorePatternWhitespace);
regex = new Regex(
regex.ToString().Replace("{day_symbol}", day_symbol)
.Replace("{short_day_symbol}", short_day_symbol),
regex.ToString().Replace("{day_symbol}", day_symbol).
Replace("{short_day_symbol}", short_day_symbol).
Replace("{zwsp}", zwsp),
RegexOptions.IgnorePatternWhitespace);
var match = regex.Match(text);
if (!match.Success) {
Expand All @@ -152,12 +151,14 @@ public static bool TryParse(string text,
string hours = hours_group.Success ? hours_group.Value : "0";
string minutes = minutes_group.Success ? minutes_group.Value : "0";
string seconds = seconds_group.Success
? seconds_group.Value
: integer_seconds_group.Success
? string.Join(".",
integer_seconds_group.Value,
fractional_seconds_group.Value)
: "0";
? seconds_group.Value
:
integer_seconds_group.Success
?
string.Join(".",
integer_seconds_group.Value,
fractional_seconds_group.Value)
: "0";
if (!int.TryParse(days, out int d) ||
!int.TryParse(hours, out int h) ||
!int.TryParse(minutes, out int min) ||
Expand All @@ -177,16 +178,16 @@ public static bool TryParse(string text,
}

public static int day_duration => date_time_formatter.Day;

public static string day_symbol =>
hour_divides_day && day_is_short
? "d" + (int)(date_time_formatter.Day / date_time_formatter.Hour)
: "d";

public static string short_day_symbol =>
hour_divides_day && day_is_short
? "ᵈ" + "⁰¹²³⁴⁵⁶⁷⁸⁹"[date_time_formatter.Day /
date_time_formatter.Hour]
? "ᵈ" +
"⁰¹²³⁴⁵⁶⁷⁸⁹"[date_time_formatter.Day / date_time_formatter.Hour]
: "ᵈ";

private static bool day_is_short =>
Expand All @@ -202,7 +203,8 @@ public static bool TryParse(string text,

private readonly double seconds_;
private const string nbsp = "\xA0";
private const string zwsp = "\u200B";
}

} // namespace ksp_plugin_adapter
} // namespace principia
} // namespace ksp_plugin_adapter
} // namespace principia

0 comments on commit e949e43

Please sign in to comment.