Update to upstream version 2.0.3

ChangeLog

@@ -1,3 +1,47 @@
+version 2.0.2 -> 2.0.3
+
+Fixes:
+ - Add {} to special characters in symbolview for easier handling (#170144)
+ - Don't blend user defined symbols because we don't know how they look like
+ - Misplaced cursor with intelligent double quotes and selections (#174937)
+ - Fixed a case where the autocompletion dies (#164231,#174003)
+ - Make the statistics pane work also for non latex files (#173745)
+ - Don't report certain log messages as tex errors (#174665)
+ - Properly escape the log messages so that also <...> shows up (#175148)
+ - some cwl typos
+
+CWL:
+ - Added babel, todonotes (thanks to Salim), glosstex, nicefrac, float,
+   fastex (thanks to Fabian Rost)
+
+Syntax:
+ - latex: -- fixed corner case where \newcommand got highlighted wrong
+ 	  -- highlight alignat and friends correctly
+
+version 2.0.1 -> 2.0.2
+
+Fixes:
+ - Insert \item[] in description environments for smart newline (#161658),
+ reported and fixed by Job Noorman
+ - Fix regression in 2.0.1 inside structure view related to opening files (debian #484146)
+ - Fix regression in latexoutputfilter resulting in the wrong file being
+   reported (#162899)
+ - Fix regression in Kile 2.0.x, blend symbols so that they are usable with
+   dark themes also (#161153)
+ - Don't create 'save' and 'save-as' actions specifically for Kile as they will
+   interfere with the corresponding actions from KatePart. Thanks to Mathias
+   Soeken for reporting.
+ - Also parse class warnings and show them in the Logview, patch by Jeroen Leeuwestein (#169040)
+ - Remove not sh-compliant code by requiring a Bash shell for system check (debian #489618)
+ - Add a workaround for a bug contained in KatePart 3.x in the 'setEncoding' method, which enforces
+   a reload on every change of the encoding (as a consequence the user sees a confusing
+   document-modified dialog) (#160258)
+ - Make find-in-files work again with anyting else than the "all files" filter (#165636)
+ - Minor cwl fixes
+
+Features:
+ - cwl file for siunitx (thanks to Dirk Sarpe) and allrunes packages
+
 version 2.0 -> 2.0.1
 
 Fixes:
@@ -16,6 +60,7 @@ Fixes:
  - Add missing package definitions to some symbols from the misc-text pane
  - Allow spaces in the name of images in the includegraphics dialog (#161101)
  - Don't recompile forever if some file timestamps are in the future (#121956)
+ - Fix the "autocompletion dies" bug (#155044) and also (#160555)
 
 Features:
  - Add \newlength as a variation of newcommand

acinclude.m4

@@ -4643,18 +4643,20 @@ fi
 
 AC_DEFUN([KDE_CHECK_PYTHON],
 [
-  KDE_CHECK_PYTHON_INTERN("2.5",
+  KDE_CHECK_PYTHON_INTERN("2.6",
-    [KDE_CHECK_PYTHON_INTERN("2.4",
+    [KDE_CHECK_PYTHON_INTERN("2.5",
-     [KDE_CHECK_PYTHON_INTERN("2.3", 
+      [KDE_CHECK_PYTHON_INTERN("2.4",
-       [KDE_CHECK_PYTHON_INTERN("2.2", 
+        [KDE_CHECK_PYTHON_INTERN("2.3", 
-         [KDE_CHECK_PYTHON_INTERN("2.1", 
+          [KDE_CHECK_PYTHON_INTERN("2.2", 
-           [KDE_CHECK_PYTHON_INTERN("2.0", 
+            [KDE_CHECK_PYTHON_INTERN("2.1", 
-             [KDE_CHECK_PYTHON_INTERN($1, $2) ])
+              [KDE_CHECK_PYTHON_INTERN("2.0", 
-           ])
+                [KDE_CHECK_PYTHON_INTERN($1, $2) ])
-         ])
+              ])
-       ])
+            ])
-     ])
+          ])
-  ])
+        ])
+      ])
+    ])
 ])
 
 AC_DEFUN([KDE_CHECK_STL],

configure.in

@@ -40,7 +40,7 @@ dnl Perform program name transformation
 AC_ARG_PROGRAM
 
 dnl Automake doc recommends to do this only here. (Janos)
-AM_INIT_AUTOMAKE(kile-2.0.1, "3.5.9") dnl searches for some needed programs
+AM_INIT_AUTOMAKE(kile-2.0.3, "3.5.10") dnl searches for some needed programs
 
 AM_MAINTAINER_MODE
 

src/kile/codecompletion.cpp

@@ -1153,7 +1153,7 @@ namespace KileDocument
 
 	void CodeCompletion::slotCharactersInserted(int, int, const TQString& string )
 	{
-		KILE_DEBUG() << "==slotCharactersInserted (" << m_kilecompletion << "," << m_inprogress << ", " << m_ref << ", " << string << ")=============" << endl;
+		KILE_DEBUG() << "==slotCharactersInserted (m_kilecompletion=" << m_kilecompletion << "m_inprogress," << m_inprogress << ",m_ref=" << m_ref << ",string=" << string << ")=============" << endl;
 
 		if ( !inProgress() && m_autoDollar && string=="$" )
 		{
@@ -1184,6 +1184,16 @@ namespace KileDocument
 				editCompleteList(reftype,startpattern);
 				return;
 			}
+		} // also unusual but may also happen, 20.11.2008 tbraun
+		else if( m_ref && !inProgress())
+		{
+			TQString startpattern;
+			CodeCompletion::Type reftype = insideReference(startpattern);
+			if ( reftype == CodeCompletion::ctNone )
+			{
+				m_ref = false;
+				return;
+			}
 		}
 
 		TQString word;

src/kile/complete/abbreviation/CMakeLists.txt

@@ -1,4 +1,7 @@
 
 ########### install files ###############
 
-INSTALL( FILES example.cwl DESTINATION share/apps/kile/complete/abbreviation )
+INSTALL( FILES
+	example.cwl
+	fastex.cwl
+	DESTINATION share/apps/kile/complete/abbreviation )

src/kile/complete/abbreviation/Makefile.am

@@ -1,2 +1,3 @@
 abbcompletedir = $(kde_datadir)/kile/complete/abbreviation
-abbcomplete_DATA = example.cwl
+abbcomplete_DATA = example.cwl \
+		   fastex.cwl

src/kile/complete/dictionary/metapost.cwl

@@ -88,7 +88,7 @@ draw
 draw_mark()
 draw_marked()
 drawarrow
-drawblarrow
+drawdblarrow
 drawboxed()
 drawboxes()
 drawoptions()

src/kile/complete/tex/CMakeLists.txt

@@ -3,6 +3,7 @@
 # get this cwl list with "for i in `ls *.cwl -1`; do echo "$i";  done"
 SET(kile_texCompleteFiles
 	acronym.cwl
+	allrunes.cwl
 	amsopn.cwl
 	afterpage.cwl
 	amsbsy.cwl
@@ -12,11 +13,13 @@ SET(kile_texCompleteFiles
 	amsthm.cwl
 	array.cwl
 	attachfile.cwl
+	babel.cwl
 	beamerfoils.cwl
 	beamerprosper.cwl
 	beamerseminar.cwl
 	beamertexpower.cwl
 	booktabs.cwl
+	bm.cwl
 	braket.cwl
 	calc.cwl
 	class-beamer.cwl
@@ -40,8 +43,10 @@ SET(kile_texCompleteFiles
 	fancyunits-per.cwl
 	fancyunits_small-fractions.cwl
 	fancyvrb.cwl
+	float.cwl
 	fontspec.cwl
 	graphicx.cwl
+	glosstex.cwl
 	hyperref.cwl
 	ifthen.cwl
 	import.cwl
@@ -60,6 +65,7 @@ SET(kile_texCompleteFiles
 	mdwlist.cwl
 	multicol.cwl
 	multido.cwl
+	nicefrac.sty
 	pdfpages.cwl
 	psfrag.cwl
 	pst-3d.cwl
@@ -80,6 +86,8 @@ SET(kile_texCompleteFiles
 	scrpage2.cwl
 	scrtime.cwl
 	setspace.cwl
+	siunitx.cwl
+	siunitx-special.cwl
 	subfig.cwl
 	supertabular.cwl
 	svninfo.cwl
@@ -87,6 +95,7 @@ SET(kile_texCompleteFiles
 	tabularx.cwl
 	tex.cwl
 	textcomp.cwl
+	todonotes.cwl
 	url.cwl
 	varioref.cwl
 	verse.cwl

src/kile/complete/tex/Makefile.am

@@ -2,6 +2,7 @@ texcompletedir = $(kde_datadir)/kile/complete/tex
 texcomplete_DATA = \
 	acronym.cwl \
 	afterpage.cwl \
+	allrunes.cwl \
 	amsbsy.cwl \
 	amsfonts.cwl \
 	amsmath.cwl \
@@ -10,11 +11,13 @@ texcomplete_DATA = \
 	amsthm.cwl \
 	array.cwl \
 	attachfile.cwl \
+	babel.cwl \
 	beamerfoils.cwl \
 	beamerprosper.cwl \
 	beamerseminar.cwl \
 	beamertexpower.cwl \
 	booktabs.cwl \
+	bm.cwl \
 	braket.cwl \
 	calc.cwl \
 	class-beamer.cwl \
@@ -38,7 +41,9 @@ texcomplete_DATA = \
 	fancyunits-per.cwl \
 	fancyunits_small-fractions.cwl \
 	fancyvrb.cwl \
+	float.cwl \
 	fontspec.cwl \
+	glosstex.cwl \
 	graphicx.cwl \
 	hyperref.cwl \
 	ifthen.cwl \
@@ -58,6 +63,7 @@ texcomplete_DATA = \
 	mdwlist.cwl \
 	multicol.cwl \
 	multido.cwl \
+	nicefrac.cwl \
 	pdfpages.cwl \
 	psfrag.cwl \
 	pst-3d.cwl \
@@ -78,6 +84,8 @@ texcomplete_DATA = \
 	scrpage2.cwl \
 	scrtime.cwl \
 	setspace.cwl \
+	siunitx.cwl \
+	siunitx-special.cwl \
 	subfig.cwl \
 	supertabular.cwl \
 	svninfo.cwl \
@@ -85,6 +93,7 @@ texcomplete_DATA = \
 	tabularx.cwl \
 	tex.cwl \
 	textcomp.cwl \
+	todonotes.cwl \
 	url.cwl \
 	varioref.cwl \
 	verse.cwl \

src/kile/complete/tex/allrunes.cwl

@@ -0,0 +1,43 @@
+# allrunes package, available from ctan
+# tbraun, 28.08.2008
+\textarc{text}
+\textara{text}
+\textarn{text}
+\textart{text}
+\textarl{text}
+\textarm{text}
+\arcfamily
+\arafamily
+\arnfamily
+\artfamily
+\arlfamily
+\armfamily
+
+# already included in standard latex
+# \textbf{text}
+# \bfseries
+# \textmd{text}
+# \mdseries
+\textlf{text}
+\lfseries
+
+\textwil{text}
+\textwol{text}
+\withlines
+\withoutlines
+
+\textst{text}
+\textcu{text}
+\textro{text}
+\straighttwigs
+\curvedtwigs
+\roundedtwigs
+
+\texthi{text}
+\textlo{text}
+\hightwigs
+\lowtwigs
+
+\hflip{rune}
+\vflip{rune}
+\turn{rune}

src/kile/complete/tex/babel.cwl

@@ -0,0 +1,43 @@
+# babel.sty,
+# available from ctan
+# tbraun 4.11.2008
+
+\selectlanguage{language}
+\begin{otherlanguage}{language}
+\begin{otherlanguage*}{language}
+\end{otherlanguage}
+\foreignlanguage{language}{text}
+\begin{hypenrules}{option}
+\end{hyphenrules}
+\languagename
+\iflanguage{language}{if true}{if false}
+\useshorthands{character}
+\defineshorthand{characters}{action}
+\aliasshorthand{character}{shorthand}
+\languageshorthands{language}
+\shorthandon{characters}
+\shorthandoff{characters}
+\languageattribute{language}{list of attributes}
+
+# extracted from gernmanb.ldf
+\prefacename
+\refname
+\abstractname
+\bibname
+\chaptername
+\appendixname
+\contentsname
+\listfigurename
+\listtablename
+\indexname
+\figurename
+\tablename
+\partname
+\enclname
+\ccname
+\headtoname
+\pagename
+\seename
+\alsoname
+\proofname
+\glossaryname

src/kile/complete/tex/bm.cwl

@@ -0,0 +1,14 @@
+# bm, ctan
+# tbraun 6/11/2008
+
+\bm{math expression}
+\hm{math expression}
+
+\boldsymbol{math expression}
+\heavysymbol{math expression}
+
+\DeclareBoldMathCommand[math version]{cmd}{math expression}
+\DeclareBoldMathCommand{cmd}{math expression}
+
+\bmmax{number}
+\hmmax{number}

src/kile/complete/tex/class-scrartcl,scrreprt,scrbook.cwl

@@ -122,3 +122,5 @@
 \pdfoutput
 \pdfpageheight
 \pdfpagewidth
+# logo
+\KOMAScript{}

src/kile/complete/tex/float.cwl

@@ -0,0 +1,10 @@
+# float, ctan
+# tbraun 4.11.2008
+
+\newfloat{type}{placement}{ext}[within]
+\floatstyle{defaultstyle}
+\floatname{type}{name}
+\floatplacement{type}{default placement specifier}
+\restylefloat{figure or table
+\listof{type}{ title}
+

src/kile/complete/tex/glosstex.cwl

@@ -0,0 +1,95 @@
+# glosstex, ctan
+# tbraun 4.11.2008
+
+\glosstex{label}
+\glosstex[pageref-mode]{label}
+\glosstex(list){label}
+\glosstex(list)[pageref-mode]{label}
+
+\glosstex*{label}
+\glosstex*[pageref-mode]{label}
+\glosstex*(list){label}
+\glosstex*(list)[pageref-mode]{label}
+
+\acronym{label}
+\acronym[pageref-mode]{label}
+\acronym(list){label}
+\acronym(list)[pageref-mode]{label}
+
+\acronym*{label}
+\acronym*[pageref-mode]{label}
+\acronym*(list){label}
+\acronym*(list)[pageref-mode]{label}
+
+\gls{label}
+\gls[pageref-mode]{label}
+\gls(list){label}
+\gls(list)[pageref-mode]{label}
+
+\gls*{label}
+\gls*[pageref-mode]{label}
+\gls*(list){label}
+\gls*(list)[pageref-mode]{label}
+
+\ac{label}
+\ac[pageref-mode]{label}
+\ac(list)[pageref-mode]{label}
+\ac<form>(list)[pageref-mode]{label}
+\ac[, lparen , rparen ,]<form>(list)[pageref-mode]{label}
+
+\ac*{label}
+\ac*[pageref-mode]{label}
+\ac*(list)[pageref-mode]{label}
+\ac*<form>(list)[pageref-mode]{label}
+\ac*[, lparen , rparen ,]<form>(list)[pageref-mode]{label}
+
+\acs{label}
+\acs[pageref-mode]{label}
+\acs(list)[pageref-mode]{label}
+\acs<form>(list)[pageref-mode]{label}
+\acs[, lparen , rparen ,]<form>(list)[pageref-mode]{label}
+
+\acs*{label}
+\acs*[pageref-mode]{label}
+\acs*(list)[pageref-mode]{label}
+\acs*<form>(list)[pageref-mode]{label}
+\acs*[, lparen , rparen ,]<form>(list)[pageref-mode]{label}
+
+\acl{label}
+\acl[pageref-mode]{label}
+\acl(list)[pageref-mode]{label}
+\acl<form>(list)[pageref-mode]{label}
+\acl[, lparen , rparen ,]<form>(list)[pageref-mode]{label}
+
+\acl*{label}
+\acl*[pageref-mode]{label}
+\acl*(list)[pageref-mode]{label}
+\acl*<form>(list)[pageref-mode]{label}
+\acl*[, lparen , rparen ,]<form>(list)[pageref-mode]{label}
+
+\acf{label}
+\acf[pageref-mode]{label}
+\acf(list)[pageref-mode]{label}
+\acf<form>(list)[pageref-mode]{label}
+\acf[, lparen , rparen ,]<form>(list)[pageref-mode]{label}
+
+\acf*{label}
+\acf*[pageref-mode]{label}
+\acf*(list)[pageref-mode]{label}
+\acf*<form>(list)[pageref-mode]{label}
+\acf*[, lparen , rparen ,]<form>(list)[pageref-mode]{label}
+
+\printglosstex(list)
+\printglosstex(list)[pageref-mode]
+
+\glxitemorderdefault{list}{item-order i/l/""}
+\glxitemplacementdefault{list}{item-order t/f/""}
+
+\glxparendefault{lparen}{rparen}
+\glxparenlistdefault{list}{lparen}{rparen}
+
+\glxref{item}
+\glxref*{item}
+
+\glxheading{glo, acr or own list}{definition}
+

src/kile/complete/tex/graphicx.cwl

@@ -19,6 +19,7 @@
 \reflectbox{text}
 \resizebox*{h-length}{v-length}{text}
 \rotatebox[key val list]{angle}{text}
+\scalebox{h-scale}{text}
 \scalebox{h-scale}[v-scale]{text}
 \setkeys{Gin}{key val}
 \textcolor{name}{text}

src/kile/complete/tex/latex-document.cwl

@@ -219,20 +219,20 @@
 \marginpar{right}
 \markboth{lefthead}{righthead}
 \markright{righthead}
-\mathbb
+\mathbb{text}
-\mathbf
+\mathbf{text}
-\mathcal
+\mathcal{text}
-\mathds
+\mathds{text}
 \mathellipsis
-\mathfrak
+\mathfrak{text}
 \mathgroup
-\mathit
+\mathit{text}
-\mathnormal
+\mathnormal{text}
-\mathrm
+\mathrm{text}
 \mathscr
-\mathsf
+\mathsf{text}
 \mathsterling
-\mathtt
+\mathtt{text}
 \mathunderscore
 \mathversion
 \mbox{text}
@@ -426,6 +426,7 @@
 \renewenvironment{nam}[args][default]{begdef}{enddef}
 \renewenvironment{nam}[args]{begdef}{enddef}
 \renewenvironment{nam}{begdef}{enddef}
+\left
 \left(
 \left[
 \left\lbrace
@@ -443,8 +444,9 @@
 \left\Downarrow
 \left\Updownarrow
 \left.
-\right(
+\right
-\right[
+\right)
+\right]
 \right\rbrace
 \right|
 \right\|

src/kile/complete/tex/nicefrac.cwl

@@ -0,0 +1,4 @@
+# nicefrac, ctan
+# tbraun 6.11.2008
+
+\nicefrac{nom}{denom}

src/kile/complete/tex/siunitx-special.cwl

@@ -0,0 +1,37 @@
+# siunitx package, special commands
+# get it from http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=siunitx
+# dsarpe 03.07.2008
+
+# Specialist units, not loaded by default, only with alsoload=<name>, here given in parentheses
+# Binary units (binary)
+\bit
+\byte
+# Synthetic chemistry (synchem)
+\mmHg
+\molar
+\Molar
+\torr
+\dalton
+# High-energy physics (hep)
+\clight
+\eVperc
+#  Areas
+\yoctobarn
+\yb
+\zeptobarn
+\zb
+\attobarn
+\ab
+\femtobarn
+\fb
+\picobarn
+\pb
+\nanobarn
+\nb
+#  Other units
+\micron
+\mrad
+\gauss
+# Astronomy (astro)
+\parsec
+\lightyear

src/kile/complete/tex/siunitx.cwl

@@ -0,0 +1,287 @@
+# siunitx package
+# get it from http://tug.ctan.org/cgi-bin/ctanPackageInformation.py?id=siunitx
+# dsarpe 03.07.2008
+
+# Numbers
+\num{number}
+\num[options]{number}
+
+# Angles
+\ang{angle}
+\ang[options]{angle}
+
+# Units and values
+\SI{value}{unit commands}
+\SI[options]{value}{unit commands}
+\SI{value}[pre-unit]{unit commands}
+\SI[options]{value}[pre-unit]{unit commands}
+
+# Powers of units
+\Square
+\ssquare
+\squared
+\cubic
+\cubed
+\per
+\tothe{power}
+\raiseto{power}
+
+# Units with no values
+\si{unit}
+\si[options]{unit}
+
+#
+# pre-defined units, prefixes and powers
+#
+# The seven base SI units
+\kilogram
+\metre
+\second
+\mole
+\kelvin
+\ampere
+\candela
+
+# The SI prefixes
+\yocto
+\zepto
+\atto
+\femto
+\pico
+\nano
+\micro
+\milli
+\centi
+\deci
+\deca
+\deka
+\hecto
+\kilo
+\mega
+\giga
+\tera
+\peta
+\exa
+\zetta
+\yotta
+
+# The derived SI units with defined names
+\becquerel
+\celsius
+\coulomb
+\farad
+\Gray
+\ggray
+\hertz
+\henry
+\joule
+\katal
+\lumen
+\lux
+\newton
+\ohm
+\pascal
+\radian
+\siemens
+\sievert
+\steradian
+\tesla
+\volt
+\watt
+\weber
+
+# Units derived from experiments
+\electronvolt
+\atomicmassunit
+\atomicmass
+
+# Units accepted for use with SI
+\bel
+\Day
+\dday
+\degree
+\hour
+\minute
+\arcmin
+\neper
+\percent
+\arcsec
+\tonne
+
+# Prefixed and abbreviated units
+# Masses
+\kilogram
+\kg
+\femtogram
+\fg
+\picogram
+\pg
+\nanogram
+\nanog
+\microgram
+\micg
+\milligram
+\mg
+\atomicmass
+\amu
+# Lengths
+\picometre
+\picom
+\nanometre
+\nm
+\micrometre
+\micm
+\millimetre
+\mm
+\centimetre
+\cm
+\decimetre
+\dm
+\kilometre
+\km
+# Times
+\second
+\Sec
+\attosecond
+\as
+\femtosecond
+\fs
+\picosecond
+\ps
+\nanosecond
+\ns
+\microsecond
+\mics
+\millisecond
+\ms
+# Moles
+\femtomole
+\fmol
+\picomole
+\pmol
+\nanomole
+\nmol
+\micromole
+\micmol
+\millimole
+\mmol
+# Currents
+\picoampere
+\pA
+\nanoampere
+\nA
+\microampere
+\micA
+\kiloampere
+\kA
+# Areas
+\squarecentimetre
+\centimetresquared
+\cms
+\squaremetre
+\squarekilometre
+# Volumes
+\microlitre
+\micl
+\millilitre
+\ml
+\cubiccentimetre
+\cmc
+\centimetrecubed
+\cubicdecimetre
+\dmc
+# Frequencies
+\hertz
+\Hz
+\millihertz
+\mHz
+\kilohertz
+\kHz
+\megahertz
+\MHz
+\gigahertz
+\GHz
+\terahertz
+\THz
+# potentials
+\millivolt
+\mV
+\kilovolt
+\kV
+# Energies
+\kilojoule
+\kJ
+\electronvolt
+\eV
+\millielectronvolt
+\meV
+\kiloelectronvolt
+\keV
+\megaelectronvolt
+\MeV
+\gigaelectronvolt
+\GeV
+\teraelectronvolt
+\TeV
+\kilowatthour
+\kWh
+# Powers
+\milliwatt
+\kilowatt
+\megawatt
+# Capacitances
+\femtofarad
+\picofarad
+\nanofarad
+\microfarad
+\millifarad
+# Resistances
+\kiloohm
+\megaohm
+\gigaohm
+\millisiemens
+# Forces
+\millinewton
+\kilonewton
+# Other units
+\hectopascal
+\megabecquerel
+\millisievert
+
+# Additional (temporary) SI units
+\angstrom
+\are
+\curie
+\BAR
+\bbar
+\barn
+\gal
+\hectare
+\millibar
+\rad
+\rem
+\roentgen
+
+# Defining new units
+\newunit{new unit command}{text}
+\newunit[options]{new unit command}{text}
+\renewunit{new unit command}{text}
+\renewunit[options]{new unit command}{text}
+\provideunit{new unit command}{text}
+\provideunit[options]{new unit command}{text}
+\newpower{power}{num}
+\newpower[post]{power}{num}
+\renewpower{power}{num}
+\renewpower[post]{power}{num}
+\providepower{power}{num}
+\providepower[post]{power}{num}
+\newprefix{prefix}{symbol}{powers-ten}
+\newprefix[binary]{prefix}{symbol}{powers-ten}
+\renewprefix{prefix}{symbol}{powers-ten}
+\renewprefix[binary]{prefix}{symbol}{powers-ten}
+\provideprefix{prefix}{symbol}{powers-ten}
+\provideprefix[binary]{prefix}{symbol}{powers-ten}
+
+# Package options inside document
+\sisetup
+

src/kile/complete/tex/subfig.cwl

@@ -3,7 +3,7 @@
 \captionsetup{kv-list}
 \captionsetup[variable]{kv-list}
 \ContinuedFloat
-\DeclareCaptionListOfFormat{keyowrd}{code}
+\DeclareCaptionListOfFormat{keyword}{code}
 \listsubcaptions
 \newsubfloat{floatname}
 \newsubfloat[kv-list]{floatname}

src/kile/complete/tex/tex.cwl

@@ -72,6 +72,7 @@
 \displaylines
 \displaywidowpenalty
 \displaywidth
+\displaystyle
 \divide
 \dotfill
 \dots
@@ -132,6 +133,7 @@
 \hfilneg
 \hfuzz
 \hoffset
+\hphantom
 \hrule
 \hrulefill
 \hsize

src/kile/complete/tex/todonotes.cwl

@@ -0,0 +1,9 @@
+# todonotes.sty
+# Salim 2008/11/09
+# http://midtiby.blogspot.com/
+
+\todo{text}
+\todo[options]{text}
+\listoftodos
+
+

src/kile/configtester.cpp

@@ -168,7 +168,7 @@ void Tester::runTests()
 	KILE_DEBUG() << "Tester::runTests: destdir = " << destdir << endl;
 	m_resultsFile = destdir + "results.rc";
 
-	TQString shellname = TDEGlobal::dirs()->findExe("sh");
+	TQString shellname = TDEGlobal::dirs()->findExe("bash");
 	KILE_DEBUG() << "Tester::runTests: shellname = " << shellname << endl;
 	m_process = new KShellProcess(TQFile::encodeName( shellname ));
 	if (! KileConfig::teXPaths().isEmpty())

src/kile/internal-testing/bugs1.tex

@@ -0,0 +1,24 @@
+% syntax highlightning bug, nested enviroments are not recognized
+\documentclass{article}
+\usepackage{amsmath}
+\usepackage{amssymb}
+\usepackage{fancybox}
+\begin{document}
+	\newlength{\parboxlength}
+	\begin{align*}
+		\setlength{\fboxsep}{15pt}
+		\setlength{\parboxlength}{\linewidth}
+		\addtolength{\parboxlength}{-2\fboxsep}
+		\fbox{
+		\parbox{\parboxlength}{
+			\setlength{\abovedisplayskip}{0pt}
+			\setlength{\belowdisplayskip}{0pt}
+			\begin{align}
+				asdf
+			\end{align}
+		}}
+	\end{align*}
+	
+	asdfasdfasdfasdfadfasdf
+
+\end{document}

src/kile/internal-testing/math-mode-selector.tex

@@ -0,0 +1,72 @@
+% /***************************************************************************
+%	begin:		Aug 09 2006
+%	edit:		--
+%	version:	0.01
+%	copyright:	(C) 2006 by Holger Danielsson and Thomas Braun
+%  ***************************************************************************/
+% 
+% /***************************************************************************
+%  *                                                                         *
+%  *   This program 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 of the License, or     *
+%  *   (at your option) any later version.                                   *
+%  *                                                                         *
+%  ***************************************************************************/
+
+\documentclass{article}
+
+\begin{document}
+234$ \sqrt{2}$  $a^2$
+
+abc
+
+$  \$      % \( % \[ $$$$
+\begin{array}{ccc}
+x^2 & y^2 & z^2
+\end{array}
+$
+
+\begin{equation}
+% \begin{equation} $
+  a^2 \\\\\$
+ \begin{array}{ccc}
+  \alpha & \beta & \gamma
+ \end{array}
+\end{equation}
+
+$\begin{array}{ccc}
+a^2 & b^2 & c^2
+\end{array}$
+
+\[
+ a^2
+\] \$ $ x^2$
+
+\( 
+ b^2 % $ test $
+\)
+
+\begin{displaymath} % works
+	\alpha + \beta + \gamma = 180° %  comment
+\begin{split}
+	
+\end{split}
+
+\end{displaymath}
+
+\begin{math} % does not work yet
+	\alpha + \beta + \gamma = 180° %  comment
+\end{math}
+
+\begin{eqnarray} % should not work
+	\alpha + \beta + \gamma = 180° %  comment
+\end{eqnarray}
+
+\ensuremath{}
+
+\begin{mathtest} % has to be defined in configure-kile-commands to work
+	asdasdasd
+\end{mathtest}
+
+\end{document}

src/kile/internal-testing/syntax-comment-updateStruct.tex

@@ -146,7 +146,7 @@ test
 \ensuremath{a^2 + b^2 = c^2}
 \section{ERROR}
 }
-\newcommand{\bloehhhhhhhh}[3][]{} % is also valid latex ...
+\newcommand{\bloehhhhhhhh}[3][]{\hallo} % is also valid latex ...
 
 \providecommand{\bloehhhhhhhhh}{test} % not yet supported
 

src/kile/internal-testing/syntax-math2.tex

@@ -51,3 +51,57 @@ $$50 \$abc\text{qwe}\alpha$$xyz      \par
 
 $50\%\mbox{abc\textbf{def}}$xyz             \par
 
+\begin{align}
+	a &=b \\
+	c & b
+	\text{asd}
+\end{align}
+
+\begin{align*} 
+	a &=b \\
+	c & b
+	\text{asd}
+\end{align*}
+
+\begin{alignat}{3}
+	a &= b \\
+	c & b
+	\text{asd}
+\end{alignat}
+
+\begin{alignat*}{3}
+	a &= b \\
+	c & b
+	\text{asd}
+\end{alignat*}
+
+\begin{alignat}{3}
+	a &= b \\
+	c & b
+	\text{asd}
+\end{alignat}
+
+\begin{xalignat}{3}
+	a &= b \\
+	c & b
+	\text{asd}
+\end{xalignat}
+
+\begin{xalignat*}{3}
+	a &= b \\
+	c & b
+	\text{asd}
+\end{xalignat*}
+
+\begin{xalignat}{3}
+	a &= b \\
+	c & b
+	\text{asd}
+\end{xalignat}
+
+\begin{xxalignat*}{3}
+	a &= b \\
+	c & b
+	\text{asd}
+\end{xxalignat*}
+

src/kile/kile.cpp

@@ -498,9 +498,6 @@ void Kile::setupActions()
 	connect(docManager(), TQT_SIGNAL(addToRecentFiles(const KURL& )), m_actRecentFiles, TQT_SLOT(addURL(const KURL& )));
 	m_actRecentFiles->loadEntries(m_config, "Recent Files");
 
-	(void) KStdAction::save(docManager(), TQT_SLOT(fileSave()), actionCollection(),"kile_file_save" );
-	(void) KStdAction::saveAs(docManager(), TQT_SLOT(fileSaveAs()), actionCollection(),"kile_file_save_as" );
-
 	(void) new TDEAction(i18n("Save All"),"save_all", 0, docManager(), TQT_SLOT(fileSaveAll()), actionCollection(),"file_save_all");
 	(void) new TDEAction(i18n("Save Copy As..."),"save_copy_as", 0, docManager(), TQT_SLOT(fileSaveCopyAs()), actionCollection(),"file_save_copy_as");
 	(void) new TDEAction(i18n("Create Template From Document..."), 0, docManager(), TQT_SLOT(createTemplate()), actionCollection(),"template_create");

src/kile/kiledocmanager.cpp

@@ -942,10 +942,26 @@ void Manager::fileSaveAs(Kate::View* view)
 		}
 		break;
 	}
-	doc->setEncoding(result.encoding);
+	if(doc->encoding().lower() != result.encoding.lower()) {
-	if(!doc->saveAs(saveURL))
+		// save the document twice if the user has selected a different encoding;
-	{
+		// this works around a bug in KatePart in the 'setEncoding' method, which 
-		return;
+		// enforces a reload on every change of the encoding, and as a consequence the
+		// user sees a document-modified dialog
+		if(!doc->saveAs(saveURL))
+		{
+			return;
+		}
+		doc->setEncoding(result.encoding);
+		if(!doc->save())
+		{
+			return;
+		}
+	}
+	else {
+		if(!doc->saveAs(saveURL))
+		{
+			return;
+		}
 	}
 	if(oldURL != saveURL)
 	{

src/kile/kiledocumentinfo.cpp

@@ -480,7 +480,23 @@ const long* TextInfo::getStatistics()
 	/* [0] = #c in words, [1] = #c in latex commands and environments,
 	   [2] = #c whitespace, [3] = #words, [4] = # latex_commands, [5] = latex_environments */
 	m_arStatistics[0]=m_arStatistics[1]=m_arStatistics[2]=m_arStatistics[3]=m_arStatistics[4]=m_arStatistics[5]=0;
+	TQString line;
 
+	if ( m_doc && m_doc->hasSelection() )
+	{
+		line = m_doc->selection();
+		KILE_DEBUG() << "getStat : line : " << line << endl;
+		count(line, m_arStatistics);
+	}
+	else if (m_doc)
+	{
+		for (uint l=0; l < m_doc->numLines(); ++l)
+		{
+			line = m_doc->textLine(l);
+			KILE_DEBUG() << "getStat : line : " << line << endl;
+			count(line, m_arStatistics);
+		}
+	}
 	return m_arStatistics;
 }
 
@@ -692,29 +708,6 @@ LaTeXInfo::~LaTeXInfo()
 {
 }
 
-const long* LaTeXInfo::getStatistics()
-{
-	/* [0] = #c in words, [1] = #c in latex commands and environments,
-	   [2] = #c whitespace, [3] = #words, [4] = # latex_commands, [5] = latex_environments */
-	m_arStatistics[0]=m_arStatistics[1]=m_arStatistics[2]=m_arStatistics[3]=m_arStatistics[4]=m_arStatistics[5]=0;
-	TQString line;
-
-	if ( m_doc && m_doc->hasSelection() )
-	{
-		line = m_doc->selection();
-		KILE_DEBUG() << "getStat : line : " << line << endl;
-		count(line, m_arStatistics);
-	}
-	else if (m_doc)
-	for (uint l=0; l < m_doc->numLines(); ++l)
-	{
-		line = m_doc->textLine(l);
-		KILE_DEBUG() << "getStat : line : " << line << endl;
-		count(line, m_arStatistics);
-	}
-	return m_arStatistics;
-}
-
 Type LaTeXInfo::getType()
 {
 	return LaTeX;

src/kile/kiledocumentinfo.h

@@ -323,8 +323,6 @@ public:
 	LaTeXInfo(Kate::Document *doc, Extensions *extensions, LatexCommands *commands, const TQObject* eventFilter);
 	virtual ~LaTeXInfo();
 
-	const long* getStatistics();
-
 	virtual Type getType();
 
 	virtual TQString getFileFilter() const;

src/kile/kileedit.cpp

@@ -935,8 +935,17 @@ void EditorExtension::insertIntelligentNewline(Kate::View *view)
 	{
 		if ( m_latexCommands->isListEnv(name) )
 		{
+			
 			view->keyReturn();
-			view->insertText("\\item " );
+			
+			if ( name == "description" )
+			{
+				view->insertText("\\item[]");
+				view->cursorLeft();
+			}
+			else
+				view->insertText("\\item ");
+			
 			return;
 		}
 		else if ( m_latexCommands->isTabularEnv(name) || m_latexCommands->isMathEnv(name) )
@@ -2331,8 +2340,6 @@ bool EditorExtension::insertDoubleQuotes()
 	Kate::View *view = determineView(0L);
 	if ( !view ) return true;
 	
-	uint row,col;
-	view->cursorPositionReal(&row,&col);
 	Kate::Document *doc = view->getDoc();
 
 	if( doc && m_ki->extensions()->isTexFile(doc->url()) )
@@ -2340,6 +2347,9 @@ bool EditorExtension::insertDoubleQuotes()
 	else
 		return false;
 	
+	uint row,col;
+	view->cursorPositionReal(&row,&col);
+
 	// simply insert, if we are inside a verb command
 	if ( insideVerb(view) || insideVerbatim(view) )
 		return false;

src/kile/kilegrepdialog.cpp

@@ -632,10 +632,7 @@ TQString KileGrepDialog::buildFilesCommand()
 	else
 		files_temp = filter_combo->currentText();
 	
-	if (files_temp.right(1) != ",")
+	TQStringList tokens = TQStringList::split ( " ", files_temp, false );
-		files_temp = files_temp + ',';
-
-	TQStringList tokens = TQStringList::split ( ",", files_temp, false );
 	TQStringList::Iterator it = tokens.begin();
 	if (it != tokens.end())
 	{

src/kile/kilelogwidget.cpp

@@ -18,6 +18,7 @@
 #include <tqregexp.h>
 #include <tqfileinfo.h>
 #include <tqpopupmenu.h>
+#include <tqstylesheet.h>
 
 #include "kiledebug.h"
 #include <kurl.h>
@@ -136,7 +137,7 @@ namespace KileWidget
 		if ( type == KileTool::Error ) emit showingErrorMessage(this);
 
 		TQString ot = "", ct = "</font>";
-
+		TQString myMsg = TQStyleSheet::escape(message);
 		switch (type)
 		{
 			case KileTool::Warning :
@@ -157,9 +158,9 @@ namespace KileWidget
 		}
 
 		if (tool.isNull())
-			append(ot + message + ct);
+			append(ot + myMsg + ct);
 		else
-			append(ot + "<b>[" + tool + "]</b> " + message + ct );
+			append(ot + "<b>[" + tool + "]</b> " + myMsg + ct );
 
 		scrollToBottom();
 	}

src/kile/kileproject.cpp

@@ -487,6 +487,7 @@ bool KileProject::save()
 		m_config->writeEntry("options", makeIndexOptions() );
 	}
 
+	KILE_DEBUG() << "Check if the config file is writeable: " << m_config->checkConfigFilesWritable(false) << endl;
 	m_config->sync();
 
 	// dump();

src/kile/kilestructurewidget.cpp

@@ -697,27 +697,28 @@ namespace KileWidget
 				else
 					emit(fileOpen(url, TQString()));
 			}
-			else if( item->type() == KileStruct::Bibliography ){
+			else{
-				fname = m_ki->checkOtherPaths(fi.dirPath(),fi.fileName(),KileInfo::bibinputs);
+				TQString otherFilename;
-				fi.setFile(fname);
+
-				url.setPath(fname);
+				if( item->type() == KileStruct::Bibliography ){
-				if(fi.isReadable()){
+					otherFilename = m_ki->checkOtherPaths(fi.dirPath(),fi.fileName(),KileInfo::bibinputs);
-					emit(fileOpen(url, TQString()));
 				}
-			}
+				else if( item->type() == KileStruct::Input ){
-			else if( item->type() == KileStruct::Input ){
+					otherFilename = m_ki->checkOtherPaths(fi.dirPath(),fi.fileName(),KileInfo::texinputs);
-				fname = m_ki->checkOtherPaths(fi.dirPath(),fi.fileName(),KileInfo::texinputs);
+				}
-				fi.setFile(fname);
+
-				url.setPath(fname);
+				fi.setFile(otherFilename);
+
 				if(fi.isReadable()){
+					url.setPath(otherFilename);
 					emit(fileOpen(url, TQString()));
 				}
-			}
+				else{
-			else{
+					if ( KMessageBox::warningYesNo(this, i18n("Cannot find the included file. The file does not exist, is not readable or Kile is unable to determine the correct path to it. The filename causing this error was: %1.\nDo you want to create this file?").arg(fname), i18n("Cannot Find File"))
-				if ( KMessageBox::warningYesNo(this, i18n("Cannot find the included file. The file does not exist, is not readable or Kile is unable to determine the correct path to it. The filename causing this error was: %1.\nDo you want to create this file?").arg(fname), i18n("Cannot Find File"))
+				== KMessageBox::Yes) {
-			== KMessageBox::Yes)
+						url.setPath(fname);
-				{
+						emit(fileNew(url));
-					emit(fileNew(url));
+					}
 				}
 			}
 		}

src/kile/kiletool.h

@@ -133,11 +133,22 @@ namespace KileTool
 
 		/**
 		 * @returns the dictionary that translates the following keys
-		 * %dir_base : the directory of the root file
+		Example docu:
-		 * %dir_target : same as %dir_base, except when the relativeDir has been set explicitly, then %dir_target= %dir_base/relativedir
+		Consider a file which is called myBestBook.tex which resides in /home/thomas/latex and you compile it with pdflatex to myBestBook.pdf.
-		 * %source : the source file (no path)
+
-		 * %S : the source filename without an extension (no path)
+		The variables have the following meanings:
-		 **/
+		%source ->  filename with suffix but without path <-> myBestBook.tex
+		%S ->  filename without suffix but without path <-> myBestBook
+		%dir_base  -> path of the source file without filename  <-> /home/thomas/latex
+		%dir_target -> path of the target file without filename, same as %dir_base if no relative path has been set <-> /home/thomas/latex
+		%target -> target filename without path <-> without filename 
+
+		And these are special variables
+		%res <-> resolution of the quickpreview action set in configure kile->tools->preview
+
+		%AFL <-> List of all files in a project marked for archiving. You can set the archive flag in the "Files and projects" sidebar using the context menu.
+
+		*/
 		TQDict<TQString>* paramDict() { return &m_dictParams; }
 
 		bool addDict(const TQString & key, const TQString & value);

src/kile/kileversion.h

@@ -20,7 +20,7 @@
 #include <tqstring.h>
 
 const TQString kileVersion="2.0";
-const TQString kileFullVersion="2.0.1";
+const TQString kileFullVersion="2.0.3";
 const TQString kilePrVersion="2";
 
 /**

src/kile/latexoutputfilter.cpp

@@ -191,21 +191,21 @@ void LatexOutputFilter::updateFileStackHeuristic(const TQString &strLine, short
 		//	2) We're at the end of the line, the filename is probably continued on the next line.
 		//	3) The TeX was closed already, signalled by the ')'.
 
-        	if(expectFileName && (i+1 >= strLine.length() || strLine[i+1].isSpace() || strLine[i+1] == ')')) {
+        	if(expectFileName && (i+1 == strLine.length() || strLine[i+1].isSpace() || strLine[i+1] == ')')) {
 			//update the partial filename
 			strPartialFileName =  strPartialFileName + strLine.mid(index, i-index + 1);
 
 			//FIXME: improve these heuristics
-			if (i+1 < strLine.length() && (strLine[i+1].isSpace() || ( (i < 78) && (i+1  == strLine.length())) ||
+			if (strLine[i+1].isSpace() || ( (i < 78) && (i+1  == strLine.length())) ||
 				                       strLine[i+1] == ')' ||
-				                       fileExists(strPartialFileName))) {
+				                       fileExists(strPartialFileName)) {
 				m_stackFile.push(LOFStackItem(strPartialFileName));
 				// KILE_DEBUG() << "\tpushed (i = " << i << " length = " << strLine.length() << "): " << strPartialFileName << endl;
 				expectFileName = false;
 				dwCookie = Start;
 			}
 			//Guess the filename is continued on the next line.
-			else if(i+1 >= strLine.length()) {
+			else if(i+1 == strLine.length()) {
 				// KILE_DEBUG() << "\tFilename spans more than one line." << endl;
 				dwCookie = FileNameHeuristic;
 			}
@@ -284,7 +284,7 @@ bool LatexOutputFilter::detectError(const TQString & strLine, short &dwCookie)
 
 	static TQRegExp reLaTeXError("^! LaTeX Error: (.*)$", false);
 	static TQRegExp rePDFLaTeXError("^Error: pdflatex (.*)$", false);
-	static TQRegExp reTeXError("^! (.*)");
+	static TQRegExp reTeXError("^! (.*)\\.$");
 	static TQRegExp reLineNumber("^l\\.([0-9]+)(.*)");
 
 	switch (dwCookie)
@@ -370,7 +370,7 @@ bool LatexOutputFilter::detectWarning(const TQString & strLine, short &dwCookie)
 	bool found = false, flush = false;
 	TQString warning;
 
-	static TQRegExp reLaTeXWarning("^(((! )?(La|pdf)TeX)|Package) .*Warning.*:(.*)", false);
+	static TQRegExp reLaTeXWarning("^(((! )?(La|pdf)TeX)|Package|Class) .*Warning.*:(.*)", false);
 	static TQRegExp reNoFile("No file (.*)");
 	static TQRegExp reNoAsyFile("File .* does not exist."); // FIXME can be removed when http://sourceforge.net/tracker/index.php?func=detail&aid=1772022&group_id=120000&atid=685683 has promoted to the users
 

src/kile/symbols/special.tex

@@ -46,11 +46,11 @@
 \command{\u{c}}
 \command{\c{c}} \par
 \command{\v{D}}
-\pkgs[T1]{fontenc} \command{\DJ}
+\pkgs[T1]{fontenc} \command{\DJ{}}
-\pkgs[T1]{fontenc} \command{\DH}
+\pkgs[T1]{fontenc} \command{\DH{}}
 \command{\v{d}}
-\pkgs[T1]{fontenc} \command{\dj}
+\pkgs[T1]{fontenc} \command{\dj{}}
-\pkgs[T1]{fontenc} \command{\dh} \par
+\pkgs[T1]{fontenc} \command{\dh{}} \par
 \command{\"{E}}
 \command{\H{E}}
 \command{\.{E}}
@@ -97,24 +97,24 @@
 \command{\'{L}}
 \command{\u{L}}
 \command{\v{L}}
-\command{\L}
+\command{\L{}}
 \command{\c{l}}
 \command{\'{l}}
 \command{\u{l}}
 \command{\v{l}}
-\command{\l} \par
+\command{\l{}} \par
 \command{\c{N}}
 \command{\'{N}}
 \command{\~{N}}
 \command{\v{N}}
 \command{\u{N}}
-\pkgs[T1]{fontenc} \command{\NG}
+\pkgs[T1]{fontenc} \command{\NG{}}
 \command{\c{n}}
 \command{\'{n}}
 \command{\~{n}}
 \command{\v{n}}
 \command{\u{n}}
-\pkgs[T1]{fontenc} \command{\ng} \par
+\pkgs[T1]{fontenc} \command{\ng{}} \par
 \command{\"{O}}
 \command{\H{O}}
 \command{\'{O}}
@@ -125,7 +125,7 @@
 \command{\u{O}}
 \command{\={O}}
 \command{\O{}}
-\command{\OE}
+\command{\OE{}}
 \pkgs[T1]{fontenc} \command{\k{O}}
 \command{\"{o}}
 \command{\H{o}}
@@ -137,10 +137,10 @@
 \command{\u{o}}
 \command{\={o}}
 \command{\o{}}
-\command{\oe}
+\command{\oe{}}
 \pkgs[T1]{fontenc} \command{\k{o}} \par
-\pkgs[T1]{fontenc} \command{\TH}
+\pkgs[T1]{fontenc} \command{\TH{}}
-\pkgs[T1]{fontenc} \command{\th} \par
+\pkgs[T1]{fontenc} \command{\th{}} \par
 \command{\c{R}}
 \command{\'{R}}
 \command{\v{R}}
@@ -155,7 +155,8 @@
 \pkgs[latin10]{inputenc} \command{\textcommabelow{s}}
 \command{\'{s}}
 \command{\v{s}}
-\command{\ss} \par
+\command{\ss{}}
+\command{\SS{}} \par
 \command{\c{T}}
 \pkgs[latin10]{inputenc} \command{\textcommabelow{T}}
 \command{\v{T}}

src/kile/symbols/special/CMakeLists.txt

@@ -179,6 +179,7 @@ SET( symbols
 	img175special.png
 	img176special.png
 	img177special.png
+	img178special.png
 )
 
 INSTALL( FILES ${symbols} DESTINATION share/apps/kile/mathsymbols/special )

src/kile/symbols/special/Makefile.am

@@ -176,4 +176,5 @@ pics_DATA = img001special.png \
 	img174special.png \
 	img175special.png \
 	img176special.png \
-	img177special.png
+	img177special.png \
+	img178special.png

src/kile/symbolview.cpp

@@ -287,9 +287,11 @@ void SymbolView::fillWidget(const TQString& prefix)
 		{
 //   			KILE_DEBUG() << "path is " << paths[i] << endl;
 			item = new TDEIconViewItem(this);
-			item->setPixmap(image);
 			item->setKey( refCnts[i] + '%' + image.text("Command") + '%' + image.text("Packages") + '%' + paths[i] );
-			image = KImageEffect::blend(colorGroup().text(), image, 1); // destroys our png comments, so we do it after reading the comments
+			if( prefix != "user" ){
+				image = KImageEffect::blend(colorGroup().text(), image, 1); // destroys our png comments, so we do it after reading the comments
+			}
+			item->setPixmap(image);
 		}
 		else
 			KILE_DEBUG() << "Loading file " << paths[i] << " failed" << endl;

src/kile/syntax/latex.xml

@@ -1,13 +1,13 @@
 <?xml version="1.01" encoding="UTF-8"?>
 <!DOCTYPE language SYSTEM "language.dtd">
-<language name="LaTeX" version="1.28" section="Markup" kateversion="2.3" extensions="*.tex; *.ltx; *.dtx; *.sty; *.cls;" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout@kdemail.net)+Holger Danielsson (holger.danielsson@versanet.de)+Michel Ludwig (michel.ludwig@kdemail.net)+Thomas Braun (braun@physik.fu-berlin.de)" license="LGPL" >
+<language name="LaTeX" version="1.29" section="Markup" kateversion="2.3" extensions="*.tex; *.ltx; *.dtx; *.sty; *.cls;" mimetype="text/x-tex" casesensitive="1" author="Jeroen Wijnhout (Jeroen.Wijnhout@kdemail.net)+Holger Danielsson (holger.danielsson@versanet.de)+Michel Ludwig (michel.ludwig@kdemail.net)+Thomas Braun (braun@physik.fu-berlin.de)" license="LGPL" >
   <highlighting>
     <contexts>
       <!-- Normal text -->
       <context name="Normal Text" attribute="Normal Text" lineEndContext="#stay">
         <RegExpr String="\\begin(?=[^a-zA-Z])" attribute="Structure" context="FindEnvironment" beginRegion="block" />
         <RegExpr String="\\end(?=[^a-zA-Z])" attribute="Structure" context="FindEnvironment" endRegion="block" />
-        <RegExpr String="\\(label|pageref|ref|vpageref|vref|cite)(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
+        <RegExpr String="\\(label|pageref|autoref|ref|vpageref|vref|cite)(?=[^a-zA-Z])" attribute="Structure" context="Label"/>
         <RegExpr String="\\(part|chapter|section|subsection|subsubsection|paragraph|subparagraph)\*?\s*(?=[\{\[])" attribute="Structure" context="Sectioning"/>
         <RegExpr String="\\(footnote)\*?\s*(?=[\{\[])" attribute="Footnote" context="Footnoting"/>
         <RegExpr String="\\(re)?newcommand(?=[^a-zA-Z])" attribute="Keyword" context="NewCommand"/>
@@ -105,7 +105,7 @@
 
       <!-- LaTeX commands \newcommand and \renewcommand -->
       <context name="NewCommand" attribute="Normal Text" lineEndContext="#stay" fallthrough="true" fallthroughContext="#pop">
-        <RegExpr String="\s*\{\s*\\[a-zA-Z]+\s*\}(\[\d\](\[[^\]]+\])?)?\{" attribute="Normal Text" context="CommandParameterStart"/>
+        <RegExpr String="\s*\{\s*\\[a-zA-Z]+\s*\}(\[\d\](\[[^\]]*\])?)?\{" attribute="Normal Text" context="CommandParameterStart"/>
         <DetectChar char="}" attribute="Error" context="#pop"/>
       </context>
 
@@ -181,8 +181,8 @@
       <context name="Environment" attribute="Environment" lineEndContext="#stay">
         <RegExpr String="(lstlisting|(B|L)?Verbatim)" attribute="Environment" context="VerbatimEnvParam"/>
         <RegExpr String="(verbatim|boxedverbatim)" attribute="Environment" context="VerbatimEnv"/>
-        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign)" attribute="Environment" context="MathEnv"/>
         <RegExpr String="(alignat|xalignat|xxalignat)" attribute="Environment" context="MathEnvParam"/>
+        <RegExpr String="(equation|displaymath|eqnarray|subeqnarray|math|multline|gather|align|flalign)" attribute="Environment" context="MathEnv"/>
         <RegExpr String="(tabular|supertabular|mpsupertabular|xtabular|mpxtabular|longtable)" attribute="Environment" context="TabEnv"/>
         <DetectChar char="&#xd7;" attribute="Bullet" context="#stay"/>
         <RegExpr String="[a-zA-Z]" attribute="Environment" context="LatexEnv"/>

src/kile/test/runTests.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 echo "Kile System Check script..."
 
 outfile=$1