# HG changeset patch
# User ht
# Date 1210353593 0
# Node ID 1a67da87d11ff24114cce4ab4eec453b5881ae29
# Parent  13afc48b0e876521f4abad164c8b8bb2a068b99e
fix spacing

diff -r 13afc48b0e87 -r 1a67da87d11f summa/bilingual/merge.el
--- a/summa/bilingual/merge.el	Thu Apr 17 22:19:02 2008 +0000
+++ b/summa/bilingual/merge.el	Fri May 09 17:19:53 2008 +0000
@@ -1,17 +1,17 @@
 ;;; Two buffers, raw latin on top, output of prep.xsl on english on the bottom
-;;; Put cursor at beginning of latin para, end of english (or v.v. :-, can't remember)
+;;; Put cursor at beginning of latin para, end of english
 (defalias
   'merge-paras
   (read-kbd-macro
-"C-SPC M-C-f C-x C-x M-w M-C-f C-s <p C-a C-x o RET C-y M-C-b 2*<C-f> SPC xml:lang=W <backspace> \"la\" C-s <p C-a M-C-f C-x o")
+"C-SPC M-C-f C-x C-x M-w M-C-f C-s < p C-a C-x o RET C-y M-C-b 2*<C-f> SPC xml:lang=W <backspace> \"la\" C-s < p C-a M-C-f C-x o")
   )
 
 ;;; Position after the first para of a multi-para intro in the English corresponding to a
 ;;; single para in the Latin
 (defalias 'fix-prooemium (read-kbd-macro
-"C-s <h4 C-a C-r <div4 C-a C-p </div> C-p C-a C-r </h3 C-n C-s </p> C-f C-x C-x C-x C-x C-s <div4 C-a 2*<C-p> C-x C-x M-x narrow- to- region RET M-x replace- regexp RET .* C-q C-j .* C-q C-j .* C-q C-j 2*RET C-x u M-x replace- regexp RET </div> C-q C-j .* C-q C-j .* C-q C-j 2*RET M-x widen RET C-x C-x C-o <div SPC xml:lang=\"en\"> C-a M-C-f"))
+"C-s < h4 C-a C-r < div4 C-a C-p < /div> C-p C-a C-r < /h3 C-n C-s < /p> C-f C-x C-x C-x C-x C-s < div4 C-a 2*<C-p> C-x C-x M-x narrow- to- region RET M-x replace- regexp RET < /div> C-q C-j .* C-q C-j .* C-q C-j 2*RET M-x widen RET C-x C-x C-o < div SPC xml:lang=\"en\"> C-a M-C-f"))
 
 ;;; Add Q. numbers
 (defalias 'number-titles (read-kbd-macro
-"C-s <div3 RET C-s title= C-f C-SPC 2*<M-f> M-w C-s <h3 RET C-s > RET C-y . SPC M-b C-b <backspace>"))
+"C-s < div3 RET C-s title= C-f C-SPC 2*<M-f> M-w C-s < h3 RET C-s > RET C-y . SPC M-b C-b <backspace>"))