Mercurial > hg > Aquinas

changeset 6:929b4153a4aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author ht
date Sat, 09 Feb 2008 13:48:46 +0000
parents 9d2a353bd236
children 13afc48b0e87
files summa/bilingual/FP_ii.xml summa/bilingual/merge.el
diffstat 2 files changed, 60 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/summa/bilingual/FP_ii.xml	Sun Jan 27 17:47:10 2008 +0000
+++ b/summa/bilingual/FP_ii.xml	Sat Feb 09 13:48:46 2008 +0000
@@ -6,7 +6,8 @@
 		  <h2 xml:lang="en" id="FP.ii-p0.1">TREATISE ON THE ONE GOD (QQ[2]-26)</h2>
 
 <div3 id="FP.ii.FP_Q2" next="FP_Q2_A1" prev="FP.ii" progress="0.25%" n="i" title="Question. 2 - The Existence of God (Three Articles)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q2-p0.1">THE EXISTENCE OF GOD (THREE ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q2-p0.1">Question 2. THE EXISTENCE OF GOD (THREE ARTICLES)</h3>
 
 			 
 
@@ -540,7 +541,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q3" next="FP_Q3_A1" prev="FP_Q2_A3" progress="0.36%" n="ii" title="Question. 3 - OF THE SIMPLICITY OF GOD (EIGHT ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q3-p0.1">OF THE SIMPLICITY OF GOD (EIGHT ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q3-p0.1">Question 3. OF THE SIMPLICITY OF GOD (EIGHT ARTICLES)</h3>
 
 			 
 
@@ -1748,7 +1750,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q4" next="FP_Q4_A1" prev="FP_Q3_A8" progress="0.58%" n="iii" title="Question. 4 - THE PERFECTION OF GOD (THREE ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q4-p0.1">THE PERFECTION OF GOD (THREE ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q4-p0.1">Question 4. THE PERFECTION OF GOD (THREE ARTICLES)</h3>
 
 			 
 
@@ -2276,7 +2279,8 @@
 		  </div3>
 <!-- merged down to here -->
 <div3 id="FP.ii.FP_Q5" next="FP_Q5_A1" prev="FP_Q4_A3" progress="0.67%" n="iv" title="Question. 5 - OF GOODNESS IN GENERAL (SIX ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q5-p0.1">OF GOODNESS IN GENERAL (SIX ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q5-p0.1">Question 5. OF GOODNESS IN GENERAL (SIX ARTICLES)</h3>
 
 			 
 
@@ -2618,7 +2622,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q6" next="FP_Q6_A1" prev="FP_Q5_A6" progress="0.84%" n="v" title="Question. 6 - THE GOODNESS OF GOD (FOUR ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q6-p0.1">THE GOODNESS OF GOD (FOUR ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q6-p0.1">Question 6. THE GOODNESS OF GOD (FOUR ARTICLES)</h3>
 
 			 
 
@@ -2811,7 +2816,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q7" next="FP_Q7_A1" prev="FP_Q6_A4" progress="0.92%" n="vi" title="Question. 7 - THE INFINITY OF GOD (FOUR ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q7-p0.1">THE INFINITY OF GOD (FOUR ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q7-p0.1">Question 7. THE INFINITY OF GOD (FOUR ARTICLES)</h3>
 
 			 
 
@@ -3053,7 +3059,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q8" next="FP_Q8_A1" prev="FP_Q7_A4" progress="1.04%" n="vii" title="Question. 8 - THE EXISTENCE OF GOD IN THINGS (FOUR ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q8-p0.1">THE EXISTENCE OF GOD IN THINGS (FOUR ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q8-p0.1">Question 8. THE EXISTENCE OF GOD IN THINGS (FOUR ARTICLES)</h3>
 
 			 
 
@@ -3314,7 +3321,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q9" next="FP_Q9_A1" prev="FP_Q8_A4" progress="1.16%" n="viii" title="Question. 9 - THE IMMUTABILITY OF GOD (TWO ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q9-p0.1">THE IMMUTABILITY OF GOD (TWO ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q9-p0.1">Question 9. THE IMMUTABILITY OF GOD (TWO ARTICLES)</h3>
 
 			 
 
@@ -3437,7 +3445,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q10" next="FP_Q10_A1" prev="FP_Q9_A2" progress="1.23%" n="ix" title="Question. 10 - THE ETERNITY OF GOD (SIX ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q10-p0.1">THE ETERNITY OF GOD (SIX ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q10-p0.1">Question 10. THE ETERNITY OF GOD (SIX ARTICLES)</h3>
 
 			 
 
@@ -3810,7 +3819,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q11" next="FP_Q11_A1" prev="FP_Q10_A6" progress="1.42%" n="x" title="Question. 11 - THE UNITY OF GOD (FOUR ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q11-p0.1">THE UNITY OF GOD (FOUR ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q11-p0.1">Question 11. THE UNITY OF GOD (FOUR ARTICLES)</h3>
 
 			 
 
@@ -4028,7 +4038,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q12" next="FP_Q12_A1" prev="FP_Q11_A4" progress="1.53%" n="xi" title="Question. 12 - HOW GOD IS KNOWN BY US (THIRTEEN ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q12-p0.1">HOW GOD IS KNOWN BY US (THIRTEEN ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q12-p0.1">Question 12. HOW GOD IS KNOWN BY US (THIRTEEN ARTICLES)</h3>
 
 			 
 
@@ -4726,7 +4737,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q13" next="FP_Q13_A1" prev="FP_Q12_A13" progress="1.92%" n="xii" title="Question. 13 - THE NAMES OF GOD (TWELVE ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q13-p0.1">THE NAMES OF GOD (TWELVE ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q13-p0.1">Question 13. THE NAMES OF GOD (TWELVE ARTICLES)</h3>
 
 			 
 
@@ -5459,7 +5471,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q14" next="FP_Q14_A1" prev="FP_Q13_A12" progress="2.35%" n="xiii" title="Question. 14 - OF GOD’S KNOWLEDGE (SIXTEEN ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q14-p0.1">OF GOD'S KNOWLEDGE (SIXTEEN ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q14-p0.1">Question 14. OF GOD'S KNOWLEDGE (SIXTEEN ARTICLES)</h3>
 
 			 
 
@@ -6360,7 +6373,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q15" next="FP_Q15_A1" prev="FP_Q14_A16" progress="2.85%" n="xiv" title="Question. 15 - OF IDEAS (THREE ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q15-p0.1">OF IDEAS (THREE ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q15-p0.1">Question 15. OF IDEAS (THREE ARTICLES)</h3>
 
 			 
 
@@ -6541,7 +6555,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q16" next="FP_Q16_A1" prev="FP_Q15_A3" progress="2.95%" n="xv" title="Question. 16 - OF TRUTH (EIGHT ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q16-p0.1">OF TRUTH (EIGHT ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q16-p0.1">Question 16. OF TRUTH (EIGHT ARTICLES)</h3>
 
 			 
 
@@ -6951,7 +6966,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q17" next="FP_Q17_A1" prev="FP_Q16_A8" progress="3.16%" n="xvi" title="Question. 17 - CONCERNING FALSITY (FOUR ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q17-p0.1">CONCERNING FALSITY (FOUR ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q17-p0.1">Question 17. CONCERNING FALSITY (FOUR ARTICLES)</h3>
 
 			 
 
@@ -7178,7 +7194,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q18" next="FP_Q18_A1" prev="FP_Q17_A4" progress="3.28%" n="xvii" title="Question. 18 - THE LIFE OF GOD (FOUR ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q18-p0.1">THE LIFE OF GOD (FOUR ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q18-p0.1">Question 18. THE LIFE OF GOD (FOUR ARTICLES)</h3>
 
 			 
 
@@ -7414,7 +7431,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q19" next="FP_Q19_A1" prev="FP_Q18_A4" progress="3.41%" n="xviii" title="Question. 19 - THE WILL OF GOD (TWELVE ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q19-p0.1">THE WILL OF GOD (TWELVE ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q19-p0.1">Question 19. THE WILL OF GOD (TWELVE ARTICLES)</h3>
 
 			 
 
@@ -8093,7 +8111,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q20" next="FP_Q20_A1" prev="FP_Q19_A12" progress="3.78%" n="xix" title="Question. 20 - GOD'S LOVE (FOUR ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q20-p0.1">GOD'S LOVE (FOUR ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q20-p0.1">Question 20. GOD'S LOVE (FOUR ARTICLES)</h3>
 
 			 
 
@@ -8339,7 +8358,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q21" next="FP_Q21_A1" prev="FP_Q20_A4" progress="3.92%" n="xx" title="Question. 21 - THE JUSTICE AND MERCY OF GOD (FOUR ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q21-p0.1">THE JUSTICE AND MERCY OF GOD (FOUR ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q21-p0.1">Question 21. THE JUSTICE AND MERCY OF GOD (FOUR ARTICLES)</h3>
 
 			 
 
@@ -8556,7 +8576,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q22" next="FP_Q22_A1" prev="FP_Q21_A4" progress="4.03%" n="xxi" title="Question. 22 - THE PROVIDENCE OF GOD (FOUR ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q22-p0.1">THE PROVIDENCE OF GOD (FOUR ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q22-p0.1">Question 22. THE PROVIDENCE OF GOD (FOUR ARTICLES)</h3>
 
 			 
 
@@ -8798,7 +8819,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q23" next="FP_Q23_A1" prev="FP_Q22_A4" progress="4.18%" n="xxii" title="Question. 23 - OF PREDESTINATION (EIGHT ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q23-p0.1">OF PREDESTINATION (EIGHT ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q23-p0.1">Question 23. OF PREDESTINATION (EIGHT ARTICLES)</h3>
 
 			 
 
@@ -9266,7 +9288,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q24" next="FP_Q24_A1" prev="FP_Q23_A8" progress="4.47%" n="xxiii" title="Question. 24 - THE BOOK OF LIFE (THREE ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q24-p0.1">THE BOOK OF LIFE (THREE ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q24-p0.1">Question 24. THE BOOK OF LIFE (THREE ARTICLES)</h3>
 
 			 
 
@@ -9427,7 +9450,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q25" next="FP_Q25_A1" prev="FP_Q24_A3" progress="4.54%" n="xxiv" title="Question. 25 - THE POWER OF GOD (SIX ARTICLES)">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q25-p0.1">THE POWER OF GOD (SIX ARTICLES)</h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q25-p0.1">Question 25. THE POWER OF GOD (SIX ARTICLES)</h3>
 
 			 
 
@@ -9780,7 +9804,8 @@
 		  </div3>
 
 <div3 id="FP.ii.FP_Q26" next="FP_Q26_A1" prev="FP_Q25_A6" progress="4.76%" n="xxv" title="Question. 26 - OF THE DIVINE BEATITUDE (FOUR ARTICLES) ">
-			 <h3 xml:lang="en" id="FP.ii.FP_Q26-p0.1">OF THE DIVINE BEATITUDE (FOUR ARTICLES) </h3>
+			 <h3 xml:lang="en"
+			   id="FP.ii.FP_Q26-p0.1">Question 26. OF THE DIVINE BEATITUDE (FOUR ARTICLES) </h3>
 
 			 
 
--- a/summa/bilingual/merge.el	Sun Jan 27 17:47:10 2008 +0000
+++ b/summa/bilingual/merge.el	Sat Feb 09 13:48:46 2008 +0000
@@ -5,3 +5,13 @@
   (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
+(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"))
+
+;;; 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>"))
+