diff options
| author | Stefan Monnier | 2001-10-25 03:39:43 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2001-10-25 03:39:43 +0000 |
| commit | 739da9251a99ee44695f6f6b9b221a41ab07a0b9 (patch) | |
| tree | abaa827bccbbbef3e32f2b8324bb9fb81cd683c3 /lisp/textmodes | |
| parent | d6cf8a2463a0286b52a7c474db6715a0cd1ee5c0 (diff) | |
| download | emacs-739da9251a99ee44695f6f6b9b221a41ab07a0b9.tar.gz emacs-739da9251a99ee44695f6f6b9b221a41ab07a0b9.zip | |
(texinfo-section-types-regexp)
(texinfo-section-level-regexp, texinfo-subsection-level-regexp)
(texinfo-subsubsection-level-regexp)
(texinfo-update-menu-same-level-regexps)
(texinfo-update-menu-higher-regexps)
(texinfo-update-menu-lower-regexps): Moved to eliminate warnings.
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/texnfo-upd.el | 190 |
1 files changed, 95 insertions, 95 deletions
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el index ec3cda5aed6..d928ec44c68 100644 --- a/lisp/textmodes/texnfo-upd.el +++ b/lisp/textmodes/texnfo-upd.el | |||
| @@ -157,6 +157,101 @@ | |||
| 157 | "String inserted before lower level entries in Texinfo master menu. | 157 | "String inserted before lower level entries in Texinfo master menu. |
| 158 | It comes after the chapter-level menu entries.") | 158 | It comes after the chapter-level menu entries.") |
| 159 | 159 | ||
| 160 | ;; We used to look for just sub, but that found @subtitle. | ||
| 161 | (defvar texinfo-section-types-regexp | ||
| 162 | "^@\\(chapter \\|sect\\|subs\\|subh\\|unnum\\|major\\|chapheading \\|heading \\|appendix\\)" | ||
| 163 | "Regexp matching chapter, section, other headings (but not the top node).") | ||
| 164 | |||
| 165 | (defvar texinfo-section-level-regexp | ||
| 166 | (regexp-opt (texinfo-filter 3 texinfo-section-list)) | ||
| 167 | "Regular expression matching just the Texinfo section level headings.") | ||
| 168 | |||
| 169 | (defvar texinfo-subsection-level-regexp | ||
| 170 | (regexp-opt (texinfo-filter 4 texinfo-section-list)) | ||
| 171 | "Regular expression matching just the Texinfo subsection level headings.") | ||
| 172 | |||
| 173 | (defvar texinfo-subsubsection-level-regexp | ||
| 174 | (regexp-opt (texinfo-filter 5 texinfo-section-list)) | ||
| 175 | "Regular expression matching just the Texinfo subsubsection level headings.") | ||
| 176 | |||
| 177 | (defvar texinfo-update-menu-same-level-regexps | ||
| 178 | '((1 . "top[ \t]+") | ||
| 179 | (2 . (concat "\\(^@\\)\\(" texinfo-chapter-level-regexp "\\)\\>[ \t]*")) | ||
| 180 | (3 . (concat "\\(^@\\)\\(" texinfo-section-level-regexp "\\)\\>[ \t]*")) | ||
| 181 | (4 . (concat "\\(^@\\)\\(" texinfo-subsection-level-regexp "\\)\\>[ \t]+")) | ||
| 182 | (5 . (concat "\\(^@\\)\\(" texinfo-subsubsection-level-regexp "\\)\\>[ \t]+"))) | ||
| 183 | "*Regexps for searching for same level sections in a Texinfo file. | ||
| 184 | The keys are strings specifying the general hierarchical level in the | ||
| 185 | document; the values are regular expressions.") | ||
| 186 | |||
| 187 | (defvar texinfo-update-menu-higher-regexps | ||
| 188 | '((1 . "^@node [ \t]*DIR") | ||
| 189 | (2 . "^@node [ \t]*top[ \t]*\\(,\\|$\\)") | ||
| 190 | (3 . | ||
| 191 | (concat | ||
| 192 | "\\(^@\\(" | ||
| 193 | texinfo-chapter-level-regexp | ||
| 194 | "\\)\\>[ \t]*\\)")) | ||
| 195 | (4 . | ||
| 196 | (concat | ||
| 197 | "\\(^@\\(" | ||
| 198 | texinfo-section-level-regexp | ||
| 199 | "\\|" | ||
| 200 | texinfo-chapter-level-regexp | ||
| 201 | "\\)\\>[ \t]*\\)")) | ||
| 202 | (5 . | ||
| 203 | (concat | ||
| 204 | "\\(^@\\(" | ||
| 205 | texinfo-subsection-level-regexp | ||
| 206 | "\\|" | ||
| 207 | texinfo-section-level-regexp | ||
| 208 | "\\|" | ||
| 209 | texinfo-chapter-level-regexp | ||
| 210 | "\\)\\>[ \t]*\\)"))) | ||
| 211 | "*Regexps for searching for higher level sections in a Texinfo file. | ||
| 212 | The keys are strings specifying the general hierarchical level in the | ||
| 213 | document; the values are regular expressions.") | ||
| 214 | |||
| 215 | (defvar texinfo-update-menu-lower-regexps | ||
| 216 | '((1 . | ||
| 217 | (concat | ||
| 218 | "\\(^@\\(" | ||
| 219 | texinfo-chapter-level-regexp | ||
| 220 | "\\|" | ||
| 221 | texinfo-section-level-regexp | ||
| 222 | "\\|" | ||
| 223 | texinfo-subsection-level-regexp | ||
| 224 | "\\|" | ||
| 225 | texinfo-subsubsection-level-regexp | ||
| 226 | "\\)\\>[ \t]*\\)")) | ||
| 227 | (2 . | ||
| 228 | (concat | ||
| 229 | "\\(^@\\(" | ||
| 230 | texinfo-section-level-regexp | ||
| 231 | "\\|" | ||
| 232 | texinfo-subsection-level-regexp | ||
| 233 | "\\|" | ||
| 234 | texinfo-subsubsection-level-regexp | ||
| 235 | "\\)\\>[ \t]*\\)")) | ||
| 236 | (3 . | ||
| 237 | (concat | ||
| 238 | "\\(^@\\(" | ||
| 239 | texinfo-subsection-level-regexp | ||
| 240 | "\\|" | ||
| 241 | texinfo-subsubsection-level-regexp | ||
| 242 | "\\)\\>[ \t]+\\)")) | ||
| 243 | (4 . | ||
| 244 | (concat | ||
| 245 | "\\(^@\\(" | ||
| 246 | texinfo-subsubsection-level-regexp | ||
| 247 | "\\)\\>[ \t]+\\)")) | ||
| 248 | ;; There's nothing below 5, use a bogus regexp that can't match. | ||
| 249 | (5 . "a\\(^\\)")) | ||
| 250 | "*Regexps for searching for lower level sections in a Texinfo file. | ||
| 251 | The keys are strings specifying the general hierarchical level in the | ||
| 252 | document; the values are regular expressions.") | ||
| 253 | |||
| 254 | |||
| 160 | (defun texinfo-make-menu (&optional beginning end) | 255 | (defun texinfo-make-menu (&optional beginning end) |
| 161 | "Without any prefix argument, make or update a menu. | 256 | "Without any prefix argument, make or update a menu. |
| 162 | Make the menu for the section enclosing the node found following point. | 257 | Make the menu for the section enclosing the node found following point. |
| @@ -1135,101 +1230,6 @@ end of that region; it limits the search." | |||
| 1135 | (point))) | 1230 | (point))) |
| 1136 | 1231 | ||
| 1137 | 1232 | ||
| 1138 | ;; We used to look for just sub, but that found @subtitle. | ||
| 1139 | (defvar texinfo-section-types-regexp | ||
| 1140 | "^@\\(chapter \\|sect\\|subs\\|subh\\|unnum\\|major\\|chapheading \\|heading \\|appendix\\)" | ||
| 1141 | "Regexp matching chapter, section, other headings (but not the top node).") | ||
| 1142 | |||
| 1143 | (defvar texinfo-section-level-regexp | ||
| 1144 | (regexp-opt (texinfo-filter 3 texinfo-section-list)) | ||
| 1145 | "Regular expression matching just the Texinfo section level headings.") | ||
| 1146 | |||
| 1147 | (defvar texinfo-subsection-level-regexp | ||
| 1148 | (regexp-opt (texinfo-filter 4 texinfo-section-list)) | ||
| 1149 | "Regular expression matching just the Texinfo subsection level headings.") | ||
| 1150 | |||
| 1151 | (defvar texinfo-subsubsection-level-regexp | ||
| 1152 | (regexp-opt (texinfo-filter 5 texinfo-section-list)) | ||
| 1153 | "Regular expression matching just the Texinfo subsubsection level headings.") | ||
| 1154 | |||
| 1155 | (defvar texinfo-update-menu-same-level-regexps | ||
| 1156 | '((1 . "top[ \t]+") | ||
| 1157 | (2 . (concat "\\(^@\\)\\(" texinfo-chapter-level-regexp "\\)\\>[ \t]*")) | ||
| 1158 | (3 . (concat "\\(^@\\)\\(" texinfo-section-level-regexp "\\)\\>[ \t]*")) | ||
| 1159 | (4 . (concat "\\(^@\\)\\(" texinfo-subsection-level-regexp "\\)\\>[ \t]+")) | ||
| 1160 | (5 . (concat "\\(^@\\)\\(" texinfo-subsubsection-level-regexp "\\)\\>[ \t]+"))) | ||
| 1161 | "*Regexps for searching for same level sections in a Texinfo file. | ||
| 1162 | The keys are strings specifying the general hierarchical level in the | ||
| 1163 | document; the values are regular expressions.") | ||
| 1164 | |||
| 1165 | (defvar texinfo-update-menu-higher-regexps | ||
| 1166 | '((1 . "^@node [ \t]*DIR") | ||
| 1167 | (2 . "^@node [ \t]*top[ \t]*\\(,\\|$\\)") | ||
| 1168 | (3 . | ||
| 1169 | (concat | ||
| 1170 | "\\(^@\\(" | ||
| 1171 | texinfo-chapter-level-regexp | ||
| 1172 | "\\)\\>[ \t]*\\)")) | ||
| 1173 | (4 . | ||
| 1174 | (concat | ||
| 1175 | "\\(^@\\(" | ||
| 1176 | texinfo-section-level-regexp | ||
| 1177 | "\\|" | ||
| 1178 | texinfo-chapter-level-regexp | ||
| 1179 | "\\)\\>[ \t]*\\)")) | ||
| 1180 | (5 . | ||
| 1181 | (concat | ||
| 1182 | "\\(^@\\(" | ||
| 1183 | texinfo-subsection-level-regexp | ||
| 1184 | "\\|" | ||
| 1185 | texinfo-section-level-regexp | ||
| 1186 | "\\|" | ||
| 1187 | texinfo-chapter-level-regexp | ||
| 1188 | "\\)\\>[ \t]*\\)"))) | ||
| 1189 | "*Regexps for searching for higher level sections in a Texinfo file. | ||
| 1190 | The keys are strings specifying the general hierarchical level in the | ||
| 1191 | document; the values are regular expressions.") | ||
| 1192 | |||
| 1193 | (defvar texinfo-update-menu-lower-regexps | ||
| 1194 | '((1 . | ||
| 1195 | (concat | ||
| 1196 | "\\(^@\\(" | ||
| 1197 | texinfo-chapter-level-regexp | ||
| 1198 | "\\|" | ||
| 1199 | texinfo-section-level-regexp | ||
| 1200 | "\\|" | ||
| 1201 | texinfo-subsection-level-regexp | ||
| 1202 | "\\|" | ||
| 1203 | texinfo-subsubsection-level-regexp | ||
| 1204 | "\\)\\>[ \t]*\\)")) | ||
| 1205 | (2 . | ||
| 1206 | (concat | ||
| 1207 | "\\(^@\\(" | ||
| 1208 | texinfo-section-level-regexp | ||
| 1209 | "\\|" | ||
| 1210 | texinfo-subsection-level-regexp | ||
| 1211 | "\\|" | ||
| 1212 | texinfo-subsubsection-level-regexp | ||
| 1213 | "\\)\\>[ \t]*\\)")) | ||
| 1214 | (3 . | ||
| 1215 | (concat | ||
| 1216 | "\\(^@\\(" | ||
| 1217 | texinfo-subsection-level-regexp | ||
| 1218 | "\\|" | ||
| 1219 | texinfo-subsubsection-level-regexp | ||
| 1220 | "\\)\\>[ \t]+\\)")) | ||
| 1221 | (4 . | ||
| 1222 | (concat | ||
| 1223 | "\\(^@\\(" | ||
| 1224 | texinfo-subsubsection-level-regexp | ||
| 1225 | "\\)\\>[ \t]+\\)")) | ||
| 1226 | ;; There's nothing below 5, use a bogus regexp that can't match. | ||
| 1227 | (5 . "a\\(^\\)")) | ||
| 1228 | "*Regexps for searching for lower level sections in a Texinfo file. | ||
| 1229 | The keys are strings specifying the general hierarchical level in the | ||
| 1230 | document; the values are regular expressions.") | ||
| 1231 | |||
| 1232 | |||
| 1233 | ;;; Updating a node | 1233 | ;;; Updating a node |
| 1234 | 1234 | ||
| 1235 | (defun texinfo-update-node (&optional beginning end) | 1235 | (defun texinfo-update-node (&optional beginning end) |