/[cmucl]/src/code/string.lisp
ViewVC logotype

Diff of /src/code/string.lisp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.12 by emarsden, Fri Apr 11 15:41:59 2003 UTC revision 1.12.30.20 by rtoy, Fri May 22 11:31:55 2009 UTC
# Line 16  Line 16 
16  ;;; ****************************************************************  ;;; ****************************************************************
17  ;;;  ;;;
18  (in-package "LISP")  (in-package "LISP")
19  (export '(char schar string  (export '(char schar glyph sglyph string
20            string= string-equal string< string> string<= string>= string/=            string= string-equal string< string> string<= string>= string/=
21            string-lessp string-greaterp string-not-lessp string-not-greaterp            string-lessp string-greaterp string-not-lessp string-not-greaterp
22            string-not-equal            string-not-equal
23              string-to-nfd string-to-nfkd string-to-nfc string-to-nfkc
24            make-string            make-string
25            string-trim string-left-trim string-right-trim            string-trim string-left-trim string-right-trim
26            string-upcase            string-upcase
# Line 27  Line 28 
28            nstring-capitalize))            nstring-capitalize))
29    
30    
31    (declaim (inline surrogatep surrogates-to-codepoint codepoint surrogates))
32    
33    (defun surrogatep (c &optional surrogate-type)
34      "Test if C is a surrogate.  C may be either an integer or a
35      character. Surrogate-type indicates what kind of surrogate to test
36      for.  :High means to test for the high (leading) surrogate; :Low
37      tests for the low (trailing surrogate).  A value of :Any or Nil
38      tests for any surrogate value (high or low)."
39      (declare (type (or character (integer 0 #x10ffff)) c))
40      (let ((code (if (characterp c)
41                      (char-code c)
42                      c)))
43        (ecase surrogate-type
44          ((:high :leading)
45           ;; Test for high surrogate
46           (<= #xD800 code #xDBFF))
47          ((:low :trailing)
48           ;; Test for low surrogate
49           (<= #xDC00 code #xDFFF))
50          ((:any nil)
51           ;; Test for any surrogate
52           (<= #xD800 code #xDFFF)))))
53    
54    (defun surrogates-to-codepoint (hi lo)
55      "Convert the given Hi and Lo surrogate characters to the
56      corresponding codepoint value"
57      (declare (type character hi lo))
58      (+ (ash (- (the (integer #xD800 #xDBFF) (char-code hi)) #xD800) 10)
59         (the (integer #xDC00 #xDFFF) (char-code lo)) #x2400))
60    
61    (defun codepoint (string i &optional (end (length string)))
62      "Return the codepoint value from String at position I.  If that
63      position is a surrogate, it is combined with either the previous or
64      following character (when possible) to compute the codepoint.  The
65      second return value is NIL if the position is not a surrogate pair.
66      Otherwise +1 or -1 is returned if the position is the high or low
67      surrogate value, respectively."
68      (declare (type simple-string string) (type kernel:index i end))
69      (let ((code (char-code (schar string i))))
70        (cond ((and (surrogatep code :high) (< (1+ i) end))
71               (let ((tmp (char-code (schar string (1+ i)))))
72                 (if (surrogatep tmp :low)
73                     (values (+ (ash (- code #xD800) 10) tmp #x2400) +1)
74                     (values code nil))))
75              ((and (surrogatep code :low) (> i 0))
76               (let ((tmp (char-code (schar string (1- i)))))
77                 (if (surrogatep tmp :high)
78                     (values (+ (ash (- tmp #xD800) 10) code #x2400) -1)
79                     (values code nil))))
80              (t (values code nil)))))
81    
82    (defun surrogates (codepoint)
83      "Return the high and low surrogate characters for Codepoint.  If
84      Codepoint is in the BMP, the first return value is the corresponding
85      character and the second is NIL."
86      (declare (type (integer 0 #x10FFFF) codepoint))
87      (if (< codepoint #x10000)
88          (values (code-char codepoint) nil)
89          (let* ((tmp (- codepoint #x10000))
90                 (hi (logior (ldb (byte 10 10) tmp) #xD800))
91                 (lo (logior (ldb (byte 10 0) tmp) #xDC00)))
92            (values (code-char hi) (code-char lo)))))
93    
94    (defun utf16-string-p (string)
95      "Check if String is a valid UTF-16 string.  If the string is valid,
96      T is returned.  If the string is not valid, NIL is returned, and the
97      second value is the index into the string of the invalid character."
98      (do ((len (length string))
99           (index 0 (1+ index)))
100          ((>= index len)
101           t)
102        (multiple-value-bind (codepoint wide)
103            (codepoint string index)
104          ;; We step through the string in order.  If there are any
105          ;; surrogates pairs, we must reach the lead surrogate first,
106          ;; which means WIDE is +1.  Otherwise, we have an invalid
107          ;; surrogate pair.  If we get any codepoint that is in
108          ;; the surrogate range, we also have an invalid string.
109          (when (or (eq wide -1)
110                    (surrogatep codepoint))
111            (return-from utf16-string-p (values nil index)))
112          (when wide (incf index)))))
113    
114  (defun string (X)  (defun string (X)
115    "Coerces X into a string.  If X is a string, X is returned.  If X is a    "Coerces X into a string.  If X is a string, X is returned.  If X is a
116     symbol, X's pname is returned.  If X is a character then a one element    symbol, X's pname is returned.  If X is a character then a one element
117     string containing that character is returned.  If X cannot be coerced    string containing that character is returned.  If X cannot be coerced
118     into a string, an error occurs."    into a string, an error occurs."
119    (cond ((stringp x) x)    (cond ((stringp x) x)
120          ((symbolp x) (symbol-name x))          ((symbolp x) (symbol-name x))
121          ((characterp x)          ((characterp x)
# Line 106  Line 190 
190    
191  (defun schar (string index)  (defun schar (string index)
192    "SCHAR returns the character object at an indexed position in a string    "SCHAR returns the character object at an indexed position in a string
193     just as CHAR does, except the string must be a simple-string."    just as CHAR does, except the string must be a simple-string."
194    (declare (optimize (safety 1)))    (declare (optimize (safety 1)))
195    (schar string index))    (schar string index))
196    
# Line 143  Line 227 
227                         (the fixnum end2))                         (the fixnum end2))
228                      ,(if lessp                      ,(if lessp
229                           `nil                           `nil
230                         `(- (the fixnum index) ,offset1)))                           `(- (the fixnum index) ,offset1)))
231                       #-unicode
232                     ((,(if lessp 'char< 'char>)                     ((,(if lessp 'char< 'char>)
233                       (schar string1 index)                       (schar string1 index)
234                       (schar string2 (+ (the fixnum index) (- start2 start1))))                       (schar string2 (+ (the fixnum index) (- start2 start1))))
235                      (- (the fixnum index) ,offset1))                      (- (the fixnum index) ,offset1))
236                     (t nil))                     #-unicode
237                       (t nil)
238                       #+unicode
239                       (t
240                        ;; Compare in code point order.  See
241                        ;; http://icu-project.org/docs/papers/utf16_code_point_order.html
242                        (flet ((fixup (code)
243                                 (if (>= code #xe000)
244                                     (- code #x800)
245                                     (+ code #x2000))))
246                          (declare (inline fixup))
247                          (let* ((c1 (char-code (schar string1 index)))
248                                 (c2 (char-code (schar string2
249                                                       (+ (the fixnum index)
250                                                          (- start2 start1))))))
251                            (cond ((and (>= c1 #xd800)
252                                        (>= c2 #xd800))
253                                   (let ((fix-c1 (fixup c1))
254                                         (fix-c2 (fixup c2)))
255                                     (if (,(if lessp '< '>) fix-c1 fix-c2)
256                                         (- (the fixnum index) ,offset1)
257                                         nil)))
258                                  (t
259                                   (if (,(if lessp '< '>) c1 c2)
260                                       (- (the fixnum index) ,offset1)
261                                       nil)))))))
262               ,(if equalp `(- (the fixnum end1) ,offset1) 'nil))))))               ,(if equalp `(- (the fixnum end1) ,offset1) 'nil))))))
263  ) ; eval-when  ) ; eval-when
264    
# Line 281  Line 391 
391    (if lessp    (if lessp
392        (if equalp        (if equalp
393            ;; STRING-NOT-GREATERP            ;; STRING-NOT-GREATERP
394            (values '<= `(not (char-greaterp char1 char2)))            (values '<=
395                      #-unicode `(not (char-greaterp char1 char2))
396                      #+unicode `(<= char1 char2))
397            ;; STRING-LESSP            ;; STRING-LESSP
398            (values '< `(char-lessp char1 char2)))            (values '<
399                      #-unicode `(char-lessp char1 char2)
400                      #+unicode `(< char1 char2)))
401        (if equalp        (if equalp
402            ;; STRING-NOT-LESSP            ;; STRING-NOT-LESSP
403            (values '>= `(not (char-lessp char1 char2)))            (values '>=
404                      #-unicode `(not (char-lessp char1 char2))
405                      #+unicode `(>= char1 char2))
406            ;; STRING-GREATERP            ;; STRING-GREATERP
407            (values '> `(char-greaterp char1 char2)))))            (values '>
408                      #-unicode `(char-greaterp char1 char2)
409                      #+unicode `(> char1 char2)))))
410    
411    #-unicode
412  (defmacro string-less-greater-equal (lessp equalp)  (defmacro string-less-greater-equal (lessp equalp)
413    (multiple-value-bind (length-test character-test)    (multiple-value-bind (length-test character-test)
414                         (string-less-greater-equal-tests lessp equalp)                         (string-less-greater-equal-tests lessp equalp)
# Line 314  Line 433 
433                     (return (- index1 offset1))                     (return (- index1 offset1))
434                     (return ()))))))))                     (return ()))))))))
435    
436    ;; Convert to lowercase for case folding, to match what Unicode
437    ;; CaseFolding.txt says.  An example where this matters: U+1E9E maps
438    ;; to U+00DF.  But the uppercase version of U+00DF is U+00DF.
439    #+unicode
440    (defmacro equal-char-codepoint (codepoint)
441      `(let ((ch ,codepoint))
442         ;; Handle ASCII separately for bootstrapping and for unidata missing.
443         (if (< 64 ch 91)
444             (+ ch 32)
445             #-(and unicode (not unicode-bootstrap))
446             ch
447             #+(and unicode (not unicode-bootstrap))
448             (if (> ch 127) (unicode-lower ch) ch))))
449    
450    #+unicode
451    (defmacro string-less-greater-equal (lessp equalp)
452      (multiple-value-bind (length-test character-test)
453          (string-less-greater-equal-tests lessp equalp)
454        `(with-two-strings string1 string2 start1 end1 offset1 start2 end2
455           (let ((slen1 (- (the fixnum end1) start1))
456                 (slen2 (- (the fixnum end2) start2)))
457             (declare (fixnum slen1 slen2))
458             (if (or (minusp slen1) (minusp slen2))
459                 ;;prevent endless looping later.
460                 (error "Improper bounds for string comparison."))
461             (do ((index1 start1 (1+ index1))
462                  (index2 start2 (1+ index2)))
463                 ((or (= index1 (the fixnum end1)) (= index2 (the fixnum end2)))
464                  (if (,length-test slen1 slen2) (- index1 offset1)))
465               (declare (fixnum index1 index2))
466               (multiple-value-bind (char1 wide1)
467                   (codepoint string1 index1)
468                 (declare (type (integer 0 #x10ffff) char1))
469                 (multiple-value-bind (char2 wide2)
470                     (codepoint string2 index2)
471                   (declare (type (integer 0 #x10ffff) char2))
472                   (setf char1 (equal-char-codepoint char1))
473                   (setf char2 (equal-char-codepoint char2))
474                   (if (= char1 char2)
475                       (progn
476                         (when wide1 (incf index1))
477                         (when wide2 (incf index2)))
478                       (if ,character-test
479                           (return (- index1 offset1))
480                           (return ()))))))))))
481    
482  ) ; eval-when  ) ; eval-when
483    
484  (defun string-lessp* (string1 string2 start1 end1 start2 end2)  (defun string-lessp* (string1 string2 start1 end1 start2 end2)
# Line 360  Line 525 
525    
526  (defun make-string (count &key element-type ((:initial-element fill-char)))  (defun make-string (count &key element-type ((:initial-element fill-char)))
527    "Given a character count and an optional fill character, makes and returns    "Given a character count and an optional fill character, makes and returns
528     a new string Count long filled with the fill character."    a new string Count long filled with the fill character."
529    (declare (type fixnum count))    (declare (type fixnum count))
530    (assert (subtypep element-type 'character))    (assert (subtypep element-type 'character))
531    (if fill-char    (if fill-char
# Line 391  Line 556 
556               (new-index (- start offset) (1+ new-index)))               (new-index (- start offset) (1+ new-index)))
557              ((= index (the fixnum end)))              ((= index (the fixnum end)))
558            (declare (fixnum index new-index))            (declare (fixnum index new-index))
559            (setf (schar newstring new-index)            (multiple-value-bind (code wide) (codepoint string index)
560                  (char-upcase (schar string index))))              (when wide (incf index))
561                ;; Handle ASCII specially because this is called early in
562                ;; initialization, before unidata is available.
563                (cond ((< 96 code 123) (decf code 32))
564                      ((> code 127) (setq code (unicode-upper code))))
565                ;;@@ WARNING: this may, in theory, need to extend newstring
566                ;;  but that never actually occurs as of Unicode 5.1.0,
567                ;;  so I'm just going to ignore it for now...
568                (multiple-value-bind (hi lo) (surrogates code)
569                  (setf (schar newstring new-index) hi)
570                  (when lo
571                    (setf (schar newstring (incf new-index)) lo)))))
572            ;;@@ WARNING: see above
573          (do ((index end (1+ index))          (do ((index end (1+ index))
574               (new-index (- (the fixnum end) offset) (1+ new-index)))               (new-index (- (the fixnum end) offset) (1+ new-index)))
575              ((= index offset-slen))              ((= index offset-slen))
# Line 420  Line 597 
597               (new-index (- start offset) (1+ new-index)))               (new-index (- start offset) (1+ new-index)))
598              ((= index (the fixnum end)))              ((= index (the fixnum end)))
599            (declare (fixnum index new-index))            (declare (fixnum index new-index))
600            (setf (schar newstring new-index)            (multiple-value-bind (code wide) (codepoint string index)
601                  (char-downcase (schar string index))))              (when wide (incf index))
602                ;; Handle ASCII specially because this is called early in
603                ;; initialization, before unidata is available.
604                (cond ((< 64 code 91) (incf code 32))
605                      ((> code 127) (setq code (unicode-lower code))))
606                ;;@@ WARNING: this may, in theory, need to extend newstring
607                ;;  but that never actually occurs as of Unicode 5.1.0,
608                ;;  so I'm just going to ignore it for now...
609                (multiple-value-bind (hi lo) (surrogates code)
610                  (setf (schar newstring new-index) hi)
611                  (when lo
612                    (setf (schar newstring (incf new-index)) lo)))))
613            ;;@@ WARNING: see above
614          (do ((index end (1+ index))          (do ((index end (1+ index))
615               (new-index (- (the fixnum end) offset) (1+ new-index)))               (new-index (- (the fixnum end) offset) (1+ new-index)))
616              ((= index offset-slen))              ((= index offset-slen))
# Line 459  Line 648 
648                   (setq newword t))                   (setq newword t))
649                  (newword                  (newword
650                   ;;char is first case-modifiable after non-case-modifiable                   ;;char is first case-modifiable after non-case-modifiable
651                   (setq char (char-upcase char))                   (setq char (char-titlecase char))
652                   (setq newword ()))                   (setq newword ()))
653                  ;;char is case-modifiable, but not first                  ;;char is case-modifiable, but not first
654                  (t (setq char (char-downcase char))))                  (t (setq char (char-downcase char))))
# Line 480  Line 669 
669        (do ((index start (1+ index)))        (do ((index start (1+ index)))
670            ((= index (the fixnum end)))            ((= index (the fixnum end)))
671          (declare (fixnum index))          (declare (fixnum index))
672          (setf (schar string index) (char-upcase (schar string index)))))          (multiple-value-bind (code wide) (codepoint string index)
673              (declare (ignore wide))
674              ;; Handle ASCII specially because this is called early in
675              ;; initialization, before unidata is available.
676              (cond ((< 96 code 123) (decf code 32))
677                    ((> code 127) (setq code (unicode-upper code))))
678              ;;@@ WARNING: this may, in theory, need to extend string
679              ;;      (which, obviously, we can't do here.  Unless
680              ;;       STRING is adjustable, maybe)
681              ;;  but that never actually occurs as of Unicode 5.1.0,
682              ;;  so I'm just going to ignore it for now...
683              (multiple-value-bind (hi lo) (surrogates code)
684                (setf (schar string index) hi)
685                (when lo
686                  (setf (schar string (incf index)) lo))))))
687      save-header))      save-header))
688    
689  (defun nstring-downcase (string &key (start 0) end)  (defun nstring-downcase (string &key (start 0) end)
# Line 492  Line 695 
695        (do ((index start (1+ index)))        (do ((index start (1+ index)))
696            ((= index (the fixnum end)))            ((= index (the fixnum end)))
697          (declare (fixnum index))          (declare (fixnum index))
698          (setf (schar string index) (char-downcase (schar string index)))))          (multiple-value-bind (code wide) (codepoint string index)
699              (declare (ignore wide))
700              (cond ((< 64 code 91) (incf code 32))
701                    ((> code 127) (setq code (unicode-lower code))))
702              ;;@@ WARNING: this may, in theory, need to extend string
703              ;;      (which, obviously, we can't do here.  Unless
704              ;;       STRING is adjustable, maybe)
705              ;;  but that never actually occurs as of Unicode 5.1.0,
706              ;;  so I'm just going to ignore it for now...
707              (multiple-value-bind (hi lo) (surrogates code)
708                (setf (schar string index) hi)
709                (when lo
710                  (setf (schar string (incf index)) lo))))))
711      save-header))      save-header))
712    
713  (defun nstring-capitalize (string &key (start 0) end)  (defun nstring-capitalize (string &key (start 0) end)
# Line 514  Line 729 
729                 (setq newword t))                 (setq newword t))
730                (newword                (newword
731                 ;;char is first case-modifiable after non-case-modifiable                 ;;char is first case-modifiable after non-case-modifiable
732                 (setf (schar string index) (char-upcase char))                 (setf (schar string index) (char-titlecase char))
733                 (setq newword ()))                 (setq newword ()))
734                (t                (t
735                 (setf (schar string index) (char-downcase char))))))                 (setf (schar string index) (char-downcase char))))))
# Line 557  Line 772 
772                             (1+ index))                             (1+ index))
773                          (declare (fixnum index)))))                          (declare (fixnum index)))))
774        (subseq (the simple-string string) left-end right-end))))        (subseq (the simple-string string) left-end right-end))))
775    
776    (declaim (inline %glyph-f %glyph-b))
777    (defun %glyph-f (string index)
778      (declare (optimize (speed 3) (space 0) (safety 0) (debug 0))
779               (type simple-string string) (type kernel:index index))
780      (let* ((prev 0)
781             (l (length string))
782             (c (codepoint string index l))
783             (n (+ index (if (> c #xFFFF) 2 1))))
784        (declare (type (integer 0 #x10FFFF) c) (type kernel:index l n))
785        (loop while (< n l) do
786          (let* ((c (codepoint string n l))
787                 (d (the (unsigned-byte 8) (unicode-combining-class c))))
788            (when (or (zerop d) (< d prev))
789              (return))
790            (setq prev d)
791            (incf n (if (> c #xFFFF) 2 1))))
792        n))
793    
794    (defun %glyph-b (string index)
795      (declare (optimize (speed 3) (space 0) (safety 0) (debug 0))
796               (type simple-string string) (type kernel:index index))
797      (let* ((prev 255)
798             (n (1- index)))
799        (declare (type kernel:index n))
800        (loop until (< n 0) do
801          (let* ((c (codepoint string n 0))
802                 (d (the (unsigned-byte 8) (unicode-combining-class c))))
803            (cond ((zerop d) (return))
804                  ((> d prev) (incf n (if (> c #xFFFF) 2 1)) (return)))
805            (setq prev d)
806            (decf n (if (> c #xFFFF) 2 1))))
807        n))
808    
809    (defun glyph (string index &key (from-end nil))
810      "GLYPH returns the glyph at the indexed position in a string, and the
811      position of the next glyph (or NIL) as a second value.  A glyph is
812      a substring consisting of the character at INDEX followed by all
813      subsequent combining characters."
814      (declare (type simple-string string) (type kernel:index index))
815      #-unicode
816      (char string index)
817      #+unicode
818      (with-array-data ((string string) (start) (end))
819        (declare (ignore start end))
820        (let ((n (if from-end (%glyph-b string index) (%glyph-f string index))))
821          (if from-end
822              (values (subseq string n index) (and (> n 0) n))
823              (values (subseq string index n) (and (< n (length string)) n))))))
824    
825    (defun sglyph (string index &key (from-end nil))
826      "SGLYPH returns the glyph at the indexed position, the same as GLYPH,
827      except that the string must be a simple-string"
828      (declare (type simple-string string) (type kernel:index index))
829      #-unicode
830      (schar string index)
831      #+unicode
832      (let ((n (if from-end (%glyph-b string index) (%glyph-f string index))))
833        (if from-end
834            (values (subseq string n index) (and (> n 0) n))
835            (values (subseq string index n) (and (< n (length string)) n)))))
836    
837    (defun decompose (string &optional (compatibility t))
838      (declare (type string string))
839      (let ((result (make-string (cond ((< (length string) 40)
840                                        (* 5 (length string)))
841                                       ((< (length string) 4096)
842                                        (* 2 (length string)))
843                                       (t (round (length string) 5/6)))))
844            (fillptr 0))
845        (declare (type kernel:index fillptr))
846        (labels ((rec (string)
847                   (declare (type simple-string string))
848                   (do ((i 0 (1+ i)))
849                       ((= i (length string)))
850                     (declare (type kernel:index i))
851                     (multiple-value-bind (code wide) (codepoint string i)
852                       (when wide (incf i))
853                       (let ((decomp (unicode-decomp code compatibility)))
854                         (if decomp (rec decomp) (out code))))))
855                 (out (code)
856                   (multiple-value-bind (hi lo) (surrogates code)
857                     (outch hi)
858                     (when lo
859                       (outch lo))
860                     (let ((cc (unicode-combining-class code)))
861                       (unless (zerop cc)
862                         (order lo cc (- fillptr (if lo 3 2)))))))
863                 (outch (char)
864                   (when (= fillptr (length result))
865                     (let ((tmp (make-string (round (length result) 5/6))))
866                       (replace tmp result)
867                       (setq result tmp)))
868                   (setf (schar result fillptr) char)
869                   (incf fillptr))
870                 (order (wide1 cc last)
871                   (loop until (minusp last) do
872                     (multiple-value-bind (code2 wide2) (codepoint result last)
873                       (let ((cc2 (unicode-combining-class code2)))
874                         (cond ((zerop cc2) (return))
875                               ((> cc2 cc)
876                                (case (+ (if wide2 2 0) (if wide1 1 0))
877                                  (0 (rotatef (schar result last)
878                                              (schar result (1+ last))))
879                                  (1 (rotatef (schar result last)
880                                              (schar result (+ last 1))
881                                              (schar result (+ last 2))))
882                                  (2 (rotatef (schar result last)
883                                              (schar result (1- last))
884                                              (schar result (1+ last))))
885                                  (3 (rotatef (schar result last)
886                                              (schar result (+ last 2)))
887                                     (rotatef (schar result (1- last))
888                                              (schar result (1+ last)))))
889                                (decf last (if wide2 2 1)))
890                               (t (return))))))))
891          (with-array-data ((string string) (start) (end))
892            (declare (ignore start end))
893            (rec string))
894          (shrink-vector result fillptr))))
895    
896    (defun string-to-nfd (string)
897      "Convert String to Unicode Normalization Form D (NFD) using the
898      canonical decomposition.  The NFD string is returned"
899      (decompose string nil))
900    
901    (defun string-to-nfkd (string)
902      "Convert String to Unicode Normalization Form KD (NFKD) uisng the
903      compatible decomposition form.  The NFKD string is returned."
904      (decompose string t))
905    
906    #+unicode
907    (defun string-to-nfc (string)
908      ;;@@ Implement me
909      ;; must return a simple-string for the package machinery
910      (if (simple-string-p string) string (coerce string 'simple-string)))
911    
912    #-unicode  ;; Needed by package.lisp
913    (defun string-to-nfc (string)
914      (if (simple-string-p string) string (coerce string 'simple-string)))
915    
916    (defun string-to-nfkc (string)
917      ;;@@ Implement me
918      (if (simple-string-p string) string (coerce string 'simple-string)))

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.12.30.20

  ViewVC Help
Powered by ViewVC 1.1.5