[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109719: Remove still more cal-tex co
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109719: Remove still more cal-tex code duplication |
Date: |
Tue, 21 Aug 2012 00:59:25 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109719
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Tue 2012-08-21 00:59:25 -0700
message:
Remove still more cal-tex code duplication
* lisp/calendar/cal-tex.el (cal-tex-leftday, cal-tex-rightday): New functions.
(cal-tex-cursor-week-at-a-glance, cal-tex-cursor-filofax-2week)
(cal-tex-cursor-filofax-week): Use them.
modified:
lisp/ChangeLog
lisp/calendar/cal-tex.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-08-21 07:46:47 +0000
+++ b/lisp/ChangeLog 2012-08-21 07:59:25 +0000
@@ -1,5 +1,10 @@
2012-08-21 Glenn Morris <address@hidden>
+ * calendar/cal-tex.el (cal-tex-leftday, cal-tex-rightday):
+ New functions.
+ (cal-tex-cursor-week-at-a-glance, cal-tex-cursor-filofax-2week)
+ (cal-tex-cursor-filofax-week): Use them.
+
* calendar/cal-tex.el (cal-tex-lefthead, cal-tex-righthead):
New constants.
(cal-tex-cursor-week-at-a-glance, cal-tex-cursor-filofax-2week)
=== modified file 'lisp/calendar/cal-tex.el'
--- a/lisp/calendar/cal-tex.el 2012-08-21 07:46:47 +0000
+++ b/lisp/calendar/cal-tex.el 2012-08-21 07:59:25 +0000
@@ -370,6 +370,28 @@
\\footskip 0.125in
")))
+(defun cal-tex-leftday (height)
+ "Insert LaTeX code for leftday function."
+ (insert "\\long\\def\\leftday#1#2#3#4#5{%
+ \\rule{\\textwidth}{0.3pt}\\\\%
+ \\hbox to \\textwidth{%
+ \\vbox to " height "{%
+ \\vspace*{2pt}%
+ \\hbox to \\textwidth{\\noindent {\\normalsize \\bf #2} \\small #1
\\hfill #5}%
+ \\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize \\em #4}}%
+ \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize
#3}}}}\\\\}\n"))
+
+(defun cal-tex-rightday (height)
+ "Insert LaTeX code for rightday function."
+ (insert "\\long\\def\\rightday#1#2#3#4#5{%
+ \\rule{\\textwidth}{0.3pt}\\\\%
+ \\hbox to \\textwidth{%
+ \\vbox to " height "{%
+ \\vspace*{2pt}%
+ \\hbox to \\textwidth{\\small #5 \\hfill #1 {\\normalsize \\bf #2}}%
+ \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em #4}}%
+ \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize
#3}}}}\\\\}\n"))
+
;;;###cal-autoload
(defun cal-tex-cursor-filofax-year (&optional n event)
"Make a Filofax one page yearly calendar of year indicated by cursor.
@@ -1060,15 +1082,8 @@
\\footskip .125in
")
(insert cal-tex-righthead)
- (insert "\\long\\def\\rightday#1#2#3#4#5{%
- \\rule{\\textwidth}{0.3pt}\\\\%
- \\hbox to \\textwidth{%
- \\vbox to 2.75in{%
- \\vspace*{2pt}%
- \\hbox to \\textwidth{\\small #5 \\hfill #1 {\\normalsize \\bf #2}}%
- \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em #4}}%
- \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize
#3}}}}\\\\}
-")
+ (cal-tex-rightday "2.75in")
+ ;; FIXME this is just (cal-tex-rightday "1.8in").
(insert "\\long\\def\\weekend#1#2#3#4#5{%
\\rule{\\textwidth}{0.3pt}\\\\%
\\hbox to \\textwidth{%
@@ -1079,15 +1094,7 @@
\\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize
#3}}}}\\\\}
")
(insert cal-tex-lefthead)
- (insert "\\long\\def\\leftday#1#2#3#4#5{%
- \\rule{\\textwidth}{0.3pt}\\\\%
- \\hbox to \\textwidth{%
- \\vbox to 2.75in{%
- \\vspace*{2pt}%
- \\hbox to \\textwidth{\\noindent {\\normalsize \\bf #2} \\small #1
\\hfill #5}%
- \\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize \\em #4}}%
- \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize
#3}}}}\\\\}
-")
+ (cal-tex-leftday "2.75in")
(cal-tex-b-document)
(cal-tex-cmd "\\pagestyle" "empty")
(dotimes (i n)
@@ -1215,25 +1222,9 @@
(cal-tex-preamble "twoside")
(cal-tex-filofax-paper)
(insert cal-tex-righthead)
- (insert "\\long\\def\\rightday#1#2#3#4#5{%
- \\rule{\\textwidth}{0.3pt}\\\\%
- \\hbox to \\textwidth{%
- \\vbox to 0.7in{%
- \\vspace*{2pt}%
- \\hbox to \\textwidth{\\small #5 \\hfill #1 {\\normalsize \\bf #2}}%
- \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em #4}}%
- \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize
#3}}}}\\\\}
-")
+ (cal-tex-rightday "0.7in")
(insert cal-tex-lefthead)
- (insert "\\long\\def\\leftday#1#2#3#4#5{%
- \\rule{\\textwidth}{0.3pt}\\\\%
- \\hbox to \\textwidth{%
- \\vbox to 0.7in{%
- \\vspace*{2pt}%
- \\hbox to \\textwidth{\\noindent {\\normalsize \\bf #2} \\small #1
\\hfill #5}%
- \\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize \\em #4}}%
- \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize
#3}}}}\\\\}
-")
+ (cal-tex-leftday "0.7in")
(cal-tex-b-document)
(cal-tex-cmd "\\pagestyle" "empty")
(dotimes (i n)
@@ -1303,15 +1294,8 @@
(cal-tex-preamble "twoside")
(cal-tex-filofax-paper)
(insert cal-tex-righthead)
- (insert "\\long\\def\\rightday#1#2#3#4#5{%
- \\rule{\\textwidth}{0.3pt}\\\\%
- \\hbox to \\textwidth{%
- \\vbox to 1.85in{%
- \\vspace*{2pt}%
- \\hbox to \\textwidth{\\small #5 \\hfill #1 {\\normalsize \\bf #2}}%
- \\hbox to \\textwidth{\\vbox {\\raggedleft \\footnotesize \\em #4}}%
- \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize
#3}}}}\\\\}
-")
+ (cal-tex-rightday "1.85in")
+ ;; FIXME this is just (cal-tex-rightday "0.8in").
(insert "\\long\\def\\weekend#1#2#3#4#5{%
\\rule{\\textwidth}{0.3pt}\\\\%
\\hbox to \\textwidth{%
@@ -1322,15 +1306,7 @@
\\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize
#3}}}}\\\\}
")
(insert cal-tex-lefthead)
- (insert "\\long\\def\\leftday#1#2#3#4#5{%
- \\rule{\\textwidth}{0.3pt}\\\\%
- \\hbox to \\textwidth{%
- \\vbox to 1.85in{%
- \\vspace*{2pt}%
- \\hbox to \\textwidth{\\noindent {\\normalsize \\bf #2} \\small #1
\\hfill #5}%
- \\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize \\em #4}}%
- \\hbox to \\textwidth{\\vbox to 0pt {\\noindent \\footnotesize
#3}}}}\\\\}
-")
+ (cal-tex-leftday "1.85in")
(cal-tex-b-document)
(cal-tex-cmd "\\pagestyle" "empty")
(dotimes (i n)
@@ -1437,6 +1413,7 @@
(cal-tex-preamble "twoside")
(cal-tex-filofax-paper)
(insert cal-tex-righthead)
+ ;; Not quite cal-tex-rightday.
(insert "\\long\\def\\rightday#1#2#3{%
\\rule{\\textwidth}{0.3pt}\\\\%
\\hbox to \\textwidth{%
@@ -1446,6 +1423,7 @@
\\hbox to \\textwidth{\\vbox {\\raggedleft \\em #2}}%
\\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize #1}}}}}
")
+ ;; FIXME this is just \rightday from above.
(insert "\\long\\def\\weekend#1#2#3{%
\\rule{\\textwidth}{0.3pt}\\\\%
\\hbox to \\textwidth{%
@@ -1456,6 +1434,7 @@
\\hbox to \\textwidth{\\vbox {\\noindent \\footnotesize #1}}}}}
")
(insert cal-tex-lefthead)
+ ;; Not quite cal-tex-leftday.
(insert "\\long\\def\\leftday#1#2#3{%
\\rule{\\textwidth}{0.3pt}\\\\%
\\hbox to \\textwidth{%
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109719: Remove still more cal-tex code duplication,
Glenn Morris <=