|
 |
8c059ce |
Index: setup.py
|
|
|
8c059ce |
===================================================================
|
|
|
8c059ce |
RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/setup.py,v
|
|
|
8c059ce |
retrieving revision 1.13
|
|
|
8c059ce |
diff -u -r1.13 setup.py
|
|
|
8c059ce |
--- setup.py 6 Nov 2007 22:28:57 -0000 1.13
|
|
|
8c059ce |
+++ setup.py 4 Jun 2008 22:35:50 -0000
|
|
|
8c059ce |
@@ -259,7 +259,7 @@
|
|
|
8c059ce |
used_stys.sort()
|
|
|
8c059ce |
|
|
|
8c059ce |
# Dirty...
|
|
|
8c059ce |
- for f in ("truncate", "elfonts", "CJKutf8", "pinyin"):
|
|
|
8c059ce |
+ for f in ("truncate", "elfonts", "CJKutf8", "pinyin", "ifxetex"):
|
|
|
8c059ce |
try:
|
|
|
8c059ce |
used_stys.remove(f)
|
|
|
8c059ce |
except:
|
|
|
8c059ce |
Index: latex/style/dbk_fonts.sty
|
|
|
8c059ce |
===================================================================
|
|
|
8c059ce |
RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/latex/style/dbk_fonts.sty,v
|
|
|
8c059ce |
retrieving revision 1.3
|
|
|
8c059ce |
diff -u -r1.3 dbk_fonts.sty
|
|
|
8c059ce |
--- latex/style/dbk_fonts.sty 18 Apr 2008 23:11:22 -0000 1.3
|
|
|
8c059ce |
+++ latex/style/dbk_fonts.sty 4 Jun 2008 22:50:36 -0000
|
|
|
8c059ce |
@@ -1,4 +1,4 @@
|
|
|
8c059ce |
-\usepackage{ifxetex}
|
|
|
8c059ce |
+
|
|
|
8c059ce |
\ifxetex
|
|
|
8c059ce |
% to have the \text macro
|
|
|
8c059ce |
\usepackage{amstext}
|
|
|
8c059ce |
Index: latex/style/docbook.sty
|
|
|
8c059ce |
===================================================================
|
|
|
8c059ce |
RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/latex/style/docbook.sty,v
|
|
|
8c059ce |
retrieving revision 1.23
|
|
|
8c059ce |
diff -u -r1.23 docbook.sty
|
|
|
8c059ce |
--- latex/style/docbook.sty 3 Sep 2007 18:47:53 -0000 1.23
|
|
|
8c059ce |
+++ latex/style/docbook.sty 31 May 2008 12:16:35 -0000
|
|
|
8c059ce |
@@ -8,12 +8,6 @@
|
|
|
8c059ce |
\DeclareOption{hyperlink}{ \def\DBKhyperlink{yes} }
|
|
|
8c059ce |
\DeclareOption{nohyperlink}{ \def\DBKhyperlink{no} }
|
|
|
8c059ce |
|
|
|
8c059ce |
-\ifx\undefined\chapter
|
|
|
8c059ce |
- \def\DBKisarticle{1}
|
|
|
8c059ce |
-\else
|
|
|
8c059ce |
- \def\DBKisarticle{0}
|
|
|
8c059ce |
-\fi
|
|
|
8c059ce |
-
|
|
|
8c059ce |
% Default values
|
|
|
8c059ce |
\ExecuteOptions{nohyperlink}
|
|
|
8c059ce |
|
|
|
8c059ce |
@@ -140,7 +134,7 @@
|
|
|
8c059ce |
%% Inclusion of float package after hyperref to have its definitions!
|
|
|
8c059ce |
\usepackage{float}
|
|
|
8c059ce |
|
|
|
8c059ce |
-\if1\DBKisarticle
|
|
|
8c059ce |
+\@ifundefined{chapter}{
|
|
|
8c059ce |
|
|
|
8c059ce |
\floatstyle{ruled}
|
|
|
8c059ce |
\newfloat{example}{htb}{loe}[section]
|
|
|
8c059ce |
@@ -153,8 +147,7 @@
|
|
|
8c059ce |
% Redefinition of tableofcontent, to have it in separate pages
|
|
|
8c059ce |
\let\stdtoc=\tableofcontents
|
|
|
8c059ce |
\def\tableofcontents{ \newpage \stdtoc{} \newpage}
|
|
|
8c059ce |
-
|
|
|
8c059ce |
-\else
|
|
|
8c059ce |
+}{
|
|
|
8c059ce |
|
|
|
8c059ce |
\floatstyle{ruled}
|
|
|
8c059ce |
\newfloat{example}{htb}{loe}[chapter]
|
|
|
8c059ce |
@@ -163,8 +156,8 @@
|
|
|
8c059ce |
\floatstyle{plain}
|
|
|
8c059ce |
\newfloat{dbequation}{htb}{loe}[chapter]
|
|
|
8c059ce |
\floatname{dbequation}{{\scshape Equation }}
|
|
|
8c059ce |
+}
|
|
|
8c059ce |
|
|
|
8c059ce |
-\fi
|
|
|
8c059ce |
% Sidebar is a boxed minipage that can contain verbatim
|
|
|
8c059ce |
\newenvironment{sidebar}[1][0.95\textwidth]{
|
|
|
8c059ce |
\hspace{0mm}\newline%
|
|
|
8c059ce |
Index: xsl/lang.xsl
|
|
|
8c059ce |
===================================================================
|
|
|
8c059ce |
RCS file: /usr/local/cvsroot/docbook/db2tex/dblatex/xsl/lang.xsl,v
|
|
|
8c059ce |
retrieving revision 1.6
|
|
|
8c059ce |
diff -u -r1.6 lang.xsl
|
|
|
8c059ce |
--- xsl/lang.xsl 18 Apr 2008 23:11:31 -0000 1.6
|
|
|
8c059ce |
+++ xsl/lang.xsl 4 Jun 2008 22:55:24 -0000
|
|
|
8c059ce |
@@ -192,7 +192,13 @@
|
|
|
8c059ce |
</xsl:variable>
|
|
|
8c059ce |
|
|
|
8c059ce |
|
|
|
8c059ce |
- <xsl:text>\usepackage{ifxetex}
</xsl:text>
|
|
|
8c059ce |
+ <xsl:text>\IfFileExists{ifxetex.sty}{%
|
|
|
8c059ce |
+ \usepackage{ifxetex}%
|
|
|
8c059ce |
+ }{%
|
|
|
8c059ce |
+ \newif\ifxetex
|
|
|
8c059ce |
+ \xetexfalse
|
|
|
8c059ce |
+ }
|
|
|
8c059ce |
+ </xsl:text>
|
|
|
8c059ce |
<xsl:text>\ifxetex
</xsl:text>
|
|
|
8c059ce |
<xsl:text>\usepackage{fontspec}
</xsl:text>
|
|
|
8c059ce |
<xsl:text>\usepackage{xltxtra}
</xsl:text>
|