summaryrefslogtreecommitdiff
path: root/Build/source/utils/xindy
diff options
context:
space:
mode:
authorJoachim Schrod <jschrod@acm.org>2010-06-11 11:03:40 +0000
committerJoachim Schrod <jschrod@acm.org>2010-06-11 11:03:40 +0000
commit49f07f72ddacfb761172a75cefbb709f5fcfc368 (patch)
tree35d4fe248ac92263454c43e3ff9cbe3033d56ae2 /Build/source/utils/xindy
parent0be1bbb82a36f26bdeffcb15f9971318002209c6 (diff)
Fix long-available bug that got visible with new 2.4 ordrules
realization. Thanks to Marc Baudoin for finding it in TL2010 pretest. git-svn-id: svn://tug.org/texlive/trunk@18891 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/utils/xindy')
-rw-r--r--Build/source/utils/xindy/xindy/modules/base/tex.xdy21
1 files changed, 12 insertions, 9 deletions
diff --git a/Build/source/utils/xindy/xindy/modules/base/tex.xdy b/Build/source/utils/xindy/xindy/modules/base/tex.xdy
index d3c23cb3e56..197dba1b455 100644
--- a/Build/source/utils/xindy/xindy/modules/base/tex.xdy
+++ b/Build/source/utils/xindy/xindy/modules/base/tex.xdy
@@ -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.