solunar.patch 2.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162
  1. --- main.c.old 2012-05-21 13:55:30.000000000 +0200
  2. +++ main.c 2012-09-13 18:29:00.000000000 +0200
  3. @@ -54,7 +54,7 @@
  4. printf (" -d, --datetime [date_time] set date and/or time\n");
  5. printf (" --datetime help show date/time format\n");
  6. printf (" -f, --full print full data\n");
  7. - printf (" -h print brief help message\n");
  8. + printf (" -h, --help print brief help message\n");
  9. printf (" -l, --latlong [+DDMM+DDDMM] latitude/longitude\n");
  10. printf (" --latlong help show lat/long format\n");
  11. printf (" --days list significant days in year\n");
  12. @@ -301,9 +301,9 @@
  13. {"latlong", required_argument, NULL, 'l'},
  14. {"longhelp", no_argument, &opt_longhelp, 0},
  15. {"quiet", no_argument, &opt_quiet, 'q'},
  16. - {"utc", no_argument, &opt_utc, 'v'},
  17. + {"utc", no_argument, &opt_utc, 'u'},
  18. {"version", no_argument, &opt_version, 'v'},
  19. - {"list-named-days", no_argument, &opt_list_named_days, 0},
  20. + {"days", no_argument, &opt_list_named_days, 0},
  21. {0, 0, 0, 0},
  22. };
  23. @@ -325,7 +325,7 @@
  24. {
  25. opt_utc = TRUE;
  26. }
  27. - if (strcmp (long_options[option_index].name, "list-named-days") == 0)
  28. + if (strcmp (long_options[option_index].name, "days") == 0)
  29. {
  30. opt_list_named_days = TRUE;
  31. }
  32. @@ -634,7 +634,7 @@
  33. SUNTIMES_CIVIL_TWILIGHT,
  34. opt_utc, tz, workingLatlong, datetimeObj);
  35. print_sunset_time (" Civil twilight ends: ",
  36. - SUNTIMES_NAUTICAL_TWILIGHT,
  37. + SUNTIMES_CIVIL_TWILIGHT,
  38. opt_utc, tz, workingLatlong, datetimeObj);
  39. print_sunrise_time (" Nautical twilight starts: ",
  40. @@ -695,7 +695,7 @@
  41. for (i = 0; i < nevents; i++)
  42. {
  43. char *s = DateTime_time_to_string_local (events[i], tz);
  44. - printf (" Moonset: %s\n", s);
  45. + printf (" Moonrise: %s\n", s);
  46. free (s);
  47. DateTime_free (events[i]);
  48. }
  49. --- TODO.old 2012-05-21 14:19:58.000000000 +0200
  50. +++ TODO 2012-09-13 18:56:00.000000000 +0200
  51. @@ -4,7 +4,7 @@
  52. year, or the current year if none set. The rest of the date information
  53. is ignored. To get the days for a specific year you can do, for example,
  54. -solunar --list-named-days --datetime 1#2013
  55. +solunar --days --datetime 1#2013
  56. Note all dates and times, both specified and output, are local to the home
  57. locale, or the city specified by --city, unless --utc is given. The --utc