Minor test fixes.

Remove workaround for legacy versions of the "hyperref"
LaTeX package.

Remove spurious import.

git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@8830 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

2 files changed, 14 insertions, 28 deletions

diff --git a/docutils/test/functional/expected/cyrillic.tex b/docutils/test/functional/expected/cyrillic.tex
index e01cb50f4..79e816882 100644
--- a/docutils/test/functional/expected/cyrillic.tex
+++ b/docutils/test/functional/expected/cyrillic.tex
@@ -18,12 +18,9 @@
 
 %%% Fallback definitions for Docutils-specific commands
 
-% titlereference standard role
-\providecommand*{\DUroletitlereference}[1]{\textsl{#1}}
-
 % hyperlinks:
 \ifthenelse{\isundefined{\hypersetup}}{
-  \usepackage[colorlinks=true,linkcolor=blue,urlcolor=blue,unicode=true]{hyperref}
+  \usepackage[colorlinks=true,linkcolor=blue,urlcolor=blue]{hyperref}
   \usepackage{bookmark}
   \urlstyle{same} % normal text font (alternatives: tt, rm, sf)
 }{}
@@ -49,18 +46,14 @@
 \foreignlanguage{english}{first example: “Hello world”.}
 
 
-\section{Notes%
-  \label{notes}%
+\section{Примечания%
+  \label{section-2}%
 }
 
-\foreignlanguage{english}{This example tests rendering of Latin and Cyrillic characters by the LaTeX
-and XeTeX writers. Check the compiled PDF for garbage characters in text and
-bookmarks.}
+Этот документ испытивает изображение LaTeXом кириллических букв.
 
-\foreignlanguage{english}{To work around a problem with Cyrillic in PDF-bookmarks in \DUroletitlereference{hyperref}
-versions older than v6.79g 2009/11/20, the test caller \texttt{latex\_cyrillic.py}
-sets \texttt{hyperref\_options} to \texttt{'unicode=true'} while \texttt{xetex\_cyrillic.py}
-sets it to \texttt{'unicode=false'}. The recommended option for current
-(2011-08-24) hyperref versions is \texttt{'pdfencoding=auto'}.}
+\foreignlanguage{english}{This document tests the rendering of Latin and Cyrillic characters by the
+LaTeX and XeTeX writers. Check the compiled PDF for garbage characters in
+text and bookmarks.}
 
 \end{document}
diff --git a/docutils/test/functional/expected/xetex-cyrillic.tex b/docutils/test/functional/expected/xetex-cyrillic.tex
index 764160cb9..55cf28859 100644
--- a/docutils/test/functional/expected/xetex-cyrillic.tex
+++ b/docutils/test/functional/expected/xetex-cyrillic.tex
@@ -23,12 +23,9 @@
 %%% User specified packages and stylesheets
 
 %%% Fallback definitions for Docutils-specific commands
-
-% titlereference standard role
-\providecommand*{\DUroletitlereference}[1]{\textsl{#1}}
 % hyperlinks:
 \ifthenelse{\isundefined{\hypersetup}}{
-  \usepackage[colorlinks=true,linkcolor=blue,urlcolor=blue,unicode=false]{hyperref}
+  \usepackage[colorlinks=true,linkcolor=blue,urlcolor=blue]{hyperref}
   \usepackage{bookmark}
   \urlstyle{same} % normal text font (alternatives: tt, rm, sf)
 }{}
@@ -55,18 +52,14 @@
 \foreignlanguage{english}{first example: “Hello world”.}
 
 
-\section{Notes%
-  \label{notes}%
+\section{Примечания%
+  \label{section-2}%
 }
 
-\foreignlanguage{english}{This example tests rendering of Latin and Cyrillic characters by the LaTeX
-and XeTeX writers. Check the compiled PDF for garbage characters in text and
-bookmarks.}
+Этот документ испытивает изображение LaTeXом кириллических букв.
 
-\foreignlanguage{english}{To work around a problem with Cyrillic in PDF-bookmarks in \DUroletitlereference{hyperref}
-versions older than v6.79g 2009/11/20, the test caller \texttt{latex\_cyrillic.py}
-sets \texttt{hyperref\_options} to \texttt{'unicode=true'} while \texttt{xetex\_cyrillic.py}
-sets it to \texttt{'unicode=false'}. The recommended option for current
-(2011-08-24) hyperref versions is \texttt{'pdfencoding=auto'}.}
+\foreignlanguage{english}{This document tests the rendering of Latin and Cyrillic characters by the
+LaTeX and XeTeX writers. Check the compiled PDF for garbage characters in
+text and bookmarks.}
 
 \end{document}