Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display dates according to calendar-date-style in render-title- functions #149

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Display dates according to calendar-date-style in render-title- functions #149

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3d72d1
Display dates according to calendar-date-style in render-title-
cdeleuze Aug 16, 2022
2a560da
Handle changing year in render-title-period
cdeleuze Aug 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 33 additions & 23 deletions calfw.el
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1259,37 +1259,47 @@ calling functions `cfw:annotations-functions'."
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Rendering Utilities

;; Display dates according to calendar-date-style

(defun cfw:render-title-month (date)
"Render the calendar title for the monthly view."
(format "%4s / %s"
(calendar-extract-year date)
(aref calendar-month-name-array
(1- (calendar-extract-month date)))))
(eval calendar-month-header
(list (cons 'month (calendar-extract-month date))
(cons 'year (calendar-extract-year date)))))

(defun cfw:render-title-period (begin-date end-date)
"Render the calendar title for the period view between BEGIN-DATE and END-DATE."
(cond
((eql (calendar-extract-month begin-date) (calendar-extract-month end-date))
(format "%4s / %s %s - %s"
(calendar-extract-year begin-date)
(aref calendar-month-name-array (1- (calendar-extract-month begin-date)))
(calendar-extract-day begin-date)
(calendar-extract-day end-date)))
(t
(format "%4s / %s %s - %s %s"
(calendar-extract-year begin-date)
(aref calendar-month-name-array (1- (calendar-extract-month begin-date)))
(calendar-extract-day begin-date)
(aref calendar-month-name-array (1- (calendar-extract-month end-date)))
(calendar-extract-day end-date)))))
(let ((bmonth (calendar-extract-month begin-date))
(emonth (calendar-extract-month end-date))
(byear (calendar-extract-year begin-date))
(eyear (calendar-extract-year end-date))
(bday (calendar-extract-day begin-date))
(eday (calendar-extract-day end-date)))
(cond
((eql bmonth emonth)
(let ((month (aref calendar-month-name-array (1- bmonth))))
(case calendar-date-style
('european (format "%s - %s %s %s" bday eday month byear))
('american (format "%s %s - %s %s" month bday eday byear))
('iso (format "%s %s %s - %s" byear month bday eday)))))
((eql byear eyear)
(let ((bmonth (aref calendar-month-name-array (1- bmonth)))
(emonth (aref calendar-month-name-array (1- emonth))))
(case calendar-date-style
('european (format "%s %s - %s %s %s" bday bmonth eday emonth byear))
('american (format "%s %s - %s %s %s" bmonth bday emonth eday byear))
('iso (format "%s %s %s - %s %s" byear bmonth bday emonth eday)))))
(t
(let ((bmonth (aref calendar-month-name-array (1- bmonth)))
(emonth (aref calendar-month-name-array (1- emonth))))
(case calendar-date-style
('european (format "%s %s %s - %s %s %s" bday bmonth byear eday emonth eyear))
('american (format "%s %s %s - %s %s %s" bmonth bday byear emonth eday eyear))
('iso (format "%s %s %s - %s %s %s" byear bmonth bday eyear emonth eday))))))))

(defun cfw:render-title-day (date)
"Render the calendar title for the day view on DATE."
(format "%4s / %s %s"
(calendar-extract-year date)
(aref calendar-month-name-array
(1- (calendar-extract-month date)))
(calendar-extract-day date)))
(calendar-date-string date))

(defun cfw:render-center (width string &optional padding)
"[internal] Format STRING in the center, padding on the both
Expand Down