aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/gentoo-syntax.txt3
-rw-r--r--ftdetect/gentoo.vim18
-rw-r--r--syntax/guidexml.vim21
3 files changed, 26 insertions, 16 deletions
diff --git a/doc/gentoo-syntax.txt b/doc/gentoo-syntax.txt
index f9f6a3a..cee4e9b 100644
--- a/doc/gentoo-syntax.txt
+++ b/doc/gentoo-syntax.txt
@@ -274,6 +274,9 @@ Authors: Ciaran McCreesh <ciaranm at gentoo dot org>
3. ChangeLog *gentoo-syntax-changelog*
20061105 pioto
+ * Update GuideXML support. See Bug #145999
+
+ 20061105 pioto
* Make package.* files' syntax accept category names without a '-'
in them. See Bug #122890
diff --git a/ftdetect/gentoo.vim b/ftdetect/gentoo.vim
index 85affa2..ac00c76 100644
--- a/ftdetect/gentoo.vim
+++ b/ftdetect/gentoo.vim
@@ -80,15 +80,15 @@ au BufNewFile,BufRead metadata.xml
" guidexml
au BufNewFile,BufRead *.xml
- \ if getline(1) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
- \ getline(2) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
- \ getline(3) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
- \ getline(4) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
- \ getline(5) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
- \ getline(6) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
- \ getline(7) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
- \ getline(8) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " ||
- \ getline(9) =~ "<!DOCTYPE \\(guide\\|book\\|sections\\) " |
+ \ if getline(1) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+ \ getline(2) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+ \ getline(3) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+ \ getline(4) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+ \ getline(5) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+ \ getline(6) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+ \ getline(7) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+ \ getline(8) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " ||
+ \ getline(9) =~ "<!DOCTYPE \\(guide\\|news\\|mainpage\\|book\\|sections\\|dynamic\\|inserts\\) " |
\ set filetype=guidexml |
\ endif
diff --git a/syntax/guidexml.vim b/syntax/guidexml.vim
index 0be19e3..18289a8 100644
--- a/syntax/guidexml.vim
+++ b/syntax/guidexml.vim
@@ -24,16 +24,23 @@ syn keyword guidexmlElement contained poster author abstract summary license
syn keyword guidexmlElement contained glsaindex glsa-latest version date
syn keyword guidexmlElement contained chapter section body figure fig img
syn keyword guidexmlElement contained br note impo warn pre p table tcolumn
-syn keyword guidexmlElement contained tr th ti ul ol li b brite box c comment
-syn keyword guidexmlElement contained e i path mail uri
+syn keyword guidexmlElement contained tr th ti ul ol li b brite c comment
+syn keyword guidexmlElement contained e i path mail uri dl dt dd newsitem
+syn keyword guidexmlElement contained sup sub keyword ident const stmt var
syn keyword guidexmlElement contained book part include sections subsection
+syn keyword guidexmlElement contained keyval values key
+syn keyword guidexmlElement contained metadoc members lead member categories
+syn keyword guidexmlElement contained cat files file docs doc memberof fileid
+syn keyword guidexmlElement contained bugs bug dynamic intro listing list catid
+syn keyword guidexmlElement contained overview inserts insert docdate
syn cluster xmlAttribHook add=guidexmlAttr
-syn match guidexmlAttr contained /about\|articles\|author\|caption\|category\|changelog/
-syn match guidexmlAttr contained /contract\|docs\|gentoo\|graphics\|id\|irc\|lang\|link/
-syn match guidexmlAttr contained /linkto\|lists\|news\|newsletter\|packages\|performace/
-syn match guidexmlAttr contained /projects\|short\|shots\|sponsors\|src\|support\|title/
-syn match guidexmlAttr contained /type\|where\|width\|href/
+syn match guidexmlAttr contained /author\|caption\|category\|test\|parent/
+syn match guidexmlAttr contained /gentoo\|id\|lang\|by\|linkto\|link/
+syn match guidexmlAttr contained /short\|src\|title\|colspan\|rowspan/
+syn match guidexmlAttr contained /type\|disclaimer\|redirect\|width\|align/
+syn match guidexmlAttr contained /mail\|fullname\|vpart\|vchap\|stopper\|arch/
+syn match guidexmlAttr contained /href\|metadoc\|name/
hi def link guidexmlElement Keyword
hi def link guidexmlAttr Keyword