summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy/xindy-2.4-PATCHES/patch-62-bug-fix
blob: c6836e9e605b50911c90ba059f497aa86b8c4d34 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
diff -ur xindy.orig/modules/base/tex.xdy xindy/modules/base/tex.xdy
--- xindy.orig/modules/base/tex.xdy	2005-05-09 22:21:11.000000000 +0200
+++ xindy/modules/base/tex.xdy	2010-06-11 13:03:40.000000000 +0200
@@ -1,4 +1,4 @@
-;; $Id: tex.xdy,v 1.2 2005/05/09 20:21:11 jschrod Exp $
+;; $Id: tex.xdy,v 1.3 2010/06/11 11:01:46 jschrod Exp $
 ;;------------------------------------------------------------
 
 ;;;
@@ -16,15 +16,10 @@
 ;; keep-blanks is not loaded. Module keep-blanks would set a flag, and
 ;; this code would check for it. We will need a hook in the kernel, to
 ;; achieve that goal.
-;;
-;; FIXME: Regexps with start-anchored matches do not work. They match
-;; everywhere. We think it's better to not handle leading blanks than
-;; to make all blanks disappear, therefore the first rule is not
-;; activated.
 
-;(merge-rule "^ +" "" :eregexp)
+(merge-rule "^ +" "" :eregexp)
 (merge-rule " +$" "" :eregexp)
-(merge-rule " +" " " :eregexp)
+(merge-rule "  +" " " :eregexp)
 
 
 ;;
@@ -55,13 +50,21 @@
 
 (merge-rule "\\[a-zA-Z@]+ *" "" :eregexp)
 (merge-rule "\\[^a-zA-Z@]" "" :eregexp)
-(merge-rule "^[{}$]" "" :eregexp)
+(merge-rule "[{}$]" "" :eregexp)
 
 
 
 ;;======================================================================
 ;;
 ;; $Log: tex.xdy,v $
+;; Revision 1.3  2010/06/11 11:01:46  jschrod
+;;     New 2.4 ordrules supports regexps with start-anchored matches.
+;; Thus we can activate the leading blank processing rule. The
+;; parenthesis-discard rule must trigger everywhere, not just at the
+;; start of the index key.
+;;     The blank suppression clause got optimized, it now triggers only
+;; if there are multiple blanks and not for each appearing blank.
+;;
 ;; Revision 1.2  2005/05/09 20:21:11  jschrod
 ;;     Support handling of some common macros for logos; ignore all other
 ;; TeX commands.