CVS update by aidan ADDED: packages/mule-packages/latin-euro-standards ChangeLog
19 years, 10 months
CVS Monitor
CVS Monitor
User: aidan
Date: 05/02/15 00:38:09
Added: packages/mule-packages/latin-euro-standards ChangeLog
Makefile latin-euro-latin10.el latin-euro-latin7.el
latin-euro-latin8.el latin-euro-latin9.el
latin-euro-standards.el latin-euro-standards.texi
package-info.in
Log:
Importing the latin-euro-standards package.
Revision Changes Path
1.1 XEmacs/packages/mule-packages/latin-euro-standards/ChangeLog
Index: ChangeLog
===================================================================
2005-02-08 Aidan Kehoe <kehoea(a)parhasard.net>
* latin-euro-standards: New package, refactored from latin-unity.
* latin-euro-latin10.el:
* latin-euro-latin7.el:
* latin-euro-latin8.el:
* latin-euro-latin9.el:
Refactored from latin-unity-latin{7,8,9,10}.el.
* Makefile:
* latin-euro-standards.el:
* latin-euro-standards.texi:
Created.
1.1 XEmacs/packages/mule-packages/latin-euro-standards/Makefile
Index: Makefile
===================================================================
# Makefile for latin-euro-standards
# This file is part of XEmacs.
# XEmacs is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by the
# Free Software Foundation; either version 2, or (at your option) any
# later version.
# XEmacs is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
# for more details.
# You should have received a copy of the GNU General Public License
# along with XEmacs; see the file COPYING. If not, write to
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
VERSION = 1.0
# XEmacs CVS version is canonical.
AUTHOR_VERSION = $(VERSION)
MAINTAINER = Aidan Kehoe <aidan(a)xemacs.org>
PACKAGE = latin-euro-standards
PKG_TYPE = regular
REQUIRES = mule-base
CATEGORY = mule
STANDARD_DOCS = t
ELCS = latin-euro-latin7.elc latin-euro-latin8.elc latin-euro-latin9.elc \
latin-euro-latin10.elc latin-euro-standards.elc
EXTRA_DEPENDENCIES = $(ELCS)
include ../../XEmacs.rules
1.1 XEmacs/packages/mule-packages/latin-euro-standards/latin-euro-latin10.el
Index: latin-euro-latin10.el
===================================================================
;;; latin-euro-latin10.el --- Define language environment
;; Copyright (C) 2002 Free Software Foundation, Inc
;; Author: Stephen J. Turnbull
;; Keywords: mule, charsets
;; Created: 2002 October 24 (as latin-unity-latin10.el)
;; Last-modified: 2005 February 7
;; This file is part of XEmacs.
;; XEmacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; XEmacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;;; Commentary:
;; Provides the latin-10 language environment, character set and coding
;; system.
;;; Code:
;; define ISO-8859-16 for XEmacs 21.4 and earlier
;;;###autoload
(unless (find-charset 'latin-iso8859-16)
;; Create character set
(make-charset
'latin-iso8859-16 "ISO8859-16 (Latin 10)"
;; sheesh, what we do for backward compatibility
;; #### this test and the similar one below probably should be
;; reformulated to use condition-case
(append (if (emacs-version>= 21 4)
'(short-name "Latin-10"
long-name "ISO8859-16 (Latin 10)")
nil)
'(registry "iso8859-16"
dimension 1
columns 1
chars 96
final ?f ; octet 06/06; cf ISO-IR 226
graphic 1
direction l2r)))
;; For syntax of Latin-10 characters.
(require 'cl)
(load "cl-macs" nil t)
(loop for c from 64 to 127
do (modify-syntax-entry (make-char 'latin-iso8859-16 c) "w"))
(mapc (lambda (c)
(modify-syntax-entry (make-char 'latin-iso8859-16 c) "w"))
'(#xA1 #xA2 #xA3 #xA6 #xA8 #xAA #xAC #xAE #xAF
#xB3 #xB4 #xB5 #xB8 #xB9 #xBA #xBC #xBD #xBE #xBF))
)
;;;###autoload
(unless (find-coding-system 'iso-8859-16)
;; Create coding system
(make-coding-system
'iso-8859-16 'iso2022 "MIME ISO-8859-16"
'(charset-g0 ascii
charset-g1 latin-iso8859-16
charset-g2 t ; grrr
charset-g3 t ; grrr
mnemonic "MIME/Ltn-10")))
;;;###autoload
(unless (assoc "Latin-10" language-info-alist)
(defun setup-latin10-environment ()
"Set up multilingual environment (MULE) for European Latin-10 users."
(interactive)
(set-language-environment "Latin-10"))
;; sheesh, what we do for backward compatibility
(apply #'set-language-info-alist
(append `("Latin-10"
((charset ascii latin-iso8859-16)
(coding-system iso-8859-16)
(coding-priority iso-8859-16)
(input-method . "latin-10-prefix")
(sample-text
.
;; #### OK, who knows some Romanian?
,(format "\
Hey, if you know Romanian, send sample encoded text (eg, using \"comma-below\"
characters) to xemacs-beta(a)xemacs.org. Please use a MIME
application/octet-stream attachment if possible."
))
(documentation . "\
This is a generic language environment for Latin-10 (ISO-8859-16). It
supports Romanian and most Western European languages.")))
(if (emacs-version>= 21 1 15)
'(("European"))
nil))))
(provide 'latin-euro-latin10)
;;; end of latin-euro-latin10.el
1.1 XEmacs/packages/mule-packages/latin-euro-standards/latin-euro-latin7.el
Index: latin-euro-latin7.el
===================================================================
;;; latin-euro-latin7.el --- Define language environment -*- coding: iso-2022-7 -*-
;; Copyright (C) 2002 Free Software Foundation, Inc
;; Author: Stephen J. Turnbull
;; Keywords: mule, charsets
;; Created: 2002 March 7 (as latin-unity-latin7.el)
;; Last-modified: 2005 February 7
;; This file is part of XEmacs.
;; XEmacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; XEmacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;;; Commentary:
;; Provides the latin-7 language environment, character set, and coding
;; system.
;;; Code:
;; define ISO-8859-13 for XEmacs 21.4 and earlier
; don't ;;;###autoload
(unless (find-charset 'latin-iso8859-13)
;; Create character set
(make-charset
'latin-iso8859-13 "ISO8859-13 (Latin 7)"
;; sheesh, what we do for backward compatibility
;; #### this test and the similar one below probably should be
;; reformulated to use condition-case
(append (if (emacs-version>= 21 4)
'(short-name "Latin-7"
long-name "ISO8859-13 (Latin 7)")
nil)
'(registry "iso8859-13"
dimension 1
columns 1
chars 96
final ?Y
graphic 1
direction l2r)))
;; For syntax of Latin-7 characters.
(require 'cl)
(load "cl-macs" nil t) ; howcum no #'provide?
(loop for c from 64 to 127 ; from 'À' to 'ÿ'
do (modify-syntax-entry (make-char 'latin-iso8859-13 c) "w"))
(mapc (lambda (c)
(modify-syntax-entry (make-char 'latin-iso8859-13 c) "w"))
'(#xA8 #xAA #xAF #xB8 #xBA #xBF))
(modify-syntax-entry (make-char 'latin-iso8859-13 32) "w") ; no-break space
(modify-syntax-entry (make-char 'latin-iso8859-13 87) "_") ; multiply
(modify-syntax-entry (make-char 'latin-iso8859-13 119) "_") ; divide
(modify-syntax-entry (make-char 'latin-iso8859-13 127) ".") ; right squote
)
(defvar iso8859/13-case-table
(let ((table (copy-case-table (standard-case-table))))
(mapc (lambda (pair)
(put-case-table-pair (make-char 'latin-iso8859-13 (car pair))
(make-char 'latin-iso8859-13 (cdr pair))
table))
'((#xA8 . #xB8) (#xAA . #xBA) (#xAF . #xBF)))
(let ((i #xC0))
(while (< i #xDF)
(unless (= i #xD7)
(put-case-table-pair (make-char 'latin-iso8859-13 i)
(make-char 'latin-iso8859-13 (+ i #x20))
table))
(setq i (1+ i))))
table)
"Case table for Latin 7, right half of ISO 8859/13.")
; don't ;;;###autoload
(unless (find-coding-system 'iso-8859-13)
;; Create coding system
(make-coding-system
'iso-8859-13 'iso2022 "MIME ISO-8859-13"
'(charset-g0 ascii
charset-g1 latin-iso8859-13
charset-g2 t ; grrr
charset-g3 t ; grrr
mnemonic "MIME/Ltn-7")))
; don't ;;;###autoload
(unless (assoc "Latin-7" language-info-alist)
(defun setup-latin7-environment ()
"Set up multilingual environment (MULE) for Baltic Rim Latin-7 users."
(interactive)
(set-language-environment "Latin-7"))
;; sheesh, what we do for backward compatibility
(apply #'set-language-info-alist
(append `("Latin-7"
((charset ascii latin-iso8859-13)
(coding-system iso-8859-13)
(coding-priority iso-8859-13)
(input-method . "latin-7-prefix")
(sample-text
.
,(format "\
Hello, Hej, Tere, Hei, Bonjour, Gr%c%c Gott, Ciao, %cHola!"
;; SMALL U WITH UMLAUT
(make-char 'latin-iso8859-13 #x7C)
;; GERMAN SHARP S
(make-char 'latin-iso8859-13 #x5F)
;; INVERTED EXCLAMATION MARK
(make-char 'latin-iso8859-13 #x21)))
(documentation . "\
This is a generic language environment for Latin-7 (ISO-8859-13). It
supports the Baltic Rim languages.")))
(if (emacs-version>= 21 1 15)
'(("Baltic Rim"))
nil))))
(provide 'latin-euro-latin7)
;;; end of latin-euro-latin7.el
1.1 XEmacs/packages/mule-packages/latin-euro-standards/latin-euro-latin8.el
Index: latin-euro-latin8.el
===================================================================
;;; latin-euro-latin8.el --- Define language environment
;; Copyright (C) 2002 Free Software Foundation, Inc
;; Author: Stephen J. Turnbull
;; Keywords: mule, charsets
;; Created: 2002 October 24 (as latin-unity-latin8.el)
;; Last-modified: 2005 February 7
;; This file is part of XEmacs.
;; XEmacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; XEmacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;;; Commentary:
;; Provides the latin-8 language environment, character set and coding
;; system.
;;; Code:
;; define ISO-8859-14 for XEmacs 21.4 and earlier
;;;###autoload
(unless (find-charset 'latin-iso8859-14)
;; Create character set
(make-charset
'latin-iso8859-14 "ISO8859-14 (Latin 8)"
;; sheesh, what we do for backward compatibility
;; #### this test and the similar one below probably should be
;; reformulated to use condition-case
(append (if (emacs-version>= 21 4)
'(short-name "Latin-8"
long-name "ISO8859-16 (Latin 8)")
nil)
'(registry "iso8859-14"
dimension 1
columns 1
chars 96
final ?_ ; octet 05/15; cf ISO-IR 199
graphic 1
direction l2r)))
;; For syntax of Latin-8 characters.
(require 'cl)
(load "cl-macs" nil t)
(loop for c from 32 to 127
do (modify-syntax-entry (make-char 'latin-iso8859-14 c) "w"))
(mapc (lambda (c)
(modify-syntax-entry (make-char 'latin-iso8859-14 c) "_"))
'(#xA3 #xA7 #xA9 #xAD #xAE #xB6))
)
;;;###autoload
(unless (find-coding-system 'iso-8859-14)
;; Create coding system
(make-coding-system
'iso-8859-14 'iso2022 "MIME ISO-8859-14"
'(charset-g0 ascii
charset-g1 latin-iso8859-14
charset-g2 t ; grrr
charset-g3 t ; grrr
mnemonic "MIME/Ltn-8")))
;;;###autoload
(unless (assoc "Latin-8" language-info-alist)
(defun setup-latin8-environment ()
"Set up multilingual environment (MULE) for European Latin-8 users."
(interactive)
(set-language-environment "Latin-8"))
;; sheesh, what we do for backward compatibility
(apply #'set-language-info-alist
(append `("Latin-8"
((charset ascii latin-iso8859-14)
(coding-system iso-8859-14)
(coding-priority iso-8859-14)
(input-method . "latin-8-prefix")
(sample-text
.
;; #### OK, who knows some Gaelic?
,(format "\
Hey, if you know a Celtic language, send sample encoded text (eg, using
\"dot-above\" characters) to xemacs-beta(a)xemacs.org. Please use a MIME
application/octet-stream attachment if possible."
))
(documentation . "\
This is a generic language environment for Latin-8 (ISO-8859-14). It
supports Celtic and most Western European languages.")))
(if (emacs-version>= 21 1 15)
'(("European"))
nil))))
(provide 'latin-euro-latin8)
;;; end of latin-euro-latin8.el
1.1 XEmacs/packages/mule-packages/latin-euro-standards/latin-euro-latin9.el
Index: latin-euro-latin9.el
===================================================================
;;; latin-euro-latin9.el --- Define language environment
;; Copyright (C) 2002, 2003 Free Software Foundation, Inc
;; Author: Stephen J. Turnbull
;; Keywords: mule, charsets
;; Created: 2002 March 7 (as latin-unity-latin9.el)
;; Last-modified: 2005 February 7
;; This file is part of XEmacs.
;; XEmacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; XEmacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;;; Commentary:
;; Provides the latin-9 language environment, character set and coding
;; system.
;;; Code:
;; define ISO-8859-15 for XEmacs 21.4 and earlier
;;;###autoload
(unless (find-charset 'latin-iso8859-15)
;; Create character set
(make-charset
'latin-iso8859-15 "ISO8859-15 (Latin 9)"
;; sheesh, what we do for backward compatibility
;; #### this test and the similar one below probably should be
;; reformulated to use condition-case
(append (if (emacs-version>= 21 4)
'(short-name "Latin-9"
long-name "ISO8859-15 (Latin 9)")
nil)
'(registry "iso8859-15"
dimension 1
columns 1
chars 96
final ?b
graphic 1
direction l2r)))
;; For syntax of Latin-9 characters.
(require 'cl)
(load "cl-macs" nil t) ; howcum no #'provide?
(loop for c from 64 to 127 ; from 'À' to 'ÿ'
do (modify-syntax-entry (make-char 'latin-iso8859-15 c) "w"))
(mapc (lambda (c)
(modify-syntax-entry (make-char 'latin-iso8859-15 c) "w"))
'(#xA6 #xA8 #xB4 #xB8 #xBC #xBD #xBE))
(modify-syntax-entry (make-char 'latin-iso8859-15 32) "w") ; no-break space
(modify-syntax-entry (make-char 'latin-iso8859-15 87) "_") ; multiply
(modify-syntax-entry (make-char 'latin-iso8859-15 119) "_") ; divide
)
;;;###autoload
(unless (find-coding-system 'iso-8859-15)
;; Create coding system
(make-coding-system
'iso-8859-15 'iso2022 "MIME ISO-8859-15"
'(charset-g0 ascii
charset-g1 latin-iso8859-15
charset-g2 t ; grrr
charset-g3 t ; grrr
mnemonic "MIME/Ltn-9")))
;;;###autoload
(unless (assoc "Latin-9" language-info-alist)
(defun setup-latin9-environment ()
"Set up multilingual environment (MULE) for European Latin-9 users."
(interactive)
(set-language-environment "Latin-9"))
;; sheesh, what we do for backward compatibility
(apply #'set-language-info-alist
(append `("Latin-9"
((charset ascii latin-iso8859-15)
(coding-system iso-8859-15)
(coding-priority iso-8859-15)
(input-method . "latin-9-prefix")
(sample-text
.
,(format "\
Hello, Hej, Tere, Hei, Bonjour, Gr%c%c Gott, Ciao, %cHola!, my %c0.02"
;; SMALL U WITH UMLAUT
(make-char 'latin-iso8859-15 #x7C)
;; GERMAN SHARP S
(make-char 'latin-iso8859-15 #x5F)
;; INVERTED EXCLAMATION MARK
(make-char 'latin-iso8859-15 #x21)
;; EURO SIGN
(make-char 'latin-iso8859-15 #x24)))
(documentation . "\
This is a generic language environment for Latin-9 (ISO-8859-15). It
supports the Euro and the following languages:
Danish, Dutch, English, Faeroese, Finnish, French, German, Icelandic,
Irish, Italian, Norwegian, Portuguese, Spanish, and Swedish.
We also have a German specific language environment \"German\".")))
(if (emacs-version>= 21 1 15)
'(("European"))
nil))))
;; #### move these to a separate file for keysyms
;; These are all the ones not in Latin-1.
;;;###autoload
(flet ((define-keysym-as-char (keysym character)
(unless (lookup-key global-map (vector keysym))
(define-key global-map (vector keysym) #'self-insert-command))
(unless (get keysym 'ascii-character)
(put keysym 'ascii-character character)))
(foo (k o)
(define-keysym-as-char k (make-char 'latin-iso8859-15 o))))
(foo 'EuroSign #x24)
(foo 'Scaron #x26)
(foo 'scaron #x28)
(foo 'Zcaron #x34)
(foo 'zcaron #x38)
(foo 'OE #x3C)
(foo 'oe #x3D)
(foo 'Ydiaeresis #x3E))
(provide 'latin-euro-latin9)
;;; end of latin-euro-latin9.el
1.1 XEmacs/packages/mule-packages/latin-euro-standards/latin-euro-standards.el
Index: latin-euro-standards.el
===================================================================
;;; latin-euro-standards.el -*- coding: iso-2022-7 -*-
;; Copyright (C) 2002 Free Software Foundation, Inc
;; Author: Aidan Kehoe
;; Keywords: mule, charsets
;; Created: 2005 February 7
;; Last-modified: 2005 February 7
;; This file is part of XEmacs.
;; XEmacs is free software; you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your option)
;; any later version.
;; XEmacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; see the file COPYING. If not, write to the
;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
;; Boston, MA 02111-1307, USA.
;;; Commentary:
;; The latin-euro-standards package provides coding systems, Mule character
;; sets, and language environments for the ISO-8859-13, -14, -15 and -16
;; standard character encodings. Besides the Euro sign--whence the name of
;; this package--among these encodings we have single-width directed
;; quotation marks, handy if you're if you're in an environment where your
;; TTY has a UTF-8 coding system which interprets these characters as
;; single-width.
;; These have been refactored out from the latin-unity package because it
;; turns out that, to have Mule-UCS support the Euro sign, the simplest
;; approach is to have these character sets available to it when
;; byte-compiling. Since latin-unity already depends on mule-ucs, and since
;; moving these character sets out from latin-unity and making it depend on
;; them is pretty practical, we've moved them here, to avoid a nasty
;; circular dependency.
;;; Code:
(require 'latin-euro-latin7)
(require 'latin-euro-latin8)
(require 'latin-euro-latin9)
(require 'latin-euro-latin10)
(provide 'latin-euro-standards)
;; end of latin-euro-standards.el
1.1 XEmacs/packages/mule-packages/latin-euro-standards/latin-euro-standards.texi
Index: latin-euro-standards.texi
===================================================================
\input texinfo ＠c -*-texinfo-*-
＠c Manual for the XEmacs latin-unity package.
＠c ** #### something uses these headers, find out how and explain here
＠c %**start of header
＠setfilename latin-euro-standards.info
＠settitle Recent ISO 8859 character encoding standards
＠setchapternewpage odd
＠c %**end of header
＠c Version values, for easy modification
＠set VERSION 1.0
＠set CREATED Monday, February 7, 2005
＠set UPDATED Monday, February 7, 2005
＠c ** Many people seem to prefer this footnote style.
＠footnotestyle end
＠direntry
* latin-euro-standards:: Make recent ISO 8859 character
encodings available to XEmacs.
＠end direntry
＠c ** It is often convenient to use a macro for names which have unusual
＠c ** spelling or formatting conventions.
＠c Macro to make formatting of the package name consistent.
＠macro pkgname
＠i{latin-euro-standards}
＠end macro
＠c Copying permissions, et al
＠c Note that this whole section is repeated thrice, once for the Info
＠c version, once for TeX, and once for HTML.
＠c Note that if you combine this document with others' work, you may
＠c need to change the permissions statement. Make sure you do so in all
＠c three places.
＠c #### Probably not the right place for HTML.
＠html
This file is part of XEmacs. It documents the ＠pkgname{} package,
which ensures that wherever possible representations of all Latin
characters are drawn from the same 8-bit character set.
Copyright ＠copyright{} 2005 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim or modified copies
of this manual provided that the copyright notice above is preserved,
and at least one of the numbered paragraphs below up to the phrase "End
of permissions notice." is included, under the terms of any of the
licenses enumerated below.
1. The GNU General Public License, version 2 or any later version
published by the Free Software Foundation, Inc. A copy of the GNU
General Public License was included with your copy of XEmacs.
Alternatively, you may request a copy from the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
2. The license used for XEmacs documentation (see the file
man/xemacs/xemacs.texi distributed with XEmacs).
3. The GNU Free Documentation License (available from the Free Software
Foundation at the address above).
End of permissions notice.
Because the XEmacs documentation license and the GNU Free Documentation
License are not free software licenses, and are mutually incompatible
with each other and with the GNU General Public License, it is desirable
that the permissions given here be preserved if possible. This normally
requires that you write fresh text for any additions or modifications to
this file, rather than copying code or comments from other sources. The
exceptions are if you are sole copyright holder for the other source, or
if you receive permission from the holders of the copyrights for the
other sources.
That is, if you merge code or comments from a file licensed to you only
under the GNU General Public License you ＠emph{may not} distribute
under the documentation licenses or with a dual license; such a
combination may be distributed under the GNU General Public License
＠emph{only}. Similarly, if you copy text from a file licensed to you
only under the XEmacs documentation license or the GNU Free
Documentation License you may distribute the result ＠emph{only} under
the appropriate license.
＠end html
＠ifinfo
This file is part of XEmacs. It documents the ＠pkgname{} package,
which ensures that wherever possible representations of all Latin
characters are drawn from the same 8-bit character set.
Copyright ＠copyright{} 2005 Free Software Foundation, Inc.
Permission is granted to make and distribute verbatim or modified copies
of this manual provided that the copyright notice above is preserved,
and at least one of the numbered paragraphs below up to the phrase "End
of permissions notice." is included, under the terms of any of the
licenses enumerated below.
＠ignore
Permission is granted to process this file through TeX and print the
results, provided the printed document carries a copying permission
notice identical to this one except for the removal of this paragraph
(this paragraph not being relevant to the printed manual).
＠end ignore
1. The GNU General Public License, version 2 or any later version
published by the Free Software Foundation, Inc. A copy of the GNU
General Public License was included with your copy of XEmacs.
Alternatively, you may request a copy from the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
2. The license used for XEmacs documentation (see the file
man/xemacs/xemacs.texi distributed with XEmacs).
3. The GNU Free Documentation License (available from the Free Software
Foundation at the address above).
End of permissions notice.
Because the XEmacs documentation license and the GNU Free Documentation
License are not free software licenses, and are mutually incompatible
with each other and with the GNU General Public License, it is desirable
that the permissions given here be preserved if possible. This normally
requires that you write fresh text for any additions or modifications to
this file, rather than copying code or comments from other sources. The
exceptions are if you are sole copyright holder for the other source, or
if you receive permission from the holders of the copyrights for the
other sources.
That is, if you merge code or comments from a file licensed to you only
under the GNU General Public License you ＠emph{may not} distribute
under the documentation licenses or with a dual license; such a
combination may be distributed under the GNU General Public License
＠emph{only}. Similarly, if you copy text from a file licensed to you
only under the XEmacs documentation license or the GNU Free
Documentation License you may distribute the result ＠emph{only} under
the appropriate license.
＠end ifinfo
＠tex
＠titlepage
＠title Recent ISO 8859 character encodings
＠subtitle Last updated ＠value{UPDATED}
＠author Aidan Kehoe
＠page
This file is part of XEmacs. It documents the ＠pkgname{} package,
which ensures that wherever possible representations of all Latin
characters are drawn from the same 8-bit character set.
Copyright ＠copyright{} 2005 Free Software Foundation, Inc.
＠vskip 0pt plus 1filll
Permission is granted to make and distribute verbatim or modified copies
of this manual provided that the copyright notice above is preserved,
and at least one of the numbered paragraphs below up to the phrase "End
of permissions notice." is included, under the terms of any of the
licenses enumerated below.
＠ignore
Permission is granted to process this file through TeX and print the
results, provided the printed document carries a copying permission
notice identical to this one except for the removal of this paragraph
(this paragraph not being relevant to the printed manual).
＠end ignore
1. The GNU General Public License, version 2 or any later version
published by the Free Software Foundation, Inc. A copy of the GNU
General Public License was included with your copy of XEmacs.
Alternatively, you may request a copy from the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
2. The license used for XEmacs documentation (see the file
man/xemacs/xemacs.texi distributed with XEmacs).
3. The GNU Free Documentation License (available from the Free Software
Foundation at the address above).
End of permissions notice.
Because the XEmacs documentation license and the GNU Free Documentation
License are not free software licenses, and are mutually incompatible
with each other and with the GNU General Public License, it is desirable
that the permissions given here be preserved if possible. This normally
requires that you write fresh text for any additions or modifications to
this file, rather than copying code or comments from other sources. The
exceptions are if you are sole copyright holder for the other source, or
if you receive permission from the holders of the copyrights for the
other sources.
That is, if you merge code or comments from a file licensed to you only
under the GNU General Public License you ＠emph{may not} distribute
under the documentation licenses or with a dual license; such a
combination may be distributed under the GNU General Public License
＠emph{only}. Similarly, if you copy text from a file licensed to you
only under the XEmacs documentation license or the GNU Free
Documentation License you may distribute the result ＠emph{only} under
the appropriate license.
＠end titlepage
＠page
＠end tex
＠ifnottex
＠node Top, Copying, (dir), (dir)
＠top Recent ISO 8859 character encodings
＠end ifnottex
This package provides several recent character encodings that have been
standardized by ISO, the international organization for standardization,
together with the associated Mule character sets and coding systems.
It is intended to be used by the Mule-UCS (＠pxref{Top,,, mule-ucs,
Mule-UCS User Manual}) and Latin Unity (＠pxref{Top,,, latin-unity,
Latin Unity for Emacsen}) packages, and was, indeed, refactored out
from the former.
Each file provides a language environment named, e.g. ＠samp{Latin-7}, a
coding system named ＠samp{iso-8859-13} (etc.) and a Mule character set
named ＠samp{latin-iso8859-13} (again, etc.).
＠menu
* Copying:: ＠pkgname{} copying conditions.
* Standards:: Details of the relevant ISO character encodings.
＠end menu
＠node Copying, Standards, Top, Top
＠chapter ＠pkgname{} Copying Conditions
＠c ** CHECK THE COPYRIGHT DATE(S) AND HOLDER(S)!
Copyright (C) 2005 Free Software Foundation, Inc.
＠pkgname{} is free software; you can redistribute it
and/or modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2, or (at your
option) any later version.
＠pkgname{} is distributed in the hope that it will
be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
General Public License for more details.
You should have received a copy of the GNU General Public License along
with XEmacs; see the file COPYING. If not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA.
＠node Standards, , Copying, Top
＠chapter Standards
＠section Latin 7
ISO 8859-13 dates from 1998, is the seventh Roman-alphabet standard of
the ISO-8859 series, and is intended for use along the Baltic rim. It
notably includes support for Latvian, something that wasn't available in
its predecessor in North European support, ISO-8859-6.
＠section Latin 8
ISO 8859-14 gives full support to Welsh and Gaelic---note that modern
Irish Gaelic fits quite comfortably in ISO-8859-1, so in practical terms
this is more likely to be used for Welsh and Scots Gaelic, if even
then. It dates from 1998.
＠section Latin 9
ISO 8859 15 dates from 1999, and is a mostly-compatible revision to ISO
8859 1, replacing the disused CURRENCY SIGN with U+20AC, EURO SIGN, and
making seven other changes to give better support to French and
Finnish. It's most often encountered in Western European Usenet groups,
in this author's experience.
＠section Latin 10, or ISO 8859-10
This standard is from 2001, and gives better support to Romanian and
some other languages than was widely available at that point. It also
has single-width directed quotation marks, which are useful in a TTY
environment where using the corresponding CNS characters within XEmacs
would result in a miscalculation of column numbers and corresponding
second-guessing and minor derangement when directed quotation marks are
used.
1.1 XEmacs/packages/mule-packages/latin-euro-standards/package-info.in
Index: package-info.in
===================================================================
(locale
(standards-version 1.1
version VERSION
author-version AUTHOR_VERSION
date DATE
build-date BUILD_DATE
maintainer MAINTAINER
distribution mule
priority high
category CATEGORY
dump nil
description
"MULE: Support for the Latin{7,8,9,10} character sets & coding systems."
filename FILENAME
md5sum MD5SUM
size SIZE
provides ()
requires (REQUIRES)
type regular
))
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: xemacs ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/02/14 23:51:49
Modified: xemacs version.sh
Log:
Update xemacs_extra_name.
Revision Changes Path
1.1066 +1 -1 XEmacs/xemacs/version.sh
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.1065
retrieving revision 1.1066
diff -u -r1.1065 -r1.1066
--- version.sh 2005/02/13 22:51:33 1.1065
+++ version.sh 2005/02/14 22:51:46 1.1066
＠＠ -8,4 +8,4 ＠＠
infodock_major_version=4
infodock_minor_version=0
infodock_build_version=8
-xemacs_extra_name="(+CVS-20050213)"
+xemacs_extra_name="(+CVS-20050214)"
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: xemacs-builds/viteno ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/02/14 23:01:33
Modified: xemacs-builds/viteno package-index setup-packages.ini
Log:
Package database backup:
- text-modes-1.84
- vhdl-1.20
Revision Changes Path
1.192 +14 -14 XEmacs/xemacs-builds/viteno/package-index
Index: package-index
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/viteno/package-index,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -r1.191 -r1.192
--- package-index 2005/02/13 21:38:34 1.191
+++ package-index 2005/02/14 22:01:30 1.192
＠＠ -712,20 +712,20 ＠＠
(package-get-update-base-entry (quote
(text-modes
(standards-version 1.1
- version "1.83"
+ version "1.84"
author-version "No-Upstream-Ver"
- date "2005-02-10"
- build-date "2005-02-10"
+ date "2005-02-14"
+ build-date "2005-02-14"
maintainer "XEmacs Development Team <xemacs-beta(a)xemacs.org>"
distribution xemacs
priority high
category "standard"
dump nil
description "Miscellaneous support for editing text files."
- filename "text-modes-1.83-pkg.tar.gz"
- md5sum "f0da5b1948ea00b6ceba79483f179ace"
- size 395653
- provides (ansi-color autoinsert crontab-edit desktop-entry-mode filladapt flyspell folding fold-isearch hexl htmlize image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed rtf-support swedish tabify whitespace-mode winmgr-mode xpm-mode xrdb-mode apache-mode po-mode po-compat css-mode)
+ filename "text-modes-1.84-pkg.tar.gz"
+ md5sum "51e7b1d612516d305e2ad73f7b3011cb"
+ size 395728
+ provides (ansi-color autoinsert crontab-edit desktop-entry-mode filladapt flyspell folding fold-isearch hexl htmlize image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed rtf-support swedish tabify whitespace-mode whitespace-visual-mode winmgr-mode xpm-mode xrdb-mode apache-mode po-mode po-compat css-mode)
requires (ispell fsf-compat xemacs-base)
type regular
))
＠＠ -1790,19 +1790,19 ＠＠
(package-get-update-base-entry (quote
(vhdl
(standards-version 1.1
- version "1.19"
- author-version "3.32.20"
- date "2004-03-18"
- build-date "2004-03-18"
+ version "1.20"
+ author-version "3.33.2"
+ date "2005-02-14"
+ build-date "2005-02-14"
maintainer "XEmacs Development Team <xemacs-beta(a)xemacs.org>"
distribution xemacs
priority low
category "standard"
dump nil
description "Support for VHDL."
- filename "vhdl-1.19-pkg.tar.gz"
- md5sum "2d97483e5af1f070dfe1d0b59b3e062d"
- size 296356
+ filename "vhdl-1.20-pkg.tar.gz"
+ md5sum "f4f9381623e0c14957f2ea064e5044d5"
+ size 300258
provides (vhdl-mode)
requires (xemacs-base edit-utils c-support speedbar ps-print os-utils)
type regular
1.186 +4 -4 XEmacs/xemacs-builds/viteno/setup-packages.ini
Index: setup-packages.ini
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs-builds/viteno/setup-packages.ini,v
retrieving revision 1.185
retrieving revision 1.186
diff -u -r1.185 -r1.186
--- setup-packages.ini 2005/02/13 21:38:34 1.185
+++ setup-packages.ini 2005/02/14 22:01:30 1.186
＠＠ -176,8 +176,8 ＠＠
install: packages/x-symbol-1.10-pkg.tar.gz 680100
＠ vhdl
-version: 1.19
-install: packages/vhdl-1.19-pkg.tar.gz 296356
+version: 1.20
+install: packages/vhdl-1.20-pkg.tar.gz 300258
＠ auctex
version: 1.46
＠＠ -340,8 +340,8 ＠＠
install: packages/pcl-cvs-1.66-pkg.tar.gz 161505
＠ text-modes
-version: 1.83
-install: packages/text-modes-1.83-pkg.tar.gz 395653
+version: 1.84
+install: packages/text-modes-1.84-pkg.tar.gz 395728
＠ tramp
version: 1.22
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: packages/xemacs-packages/vhdl ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/02/14 22:54:26
Modified: packages/xemacs-packages/vhdl ChangeLog Makefile
Log:
Increment VERSION in Makefile
Revision Changes Path
1.25 +4 -0 XEmacs/packages/xemacs-packages/vhdl/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vhdl/ChangeLog,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- ChangeLog 2005/02/14 17:27:50 1.24
+++ ChangeLog 2005/02/14 21:54:25 1.25
＠＠ -1,3 +1,7 ＠＠
+2005-02-14 Norbert Koch <viteno(a)xemacs.org>
+
+ * Makefile (VERSION): XEmacs package 1.20 released.
+
2005-02-07 Jerry James <james(a)xemacs.org>
* vhdl-mode.el: Sync with version 3.33.2.
1.30 +1 -1 XEmacs/packages/xemacs-packages/vhdl/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vhdl/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- Makefile 2005/02/14 17:27:50 1.29
+++ Makefile 2005/02/14 21:54:25 1.30
＠＠ -17,7 +17,7 ＠＠
# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA.
-VERSION = 1.19
+VERSION = 1.20
AUTHOR_VERSION = 3.33.2
MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org>
PACKAGE = vhdl
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: packages/xemacs-packages/text-modes ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/02/14 22:53:48
Modified: packages/xemacs-packages/text-modes ChangeLog Makefile
Log:
Increment VERSION in Makefile
Revision Changes Path
1.146 +2 -0 XEmacs/packages/xemacs-packages/text-modes/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/text-modes/ChangeLog,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- ChangeLog 2005/02/14 21:28:05 1.145
+++ ChangeLog 2005/02/14 21:53:45 1.146
＠＠ -1,5 +1,7 ＠＠
2005-02-14 Norbert Koch <viteno(a)xemacs.org>
+ * Makefile (VERSION): XEmacs package 1.84 released.
+
* whitespace-visual-mode.el: New mode, successor to
old-whitespace-mode. Includes some bug fixes.
1.91 +1 -1 XEmacs/packages/xemacs-packages/text-modes/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/text-modes/Makefile,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- Makefile 2005/02/10 18:15:40 1.90
+++ Makefile 2005/02/14 21:53:46 1.91
＠＠ -19,7 +19,7 ＠＠
# This XEmacs package contains independent single file lisp packages
-VERSION = 1.83
+VERSION = 1.84
AUTHOR_VERSION =
MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org>
PACKAGE = text-modes
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: packages ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/02/14 22:53:10
Modified: packages ChangeLog
Log:
Package release
Revision Changes Path
1.496 +4 -0 XEmacs/packages/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/ChangeLog,v
retrieving revision 1.495
retrieving revision 1.496
diff -u -r1.495 -r1.496
--- ChangeLog 2005/02/13 21:33:53 1.495
+++ ChangeLog 2005/02/14 21:53:08 1.496
＠＠ -1,3 +1,7 ＠＠
+2005-02-14 Norbert Koch <viteno(a)xemacs.org>
+
+ * Packages released: text-modes vhdl.
+
2005-02-13 Norbert Koch <viteno(a)xemacs.org>
* Packages released: ispell.
- 1 participants
- 0 comments
CVS update by viteno MODIFIED: packages/xemacs-packages/text-modes, package-info.in ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: viteno
Date: 05/02/14 22:28:08
Modified: packages/xemacs-packages/text-modes ChangeLog
package-info.in
Added: packages/xemacs-packages/text-modes
whitespace-visual-mode.el
Log:
Heiko M~nkel <muenkel(a)tnt.uni-hannover.de>
Change of whitespace-mode to whitespace-visual-mode
<200502131216.47439.muenkel(a)tnt.uni-hannover.de>
Revision Changes Path
1.145 +5 -0 XEmacs/packages/xemacs-packages/text-modes/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/text-modes/ChangeLog,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- ChangeLog 2005/02/10 18:15:40 1.144
+++ ChangeLog 2005/02/14 21:28:05 1.145
＠＠ -1,3 +1,8 ＠＠
+2005-02-14 Norbert Koch <viteno(a)xemacs.org>
+
+ * whitespace-visual-mode.el: New mode, successor to
+ old-whitespace-mode. Includes some bug fixes.
+
2005-02-10 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.83 released.
1.12 +1 -1 XEmacs/packages/xemacs-packages/text-modes/package-info.in
Index: package-info.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/text-modes/package-info.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- package-info.in 2003/10/01 06:49:49 1.11
+++ package-info.in 2005/02/14 21:28:05 1.12
＠＠ -13,7 +13,7 ＠＠
filename FILENAME
md5sum MD5SUM
size SIZE
- provides (ansi-color autoinsert crontab-edit desktop-entry-mode filladapt flyspell folding fold-isearch hexl htmlize image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed rtf-support swedish tabify whitespace-mode winmgr-mode xpm-mode xrdb-mode apache-mode po-mode po-compat css-mode)
+ provides (ansi-color autoinsert crontab-edit desktop-entry-mode filladapt flyspell folding fold-isearch hexl htmlize image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed rtf-support swedish tabify whitespace-mode whitespace-visual-mode winmgr-mode xpm-mode xrdb-mode apache-mode po-mode po-compat css-mode)
requires (REQUIRES)
type regular
))
1.1 XEmacs/packages/xemacs-packages/text-modes/whitespace-visual-mode.el
Index: whitespace-visual-mode.el
===================================================================
;;; whitespace-visual-mode.el -- minor mode for making whitespace visible
;; Copyright (C) 1994 - 2005 Dr. Heiko Muenkel
;; Author: Dr. Heiko Muenkel <muenkel(a)tnt.uni-hannover.de>
;; Keywords: modes, extensions
;; This file is part of XEmacs.
;; XEmacs is free software; you can redistribute it and/or modify it
;; under the terms of the GNU General Public License as published by
;; the Free Software Foundation; either version 2, or (at your
;; option) any later version.
;; XEmacs is distributed in the hope that it will be useful, but
;; WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with XEmacs; if not, write to the Free Software
;; Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
;; 02111-1307, USA.
;;; Synched up with: [[ FSF 19.34. ]] Not in FSF.
;;; Commentary:
;; $Id: whitespace-visual-mode.el,v 1.1 2005/02/14 21:28:06 viteno Exp $
;; Description:
;;
;; This is a minor mode, which highlights whitespaces (blanks and
;; tabs) with different faces, so that it is easier to
;; distinguish between them.
;; Toggle the mode with: M-x whitespace-visual-mode
;; or with: M-x whitespace-visual-incremental-mode
;; The second one should be used in big files.
;;
;; If you want to know how the whitespaces are highlighted then
;; type: M-x whitespace-visual-show-faces
;;
;; There are 2 hook variables `whitespace-visual-incremental-mode-hook'
;; and `whitespace-visual-mode-hook' to customize the mode.
;;
;; Look at the variable `whitespace-visual-chars', if you only want to
;; highlight tabs or blanks and not both.
;;
;; Set `whitespace-visual-install-toolbar-icon' to t, if you want a
;; toolbar icon for this mode.
;;
;; Set `whitespace-visual-install-submenu' to t, if you want a submenu
;; for this mode. Sorry, at the moment there is no menu for the
;; GNU Emacs.
;;
;; Thanks to Mike Scheidler for the toolbar icon code.
;;
;; Changes:
;; 2005-02-10:
;; The prefix of the package is now whitespace-visual
;; instead of only whitespace. The new prefix whitespace-visual
;; was choosen to avoid conflicts with another package called
;; whitespace. Adding a whitespace toolbar icon should now work
;; again. The whitespace submenu is now in the "Tools" menu
;; instead of the old Apps menu.
;;
;; Installation:
;;
;; This file is part of the XEmacs package system. The following
;; instructions belong to older versions of this mode.
;;
;; Put the files whitespace-visual-mode.el and adapt.el in one of your
;; load-path directories and the following lines (without the
;; comment signs) in your .emacs (adapt.el is already in the
;; XEmacs 19.12).
;;
;; (autoload 'whitespace-visual-mode "whitespace-visual-mode"
;; "Toggle whitespace visual mode.
;; With arg, turn whitespace visual mode on iff arg is positive.
;; In whitespace visual mode the different whitespaces (tab, blank return)
;; are highlighted with different faces. The faces are:
;; `whitespace-visual-blank-face', `whitespace-visual-tab-face' and
;; `whitespace-visual-return-face'."
;; t)
;;
;; (autoload 'whitespace-visual-incremental-mode "whitespace-visual-mode"
;; "Toggle whitespace visual incremental mode.
;; With arg, turn whitespace visual incremental mode on iff
;; arg is positive. In whitespace visual incremental mode
;; the different whitespaces (tab and blank) are highlighted with
;; different faces. The faces are: `whitespace-blank-face' and
;; `whitespace-visual-tab-face'. Use the command
;; `whitespace-visual-show-faces' to show their values.
;; In this mode only these tabs and blanks are highlighted, which are in
;; the region from (point) - (window-height) to (point) +
;; (window-height)."
;;; Code:
(provide 'whitespace-visual-mode)
;; We don't need adapt
;; (require 'adapt)
;;; variables:
(defgroup whitespace-visual nil
"Minor mode for making whitespaces visible"
:group 'outlines
:group 'matching)
(defcustom whitespace-visual-mode nil
"Non-nil, if the `whitespace-visual-mode' is active."
:type 'boolean
:set (lambda (symbol value)
(whitespace-visual-mode (or value 0)))
:require 'whitespace-visual-mode
:initialize 'custom-initialize-default
:group 'whitespace-visual)
(make-variable-buffer-local 'whitespace-visual-mode)
;;;###autoload
(defcustom whitespace-visual-mode-line-string " WSP"
"*String displayed on the modeline when whitespace-visual-mode is active.
Set this to nil if you don't want a modeline indicator."
:group 'whitespace-visual
:type 'string)
;;;###autoload
(defcustom whitespace-visual-incremental-mode-line-string " WSPI"
"*String displayed on the modeline when whitespace-visual-incremental-mode
is active. Set this to nil if you don't want a modeline indicator."
:group 'whitespace-visual
:type 'string)
(defcustom whitespace-visual-chars 'tabs-and-blanks
"*Determines, which whitespaces are highlighted.
Valid values are:
'tabs-and-blanks => tabs and blanks are highlighted;
'tabs => only tabs are highlighted;
'blanks => only blanks are highlighted;.
Changing this variable during the whitespace-visual-*-mode is active could lead
to wrong highlighted whitespaces."
:type '(radio (const tabs-and-blanks)
(const tabs)
(const blanks))
:group 'whitespace-visual)
(make-variable-buffer-local 'whitespace-visual-chars)
(defcustom whitespace-visual-mode-hook nil
"*Run after the `whitespace-visual-mode' is switched on."
:type 'hook
:group 'whitespace-visual)
(defcustom whitespace-visual-incremental-mode-hook nil
"*Run after the `whitespace-visual-incremental-mode' is switched on."
:type 'hook
:group 'whitespace-visual)
;; We don't need adapt.
;; (if (adapt-xemacsp)
;; (progn
(defcustom whitespace-visual-install-toolbar-icon nil
"Set it to t, if a toolbar icon should be installed during loading this file.
The icon calls the function 'whitespace-visual-toolbar-function'."
:type 'boolean
:group 'whitespace-visual)
(defcustom whitespace-visual-install-submenu nil
"Set it to t, if a submenu should be installed during loading this file."
:type 'boolean
:group 'whitespace-visual)
;; ))
(defcustom whitespace-visual-toolbar-function
'whitespace-visual-incremental-mode
"*The toolbar icon for the whitespace visual mode calls this function.
Valid values are:
'whitespace-visual--mode and 'whitespace-visual-incremental-mode."
:type 'function
:group 'whitespace-visual)
(defcustom whitespace-visual-blank-and-tab-search-string "\\( \\)\\|\\(\t\\)"
"The regexp used to search for tabs and blanks."
:type 'regexp
:group 'whitespace-visual)
(defcustom whitespace-visual-tab-search-string "\t"
"The search string used to find tabs."
:type 'string
:group 'whitespace-visual)
(defcustom whitespace-visual-blank-search-string " "
"The search string used to find blanks."
:type 'string
:group 'whitespace-visual)
(defface whitespace-visual-blank-face
'((t
(:background "LightBlue1")))
"Face to show blanks with"
:group 'whitespace-visual)
(defface whitespace-visual-tab-face
'((t
(:background "yellow" :underline t)))
"Face to show TABs with"
:group 'whitespace-visual)
(defun whitespace-visual-show-faces ()
"Shows the faces used by the `whitespace-visual-mode'."
(interactive)
(save-excursion
(let ((actual-buffer-name (buffer-name (current-buffer)))
(actual-whitespace-chars whitespace-visual-chars)
(whitespace-visual-mode-active
(or whitespace-visual-mode
whitespace-visual-incremental-mode))
(buffer (get-buffer-create "*Help*")))
(set-buffer buffer)
(setq whitespace-visual-chars actual-whitespace-chars)
(delete-region (point-min) (point-max))
(insert "In the whitespace visual minor mode\n"
" this \" ")
(whitespace-visual-highlight-region (1- (point)) (point))
(insert "\" is a blank, highlighted with "
"`whitespace-visual-blank-face' and\n"
" this \"\t")
(whitespace-visual-highlight-region (1- (point)) (point))
(insert "\" is a tab, highlighted with `whitespace-visual-tab-face'.")
(newline 2)
(if (eq whitespace-visual-chars 'blanks)
(insert
"The highlighting of tabs is switched off.\n")
(if (eq whitespace-visual-chars 'tabs)
(insert
"The highlighting of blanks is switched off.\n")))
(newline)
(if whitespace-visual-mode-active
(insert "A whitespace-visual minor mode is active in the buffer\n "
actual-buffer-name
".\n")
(insert "No whitespace-visual minor mode is active in the buffer\n "
actual-buffer-name
".\n"))
(show-temp-buffer-in-current-frame buffer)
)))
;;;
(defun whitespace-visual-highlight-chars-in-region (char-string from to face)
"Highlights the CHAR-STRING in the region from FROM to TO with the FACE."
(while (search-forward char-string end t)
(let ((extent))
(cond ((match-beginning 0)
(setq extent (make-extent (match-beginning 0) (match-end 0)))
(set-extent-face extent face)
))
(set-extent-property extent 'start-open t)
(set-extent-property extent 'end-open t)
)))
(defun whitespace-visual-highlight-region (from to)
"Highlights the whitespaces in the region from FROM to TO."
(let ((start (min from to))
(end (max from to)))
(save-excursion
;; (message "Highlighting tabs and blanks...")
(goto-char start)
(cond ((eq whitespace-visual-chars 'tabs-and-blanks)
(while (search-forward-regexp
whitespace-visual-blank-and-tab-search-string end t)
(let ((extent))
(cond ((match-beginning 1) ; blanks ?
(setq extent (make-extent (match-beginning 1)
(match-end 1)))
(set-extent-face extent 'whitespace-visual-blank-face)
)
((match-beginning 2) ; tabs ?
(setq extent (make-extent (match-beginning 2)
(match-end 2)))
(set-extent-face extent 'whitespace-visual-tab-face)
)
)
(set-extent-property extent 'start-open t)
(set-extent-property extent 'end-open t)
)))
((eq whitespace-visual-chars 'tabs)
(whitespace-visual-highlight-chars-in-region
whitespace-visual-tab-search-string
from
to
'whitespace-visual-tab-face))
((eq whitespace-visual-chars 'blanks)
(whitespace-visual-highlight-chars-in-region
whitespace-visual-blank-search-string
from
to
'whitespace-visual-blank-face))
(t (error "ERROR: Bad value of whitespace-visual-highlight-char")))
)))
(defun whitespace-visual-highlight-buffer ()
"Highlights the whitespaces in the current buffer."
(whitespace-visual-highlight-region (point-min) (point-max))
)
(defsubst whitespace-visual-find-next-highlighted-region (from to)
"Returns nil or the next highlighted region."
(map-extents '(lambda (extent dummy)
(if (extent-property extent
'whitespace-visual-highlighted-region)
extent))
nil
from
to))
(defun whitespace-visual-incremental-highlight (from to)
"Highlights the region from FROM to TO incremental."
(save-excursion
(goto-char from)
(let ((extent (extent-at (point) nil 'whitespace-visual-highlighted-region))
(next-extent nil)
(start nil))
(while (< (point) to)
(if extent
(goto-char (extent-end-position extent)))
(if (< (point) to)
(progn
(setq start (point))
(setq next-extent (whitespace-visual-find-next-highlighted-region
start
to))
(if extent
(if next-extent
(progn
(set-extent-endpoints extent
(extent-start-position extent)
(extent-end-position next-extent)
)
(whitespace-visual-highlight-region start
(1-
(extent-start-position
next-extent)))
(delete-extent next-extent))
(set-extent-endpoints extent
(extent-start-position extent)
to)
(whitespace-visual-highlight-region start to))
(if next-extent
(progn
(setq extent next-extent)
(whitespace-visual-highlight-region
start
(1- (extent-start-position
next-extent)))
(set-extent-endpoints extent
start
(extent-end-position next-extent)))
(setq extent (make-extent start to))
(set-extent-property extent
'whitespace-visual-highlighted-region t)
(whitespace-visual-highlight-region start to)))
))))))
(defun whitespace-visual-highlight-window ()
"Highlights the whitespaces in the current window."
(whitespace-visual-incremental-highlight
(save-excursion
(forward-line (- (window-height)))
(point))
(save-excursion
(forward-line (window-height))
(point))))
(defun whitespace-visual-dehighlight-region (start end)
"Dehighlights the whitespaces in the region from START to END."
(map-extents '(lambda (extent dummy)
(if (or (eq (extent-face extent)
'whitespace-visual-blank-face)
(eq (extent-face extent)
'whitespace-visual-tab-face)
(extent-property
extent
'whitespace-visual-highlighted-region))
(progn
(delete-extent extent)
nil)))
nil
start
end
)
)
(defun whitespace-visual-dehighlight-buffer ()
"Dehighlights the whitespaces in the current buffer."
(whitespace-visual-dehighlight-region (point-min) (point-max))
)
(defun whitespace-visual-highlight-after-change-function (beg end len)
"Called, when any modification is made to buffer text. Highlights
the whitespaces (blanks and tabs) in the region from BEG to
END. LEN isn't used, but provided from the after-change hook."
(if (or (eq beg end)
(null whitespace-visual-mode))
nil
(whitespace-visual-dehighlight-region beg end)
(whitespace-visual-highlight-region beg end)))
;;;###autoload
(defun whitespace-visual-mode (&optional arg)
"Toggle whitespace visual mode.
With arg, turn whitespace visual mode on iff arg is positive.
In whitespace visual mode the different whitespaces (tab and blank)
are highlighted with different faces. The faces are:
`whitespace-visual-blank-face' and `whitespace-visual-tab-face'.
Use the command `whitespace-visual-show-faces' to show their values."
(interactive "P")
(setq whitespace-visual-mode
(if (null arg) (not whitespace-visual-mode)
(> (prefix-numeric-value arg) 0)))
(if (and whitespace-visual-mode whitespace-visual-incremental-mode)
(progn
(whitespace-visual-incremental-highlight (point-min) (point-max))
(setq whitespace-visual-incremental-mode nil)
(remove-hook 'post-command-hook 'whitespace-visual-highlight-window)
(run-hooks 'whitespace-visual-mode-hook)
)
(setq whitespace-visual-incremental-mode nil)
(remove-hook 'post-command-hook 'whitespace-visual-highlight-window)
(redraw-modeline) ;(force-mode-line-update)
(if whitespace-visual-mode
(progn
(whitespace-visual-highlight-buffer)
(make-local-variable 'after-change-functions)
(add-hook 'after-change-functions
'whitespace-visual-highlight-after-change-function)
(run-hooks 'whitespace-visual-mode-hook))
(whitespace-visual-dehighlight-buffer)
(remove-hook 'after-change-functions
'whitespace-visual-highlight-after-change-function)
(remove-hook 'post-command-hook 'whitespace-visual-highlight-window)
)))
(defvar whitespace-visual-incremental-mode nil
"Non-nil, if the `whitespace-visual-incremental-mode' is active.")
(make-variable-buffer-local 'whitespace-visual-incremental-mode)
;;;###autoload
(defun whitespace-visual-incremental-mode (&optional arg)
"Toggle whitespace visual incremental mode.
With arg, turn whitespace-visual incremental mode on iff arg is positive.
In whitespace visual incremental mode the different whitespaces (tab and
blank) are highlighted with different faces. The faces are:
`whitespace-visual-blank-face' and `whitespace-visual-tab-face'.
Use the command `whitespace-visual-show-faces' to show their values.
In this mode only these tabs and blanks are highlighted, which are in
the region from (point) - (window-height) to (point) + (window-height)."
(interactive "P")
(setq whitespace-visual-incremental-mode
(if (null arg) (not whitespace-visual-incremental-mode)
(> (prefix-numeric-value arg) 0)))
(if (and whitespace-visual-mode whitespace-visual-incremental-mode)
(set-extent-property (make-extent (point-min) (point-max))
'whitespace-visual-highlighted-region
t))
(setq whitespace-visual-mode nil)
(redraw-modeline) ;(force-mode-line-update)
;(set-buffer-modified-p (buffer-modified-p)) ;No-op, but updates mode line.
(if whitespace-visual-incremental-mode
(progn
(whitespace-visual-highlight-window)
(make-local-variable 'post-command-hook)
(add-hook 'post-command-hook 'whitespace-visual-highlight-window)
(make-local-variable 'after-change-functions)
(add-hook 'after-change-functions
'whitespace-visual-highlight-after-change-function)
(run-hooks 'whitespace-visual-incremental-mode-hook))
(whitespace-visual-dehighlight-buffer)
(remove-hook 'after-change-functions
'whitespace-visual-highlight-after-change-function)
(remove-hook 'post-command-hook 'whitespace-visual-highlight-window)
))
;;; Add whitespace-visual-mode and whitespace-visual-incremental-mode
;;; to the minor-mode-alist
;;;###autoload
(if (fboundp 'add-minor-mode)
(progn
(add-minor-mode 'whitespace-visual-mode
whitespace-visual-mode-line-string)
(add-minor-mode 'whitespace-visual-incremental-mode
whitespace-visual-incremental-mode-line-string))
(or (assq 'whitespace-visual-mode minor-mode-alist)
(setq minor-mode-alist
(cons '(whitespace-visual-mode whitespace-visual-mode-line-string)
minor-mode-alist)))
(or (assq 'whitespace-visual-incremental-mode minor-mode-alist)
(setq minor-mode-alist
(cons '(whitespace-visual-incremental-mode
whitespace-visual-incremental-mode-line-string)
minor-mode-alist))))
;;; Menu for the whitespace-visual mode
(defun whitespace-visual-set-whitespace-chars (new-whitespace-chars)
"Sets the variable `whitespace-visual-chars' and activates the change."
(interactive
(list
(read
(completing-read "Whitespaces to highlight: "
'(("tabs-and-blanks")
("tabs")
("blanks"))
nil
t
(symbol-name 'whitespace-visual-chars)))))
(if (eq whitespace-visual-chars new-whitespace-chars)
nil ; nothing to do
(setq whitespace-visual-chars new-whitespace-chars)
(setq-default whitespace-visual-chars new-whitespace-chars)
(cond (whitespace-visual-mode (whitespace-visual-mode)
(whitespace-visual-mode))
(whitespace-visual-incremental-mode
(whitespace-visual-incremental-mode)
(whitespace-visual-incremental-mode))
)))
(defvar whitespace-visual-menu nil
"A menu for the whitespace visual minor mode.")
(setq whitespace-visual-menu
'("Whitespace Menu"
["Highlight Whitespaces"
whitespace-visual-mode
:style toggle
:selected whitespace-visual-mode]
["Incremental Highlighting"
whitespace-visual-incremental-mode
:style toggle
:selected whitespace-visual-incremental-mode
]
"---"
["Show Whitespace Faces" whitespace-visual-show-faces t]
"---"
["Highlight Tabs & Blanks"
(whitespace-visual-set-whitespace-chars 'tabs-and-blanks)
:style radio
:selected (eq whitespace-visual-chars 'tabs-and-blanks)]
["Highlight Only Tabs"
(whitespace-visual-set-whitespace-chars 'tabs)
:style radio
:selected (eq whitespace-visual-chars 'tabs)]
["Highlight Only Blanks"
(whitespace-visual-set-whitespace-chars 'blanks)
:style radio
:selected (eq whitespace-visual-chars 'blanks)]
))
(if (and (boundp 'whitespace-visual-install-submenu)
whitespace-visual-install-submenu)
(add-submenu '("Tools") whitespace-visual-menu))
;;; Toolbar icon for the XEmacs
(if (featurep 'toolbar)
(defvar toolbar-wspace-icon
(toolbar-make-button-list
"/* XPM */
static char * whitespace[] = {
\"28 28 4 1\",
\" c Gray75 s backgroundToolBarColor\",
\". c black s foregroundToolBarColor\",
\"X c Gray60\",
\"o c white\",
\" \",
\" \",
\" \",
\" \",
\" .. . \",
\" XXX.XXXXXX . \",
\" Xoo.oooooXX . \",
\" .. .. ..o.o..oo..X... .. \",
\" . . X.o..o.ooX. X. . . \",
\" . . .oo.oo.ooX.XX. .... \",
\" ... .oo.oo.ooo.oo. . \",
\" . .Xoo.oo.ooo.oo. . . \",
\" . .Xo...o..o...o.. .. \",
\" XooooooooooooX \",
\" XooooooooooooX \",
\" .... ....ooo...ooo... .. \",
\" . . .oo.o.oo.oo.oX. . . \",
\" . .oo.ooo..oo.oX .... \",
\" .. .oo.o..o.oo.oX . \",
\" . . .oo.o.oo.oo.oX. . . \",
\" .... ...oo.....oo.. .. \",
\" .ooooooooooooX \",
\" .XXXXXXXXXXXXX \",
\" . \",
\" ... \",
\" \",
\" \",
\" \"
};")
"A whitespace icon.")
)
(defun whitespace-visual-toolbar-function ()
"Calls the function determined by `whitespace-visual-toolbar-function'."
(interactive)
(call-interactively whitespace-visual-toolbar-function))
(if (and (featurep 'xemacs) ;; (adapt-xemacsp)
whitespace-visual-install-toolbar-icon
(featurep 'toolbar)
(eq (device-type (selected-device)) 'x))
(let ((tb (mapcar #'(lambda (e)
(elt e 1)) (specifier-instance default-toolbar))))
(and (not (member 'whitespace-visual-toolbar-function tb))
(set-specifier
default-toolbar
(toolbar-add-item
(make-toolbar-instantiator default-toolbar)
[toolbar-wspace-icon whitespace-visual-toolbar-function
t "Toggle whitespace visual mode"]
(let ((n (or
(position 'toolbar-replace tb)
(position 'toolbar-undo tb)
(position 'toolbar-paste tb)
(position 'toolbar-copy tb)
(position 'toolbar-cut tb))))
(if n (1+ n) (length tb))))))))
;;; whitespace-visual-mode.el ends here
- 1 participants
- 0 comments
Notice of CVSROOT-commit by viteno in CVSROOT
19 years, 10 months
CVS Monitor
CVS Monitor
Commit done by viteno
Mon Feb 14 22:17:07 CET 2005
Update of /pack/xemacscvs/CVSROOT
In directory sunsite.dk:/tmp/cvs-serv25048
Modified Files:
ChangeLog avail
Log Message:
Package maintenance for latin-euro-standards.
- 1 participants
- 0 comments
CVS update by viteno ( User: viteno Date: 05/02/14 22:14:34) NEW: XEmacs/packages/mule-packages/latin-euro-standards
19 years, 10 months
CVS Monitor
CVS Monitor
XEmacs/packages/mule-packages/latin-euro-standards - New directory
- 1 participants
- 0 comments
CVS update by james MODIFIED: packages/xemacs-packages/vhdl, vhdl-mode.el ...
19 years, 10 months
CVS Monitor
CVS Monitor
User: james
Date: 05/02/14 18:27:52
Modified: packages/xemacs-packages/vhdl ChangeLog Makefile
vhdl-mode.el
Log:
Update to upstream version 3.33.2. See xemacs-patches message with ID
<psy8e0ca6k.fsf(a)diannao.ittc.ku.edu>.
Revision Changes Path
1.24 +5 -0 XEmacs/packages/xemacs-packages/vhdl/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vhdl/ChangeLog,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ChangeLog 2004/03/18 16:56:20 1.23
+++ ChangeLog 2005/02/14 17:27:50 1.24
＠＠ -1,3 +1,8 ＠＠
+2005-02-07 Jerry James <james(a)xemacs.org>
+
+ * vhdl-mode.el: Sync with version 3.33.2.
+ * Makefile (AUTHOR_VERSION): Change to 3.33.2.
+
2004-03-18 Norbert Koch <viteno(a)xemacs.org>
* Makefile (VERSION): XEmacs package 1.19 released.
1.29 +1 -1 XEmacs/packages/xemacs-packages/vhdl/Makefile
Index: Makefile
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vhdl/Makefile,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- Makefile 2004/03/18 16:56:20 1.28
+++ Makefile 2005/02/14 17:27:50 1.29
＠＠ -18,7 +18,7 ＠＠
# Boston, MA 02111-1307, USA.
VERSION = 1.19
-AUTHOR_VERSION = 3.32.20
+AUTHOR_VERSION = 3.33.2
MAINTAINER = XEmacs Development Team <xemacs-beta(a)xemacs.org>
PACKAGE = vhdl
PKG_TYPE = regular
1.8 +594 -290 XEmacs/packages/xemacs-packages/vhdl/vhdl-mode.el
Index: vhdl-mode.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/packages/xemacs-packages/vhdl/vhdl-mode.el,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- vhdl-mode.el 2004/03/18 16:25:09 1.7
+++ vhdl-mode.el 2005/02/14 17:27:50 1.8
＠＠ -1,18 +1,18 ＠＠
;;; vhdl-mode.el --- major mode for editing VHDL code
-;; Copyright (C) 1992-2003 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2005 Free Software Foundation, Inc.
;; Authors: Reto Zimmermann <reto(a)gnu.org>
;; Rodney J. Whitby <software.vhdl-mode(a)rwhitby.net>
;; Maintainer: Reto Zimmermann <reto(a)gnu.org>
-;; RCS: $Id: vhdl-mode.el,v 1.7 2004/03/18 16:25:09 james Exp $
+;; RCS: $Id: vhdl-mode.el,v 1.8 2005/02/14 17:27:50 james Exp $
;; Keywords: languages vhdl
;; WWW: http://opensource.ethz.ch/emacs/vhdl-mode.html
-(defconst vhdl-version "3.32.20"
+(defconst vhdl-version "3.33.2"
"VHDL Mode version number.")
-(defconst vhdl-time-stamp "2004-02-16"
+(defconst vhdl-time-stamp "2005-01-11"
"VHDL Mode time stamp for last update.")
;; This file is part of GNU Emacs.
＠＠ -45,6 +45,8 ＠＠
;; - Insertion of file headers
;; - Insertion of user-specified models
;; - Port translation / testbench generation
+;; - Structural composition
+;; - Configuration generation
;; - Sensitivity list updating
;; - File browser
;; - Design hierarchy browser
＠＠ -750,15 +752,28 ＠＠
"*Specifies how the architecture file name is obtained.
The architecture file name can be obtained by modifying the entity
and/or architecture name (e.g. attaching or stripping off a substring). The
-string that is matched against the regexp is the concatenation of the entity
-and the architecture name separated by a space. This gives access to both
-names (see default setting as example)."
+file extension is automatically taken from the file name of the current
+buffer. The string that is matched against the regexp is the concatenation
+of the entity and the architecture name separated by a space. This gives
+access to both names (see default setting as example)."
vhdl-name-doc-string)
:type '(cons (regexp :tag "From regexp")
(string :tag "To string "))
:group 'vhdl-naming
:group 'vhdl-compose)
+(defcustom vhdl-configuration-file-name '(".*" . "\\&")
+ (concat
+ "*Specifies how the configuration file name is obtained.
+The configuration file name can be obtained by modifying the configuration
+name (e.g. attaching or stripping off a substring). The file extension is
+automatically taken from the file name of the current buffer."
+ vhdl-name-doc-string)
+ :type '(cons (regexp :tag "From regexp")
+ (string :tag "To string "))
+ :group 'vhdl-naming
+ :group 'vhdl-compose)
+
(defcustom vhdl-package-file-name '(".*" . "\\&")
(concat
"*Specifies how the package file name is obtained.
＠＠ -1082,6 +1097,99 ＠＠
:group 'vhdl-model)
+(defgroup vhdl-compose nil
+ "Customizations for structural composition."
+ :group 'vhdl)
+
+(defcustom vhdl-compose-architecture-name '(".*" . "str")
+ (concat
+ "*Specifies how the component architecture name is obtained.
+The component architecture name can be obtained by modifying the entity name
+\(e.g. attaching or stripping off a substring).
+If TO STRING is empty, the architecture name is queried."
+ vhdl-name-doc-string)
+ :type '(cons (regexp :tag "From regexp")
+ (string :tag "To string "))
+ :group 'vhdl-compose)
+
+(defcustom vhdl-compose-configuration-name
+ '("\\(.*\\) \\(.*\\)" . "\\1_\\2_cfg")
+ (concat
+ "*Specifies how the configuration name is obtained.
+The configuration name can be obtained by modifying the entity and/or
+architecture name (e.g. attaching or stripping off a substring). The string
+that is matched against the regexp is the concatenation of the entity and the
+architecture name separated by a space. This gives access to both names (see
+default setting as example)."
+ vhdl-name-doc-string)
+ :type '(cons (regexp :tag "From regexp")
+ (string :tag "To string "))
+ :group 'vhdl-compose)
+
+(defcustom vhdl-components-package-name
+ '((".*" . "\\&_components") . "components")
+ (concat
+ "*Specifies how the name for the components package is obtained.
+The components package is a package containing all component declarations for
+the current design. It's name can be obtained by modifying the project name
+\(e.g. attaching or stripping off a substring). If no project is defined, the
+DIRECTORY entry is chosen."
+ vhdl-name-doc-string)
+ :type '(cons (cons :tag "Project" :indent 2
+ (regexp :tag "From regexp")
+ (string :tag "To string "))
+ (string :tag "Directory:\n String "))
+ :group 'vhdl-compose)
+
+(defcustom vhdl-use-components-package nil
+ "*Non-nil means use a separate components package for component declarations.
+Otherwise, component declarations are inserted and searched for in the
+architecture declarative parts."
+ :type 'boolean
+ :group 'vhdl-compose)
+
+(defcustom vhdl-compose-include-header t
+ "*Non-nil means include a header in automatically generated files."
+ :type 'boolean
+ :group 'vhdl-compose)
+
+(defcustom vhdl-compose-create-files 'single
+ "*Specifies whether new files should be created for the new component.
+The component's entity and architecture are inserted:
+ None : in current buffer
+ Single file : in new single file
+ Separate files: in two separate files
+The file names are obtained from variables `vhdl-entity-file-name' and
+`vhdl-architecture-file-name'."
+ :type '(choice (const :tag "None" none)
+ (const :tag "Single file" single)
+ (const :tag "Separate files" separate))
+ :group 'vhdl-compose)
+
+(defcustom vhdl-compose-configuration-create-file nil
+ "*Specifies whether a new file should be created for the configuration.
+If non-nil, a new file is created for the configuration.
+The file name is obtained from variable `vhdl-configuration-file-name'."
+ :type 'boolean
+ :group 'vhdl-compose)
+
+(defcustom vhdl-compose-configuration-hierarchical t
+ "*Specifies whether hierarchical configurations should be created.
+If non-nil, automatically created configurations are hierarchical and include
+the whole hierarchy of subcomponents. Otherwise the configuration only
+includes one level of subcomponents."
+ :type 'boolean
+ :group 'vhdl-compose)
+
+(defcustom vhdl-compose-configuration-use-subconfiguration t
+ "*Specifies whether subconfigurations should be used inside configurations.
+If non-nil, automatically created configurations use configurations in binding
+indications for subcomponents, if such configurations exist. Otherwise,
+entities are used in binding indications for subcomponents."
+ :type 'boolean
+ :group 'vhdl-compose)
+
+
(defgroup vhdl-port nil
"Customizations for port translation functions."
:group 'vhdl
＠＠ -1161,8 +1269,7 ＠＠
(string :tag "To string "))
:group 'vhdl-testbench)
-(defcustom vhdl-testbench-configuration-name
- '("\\(.*\\) \\(.*\\)" . "\\1_\\2_cfg")
+(defcustom vhdl-testbench-configuration-name vhdl-compose-configuration-name
(concat
"*Specifies how the testbench configuration name is obtained.
The configuration name of a testbench can be obtained by modifying the entity
＠＠ -1280,62 +1387,6 ＠＠
:group 'vhdl-testbench)
-(defgroup vhdl-compose nil
- "Customizations for structural composition."
- :group 'vhdl)
-
-(defcustom vhdl-compose-create-files 'single
- "*Specifies whether new files should be created for the new component.
-The component's entity and architecture are inserted:
- None : in current buffer
- Single file : in new single file
- Separate files: in two separate files
-The file names are obtained from variables `vhdl-entity-file-name' and
-`vhdl-architecture-file-name'."
- :type '(choice (const :tag "None" none)
- (const :tag "Single file" single)
- (const :tag "Separate files" separate))
- :group 'vhdl-compose)
-
-(defcustom vhdl-compose-include-header t
- "*Non-nil means include a header in automatically generated files."
- :type 'boolean
- :group 'vhdl-compose)
-
-(defcustom vhdl-compose-architecture-name '(".*" . "str")
- (concat
- "*Specifies how the component architecture name is obtained.
-The component architecture name can be obtained by modifying the entity name
-\(e.g. attaching or stripping off a substring).
-If TO STRING is empty, the architecture name is queried."
- vhdl-name-doc-string)
- :type '(cons (regexp :tag "From regexp")
- (string :tag "To string "))
- :group 'vhdl-compose)
-
-(defcustom vhdl-components-package-name
- '((".*" . "\\&_components") . "components")
- (concat
- "*Specifies how the name for the components package is obtained.
-The components package is a package containing all component declarations for
-the current design. Its name can be obtained by modifying the project name
-\(e.g. attaching or stripping off a substring). If no project is defined, the
-DIRECTORY entry is chosen."
- vhdl-name-doc-string)
- :type '(cons (cons :tag "Project" :indent 2
- (regexp :tag "From regexp")
- (string :tag "To string "))
- (string :tag "Directory:\n String "))
- :group 'vhdl-compose)
-
-(defcustom vhdl-use-components-package nil
- "*Non-nil means use a separate components package for component declarations.
-Otherwise, component declarations are inserted and searched for in the
-architecture declarative parts."
- :type 'boolean
- :group 'vhdl-compose)
-
-
(defgroup vhdl-comment nil
"Customizations for comments."
:group 'vhdl)
＠＠ -1814,6 +1865,7 ＠＠
(defconst vhdl-offsets-alist-default
'((string . -1000)
+ (cpp-macro . -1000)
(block-open . 0)
(block-close . 0)
(statement . 0)
＠＠ -2661,6 +2713,7 ＠＠
(define-key vhdl-mode-map "\C-c\C-c\C-n" 'vhdl-compose-new-component)
(define-key vhdl-mode-map "\C-c\C-c\C-p" 'vhdl-compose-place-component)
(define-key vhdl-mode-map "\C-c\C-c\C-w" 'vhdl-compose-wire-components)
+ (define-key vhdl-mode-map "\C-c\C-c\C-f" 'vhdl-compose-configuration)
(define-key vhdl-mode-map "\C-c\C-c\C-k" 'vhdl-compose-components-package)
(define-key vhdl-mode-map "\C-cc" 'vhdl-comment-uncomment-region)
(define-key vhdl-mode-map "\C-c-" 'vhdl-comment-append-inline)
＠＠ -3308,9 +3361,11 ＠＠
:style toggle :selected vhdl-port-reversed-direction :active vhdl-port-list])
("Compose"
["New Component" vhdl-compose-new-component t]
+ ["Copy Component" vhdl-port-copy t]
["Place Component" vhdl-compose-place-component vhdl-port-list]
["Wire Components" vhdl-compose-wire-components t]
"--"
+ ["Generate Configuration" vhdl-compose-configuration t]
["Generate Components Package" vhdl-compose-components-package t])
("Subprogram"
["Copy" vhdl-subprog-copy t]
＠＠ -3554,6 +3609,8 ＠＠
["Entity File Name..." (customize-option 'vhdl-entity-file-name) t]
["Architecture File Name..."
(customize-option 'vhdl-architecture-file-name) t]
+ ["Configuration File Name..."
+ (customize-option 'vhdl-configuration-file-name) t]
["Package File Name..." (customize-option 'vhdl-package-file-name) t]
("File Name Case"
["As Is"
＠＠ -3731,7 +3788,21 ＠＠
"--"
["Customize Group..." (customize-group 'vhdl-port) t])
("Compose"
- ("Create Files"
+ ["Architecture Name..."
+ (customize-option 'vhdl-compose-architecture-name) t]
+ ["Configuration Name..."
+ (customize-option 'vhdl-compose-configuration-name) t]
+ ["Components Package Name..."
+ (customize-option 'vhdl-components-package-name) t]
+ ["Use Components Package"
+ (customize-set-variable 'vhdl-use-components-package
+ (not vhdl-use-components-package))
+ :style toggle :selected vhdl-use-components-package]
+ ["Include Header"
+ (customize-set-variable 'vhdl-compose-include-headera
+ (not vhdl-compose-include-header))
+ :style toggle :selected vhdl-compose-include-header]
+ ("Create Entity/Architecture Files"
["None"
(customize-set-variable 'vhdl-compose-create-files 'none)
:style radio :selected (eq 'none vhdl-compose-create-files)]
＠＠ -3741,18 +3812,18 ＠＠
["Separate"
(customize-set-variable 'vhdl-compose-create-files 'separate)
:style radio :selected (eq 'separate vhdl-compose-create-files)])
- ["Include Header"
- (customize-set-variable 'vhdl-compose-include-header
- (not vhdl-compose-include-header))
- :style toggle :selected vhdl-compose-include-header]
- ["Architecture Name..."
- (customize-option 'vhdl-compose-architecture-name) t]
- ["Components Package Name..."
- (customize-option 'vhdl-components-package-name) t]
- ["Use Components Package"
- (customize-set-variable 'vhdl-use-components-package
- (not vhdl-use-components-package))
- :style toggle :selected vhdl-use-components-package]
+ ["Create Configuration File"
+ (customize-set-variable 'vhdl-compose-configuration-create-file
+ (not vhdl-compose-configuration-create-file))
+ :style toggle :selected vhdl-compose-configuration-create-file]
+ ["Hierarchical Configuration"
+ (customize-set-variable 'vhdl-compose-configuration-hierarchical
+ (not vhdl-compose-configuration-hierarchical))
+ :style toggle :selected vhdl-compose-configuration-hierarchical]
+ ["Use Subconfiguration"
+ (customize-set-variable 'vhdl-compose-configuration-use-subconfiguration
+ (not vhdl-compose-configuration-use-subconfiguration))
+ :style toggle :selected vhdl-compose-configuration-use-subconfiguration]
"--"
["Customize Group..." (customize-group 'vhdl-compose) t])
("Comment"
＠＠ -4203,13 +4274,13 ＠＠
symbols are surrounded by one space, and multiple spaces are eliminated.
-| CODE FILLING:
-| Code filling allows to condens code (e.g. sensitivity lists or port
-| maps) by removing comments and newlines and re-wrapping so that all
-| lines are maximally filled (block filling). `C-c C-f C-f' fills a list
-| enclosed by parenthesis, `C-c C-f C-g' a group of lines separated by
-| blank lines, `C-c C-f C-i' a block of lines with same indent, and
-| `C-c C-f M-f' an entire region.
+ CODE FILLING:
+ Code filling allows to condens code (e.g. sensitivity lists or port
+ maps) by removing comments and newlines and re-wrapping so that all
+ lines are maximally filled (block filling). `C-c C-f C-f' fills a list
+ enclosed by parenthesis, `C-c C-f C-g' a group of lines separated by
+ blank lines, `C-c C-f C-i' a block of lines with same indent, and
+ `C-c C-f M-f' an entire region.
CODE BEAUTIFICATION:
＠＠ -4234,21 +4305,21 ＠＠
A clause with several generic/port names on the same line can be
flattened (`C-c C-p C-f') so that only one name per line exists. The
-| direction of ports can be reversed (`C-c C-p C-r'), i.e., inputs become
-| outputs and vice versa, which can be useful in testbenches. (This
-| reversion is done on the internal data structure and is only reflected
-| in subsequent paste operations.)
+ direction of ports can be reversed (`C-c C-p C-r'), i.e., inputs become
+ outputs and vice versa, which can be useful in testbenches. (This
+ reversion is done on the internal data structure and is only reflected
+ in subsequent paste operations.)
Names for actual ports, instances, testbenches, and
design-under-test instances can be derived from existing names according
to options `vhdl-...-name'. See customization group `vhdl-port'.
-| SUBPROGRAM TRANSLATION:
-| Similar functionality exists for copying/pasting the interface of
-| subprograms (function/procedure). A subprogram interface can be copied
-| and then pasted as a subprogram declaration, body or call (uses
-| association list with formals).
+ SUBPROGRAM TRANSLATION:
+ Similar functionality exists for copying/pasting the interface of
+ subprograms (function/procedure). A subprogram interface can be copied
+ and then pasted as a subprogram declaration, body or call (uses
+ association list with formals).
TESTBENCH GENERATION:
＠＠ -4304,38 +4375,54 ＠＠
required by secondary units.
-| STRUCTURAL COMPOSITION:
-| Enables simple structural composition. `C-c C-c C-n' creates a skeleton
-| for a new component. Subcomponents (i.e. component declaration and
-| instantiation) can be automatically placed from a previously read port
-| \(`C-c C-c C-p') or directly from the hierarchy browser (`P'). Finally,
-| all subcomponents can be automatically connected using internal signals
-| and ports (`C-c C-c C-w') following these rules:
-| - subcomponent actual ports with same name are considered to be
-| connected by a signal (internal signal or port)
-| - signals that are only inputs to subcomponents are considered as
-| inputs to this component -> input port created
-| - signals that are only outputs from subcomponents are considered as
-| outputs from this component -> output port created
-| - signals that are inputs to AND outputs from subcomponents are
-| considered as internal connections -> internal signal created
-|
-| Component declarations can be placed in a components package (option
-| `vhdl-use-components-package') which can be automatically generated for
-| an entire directory or project (`C-c C-c M-p'). The VHDL'93 direct
-| component instantiation is also supported (option
-| `vhdl-use-direct-instantiation').
+ STRUCTURAL COMPOSITION:
+ Enables simple structural composition. `C-c C-c C-n' creates a skeleton
+ for a new component. Subcomponents (i.e. component declaration and
+ instantiation) can be automatically placed from a previously read port
+ \(`C-c C-c C-p') or directly from the hierarchy browser (`P'). Finally,
+ all subcomponents can be automatically connected using internal signals
+ and ports (`C-c C-c C-w') following these rules:
+ - subcomponent actual ports with same name are considered to be
+ connected by a signal (internal signal or port)
+ - signals that are only inputs to subcomponents are considered as
+ inputs to this component -> input port created
+ - signals that are only outputs from subcomponents are considered as
+ outputs from this component -> output port created
+ - signals that are inputs to AND outputs from subcomponents are
+ considered as internal connections -> internal signal created
+
+ Purpose: With appropriate naming conventions it is possible to
+ create higher design levels with only a few mouse clicks or key
+ strokes. A new design level can be created by simply generating a new
+ component, placing the required subcomponents from the hierarchy
+ browser, and wiring everything automatically.
+
+ Note: Automatic wiring only works reliably on templates of new
+ components and component instantiations that were created by VHDL mode.
+
+ Component declarations can be placed in a components package (option
+ `vhdl-use-components-package') which can be automatically generated for
+ an entire directory or project (`C-c C-c M-p'). The VHDL'93 direct
+ component instantiation is also supported (option
+ `vhdl-use-direct-instantiation').
+
+| Configuration declarations can automatically be generated either from
+| the menu (`C-c C-c C-f') (for the architecture the cursor is in) or from
+| the speedbar menu (for the architecture under the cursor). The
+| configurations can optionally be hierarchical (i.e. include all
+| component levels of a hierarchical design, option
+| `vhdl-compose-configuration-hierarchical') or include subconfigurations
+| (option `vhdl-compose-configuration-use-subconfiguration'). For
+| subcomponents in hierarchical configurations, the most-recently-analyzed
+| (mra) architecture is selected. If another architecture is desired, it
+| can be marked as most-recently-analyzed (speedbar menu) before
+| generating the configuration.
|
-| Purpose: With appropriate naming conventions it is possible to
-| create higher design levels with only a few mouse clicks or key
-| strokes. A new design level can be created by simply generating a new
-| component, placing the required subcomponents from the hierarchy
-| browser, and wiring everything automatically.
-|
-| Note: Automatic wiring only works reliably on templates of new
-| components and component instantiations that were created by VHDL mode.
-|
-| See the options group `vhdl-compose' for all relevant user options.
+| Note: Configurations of subcomponents (i.e. hierarchical configuration
+| declarations) are currently not considered when displaying
+| configurations in speedbar.
+
+ See the options group `vhdl-compose' for all relevant user options.
SOURCE FILE COMPILATION:
＠＠ -5266,6 +5353,7 ＠＠
(cond
((nth 3 state) 'string)
((nth 4 state) 'comment)
+ ((vhdl-beginning-of-macro) 'pound)
(t nil)))))
(defun vhdl-forward-comment (&optional direction)
＠＠ -5348,15 +5436,20 ＠＠
(defun vhdl-forward-syntactic-ws (&optional lim)
"Forward skip of syntactic whitespace."
- (save-restriction
- (let* ((lim (or lim (point-max)))
- (here lim)
- (hugenum (point-max)))
- (narrow-to-region lim (point))
- (while (/= here (point))
- (setq here (point))
- (vhdl-forward-comment hugenum)))))
+ (let* ((here (point-max))
+ (hugenum (point-max)))
+ (while (/= here (point))
+ (setq here (point))
+ (vhdl-forward-comment hugenum)
+ ;; skip preprocessor directives
+ (when (and (eq (char-after) ?#)
+ (= (vhdl-point 'boi) (point)))
+ (while (and (eq (char-before (vhdl-point 'eol)) ?\\)
+ (= (forward-line 1) 0)))
+ (end-of-line)))
+ (if lim (goto-char (min (point) lim)))))
+
;; This is the best we can do in Win-Emacs.
(defun vhdl-win-fsws (&optional lim)
"Forward skip syntactic whitespace for Win-Emacs."
＠＠ -5373,18 +5466,28 ＠＠
(and (string-match "Win-Emacs" emacs-version)
(fset 'vhdl-forward-syntactic-ws 'vhdl-win-fsws))
+(defun vhdl-beginning-of-macro (&optional lim)
+ "Go to the beginning of a cpp macro definition (nicked from `cc-engine')."
+ (let ((here (point)))
+ (beginning-of-line)
+ (while (eq (char-before (1- (point))) ?\\)
+ (forward-line -1))
+ (back-to-indentation)
+ (if (and (<= (point) here)
+ (eq (char-after) ?#))
+ t
+ (goto-char here)
+ nil)))
+
(defun vhdl-backward-syntactic-ws (&optional lim)
"Backward skip over syntactic whitespace."
- (save-restriction
- (let* ((lim (or lim (point-min)))
- (here lim)
- (hugenum (- (point-max))))
- (if (< lim (point))
- (progn
- (narrow-to-region lim (point))
- (while (/= here (point))
- (setq here (point))
- (vhdl-forward-comment hugenum)))))))
+ (let* ((here (point-min))
+ (hugenum (- (point-max))))
+ (while (/= here (point))
+ (setq here (point))
+ (vhdl-forward-comment hugenum)
+ (vhdl-beginning-of-macro))
+ (if lim (goto-char (max (point) lim)))))
;; This is the best we can do in Win-Emacs.
(defun vhdl-win-bsws (&optional lim)
＠＠ -6729,6 +6832,8 ＠＠
(skip-chars-forward " \t")
(if (looking-at "--")
(vhdl-add-syntax 'comment))
+ (if (eq literal 'pound)
+ (vhdl-add-syntax 'cpp-macro))
;; return the syntax
vhdl-syntactic-context))))
＠＠ -7520,7 +7625,7 ＠＠
(if (match-string 1)
(goto-char (match-end 1))
(replace-match "\\3 \\4 \\5")
- (goto-char (match-end 4))))
+ (goto-char (match-end 2))))
;; eliminate multiple spaces and spaces at end of line
(goto-char beg)
(while (or (and (looking-at "--.*\n") (re-search-forward "--.*\n" end t))
＠＠ -7653,7 +7758,7 ＠＠
(message "Updating sensitivity lists...")
(while (re-search-forward "^\\s-*\\(\\w+[ \t\n]*:[ \t\n]*\\)?process\\>" nil t)
(goto-char (match-beginning 0))
- (condition-case nil (vhdl-update-sensitivity-list) (error)))
+ (condition-case nil (vhdl-update-sensitivity-list) (error "")))
(message "Updating sensitivity lists...done"))))
(defun vhdl-update-sensitivity-list ()
＠＠ -7697,8 +7802,9 ＠＠
((re-search-forward "^\\s-*case\\>" proc-end t)
(re-search-forward "\\<is\\>" proc-end t))
;; parameter list of procedure call
- ((re-search-forward "^\\s-*\\w+[ \t\n]*(" proc-end t)
- (progn (backward-char) (forward-sexp) (point)))))
+ ((and (re-search-forward "^\\s-*\\w+[ \t\n]*(" proc-end t)
+ (1- (point)))
+ (progn (forward-sexp) (point)))))
name read-list sens-list signal-list
sens-beg sens-end beg end margin)
;; scan for signals in old sensitivity list
＠＠ -9681,11 +9787,14 ＠＠
(match-string 2))))
(equal (downcase library) "work"))
(vhdl-insert-keyword "LIBRARY ")
- (insert library ";\n")
- (indent-to margin))
- (vhdl-insert-keyword "USE ")
- (insert library "." package)
- (vhdl-insert-keyword ".ALL;"))))
+ (insert library ";")
+ (when package
+ (insert "\n")
+ (indent-to margin)))
+ (when package
+ (vhdl-insert-keyword "USE ")
+ (insert library "." package)
+ (vhdl-insert-keyword ".ALL;")))))
(defun vhdl-template-package-math-complex ()
"Insert specification of `math_complex' package."
＠＠ -10763,6 +10872,7 ＠＠
string)
(vhdl-forward-comment (point-max))
(setq string (buffer-substring-no-properties start (point)))
+ (vhdl-forward-syntactic-ws)
;; strip off leading blanks and first newline
(while (string-match "^\\(\\s-+\\)" string)
(setq string (concat (substring string 0 (match-beginning 1))
＠＠ -10940,7 +11050,7 ＠＠
(while (not end-of-list)
;; parse object
(setq object
- (and (vhdl-parse-string "\\(signal\\|quantity\\|terminal\\)[ \t\n]*" t)
+ (and (vhdl-parse-string "\\<\\(signal\\|quantity\\|terminal\\)\\>[ \t\n]*" t)
(match-string-no-properties 1)))
;; parse names (accept extended identifiers)
(vhdl-parse-string "\\(\\w+\\|\\\\[^\\]+\\\\\\)[ \t\n]*")
＠＠ -10950,7 +11060,7 ＠＠
;; parse direction
(vhdl-parse-string ":[ \t\n]*")
(setq direct
- (and (vhdl-parse-string "\\(in\\|out\\|inout\\|buffer\\|linkage\\)[ \t\n]+" t)
+ (and (vhdl-parse-string "\\<\\(in\\|out\\|inout\\|buffer\\|linkage\\)\\>[ \t\n]+" t)
(match-string-no-properties 1)))
;; parse type
(vhdl-parse-string "\\([^();\n]+\\)")
＠＠ -11167,7 +11277,10 ＠＠
(car (nth 0 (car generic-list)))
(or (nth 2 (car generic-list)) " ")))
(setq generic-list (cdr generic-list))
- (insert (if generic-list ", " ")")))
+ (insert (if generic-list ", " ")"))
+ (when (and (not generic-list) secondary
+ (null (nth 2 vhdl-port-list)))
+ (insert ";")))
(unless vhdl-argument-list-indent
(insert "\n") (indent-to (+ margin vhdl-basic-offset)))
(setq list-margin (current-column))
＠＠ -11183,6 +11296,9 ＠＠
(or (nth 2 generic) "")))
(setq generic-list (cdr generic-list))
(insert (if generic-list "," ")"))
+ (when (and (not generic-list) secondary
+ (null (nth 2 vhdl-port-list)))
+ (insert ";"))
;; paste comment
(when (or vhdl-include-type-comments
(and vhdl-include-port-comments (nth 3 generic)))
＠＠ -11210,7 +11326,7 ＠＠
(insert (vhdl-replace-string vhdl-actual-port-name
(car (nth 0 (car port-list)))))
(setq port-list (cdr port-list))
- (insert (if port-list ", " ");")))
+ (insert (if port-list ", " ")")))
(unless vhdl-argument-list-indent
(insert "\n") (indent-to (+ margin vhdl-basic-offset)))
(setq list-margin (current-column))
＠＠ -11290,6 +11406,8 ＠＠
(when (nth 2 vhdl-port-list)
(insert "\n") (indent-to (+ margin vhdl-basic-offset))
(vhdl-port-paste-port-map))
+ (unless (or (nth 1 vhdl-port-list) (nth 2 vhdl-port-list))
+ (insert ";"))
(message "Pasting port as instantiation \"%s\"...done" name))
(setq vhdl-port-list orig-vhdl-port-list))))
＠＠ -12241,8 +12359,7 ＠＠
(load-file file-name)
(when (/= (length (aget vhdl-project-alist vhdl-project t)) 10)
(adelete 'vhdl-project-alist vhdl-project)
- ;; XEmacs change: we do not support a no-args (error)
- (error "Internal VHDL mode error."))
+ (error ""))
(when not-make-current
(setq vhdl-project current-project))
(vhdl-update-mode-menu)
＠＠ -12499,7 +12616,7 ＠＠
"postponed\\|process\\|"
(when (vhdl-standard-p 'ams) "procedural\\|")
"with\\|while"
- "\\)\\>\\|\\w+\\s-*\\(([^\n]*)\\)*\\s-*<=\\)")
+ "\\)\\>\\|\\w+\\s-*\\(([^\n]*)\\|\\.\\w+\\)*\\s-*<=\\)")
1 'font-lock-function-name-face)
;; highlight label and component name of component instantiations
＠＠ -12758,14 +12875,18 ＠＠
(defun vhdl-font-lock-init ()
"Initialize fontification."
- ;; highlight template prompts and directives
+ ;; highlight template prompts and directives
(setq vhdl-font-lock-keywords-0
(list (list (concat "\\(^\\|[ \t(.']\\)\\(<"
vhdl-template-prompt-syntax ">\\)")
2 'vhdl-font-lock-prompt-face t)
(list (concat "--\\s-*"
vhdl-directive-keywords-regexp "\\s-+\\(.*\\)$")
- 2 'vhdl-font-lock-directive-face t)))
+ 2 'vhdl-font-lock-directive-face t)
+ ;; highlight c-preprocessor directives
+ (list "^#[ \t]*\\(\\w+\\)\\([ \t]+\\(\\w+\\)\\)?"
+ '(1 font-lock-builtin-face)
+ '(3 font-lock-variable-name-face nil t))))
;; highlight keywords and standardized types, attributes, enumeration
;; values, and subprograms
(setq vhdl-font-lock-keywords-1
＠＠ -12886,9 +13007,9 ＠＠
;; (ent-key ent-name ent-file ent-line
;; (arch-key arch-name arch-file arch-line
;; (inst-key inst-name inst-file inst-line inst-comp-name inst-ent-key
-;; inst-arch-key inst-conf-key inst-lib-key)
+;; inst-arch-key inst-conf-key inst-lib-key inst-path)
;; (lib-name pack-key))
-;; (lib-name pack-key))
+;; mra-key (lib-name pack-key))
(defvar vhdl-config-alist nil
"Cache with configurations for each project/directory.")
＠＠ -13054,7 +13175,6 ＠＠
(let* ((ent-name (match-string-no-properties 1))
(ent-key (downcase ent-name))
(ent-entry (aget ent-alist ent-key t))
- (arch-alist (nth 3 ent-entry))
(lib-alist (vhdl-scan-context-clause)))
(if (nth 1 ent-entry)
(vhdl-warning-when-idle
＠＠ -13064,7 +13184,8 ＠＠
(setq ent-list (cons ent-key ent-list))
(aput 'ent-alist ent-key
(list ent-name file-name (vhdl-current-line)
- arch-alist lib-alist)))))
+ (nth 3 ent-entry) (nth 4 ent-entry)
+ lib-alist)))))
;; scan for architectures
(goto-char (point-min))
(while (re-search-forward "^[ \t]*architecture[ \t\n]+\\(\\w+\\)[ \t\n]+of[ \t\n]+\\(\\w+\\)[ \t\n]+is\\>" nil t)
＠＠ -13090,7 +13211,7 ＠＠
(list (or (nth 0 ent-entry) ent-name)
(nth 1 ent-entry) (nth 2 ent-entry)
(vhdl-sort-alist arch-alist)
- (nth 4 ent-entry))))))
+ arch-key (nth 5 ent-entry))))))
;; scan for configurations
(goto-char (point-min))
(while (re-search-forward "^[ \t]*configuration[ \t\n]+\\(\\w+\\)[ \t\n]+of[ \t\n]+\\(\\w+\\)[ \t\n]+is\\>" nil t)
＠＠ -13207,41 +13328,55 ＠＠
(beg-of-unit (point))
(end-of-unit (vhdl-get-end-of-unit))
(inst-no 0)
- inst-alist)
+ inst-alist inst-path)
;; scan for contained instantiations
(while (and (re-search-forward
(concat "^[ \t]*\\(\\w+\\)[ \t\n]*:[ \t\n]*\\("
"\\(\\w+\\)[ \t\n]+\\(--[^\n]*\n[ \t\n]*\\)*\\(generic\\|port\\)[ \t\n]+map\\>\\|"
"component[ \t\n]+\\(\\w+\\)\\|"
- "\\(\\(entity\\)\\|configuration\\)[ \t\n]+\\(\\(\\w+\\)\\.\\)?\\(\\w+\\)\\([ \t\n]*(\\(\\w+\\))\\)?\\)") end-of-unit t)
+ "\\(\\(entity\\)\\|configuration\\)[ \t\n]+\\(\\(\\w+\\)\\.\\)?\\(\\w+\\)\\([ \t\n]*(\\(\\w+\\))\\)?\\|"
+ "\\(\\(for\\|if\\)\\>[^;:]+\\<generate\\>\\|block\\>\\)\\)\\|"
+ "\\(^[ \t]*end[ \t\n]+\\(generate\\|block\\)\\>\\)") end-of-unit t)
(or (not limit-hier-inst-no)
(<= (setq inst-no (1+ inst-no))
limit-hier-inst-no)))
- (let* ((inst-name (match-string-no-properties 1))
- (inst-key (downcase inst-name))
- (inst-comp-name
- (or (match-string-no-properties 3)
- (match-string-no-properties 6)))
- (inst-ent-key
- (or (and (match-string 8)
- (vhdl-match-string-downcase 11))
- (and inst-comp-name
- (downcase inst-comp-name))))
- (inst-arch-key (vhdl-match-string-downcase 13))
- (inst-conf-key
- (and (not (match-string 8))
- (vhdl-match-string-downcase 11)))
- (inst-lib-key (vhdl-match-string-downcase 10)))
- (goto-char (match-end 1))
- (setq inst-list (cons inst-key inst-list)
- inst-ent-list (cons inst-ent-key inst-ent-list))
- (setq inst-alist
- (append
- inst-alist
- (list (list inst-key inst-name file-name
- (vhdl-current-line) inst-comp-name
- inst-ent-key inst-arch-key
- inst-conf-key inst-lib-key))))))
+ (cond
+ ;; block/generate beginning found
+ ((match-string 14)
+ (setq inst-path
+ (cons (match-string-no-properties 1) inst-path)))
+ ;; block/generate end found
+ ((match-string 16)
+ (setq inst-path (cdr inst-path)))
+ ;; instantiation found
+ (t
+ (let* ((inst-name (match-string-no-properties 1))
+ (inst-key (downcase inst-name))
+ (inst-comp-name
+ (or (match-string-no-properties 3)
+ (match-string-no-properties 6)))
+ (inst-ent-key
+ (or (and (match-string 8)
+ (vhdl-match-string-downcase 11))
+ (and inst-comp-name
+ (downcase inst-comp-name))))
+ (inst-arch-key (vhdl-match-string-downcase 13))
+ (inst-conf-key
+ (and (not (match-string 8))
+ (vhdl-match-string-downcase 11)))
+ (inst-lib-key (vhdl-match-string-downcase 10)))
+ (goto-char (match-end 1))
+ (setq inst-list (cons inst-key inst-list)
+ inst-ent-list
+ (cons inst-ent-key inst-ent-list))
+ (setq inst-alist
+ (append
+ inst-alist
+ (list (list inst-key inst-name file-name
+ (vhdl-current-line) inst-comp-name
+ inst-ent-key inst-arch-key
+ inst-conf-key inst-lib-key
+ (reverse inst-path)))))))))
;; scan for contained configuration specifications
(goto-char beg-of-unit)
(while (re-search-forward
＠＠ -13291,7 +13426,7 ＠＠
(aput 'ent-alist ent-key
(list (nth 0 ent-entry) (nth 1 ent-entry)
(nth 2 ent-entry) (vhdl-sort-alist arch-alist)
- (nth 4 ent-entry)))
+ (nth 4 ent-entry) (nth 5 ent-entry)))
(when (and limit-hier-inst-no
(> inst-no limit-hier-inst-no))
(message "WARNING: Scan limit (hierarchy: instances per architecture) reached in file:\n \"%s\"" file-name)
＠＠ -13484,7 +13619,7 ＠＠
(if (or (nth 1 entry) arch-alist)
(aput 'ent-alist ent-key
(list (nth 0 entry) (nth 1 entry) (nth 2 entry)
- arch-alist (nth 4 entry)))
+ arch-alist (nth 4 entry) (nth 5 entry)))
(adelete 'ent-alist ent-key)))
(setq arch-list (cdr arch-list)
arch-ent-list (cdr arch-ent-list)))
＠＠ -13548,6 +13683,7 ＠＠
updated))
(setq file-list (cdr file-list)))
(setq vhdl-modified-file-list nil)
+ (vhdl-speedbar-update-current-unit)
(when updated (message "Updating hierarchy...done")))))
;; structure (parenthesised expression means list of such entries)
＠＠ -13607,7 +13743,8 ＠＠
(nth 6 inst-entry) ; from direct instantiation
(nth 4 (aget conf-alist (nth 7 inst-entry)))
; from configuration spec.
- (caar (nth 3 inst-ent-entry)))) ; random (simplified MRA)
+ (nth 4 inst-ent-entry) ; MRA
+ (caar (nth 3 inst-ent-entry)))) ; first alphabetically
(setq inst-arch-entry (aget (nth 3 inst-ent-entry) inst-arch-key t))
;; set library
(setq inst-lib-key
＠＠ -13784,7 +13921,7 ＠＠
(progn (load-file file-dir-name)
(string< (mapconcat
(lambda (a) (format "%3d" (string-to-int a)))
- (split-string "3.31.14" "\\.") "")
+ (split-string "3.33" "\\.") "")
(mapconcat
(lambda (a) (format "%3d" (string-to-int a)))
(split-string vhdl-cache-version "\\.") "")))
＠＠ -13844,6 +13981,8 ＠＠
(define-key vhdl-speedbar-key-map "_" 'vhdl-speedbar-contract-all)
(define-key vhdl-speedbar-key-map "C" 'vhdl-speedbar-port-copy)
(define-key vhdl-speedbar-key-map "P" 'vhdl-speedbar-place-component)
+ (define-key vhdl-speedbar-key-map "F" 'vhdl-speedbar-configuration)
+ (define-key vhdl-speedbar-key-map "A" 'vhdl-speedbar-select-mra)
(define-key vhdl-speedbar-key-map "K" 'vhdl-speedbar-make-design)
(define-key vhdl-speedbar-key-map "R" 'vhdl-speedbar-rescan-hierarchy)
(define-key vhdl-speedbar-key-map "S" 'vhdl-save-caches)
＠＠ -13885,6 +14024,10 ＠＠
(vhdl-speedbar-check-unit 'subprogram))]
["Place Component" vhdl-speedbar-place-component
(vhdl-speedbar-check-unit 'entity)]
+ ["Generate Configuration" vhdl-speedbar-configuration
+ (vhdl-speedbar-check-unit 'architecture)]
+ ["Select as MRA" vhdl-speedbar-select-mra
+ (vhdl-speedbar-check-unit 'architecture)]
["Make" vhdl-speedbar-make-design
(save-excursion (beginning-of-line) (looking-at "[0-9]+: *[[<]"))]
["Generate Makefile" vhdl-speedbar-generate-makefile
＠＠ -14231,7 +14374,8 ＠＠
(ent-entry (aget ent-alist token t))
(arch-alist (nth 3 ent-entry))
(inst-alist (vhdl-get-instantiations token indent))
- (subpack-alist (nth 4 ent-entry))
+ (subpack-alist (nth 5 ent-entry))
+ (multiple-arch (> (length arch-alist) 1))
arch-entry inst-entry)
(if (not (or arch-alist inst-alist subpack-alist))
(speedbar-change-expand-button-char ??)
＠＠ -14254,6 +14398,9 ＠＠
(nth 1 arch-entry) 'vhdl-speedbar-find-file
(cons (nth 2 arch-entry) (nth 3 arch-entry))
'vhdl-speedbar-architecture-face (1+ indent))
+ (when (and multiple-arch
+ (equal (nth 0 arch-entry) (nth 4 ent-entry)))
+ (end-of-line 0) (insert " (mra)") (forward-char 1))
(setq arch-alist (cdr arch-alist)))
;; insert instantiations
(when inst-alist
＠＠ -14486,7 +14633,8 ＠＠
(setq pack-entry (aget pack-alist pack-key t))
(vhdl-speedbar-make-subpack-line
(or (nth 0 pack-entry) pack-key) lib-name
- (cons (nth 1 pack-entry) (nth 2 pack-entry)) indent)
+ (cons (nth 1 pack-entry) (nth 2 pack-entry))
+ (cons (nth 6 pack-entry) (nth 7 pack-entry)) indent)
(setq subpack-alist (cdr subpack-alist)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
＠＠ -14708,7 +14856,7 ＠＠
(put-text-property visible-start (point) 'invisible nil)))
(defun vhdl-speedbar-make-subpack-line (pack-name lib-name pack-file-marker
- depth)
+ pack-body-file-marker depth)
"Insert used package entry."
(let ((start (point))
visible-start)
＠＠ -14727,6 +14875,14 ＠＠
(speedbar-make-button
start (point) 'vhdl-speedbar-package-face 'speedbar-highlight-face
'vhdl-speedbar-find-file pack-file-marker)
+ (when (car pack-body-file-marker)
+ (insert " (")
+ (setq start (point))
+ (insert "body")
+ (speedbar-make-button
+ start (point) 'vhdl-speedbar-package-face 'speedbar-highlight-face
+ 'vhdl-speedbar-find-file pack-body-file-marker)
+ (insert ")"))
(setq start (point))
(insert " (" lib-name ")")
(put-text-property (+ 2 start) (1- (point)) 'face
＠＠ -14883,6 +15039,18 ＠＠
(set-text-properties 0 (length string) nil string)
string))
+(defun vhdl-speedbar-higher-text ()
+ "Get speedbar-line-text of higher level."
+ (let (depth string)
+ (save-excursion
+ (beginning-of-line)
+ (looking-at "^\\([0-9]+\\):")
+ (setq depth (string-to-int (match-string 1)))
+ (when (re-search-backward (format "^%d: *[[<{][-+?][]>}] \\([^ \n]+\\)" (1- depth)) nil t)
+ (setq string (match-string 1))
+ (set-text-properties 0 (length string) nil string)
+ string))))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Help functions
＠＠ -15007,6 +15175,31 ＠＠
(vhdl-compose-place-component)
(select-frame speedbar-frame)))
+(defun vhdl-speedbar-configuration ()
+ "Generate configuration for the architecture under the cursor."
+ (interactive)
+ (if (not (vhdl-speedbar-check-unit 'architecture))
+ (error "ERROR: No architecture under cursor.")
+ (let ((arch-name (vhdl-speedbar-line-text))
+ (ent-name (vhdl-speedbar-higher-text)))
+ (if (fboundp 'speedbar-select-attached-frame)
+ (speedbar-select-attached-frame)
+ (select-frame speedbar-attached-frame))
+ (vhdl-compose-configuration ent-name arch-name))))
+
+(defun vhdl-speedbar-select-mra ()
+ "Select the architecture under the cursor as MRA."
+ (interactive)
+ (if (not (vhdl-speedbar-check-unit 'architecture))
+ (error "ERROR: No architecture under cursor.")
+ (let* ((arch-key (downcase (vhdl-speedbar-line-text)))
+ (ent-key (downcase (vhdl-speedbar-higher-text)))
+ (ent-alist (aget vhdl-entity-alist
+ (or (vhdl-project-p) default-directory) t))
+ (ent-entry (aget ent-alist ent-key t)))
+ (setcar (cddr (cddr ent-entry)) arch-key) ; (nth 4 ent-entry)
+ (speedbar-refresh))))
+
(defun vhdl-speedbar-make-design ()
"Make (compile) design unit or directory/project under the cursor."
(interactive)
＠＠ -15041,6 +15234,10 ＠＠
(memq (get-text-property (match-end 0) 'face)
'(vhdl-speedbar-entity-face
vhdl-speedbar-entity-selected-face)))
+ ((eq design-unit 'architecture)
+ (memq (get-text-property (match-end 0) 'face)
+ '(vhdl-speedbar-architecture-face
+ vhdl-speedbar-architecture-selected-face)))
((eq design-unit 'subprogram)
(eq (get-text-property (match-end 0) 'face)
'vhdl-speedbar-subprogram-face))
＠＠ -15254,7 +15451,7 ＠＠
(vhdl-insert-keyword "END ")
(unless (vhdl-standard-p '87) (vhdl-insert-keyword "ARCHITECTURE "))
(insert arch-name ";\n\n")
- ;; insert footer
+ ;; insert footer and save
(if (and vhdl-compose-include-header (not (equal vhdl-file-footer "")))
(vhdl-template-footer)
(vhdl-comment-display-line) (insert "\n"))
＠＠ -15388,7 +15585,8 ＠＠
(vhdl-port-copy))))
(vhdl-port-flatten t)
(setq generic-alist (nth 1 vhdl-port-list)
- port-alist (nth 2 vhdl-port-list))
+ port-alist (nth 2 vhdl-port-list)
+ vhdl-port-list nil)
(setq constant-alist nil
signal-alist nil)
(when has-generic
＠＠ -15716,6 +15914,178 ＠＠
(message "Generating components package \"%s\"...done\n File created: \"%s\""
pack-name pack-file-name)))
+(defun vhdl-compose-configuration-architecture (ent-name arch-name inst-alist
+ &optional insert-conf)
+ "Generate block configuration for architecture."
+ (let ((margin (current-indentation))
+ (beg (save-excursion (beginning-of-line) (point)))
+ ent-entry inst-entry inst-path inst-prev-path cons-key tmp-alist)
+ ;; insert block configuration (for architecture)
+ (vhdl-insert-keyword "FOR ") (insert arch-name "\n")
+ (setq margin (+ margin vhdl-basic-offset))
+ ;; process all instances
+ (while inst-alist
+ (setq inst-entry (car inst-alist))
+ ;; is component?
+ (when (nth 4 inst-entry)
+ (setq insert-conf t)
+ (setq inst-path (nth 9 inst-entry))
+ ;; skip common path with previous instance
+ (while (and inst-path (equal (car inst-path) (car inst-prev-path)))
+ (setq inst-path (cdr inst-path)
+ inst-prev-path (cdr inst-prev-path)))
+ ;; insert block configuration end (for previous block/generate)
+ (while inst-prev-path
+ (setq margin (- margin vhdl-basic-offset))
+ (indent-to margin)
+ (vhdl-insert-keyword "END FOR;\n")
+ (setq inst-prev-path (cdr inst-prev-path)))
+ ;; insert block configuration beginning (for current block/generate)
+ (indent-to margin)
+ (while inst-path
+ (setq margin (+ margin vhdl-basic-offset))
+ (vhdl-insert-keyword "FOR ")
+ (insert (car inst-path) "\n")
+ (indent-to margin)
+ (setq inst-path (cdr inst-path)))
+ ;; insert component configuration beginning
+ (vhdl-insert-keyword "FOR ")
+ (insert (nth 1 inst-entry) " : " (nth 4 inst-entry) "\n")
+ ;; find subconfiguration
+ (setq conf-key (nth 7 inst-entry))
+ (setq tmp-alist conf-alist)
+ ;; use first configuration found for instance's entity
+ (while (and tmp-alist (null conf-key))
+ (when (equal (nth 5 inst-entry) (nth 4 (car tmp-alist)))
+ (setq conf-key (nth 0 (car tmp-alist))))
+ (setq tmp-alist (cdr tmp-alist)))
+ (setq conf-entry (aget conf-alist conf-key t))
+ ;; insert binding indication ...
+ ;; ... with subconfiguration (if exists)
+ (if (and vhdl-compose-configuration-use-subconfiguration conf-entry)
+ (progn
+ (indent-to (+ margin vhdl-basic-offset))
+ (vhdl-insert-keyword "USE CONFIGURATION ")
+ (insert (vhdl-work-library) "." (nth 0 conf-entry))
+ (insert ";\n"))
+ ;; ... with entity (if exists)
+ (setq ent-entry (aget ent-alist (nth 5 inst-entry) t))
+ (when ent-entry
+ (indent-to (+ margin vhdl-basic-offset))
+ (vhdl-insert-keyword "USE ENTITY ")
+ (insert (vhdl-work-library) "." (nth 0 ent-entry))
+ ;; insert architecture name (if architecture exists)
+ (when (nth 3 ent-entry)
+ (setq arch-name
+ ;; choose architecture name a) from configuration,
+ ;; b) from mra, or c) from first architecture
+ (or (nth 0 (aget (nth 3 ent-entry)
+ (or (nth 6 inst-entry)
+ (nth 4 ent-entry)) t))
+ (nth 1 (car (nth 3 ent-entry)))))
+ (insert "(" arch-name ")"))
+ (insert ";\n")
+ ;; insert block configuration (for architecture of subcomponent)
+ (when (and vhdl-compose-configuration-hierarchical
+ (nth 3 ent-entry))
+ (indent-to (+ margin vhdl-basic-offset))
+ (vhdl-compose-configuration-architecture
+ (nth 0 ent-entry) arch-name
+ (nth 3 (aget (nth 3 ent-entry) (downcase arch-name) t))))))
+ ;; insert component configuration end
+ (indent-to margin)
+ (vhdl-insert-keyword "END FOR;\n")
+ (setq inst-prev-path (nth 9 inst-entry)))
+ (setq inst-alist (cdr inst-alist)))
+ ;; insert block configuration end (for block/generate)
+ (while inst-prev-path
+ (setq margin (- margin vhdl-basic-offset))
+ (indent-to margin)
+ (vhdl-insert-keyword "END FOR;\n")
+ (setq inst-prev-path (cdr inst-prev-path)))
+ (indent-to (- margin vhdl-basic-offset))
+ ;; insert block configuration end or remove beginning (for architecture)
+ (if insert-conf
+ (vhdl-insert-keyword "END FOR;\n")
+ (delete-region beg (point)))))
+
+(defun vhdl-compose-configuration (&optional ent-name arch-name)
+ "Generate configuration declaration."
+ (interactive)
+ (vhdl-require-hierarchy-info)
+ (let ((ent-alist (aget vhdl-entity-alist
+ (or (vhdl-project-p) default-directory) t))
+ (conf-alist (aget vhdl-config-alist
+ (or (vhdl-project-p) default-directory) t))
+ (from-speedbar ent-name)
+ inst-alist conf-name conf-file-name pos)
+ (vhdl-prepare-search-2
+ ;; get entity and architecture name
+ (unless ent-name
+ (save-excursion
+ (unless (and (re-search-backward "^\\(architecture\\s-+\\(\\w+\\)\\s-+of\\s-+\\(\\w+\\)\\|end\\)\\>" nil t)
+ (not (equal "END" (upcase (match-string 1))))
+ (setq ent-name (match-string-no-properties 3))
+ (setq arch-name (match-string-no-properties 2)))
+ (error "ERROR: Not within an architecture"))))
+ (setq conf-name (vhdl-replace-string
+ vhdl-compose-configuration-name
+ (concat ent-name " " arch-name)))
+ (setq inst-alist
+ (nth 3 (aget (nth 3 (aget ent-alist (downcase ent-name) t))
+ (downcase arch-name) t))))
+ (message "Generating configuration \"%s\"..." conf-name)
+ (if vhdl-compose-configuration-create-file
+ ;; open configuration file
+ (progn
+ (setq conf-file-name
+ (concat (vhdl-replace-string vhdl-configuration-file-name
+ conf-name t)
+ "." (file-name-extension (buffer-file-name))))
+ (when (and (file-exists-p conf-file-name)
+ (not (y-or-n-p (concat "File \"" conf-file-name
+ "\" exists; overwrite? "))))
+ (error "ERROR: Creating configuration...aborted"))
+ (find-file conf-file-name)
+ (erase-buffer)
+ (set-buffer-modified-p nil)
+ ;; insert header
+ (if vhdl-compose-include-header
+ (progn (vhdl-template-header
+ (concat "Configuration declaration for design \""
+ ent-name "(" arch-name ")\""))
+ (goto-char (point-max)))
+ (vhdl-comment-display-line) (insert "\n\n")))
+ ;; goto end of architecture
+ (unless from-speedbar
+ (re-search-forward "^end\\>" nil)
+ (end-of-line) (insert "\n\n")
+ (vhdl-comment-display-line) (insert "\n\n")))
+ ;; insert library clause
+ (setq pos (point))
+ (vhdl-template-standard-package (vhdl-work-library) nil)
+ (when (/= pos (point))
+ (insert "\n\n"))
+ ;; insert configuration
+ (vhdl-insert-keyword "CONFIGURATION ") (insert conf-name)
+ (vhdl-insert-keyword " OF ") (insert ent-name)
+ (vhdl-insert-keyword " IS\n")
+ (indent-to vhdl-basic-offset)
+ ;; insert block configuration (for architecture)
+ (vhdl-compose-configuration-architecture ent-name arch-name inst-alist t)
+ (vhdl-insert-keyword "END ") (insert conf-name ";")
+ (when conf-file-name
+ ;; insert footer and save
+ (insert "\n\n")
+ (if (and vhdl-compose-include-header (not (equal vhdl-file-footer "")))
+ (vhdl-template-footer)
+ (vhdl-comment-display-line) (insert "\n"))
+ (save-buffer))
+ (message
+ (concat (format "Generating configuration \"%s\"...done" conf-name)
+ (and conf-file-name
+ (format "\n File created: \"%s\"" conf-file-name))))))
+
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;;; Compilation / Makefile generation
＠＠ -15991,7 +16361,7 ＠＠
(setq ent-file-name (file-relative-name
(nth 2 ent-entry) compile-directory)
arch-alist (nth 4 ent-entry)
- lib-alist (nth 5 ent-entry)
+ lib-alist (nth 6 ent-entry)
rule (aget rule-alist ent-file-name)
target-list (nth 0 rule)
depend-list (nth 1 rule)
＠＠ -16261,7 +16631,8 ＠＠
(insert " \\\n\t\t$(UNIT-" work-library "-" (car second-list) ")")
(setq second-list (cdr second-list)))
(while subcomp-list
- (when (assoc (car subcomp-list) unit-list)
+ (when (and (assoc (car subcomp-list) unit-list)
+ (not (equal unit-key (car subcomp-list))))
(insert " \\\n\t\t" (car subcomp-list)))
(setq subcomp-list (cdr subcomp-list)))
(insert "\n")
＠＠ -16366,8 +16737,10 ＠＠
'vhdl-upper-case-enum-values
'vhdl-upper-case-constants
'vhdl-use-direct-instantiation
+ 'vhdl-compose-configuration-name
'vhdl-entity-file-name
'vhdl-architecture-file-name
+ 'vhdl-configuration-file-name
'vhdl-package-file-name
'vhdl-file-name-case
'vhdl-electric-keywords
＠＠ -16413,6 +16786,9 ＠＠
'vhdl-testbench-entity-file-name
'vhdl-testbench-architecture-file-name
'vhdl-compose-create-files
+ 'vhdl-compose-configuration-create-file
+ 'vhdl-compose-configuration-hierarchical
+ 'vhdl-compose-configuration-use-subconfiguration
'vhdl-compose-include-header
'vhdl-compose-architecture-name
'vhdl-components-package-name
＠＠ -16475,106 +16851,34 ＠＠
(defconst vhdl-doc-release-notes nil
"\
-Release Notes for VHDL Mode 3.32
+Release Notes for VHDL Mode 3.33
================================
- New Features
- - Enhanced Features
- User Options
- - Remarks
New Features
------------
-
-STRUCTURAL COMPOSITION:
- - Enables simple structural composition similar to graphical editors.
- Simplifies the creation of higher design levels where subcomponents
- are simply sticked together:
- 1. Create a skeleton for a new component
- 2. Place subcomponents in it directly from the hierarchy browser
- 3. Automatically connect all subcomponents and create the ports
- for the new component (based on names of actual ports)
- - Automatic generation of a components package (package containing
- component declarations for all entities).
- - Find more information in the online documentation (`C-c C-h').
-
-PORT TRANSLATION:
- - Reverse direction of ports (useful for testbenches).
-
-SUBPROGRAM TRANSLATION:
- - Copy/paste of subprogram interfaces (similar to port translation).
-
-CODE FILLING:
- - Condense code using code-sensitive block filling.
-
-CODE STATISTICS:
- - Calculate number of code lines and statements in a buffer.
-
-
-Enhanced Features
------------------
-
-TESTBENCH GENERATION:
- - Enhanced templates and user option default values.
-
-Emacs 21 compatibility/enhancements:
- - `lazy-lock-mode' is not used anymore (built-in `jit-lock-mode' is faster).
-And many other minor fixes and enhancements.
+CONFIGURATION DECLARATION GENERATION:
+ - Automatic generation of a configuration declaration for a design.
+ (See documentation (`C-c C-h') in section on STRUCTURAL COMPOSITION.)
User Options
------------
-`vhdl-project-file-name': (enhanced)
- Include user name in project setup file name.
-`vhdl-speedbar-cache-file-name': (enhanced, changed default)
- Include user name in cache file name.
-`vhdl-default-library': (new)
- Default working library if no project is active.
-`vhdl-architecture-file-name': (new)
- Specify how the architecture file name is obtained.
-`vhdl-package-file-name': (new)
- Specify how the package file name is obtained.
-`vhdl-file-name-case': (new)
- Allows to change case when deriving file names.
-`vhdl-compose-create-files': (new)
- Specify whether new files should be created for a new component.
-`vhdl-compose-include-header': (new)
- Specify whether a header is included in a new component's file.
-`vhdl-compose-architecture-name': (new)
- Specify how a new component's architecture name is obtained.
-`vhdl-components-package-name': (new)
- Specify how the name for the components package is obtained.
-`vhdl-use-components-package': (new)
- Specify whether component declarations go in a components package.
-`vhdl-use-direct-instantiation': (new)
- Specify whether to use VHDL'93 direct component instantiation.
-`vhdl-instance-name': (changed default)
- Allows insertion of a running number to generate unique instance names.
-`vhdl-testbench-entity-header', `vhdl-testbench-architecture-header':(obsolete)
- Headers are now automatically derived from the standard header.
-`vhdl-testbench-include-header': (new)
- Specify whether a header is included in testbench files.
-`vhdl-testbench-declaration', `vhdl-testbench-statements': (changed default)
- Non-empty default values for more complete testbench templates.
-`vhdl-testbench-entity-file-name': (new)
- Specify how the testbench entity file name is obtained.
-`vhdl-testbench-architecture-file-name': (new)
- Specify how the testbench architecture file name is obtained.
-
-
-Remarks
--------
-
-- Changed key binding for `vhdl-comment-uncomment-region': `C-c c'
- (`C-c C-c ...' is now used for structural composition).
-
-- Automatic buffer highlighting (font-lock) is now controlled by option
- `global-font-lock-mode' in GNU Emacs (`font-lock-auto-fontify' in XEmacs).
- \(Important: You MUST customize this option in order to turn automatic
- buffer highlighting on.)
+`vhdl-configuration-file-name': (new)
+ Specify how the configuration file name is obtained.
+`vhdl-compose-configuration-name': (new)
+ Specify how the configuration name is optained.
+`vhdl-compose-configuration-create-file': (new)
+ Specify whether a new file should be created for a configuration.
+`vhdl-compose-configuration-hierarchical': (new)
+ Specify whether hierarchical configurations should be created.
+`vhdl-compose-configuration-use-subconfiguration': (new)
+ Specify whether subconfigurations should be used inside configurations.
")
- 1 participants
- 0 comments