[Docutils-checkins] SF.net SVN: docutils:[7492] trunk/docutils

[<mi...@us...>]

Revision: 7492
          http://docutils.svn.sourceforge.net/docutils/?rev=7492&view=rev
Author:   milde
Date:     2012-08-14 08:47:23 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Apply [ 3555160 ] ensure order of "otherlanguages".

Modified Paths:
--------------
    trunk/docutils/HISTORY.txt
    trunk/docutils/docutils/writers/latex2e/__init__.py
    trunk/docutils/docutils/writers/xetex/__init__.py
    trunk/docutils/test/functional/expected/standalone_rst_xetex.tex

Modified: trunk/docutils/HISTORY.txt
===================================================================
--- trunk/docutils/HISTORY.txt	2012-08-13 23:30:52 UTC (rev 7491)
+++ trunk/docutils/HISTORY.txt	2012-08-14 08:47:23 UTC (rev 7492)
@@ -30,14 +30,18 @@
 
 * docutils/parsers/rst/directives/misc.py
 
-  - Fix [ 3546533 ] unicode error with date directive.
+  - Fix [ 3546533 ] Unicode error with `date` directive.
 
 * docutils/writers/manpage.py
 
-  - Apply [3527401] addmonition's don't preserve indentation
-  - Apply [3527397] Add indentation to literal blocks in manpage writer.
+  - Apply [ 3527401 ] addmonition's don't preserve indentation
+  - Apply [ 3527397 ] Add indentation to literal blocks in manpage writer.
 
+* docutils/writers/latex2e/__init__.py, docutils/writers/xetex/__init__.py
 
+  - Apply [ 3555160 ] ensure order of "otherlanguages".
+
+
 Release 0.9.1 (2012-06-17)
 ==========================
 

Modified: trunk/docutils/docutils/writers/latex2e/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/latex2e/__init__.py	2012-08-13 23:30:52 UTC (rev 7491)
+++ trunk/docutils/docutils/writers/latex2e/__init__.py	2012-08-14 08:47:23 UTC (rev 7492)
@@ -379,7 +379,7 @@
 
     def __call__(self):
         """Return the babel call with correct options and settings"""
-        languages = self.otherlanguages.keys()
+        languages = sorted(self.otherlanguages.keys())
         languages.append(self.language or 'english')
         self.setup = [r'\usepackage[%s]{babel}' % ','.join(languages)]
         if 'spanish' in languages:

Modified: trunk/docutils/docutils/writers/xetex/__init__.py
===================================================================
--- trunk/docutils/docutils/writers/xetex/__init__.py	2012-08-13 23:30:52 UTC (rev 7491)
+++ trunk/docutils/docutils/writers/xetex/__init__.py	2012-08-14 08:47:23 UTC (rev 7492)
@@ -118,7 +118,7 @@
                  r'\setdefaultlanguage{%s}' % self.language]
         if self.otherlanguages:
             setup.append(r'\setotherlanguages{%s}' %
-                         ','.join(self.otherlanguages.keys()))
+                         ','.join(sorted(self.otherlanguages.keys())))
         return '\n'.join(setup)
 
 

Modified: trunk/docutils/test/functional/expected/standalone_rst_xetex.tex
===================================================================
--- trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2012-08-13 23:30:52 UTC (rev 7491)
+++ trunk/docutils/test/functional/expected/standalone_rst_xetex.tex	2012-08-14 08:47:23 UTC (rev 7492)
@@ -7,7 +7,7 @@
 \usepackage{amsmath}
 \usepackage{polyglossia}
 \setdefaultlanguage{english}
-\setotherlanguages{german,british,french}
+\setotherlanguages{british,french,german}
 \usepackage{color}
 \usepackage{float} % float configuration
 \floatplacement{figure}{H} % place figures here definitely

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.