diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2012-11-30 12:30:40 +0100 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2012-11-30 12:30:40 +0100 |
| commit | d14415e37072dbe16077efd700aee5bd33707b54 (patch) | |
| tree | 062c3c190039ac9490f56598b0ee116de18c2480 /inc/geshi/latex.php | |
| parent | 2ed38036a53a489d2fcadc46ce601f8c876fca31 (diff) | |
| parent | 38479cbba628ee76a92ff5f3c974cfa8e6ce9e61 (diff) | |
| download | rpg-d14415e37072dbe16077efd700aee5bd33707b54.tar.gz rpg-d14415e37072dbe16077efd700aee5bd33707b54.tar.bz2 | |
Merge branch 'master' into subscription
* master: (175 commits)
some coding style improvements
added .idea project folder to gitignore
use correct setUp method and parent calls.
Correct German plugin manager translation (download != install)
correct return in sendDigest()
Fix case-insensitive match in ACL checking
GeSHi update to 1.0.8.11
ignore empty header on mail sending
remove empty BCC/CC mail headers
Galician language update
some welcome page changes
Combine subsequent calls to strtr into a single transformation
changed semicolon to colon in link to welcome page to make it less confusing
fixed wrong sidebar showing in namespaces when sidebar is disabled
Typo fix for TL;DR
removed a bunch of outdated and irrelevant networking acronyms
added another place to look for logo to make it more consistent (FS#2656)
French language update
Czech language update
compat js findPosX/y more closely mimic historical function
...
Conflicts:
inc/auth.php
inc/common.php
inc/subscription.php
lib/exe/indexer.php
Diffstat (limited to 'inc/geshi/latex.php')
| -rw-r--r-- | inc/geshi/latex.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/inc/geshi/latex.php b/inc/geshi/latex.php index 91c034236..386a0b989 100644 --- a/inc/geshi/latex.php +++ b/inc/geshi/latex.php @@ -4,7 +4,7 @@ * ----- * Author: efi, Matthias Pospiech (matthias@pospiech.eu) * Copyright: (c) 2006 efi, Matthias Pospiech (matthias@pospiech.eu), Nigel McNie (http://qbnz.com/highlighter) - * Release Version: 1.0.8.10 + * Release Version: 1.0.8.11 * Date Started: 2006/09/23 * * LaTeX language file for GeSHi. @@ -67,7 +67,7 @@ $language_data = array ( 'colorbox','date','dedication','def','definecolor','documentclass', 'edef','else','email','emph','eqref','extratitle','fbox','fi', 'flushleft','flushright','footnote','frac','frontmatter', - 'graphicspath','hfill','hline','hspace','huge','ifx','include', + 'graphicspath','hfil','hfill','hfilll','hline','hspace','huge','ifx','include', 'includegraphics','infty','input','int','item','itemsep', 'KOMAoption','KOMAoptions','label','LaTeX','left','let','limits', 'listfiles','listoffigures','listoftables','lowertitleback', @@ -81,7 +81,7 @@ $language_data = array ( 'table','tableofcontents','textbf','textcolor','textit', 'textnormal','textsuperscript','texttt','textwidth','thanks','title', 'titlehead','today','ttfamily','uppertitleback','urlstyle', - 'usepackage','vspace' + 'usepackage','vfil','vfill','vfilll','vspace' ) ), 'SYMBOLS' => array( |