Takayuki Shimizukawa avatar Takayuki Shimizukawa committed 2f5ccd5 Merge

Merged in r_rudi/sphinx (pull request #122)

move "copy additional files" after "copying TeX support files" in latex builder.

Comments (0)

Files changed (2)

 
    .. versionadded:: 0.6
 
+   .. versionchanged:: 1.2
+      This overrides the files which is provided from Sphinx such as sphinx.sty.
+
 .. confval:: latex_preamble
 
    Additional LaTeX markup for the preamble.

sphinx/builders/latex.py

                          path.join(self.outdir, dest))
             self.info()
 
+        # copy TeX support files from texinputs
+        self.info(bold('copying TeX support files...'))
+        staticdirname = path.join(package_dir, 'texinputs')
+        for filename in os.listdir(staticdirname):
+            if not filename.startswith('.'):
+                copyfile(path.join(staticdirname, filename),
+                         path.join(self.outdir, filename))
+
         # copy additional files
         if self.config.latex_additional_files:
             self.info(bold('copying additional files...'), nonl=1)
             logobase = path.basename(self.config.latex_logo)
             copyfile(path.join(self.confdir, self.config.latex_logo),
                      path.join(self.outdir, logobase))
-
-        self.info(bold('copying TeX support files... '), nonl=True)
-        staticdirname = path.join(package_dir, 'texinputs')
-        for filename in os.listdir(staticdirname):
-            if not filename.startswith('.'):
-                copyfile(path.join(staticdirname, filename),
-                         path.join(self.outdir, filename))
         self.info('done')
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.