# HG changeset patch
# User ht
# Date 1236519843 0
# Node ID 28d43bc93d8f7950ca14d4a0db363de5f09c89dc
# Parent  2bff41f493498c6f9571ca02b691f0699b5d4991
new defn

diff -r 2bff41f49349 -r 28d43bc93d8f summa/bilingual/merge.el
--- a/summa/bilingual/merge.el	Mon Dec 08 23:15:50 2008 +0000
+++ b/summa/bilingual/merge.el	Sun Mar 08 13:44:03 2009 +0000
@@ -1,13 +1,18 @@
 ;;; 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
+(defalias 'merge-paras (read-kbd-macro
+"C-SPC M-C-f C-x C-x M-w C-x o 4*<C-b> 4*<C-f> C-r right\"/> RET M-f C-f C-d C-f C-y </div> C-r <p SPC RET 3*<C-f> xml:lang=\"la\" SPC C-r <p RET M-C-f C-s clear: SPC both RET C-r <div RET M-C-f C-x o M-C-f C-s <p RET 2*<C-b>"))
+
 (defalias
-  'merge-paras
+  'old-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")
   )
 
+
+
 ;;; Position after the first para of a multi-para intro in the English corresponding to a
-;;; single para in the Latin
+;;; single para in the Latin: overtaken by fixup.xsl
 (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 < /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"))