Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a1cc9098192f106dc20f03647238ddaff6a13484)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a1cc9098192f106dc20f03647238ddaff6a13484)
  • Date: Sun, 16 Sep 2012 15:39:21 -0500

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

latex/texlive-texmf/HISTORY | 4 +
latex/texlive-texmf/PRE_BUILD | 6 ++
latex/texlive-texmf/dvipdfmx.cfg_whitespace | 17 ++++++++
latex/texlive-texmf/fix-natbib-add-spaces | 37
++++++++++++++++++
latex/texlive-texmf/upstream_updmap-ignoring-settings | 19 +++++++++
5 files changed, 82 insertions(+), 1 deletion(-)

New commits:
commit a1cc9098192f106dc20f03647238ddaff6a13484
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

latex/texlive-texmf: add bugfixes from debian

diff --git a/latex/texlive-texmf/HISTORY b/latex/texlive-texmf/HISTORY
index b0d1df4..c52eaf7 100644
--- a/latex/texlive-texmf/HISTORY
+++ b/latex/texlive-texmf/HISTORY
@@ -1,6 +1,10 @@
2012-09-16 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 20120701
* texmfcnf.lua_fix.patch: refreshed patch
+ * PRE_BUILD: apply bugfixes from debian
+ * dvipdfmx.cfg_whitespace: fix whitespace in config file
+ * fix-natbib-add-spaces: prevent natbib from adding spurious spaces
+ * upstream_updmap-ignoring-settings: prevent updmap.pl from ignoring
settings

2011-10-31 Sukneet Basuta <sukneet AT sourcemage.org>
* PRE_BUILD: patch texmfcnf.lua for proper luatex dirs
diff --git a/latex/texlive-texmf/PRE_BUILD b/latex/texlive-texmf/PRE_BUILD
index e7a2d70..40db8db 100755
--- a/latex/texlive-texmf/PRE_BUILD
+++ b/latex/texlive-texmf/PRE_BUILD
@@ -17,7 +17,11 @@ fi &&

cd ${SOURCE_DIRECTORY} &&
# patch texmfcnf.lua for luatex
-patch -p0 < ${SPELL_DIRECTORY}/texmfcnf.lua_fix.patch &&
+patch -p0 < ${SPELL_DIRECTORY}/texmfcnf.lua_fix.patch &&
+
+patch -p1 < ${SPELL_DIRECTORY}/upstream_updmap-ignoring-settings &&
+patch -p1 < ${SPELL_DIRECTORY}/fix-natbib-add-spaces &&
+patch -p1 < ${SPELL_DIRECTORY}/dvipdfmx.cfg_whitespace &&

# rm texmf.cnf so it doesn't overwrite patched version
rm ${SOURCE_DIRECTORY}/texmf/web2c/texmf.cnf
diff --git a/latex/texlive-texmf/dvipdfmx.cfg_whitespace
b/latex/texlive-texmf/dvipdfmx.cfg_whitespace
new file mode 100644
index 0000000..c876f8e
--- /dev/null
+++ b/latex/texlive-texmf/dvipdfmx.cfg_whitespace
@@ -0,0 +1,17 @@
+---
+ texmf/dvipdfmx/dvipdfmx.cfg | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: texlive-base-2011.20120216/texmf/dvipdfmx/dvipdfmx.cfg
+===================================================================
+--- texlive-base-2011.20120216.orig/texmf/dvipdfmx/dvipdfmx.cfg
2011-11-03 22:59:19.000000000 +0900
++++ texlive-base-2011.20120216/texmf/dvipdfmx/dvipdfmx.cfg 2012-02-16
23:59:31.849633176 +0900
+@@ -34,7 +34,7 @@
+ %% papersize-spec is 'paper-format' or length-pair, e.g., 'a4', 'letter',
+ %% '20cm,30cm'. Recognized unit is 'cm', 'mm', 'bp', 'pt', 'in'.
+
+-p a4
++p a4
+
+ %% Annotation Box Margin:
+ %%
diff --git a/latex/texlive-texmf/fix-natbib-add-spaces
b/latex/texlive-texmf/fix-natbib-add-spaces
new file mode 100644
index 0000000..64c5370
--- /dev/null
+++ b/latex/texlive-texmf/fix-natbib-add-spaces
@@ -0,0 +1,37 @@
+natbib \defcitealias adds spurious spaces, see bug #628044
+fix this by adding some %
+---
+ texmf-dist/source/latex/natbib/natbib.dtx | 4 ++--
+ texmf-dist/tex/latex/natbib/natbib.sty | 4 ++--
+ 2 files changed, 4 insertions(+), 4 deletions(-)
+
+Index: texlive-base-2012.20120611/texmf-dist/source/latex/natbib/natbib.dtx
+===================================================================
+---
texlive-base-2012.20120611.orig/texmf-dist/source/latex/natbib/natbib.dtx
2010-12-07 10:39:19.000000000 +0900
++++ texlive-base-2012.20120611/texmf-dist/source/latex/natbib/natbib.dtx
2012-06-25 10:57:23.330134667 +0900
+@@ -3992,8 +3992,8 @@
+ % indexing can be achieved.
+ % \begin{macrocode}
+ \newcommand\defcitealias[2]{%
+- \@ifundefined{al@#1\@extra@b@citeb}{}
+- {\PackageWarning{natbib}{Overwriting existing alias for citation #1}}
++ \@ifundefined{al@#1\@extra@b@citeb}{}%
++ {\PackageWarning{natbib}{Overwriting existing alias for citation #1}}%
+ \@namedef{al@#1\@extra@b@citeb}{#2}}
+ \DeclareRobustCommand\citetalias{\begingroup
+ \NAT@swafalse\let\NAT@ctype\thr@@\NAT@parfalse\NAT@citetp}
+Index: texlive-base-2012.20120611/texmf-dist/tex/latex/natbib/natbib.sty
+===================================================================
+--- texlive-base-2012.20120611.orig/texmf-dist/tex/latex/natbib/natbib.sty
2010-12-07 10:39:19.000000000 +0900
++++ texlive-base-2012.20120611/texmf-dist/tex/latex/natbib/natbib.sty
2012-06-25 10:57:14.030135437 +0900
+@@ -740,8 +740,8 @@
+ \DeclareRobustCommand\citefullauthor
+ {\citeauthor*}
+ \newcommand\defcitealias[2]{%
+- \@ifundefined{al@#1\@extra@b@citeb}{}
+- {\PackageWarning{natbib}{Overwriting existing alias for citation #1}}
++ \@ifundefined{al@#1\@extra@b@citeb}{}%
++ {\PackageWarning{natbib}{Overwriting existing alias for citation #1}}%
+ \@namedef{al@#1\@extra@b@citeb}{#2}}
+ \DeclareRobustCommand\citetalias{\begingroup
+ \NAT@swafalse\let\NAT@ctype\thr@@\NAT@parfalse\NAT@citetp}
diff --git a/latex/texlive-texmf/upstream_updmap-ignoring-settings
b/latex/texlive-texmf/upstream_updmap-ignoring-settings
new file mode 100644
index 0000000..7e4b060
--- /dev/null
+++ b/latex/texlive-texmf/upstream_updmap-ignoring-settings
@@ -0,0 +1,19 @@
+---
+ texmf/scripts/tetex/updmap.pl | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- texlive-base-2012.20120611.orig/texmf/scripts/tetex/updmap.pl
++++ texlive-base-2012.20120611/texmf/scripts/tetex/updmap.pl
+@@ -1042,10 +1042,10 @@
+ &writeLines(">$dvipsoutputdir/builtin35.map",
+ normalizeLines(@builtin35_map));
+
+- my @dftdvips_fonts = ($dvipsDownloadBase35 ? @ps2pk_fonts :
@dvips35_fonts);
++ my @dftdvips_fonts = ( ($dvipsDownloadBase35 eq "true") ? @ps2pk_fonts :
@dvips35_fonts);
+
+ my @psfonts_t1_map;
+- if ($dvipsDownloadBase35) {
++ if ($dvipsDownloadBase35 eq "true") {
+ push @psfonts_t1_map, "% ps2pk35.map",
+ @dftdvips_fonts = @ps2pk_fonts;
+ } else {



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (a1cc9098192f106dc20f03647238ddaff6a13484), Florian Franzmann, 09/16/2012

Archive powered by MHonArc 2.6.24.

Top of Page