summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog14
-rw-r--r--lisp/bbdb-print.el16
-rw-r--r--tex/bbdb-print-brief.tex14
-rw-r--r--tex/bbdb-print.tex11
4 files changed, 42 insertions, 13 deletions
diff --git a/ChangeLog b/ChangeLog
index e34b360..18d71c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2000-04-13 Jochen Küpper <Jochen@Jochen-Kuepper.de>
+
+ * tex/bbdb-print-brief.tex, tex/bbdb-print.tex: Use ec fonts
+ instead of cm. Set tt-fonts, before these weren't specified at all
+ ( ectt for ec, pcrr ( = Courier ) for Postscript ).
+
+ * lisp/bbdb-print.el (bbdb-print-format-record): Put a
+ "\goodbreak" in front of every "\separator" to avoid breaks right
+ after the separator and to get a better overall formatting of
+ tex-output.
+ (bbdb-print): Insert catcodes (I need) for ec-fonts. This needs to
+ be done for Postscript as well. Also more catcodes need to be
+ inserted.
+
2000-04-13 Waider <waider@waider.ie>
* Makefile:
diff --git a/lisp/bbdb-print.el b/lisp/bbdb-print.el
index 6c4556a..5baeeef 100644
--- a/lisp/bbdb-print.el
+++ b/lisp/bbdb-print.el
@@ -56,6 +56,9 @@
;; $Id$
;;
;; $Log$
+;; Revision 1.61 2000/04/13 17:19:58 kuepper
+;; Improved TeX output (fonts, breaks).
+;;
;; Revision 1.60 2000/04/13 00:22:23 waider
;; * Address layout patch, including Euro addresses and the streets->list thing
;;
@@ -371,6 +374,15 @@ the printout, notably the variables `bbdb-print-alist' and
((= 3 columns) "\\threecol")
((= 2 columns) "\\twocol")
((= 1 columns) "\\onecol"))
+ ;; catcodes are font-encoding specific !
+ ;; Add more if you know them
+ (if (equal psstring "ps")
+ (concat "\n\n"
+ ;; Adobe Times and Courier
+ )
+ (concat "\n\n"
+ ;; ec fonts
+ "\\catcode`ß=\\active\\chardefß=\"FF"))
"\n\n\\beginaddresses\n")
(while records
(setq current-letter
@@ -508,8 +520,8 @@ The return value is the new CURRENT-LETTER."
(if (and current-letter
(not (string-equal first-letter current-letter)))
- (insert (format "\\separator{%s}\n%%\n" (bbdb-print-tex-quote
- (upcase first-letter)))))
+ (insert (format "\\goodbreak\n\\separator{%s}\n%%\n"
+ (bbdb-print-tex-quote (upcase first-letter)))))
(insert "\\beginrecord\n")
diff --git a/tex/bbdb-print-brief.tex b/tex/bbdb-print-brief.tex
index c5a27b0..c232363 100644
--- a/tex/bbdb-print-brief.tex
+++ b/tex/bbdb-print-brief.tex
@@ -59,10 +59,11 @@
%%%
\def\setsize#1{
- \font\rm=cmr#1
- \font\bf=cmbx#1
- \font\it=\ifnum #1=6 cmti7 \else cmti#1\fi
- \font\bigbf=cmbx10 scaled \magstep3
+ \font\rm=ecrm#1
+ \font\bf=ecbx#1
+ \font\it=\ifnum #1=6 ecti7 \else ecti#1 \fi
+ \font\tt=ectt#1
+ \font\bigbf=ecbx10 scaled \magstep3
\rm
\baselineskip=#1pt
\ifnum #1>9 \advance\baselineskip by 1pt \fi
@@ -72,6 +73,7 @@
\font\rm=ptmr at #1pt
\font\bf=ptmb at #1pt
\font\it=ptmri at #1pt
+ \font\tt=pcrr at #1pt
{\dimen0=#1pt\global\font\bigbf=ptmb at 1.8\dimen0}
\rm
\baselineskip=#1pt
@@ -86,7 +88,7 @@
\def\sep##1{\line{\hrulefill}\smallskip\mark{##1}}
\else \ifnum #1=2
\def\sep##1{\hbox{\vrule\hskip -0.4pt\vbox{\hrule\smallskip
- \centerline{\bf{##1}}\smallskip\hrule}\hskip -0.4pt\vrule
+ \centerline{\bf{##1}}\smallskip\hrule}\hskip -0.4pt\vrule
\mark{##1}}}
\else \ifnum #1=3
\def\sep##1{\hbox{\vrule\hskip -0.4pt\vbox{\hrule\smallskip
@@ -96,7 +98,7 @@
\def\sep##1{\smallskip\centerline{\bigbf{##1}}\medskip\mark{##1}}
\else \ifnum #1=5
\def\sep##1{\hrule\smallskip
- \centerline{\bigbf{##1}}\smallskip\hrule\medskip\mark{##1}}
+ \centerline{\bigbf{##1}}\smallskip\hrule\medskip\mark{##1}}
\else \ifnum #1=6
\def\cute{$\sya\syb\syc\syd$}
\def\revcute{$\syd\syc\syb\sya$}
diff --git a/tex/bbdb-print.tex b/tex/bbdb-print.tex
index dd92142..25c2f26 100644
--- a/tex/bbdb-print.tex
+++ b/tex/bbdb-print.tex
@@ -60,11 +60,11 @@
%%%
\def\setsize#1{
- \font\rm=cmr#1
- \font\bf=cmbx#1
- \font\it=\ifnum #1=6 cmti7 \else cmti#1\fi
- \font\bigbf=cmbx10 scaled \magstep3
- \font\tt=cmtt#1
+ \font\rm=ecrm#1
+ \font\bf=ecbx#1
+ \font\it=\ifnum #1=6 ecti7 \else ecti#1 \fi
+ \font\tt=ectt#1
+ \font\bigbf=ecbx10 scaled \magstep3
\rm
\baselineskip=#1pt
\ifnum #1>9 \advance\baselineskip by 1pt \fi
@@ -74,6 +74,7 @@
\font\rm=ptmr at #1pt
\font\bf=ptmb at #1pt
\font\it=ptmri at #1pt
+ \font\tt=pcrr at #1pt
{\dimen0=#1pt\global\font\bigbf=ptmb at 1.8\dimen0}
\rm
\baselineskip=#1pt