[subversion-commit] SVN lmodern commit + diffs: r1440 - in
lmodern/trunk/debian: . sed_scripts
Florent Rougon
frn at costa.debian.org
Sun Jun 18 18:31:22 UTC 2006
Author: frn
Date: 2006-06-18 18:31:21 +0000 (Sun, 18 Jun 2006)
New Revision: 1440
Added:
lmodern/trunk/debian/copyright.in
lmodern/trunk/debian/lmodern.cfg.in
lmodern/trunk/debian/lmodern.lintian-overrides
lmodern/trunk/debian/sed_scripts/extract-end
lmodern/trunk/debian/sed_scripts/extract-start
Removed:
lmodern/trunk/debian/copyright.Debian
lmodern/trunk/debian/lmodern.cfg
Modified:
lmodern/trunk/debian/changelog
lmodern/trunk/debian/control
lmodern/trunk/debian/lmodern.README.Debian
lmodern/trunk/debian/lmodern.defoma-hints
lmodern/trunk/debian/rules
Log:
* Updating the package for upstream version 1.00.
* Use debian/copyright.in instead of debian/copyright.Debian (because the
latter is confusing to me) and update it with the information shipped in LM
1.00.
* Update lmodern.defoma-hints and rules for LM 1.00.
* The monolithic lm.map is incomplete in LM 1.00, therefore we use the more
specific map files (lm-ec.map, etc.). They are found and declared
automatically in 10lmodern.cfg. In order to do this, debian/lmodern.cfg is
now generated from debian/lmodern.cfg.in, where
'@LMODERN_BASIC_MAP_DECLARATIONS@' is simply replaced by the basic map
declarations (where "basic" means those that should be equivalent to lm.map
if it wasn't incomplete; not lm-rep-*.map, nor the cork-lm.map that we have
for backward compatibility). This replacement is performed by two simple sed
scripts: sed_scripts/extract-start and sed_scripts/extract-end.
* Use the "core X11 fonts system" expression in the package description and
README.Debian (this is the one used in hw/xfree86/doc/README.fonts from the
xorg-server 1.0.2 source package). Also, slightly update/trim these places
about how fonts are rendered, because I think that with current X.Org, it is
FreeType who does the rendering of Type 1 fonts, even when the core X11
fonts system is in use (although there is no antialiasing in this case,
don't ask me why).
* Use a build-indep-stamp file to avoid running the build-indep target twice
per build (first time when "debian/rules build" is called, second time when
"debian/rules binary" is invoked).
* Recode MANIFEST.txt to have Unix-style line endings before installing it in
/usr/share/doc/lmodern/. Add 'recode' to Build-Depends-Indep for this
reason.
* Install a lintian override file for the inappropriate warning:
lmodern: maintainer-script-needs-depends-on-ucf preinst
Modified: lmodern/trunk/debian/changelog
===================================================================
--- lmodern/trunk/debian/changelog 2006-06-18 16:40:28 UTC (rev 1439)
+++ lmodern/trunk/debian/changelog 2006-06-18 18:31:21 UTC (rev 1440)
@@ -1,3 +1,64 @@
+lmodern (1.00-1) unstable; urgency=low
+
+ * New upstream release.
+
+ There are a bunch of new fonts. The new text fonts are lmdunh10, lmduno10,
+ lmssq8, lmssqbo8, lmssqbx8, lmssqo8 and lmu10.
+
+ The other new fonts are maths and symbol fonts. We don't register them
+ with defoma, because:
+
+ a) these fonts don't fit well in the defoma classification
+ (GeneralFamily, Shape...);
+
+ b) that doesn't look very useful (they support only a small part of
+ ASCII, if any, so using them in applications such as text editors
+ cannot be done without resorting to functions such as
+ "Insert Special Characters"). OK, that might be useful for
+ GhostScript... Since probably nobody uses that, I'd rather not bother
+ unless specifically asked for this feature (having the maths/symbol
+ fonts directly registered with GhostScript).
+
+ The link to the Latin Modern wishlist web page in the upstream README
+ file is now fixed (closes: #352949).
+
+ * Use debian/copyright.in instead of debian/copyright.Debian (because
+ the latter is confusing to me) and update it with the information
+ shipped in LM 1.00.
+
+ * The monolithic lm.map is incomplete in LM 1.00, therefore we use the
+ more specific map files (lm-ec.map, etc.). They are found and declared
+ automatically in 10lmodern.cfg. In order to do this,
+ debian/lmodern.cfg is now generated from debian/lmodern.cfg.in, where
+ '@LMODERN_BASIC_MAP_DECLARATIONS@' is simply replaced by the basic map
+ declarations (where "basic" means those that should be equivalent to
+ lm.map if it wasn't incomplete; not lm-rep-*.map, nor the cork-lm.map
+ that we have for backward compatibility). This replacement is
+ performed by two simple sed scripts: sed_scripts/extract-start and
+ sed_scripts/extract-end.
+
+ * Install a lintian override file for the inappropriate warning:
+
+ lmodern: maintainer-script-needs-depends-on-ucf preinst
+
+ * Use the "core X11 fonts system" expression in the package description
+ and README.Debian (this is the one used in hw/xfree86/doc/README.fonts
+ from the xorg-server 1.0.2 source package). Also, slightly update/trim
+ these places about how fonts are rendered, because I think that with
+ current X.Org, it is FreeType who does the rendering of Type 1 fonts,
+ even when the core X11 fonts system is in use (although there is no
+ antialiasing in this case, don't ask me why).
+
+ * Use a build-indep-stamp file to avoid running the build-indep target
+ twice per build (first time when "debian/rules build" is called,
+ second time when "debian/rules binary" is invoked).
+
+ * Recode MANIFEST.txt to have Unix-style line endings before installing
+ it in /usr/share/doc/lmodern/. Add 'recode' to Build-Depends-Indep for
+ this reason.
+
+ -- Florent Rougon <frn at debian.org> Sun, 18 Jun 2006 20:00:12 +0200
+
lmodern (0.99.3-4) unstable; urgency=low
* lmodern.scale is back to /etc/X11/fonts/Type1/ because the location
Modified: lmodern/trunk/debian/control
===================================================================
--- lmodern/trunk/debian/control 2006-06-18 16:40:28 UTC (rev 1439)
+++ lmodern/trunk/debian/control 2006-06-18 18:31:21 UTC (rev 1440)
@@ -4,7 +4,7 @@
Maintainer: Debian teTeX maintainers <debian-tetex-maint at lists.debian.org>
Uploaders: Julian Gilbey <jdg at debian.org>, C.M. Connelly <cmc at debian.org>, Atsuhito KOHDA <kohda at debian.org>, Frank Küster <frank at debian.org>, Florent Rougon <frn at debian.org>, Norbert Preining <preining at logic.at>
Build-Depends: debhelper (>= 5.0.35)
-Build-Depends-Indep: defoma (>= 0.7.0), tex-common (>= 0.16)
+Build-Depends-Indep: defoma (>= 0.7.0), tex-common (>= 0.16), recode
Standards-Version: 3.7.2
Package: lmodern
@@ -31,8 +31,5 @@
The fonts are setup for use with the TeX typesetting system. They
are also registered with defoma, which makes them available to other
applications such as Ghostscript and Fontconfig. Finally, they are
- made available to the X Window System directly, which makes it
- possible to use them in any X application (however, XFree86's native
- rendering of PostScript Type 1 fonts is not fantastic at the moment,
- so the result in this last case is not so pleasant as with font
- rendering engines that perform anti-aliasing, such as FreeType).
+ made available to the core X11 fonts system, which makes it possible
+ to use them in any X application.
Deleted: lmodern/trunk/debian/copyright.Debian
===================================================================
--- lmodern/trunk/debian/copyright.Debian 2006-06-18 16:40:28 UTC (rev 1439)
+++ lmodern/trunk/debian/copyright.Debian 2006-06-18 18:31:21 UTC (rev 1440)
@@ -1,121 +0,0 @@
-This package was debianized by Florent Rougon <f.rougon at free.fr> on
-Tue, 27 Jan 2004 20:12:21 +0100.
-
-It was downloaded from:
-
- http://www.tug.org/tex-archive/help/Catalogue/entries/lm.html
-
-
-Upstream work
--------------
-
-Running t1disasm (from the t1utils package) on the .pfb files yields:
-
- Generated by MetaType1 (a MetaPost-based engine)
- Supported by DANTE eV, GUST, GUTenberg, NTG, and TUG.
- METATYPE1/Type 1 version by B. Jackowski & J. M. Nowacki from
- GUST (http://www.gust.org.pl).
- Copyright 2003--2005 TeX USERS GROUPS.
- This work is released under the GUST Font Source License.
- For the most recent version of this license see
- http://www.gust.org.pl/fonts/licenses/GUST-FONT-SOURCE-LICENSE.txt or
- http://tug.org/fonts/licenses/GUST-FONT-SOURCE-LICENSE.txt
- This work has the LPPL maintenance status "maintained".
- The Current Maintainer of this work is Bogus\l{}aw Jackowski and
- Janusz M. Nowacki.
- This work consists of the files listed in the MANIFEST.txt file.
-
-
-Upstream file README says:
-
- The current LM package contains the most recent although still
- pre-release version of the Latin Modern family of fonts in the
- PostScript Type 1 and OpenType format. The fonts are based on
- Donald E. Knuth's Computer Modern fonts in the PostScript Type 1
- format, released into public domain by the American Mathematical
- Society (for the history of the outline version of the CM fonts
- see, e.g., http://www.math.utah.edu/~beebe/fonts/bluesky.html ).
-
- The Latin Modern fonts can be freely used and distributed under
- the GUST Font Source License (see above) which is a slightly
- modified version of the LaTeX Project Public License (LPPL;
- see http://www.latex-project.org/lppl.txt )
-
- See the appendix B for the GUST Font Source License.
-
-
-Please read the appendix A below if you want to examine the licensing terms
-for the Computer Modern fonts in Type 1 format on which the Latin Modern fonts
-are based.
-
-
-Debian packaging
-----------------
-
-Copyright (c) 2004, 2005, 2006 Florent Rougon
-Copyright (c) 2005, 2006 Norbert Preining
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 dated June, 1991.
-
- This program is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA.
-
-On Debian systems, the complete text of the GNU General Public License can be
-found in `/usr/share/common-licenses/GPL'.
-
-
-Appendix A -- Licensing terms for the Computer Modern fonts in Type 1 format
- on which the Latin Modern fonts are based.
------------------------------------------------------------------------------
-
-Running t1disasm (from the t1utils package) on
-/usr/share/texmf/fonts/type1/bluesky/cm/*.pfb and
-/usr/share/texmf/fonts/type1/bluesky/cmextra/*.pfb yields:
-
- Copyright (C) 1997 American Mathematical Society. All Rights Reserved
-
- [ Florent Rougon's note: well, for
- /usr/share/texmf/fonts/type1/bluesky/cm/cmb{,sy}10.pfb, you will only get
- one space between "Society." and "All" (with tetex-extra 2.0.2-5.1). ;-) ]
-
-The precise distribution conditions for these fonts can be found in
-/usr/share/doc/texmf/fonts/bluesky/README from the tetex-doc package. I will
-duplicate here the relevant excerpt for your convenience:
-
- The PostScript Type 1 implementation of the Computer Modern fonts produced
- by and previously distributed by Blue Sky Research and Y&Y, Inc. are now
- freely available for general use. This has been accomplished through the
- cooperation of a consortium of scientific publishers with Blue Sky Research
- and Y&Y. Members of this consortium include:
-
- Elsevier Science
- IBM Corporation
- Society for Industrial and Applied Mathematics (SIAM)
- Springer-Verlag
- American Mathematical Society (AMS)
-
- In order to assure the authenticity of these fonts, copyright will be held
- by the American Mathematical Society. This is not meant to restrict in any
- way the legitimate use of the fonts, such as (but not limited to) electronic
- distribution of documents containing these fonts, inclusion of these fonts
- into other public domain or commercial font collections or computer
- applications, use of the outline data to create derivative fonts and/or
- faces, etc. However, the AMS does require that the AMS copyright notice be
- removed from any derivative versions of the fonts which have been altered in
- any way. In addition, to ensure the fidelity of TeX documents using Computer
- Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces,
- has requested that any alterations which yield different font metrics be
- given a different name.
-
-Appendix B -- GUST Font Source License
------------------------------------------------------------------------------
-
Copied: lmodern/trunk/debian/copyright.in (from rev 1414, lmodern/trunk/debian/copyright.Debian)
===================================================================
--- lmodern/trunk/debian/copyright.Debian 2006-06-02 23:53:54 UTC (rev 1414)
+++ lmodern/trunk/debian/copyright.in 2006-06-18 18:31:21 UTC (rev 1440)
@@ -0,0 +1,119 @@
+This package was debianized by Florent Rougon <f.rougon at free.fr> on
+Tue, 27 Jan 2004 20:12:21 +0100.
+
+It was downloaded from:
+
+ http://www.tug.org/tex-archive/help/Catalogue/entries/lm.html
+
+
+Upstream work
+-------------
+
+The upstream README.eng file says:
+
+ Font: The Latin Modern Family of Fonts
+ Designer (Computer Modern Family of Fonts): Donald E. Knuth
+ Author: Bogus\l{}aw Jackowski and Janusz M. Nowacki
+ Version: 1.00
+ Date: 13 IV 2006
+ License:
+ % Copyright 2003--2006 by B. Jackowski and J.M. Nowacki
+ % (on behalf of TeX Users Groups).
+ % This work is released under the GUST Font Source License
+ % -- see GUST-FONT-SOURCE-LICENSE.txt.
+ % This work has the LPPL maintenance status "maintained".
+ % The Current Maintainer of this work is Bogus\l{}aw Jackowski
+ % and Janusz M. Nowacki.
+ % This work consists of the files listed in the MANIFEST.txt file.
+
+ [...]
+
+ The current LM package contains the most recent version
+ of the Latin Modern family of fonts in the PostScript Type 1 and
+ OpenType format. The fonts are based on Donald E. Knuth's Computer Modern
+ fonts in the PostScript Type 1 format, released into public domain by the
+ American Mathematical Society (for the history of the outline version of
+ the CM fonts see, e.g., http://www.math.utah.edu/~beebe/fonts/bluesky.html ).
+ The project is supported by TeX users groups: CSTUG, DANTE eV, GUST,
+ GUTenberg, NTG, and TUG.
+
+See the appendix B for the GUST Font Source License.
+
+Please read the appendix A below if you want to examine the licensing terms
+for the Computer Modern fonts in Type 1 format on which the Latin Modern fonts
+are based.
+
+
+Debian packaging
+----------------
+
+Copyright (c) 2004, 2005, 2006 Florent Rougon
+Copyright (c) 2005, 2006 Norbert Preining
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 dated June, 1991.
+
+ This program is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ Boston, MA 02110-1301 USA.
+
+On Debian systems, the complete text of the GNU General Public License version
+2 can be found in `/usr/share/common-licenses/GPL-2'.
+
+
+Appendix A -- Licensing terms for the Computer Modern fonts in Type 1 format
+ on which the Latin Modern fonts are based.
+-----------------------------------------------------------------------------
+
+Running t1disasm (from the t1utils package) on
+/usr/share/texmf/fonts/type1/bluesky/cm/*.pfb and
+/usr/share/texmf/fonts/type1/bluesky/cmextra/*.pfb yields:
+
+ Copyright (C) 1997 American Mathematical Society. All Rights Reserved
+
+ [ Florent Rougon's note: well, for
+ /usr/share/texmf/fonts/type1/bluesky/cm/cmb{,sy}10.pfb, you will only get
+ one space between "Society." and "All" (with tetex-extra 2.0.2-5.1). ;-) ]
+
+The precise distribution conditions for these fonts can be found in
+/usr/share/doc/texmf/fonts/bluesky/README from the tetex-doc package. I will
+duplicate here the relevant excerpt for your convenience:
+
+ The PostScript Type 1 implementation of the Computer Modern fonts produced
+ by and previously distributed by Blue Sky Research and Y&Y, Inc. are now
+ freely available for general use. This has been accomplished through the
+ cooperation of a consortium of scientific publishers with Blue Sky Research
+ and Y&Y. Members of this consortium include:
+
+ Elsevier Science
+ IBM Corporation
+ Society for Industrial and Applied Mathematics (SIAM)
+ Springer-Verlag
+ American Mathematical Society (AMS)
+
+ In order to assure the authenticity of these fonts, copyright will be held
+ by the American Mathematical Society. This is not meant to restrict in any
+ way the legitimate use of the fonts, such as (but not limited to) electronic
+ distribution of documents containing these fonts, inclusion of these fonts
+ into other public domain or commercial font collections or computer
+ applications, use of the outline data to create derivative fonts and/or
+ faces, etc. However, the AMS does require that the AMS copyright notice be
+ removed from any derivative versions of the fonts which have been altered in
+ any way. In addition, to ensure the fidelity of TeX documents using Computer
+ Modern fonts, Professor Donald Knuth, creator of the Computer Modern faces,
+ has requested that any alterations which yield different font metrics be
+ given a different name.
+
+Appendix B -- GUST Font Source License
+-----------------------------------------------------------------------------
+
+What follows is the exact contents of GUST-FONT-SOURCE-LICENSE.txt from the
+upstream distribution of the Latin Modern fonts.
+
Modified: lmodern/trunk/debian/lmodern.README.Debian
===================================================================
--- lmodern/trunk/debian/lmodern.README.Debian 2006-06-18 16:40:28 UTC (rev 1439)
+++ lmodern/trunk/debian/lmodern.README.Debian 2006-06-18 18:31:21 UTC (rev 1440)
@@ -15,11 +15,7 @@
Ghostscript are two noteworthy applications that take advantage of
defoma-registered fonts in Debian;
- - the X Window System directly[1], for use by any X application.
- However, you should be aware that X.org's native rendering of
- PostScript Type 1 fonts is not very satisfactory at the moment. The
- results are much more pleasant with a font rendering engine that can
- perform anti-aliasing (such as FreeType).
+ - the core X11 fonts system[1], for use by any X application.
How to use the Latin Modern fonts with defoma-aware applications?
@@ -123,8 +119,7 @@
at all.
-[1] By *in*directly, I mean, through defoma, Fontconfig and FreeType,
- for instance.
+[1] In this case, the X server doesn't use Fontconfig to access the fonts.
[2] The unofficial lmodern package distributed by Michael Wiedmann on
http://www.miwie.org/lm/ before the official package came into
@@ -132,4 +127,4 @@
/etc/texmf/updmap.d/10lmodern.bak when removed.
- -- Florent Rougon <frn at debian.org>, Fri Apr 21 17:36:01 2006
+ -- Florent Rougon <frn at debian.org>, Sun Jun 18 19:11:33 2006
Deleted: lmodern/trunk/debian/lmodern.cfg
===================================================================
--- lmodern/trunk/debian/lmodern.cfg 2006-06-18 16:40:28 UTC (rev 1439)
+++ lmodern/trunk/debian/lmodern.cfg 2006-06-18 18:31:21 UTC (rev 1440)
@@ -1,31 +0,0 @@
-# Don't delete the following pseudo-comment unless you know what you are doing.
-# -_- DebPkgProvidedMaps -_-
-# This file will *not* be included in updmap.cfg if the lmodern package is
-# removed. Please read update-updmap(1) for details.
-#
-# This file is part of the set of files used to (indirectly) generate the
-# final map files such as psfonts_{t1,pk}.map, {pdftex,dvipdfm}_{,n}dl14.map,
-# ps2pk.map, builtin35.map and download35.map under /var/lib/texmf/fonts/map/
-# (with psfonts.map being a symbolic link to one of psfonts_{t1,pk}.map,
-# pdftex.map a symbolic link to one of pdftex_{,n}dl14.map and dvipdfm.map a
-# symbolic link to one of dvipdfm_{,n}dl14.map, the choice depending on your
-# updmap configuration, which you can customize by altering the files in
-# /etc/texmf/updmap.d/ and running update-updmap).
-#
-# You should *not* modify the aforementioned final map files under
-# /var/lib/texmf/fonts/map/ directly, for they are automatically generated by
-# updmap-sys(1). Instead, you should read update-updmap(1), updmap-sys(1) and
-# if you actually need to make changes to the aforementioned final map files,
-# you should make the changes in /etc/texmf/updmap.d/, use update-updmap to
-# regenerate /var/lib/texmf/web2c/updmap.cfg and finally updmap-sys to
-# regenerate the final map files.
-#
-# Reading /etc/texmf/updmap.d/00updmap.cfg can also help understand how all
-# this works.
-#
-#
-# Declare lm.map for use by the updmap-sys(1) machinery.
-Map lm.map
-#
-# this map file is for compatibility with old dvi files
-Map cork-lm.map
Copied: lmodern/trunk/debian/lmodern.cfg.in (from rev 1414, lmodern/trunk/debian/lmodern.cfg)
===================================================================
--- lmodern/trunk/debian/lmodern.cfg 2006-06-02 23:53:54 UTC (rev 1414)
+++ lmodern/trunk/debian/lmodern.cfg.in 2006-06-18 18:31:21 UTC (rev 1440)
@@ -0,0 +1,32 @@
+# Don't delete the following pseudo-comment unless you know what you are doing.
+# -_- DebPkgProvidedMaps -_-
+# This file will *not* be included in updmap.cfg if the lmodern package is
+# removed. Please read update-updmap(1) for details.
+#
+# This file is part of the set of files used to (indirectly) generate the
+# final map files such as psfonts_{t1,pk}.map, {pdftex,dvipdfm}_{,n}dl14.map,
+# ps2pk.map, builtin35.map and download35.map under /var/lib/texmf/fonts/map/
+# (with psfonts.map being a symbolic link to one of psfonts_{t1,pk}.map,
+# pdftex.map a symbolic link to one of pdftex_{,n}dl14.map and dvipdfm.map a
+# symbolic link to one of dvipdfm_{,n}dl14.map, the choice depending on your
+# updmap configuration, which you can customize by altering the files in
+# /etc/texmf/updmap.d/ and running update-updmap).
+#
+# You should *not* modify the aforementioned final map files under
+# /var/lib/texmf/fonts/map/ directly, for they are automatically generated by
+# updmap-sys(1). Instead, you should read update-updmap(1), updmap-sys(1) and
+# if you actually need to make changes to the aforementioned final map files,
+# you should make the changes in /etc/texmf/updmap.d/, use update-updmap to
+# regenerate /var/lib/texmf/web2c/updmap.cfg and finally updmap-sys to
+# regenerate the final map files.
+#
+# Reading /etc/texmf/updmap.d/00updmap.cfg can also help understand how all
+# this works.
+#
+#
+# Declare the basic Latin Modern map files for use by the updmap-sys(1)
+# machinery.
+ at LMODERN_BASIC_MAP_DECLARATIONS@
+#
+# This map file is for compatibility with old DVI files.
+Map cork-lm.map
Modified: lmodern/trunk/debian/lmodern.defoma-hints
===================================================================
--- lmodern/trunk/debian/lmodern.defoma-hints 2006-06-18 16:40:28 UTC (rev 1439)
+++ lmodern/trunk/debian/lmodern.defoma-hints 2006-06-18 18:31:21 UTC (rev 1440)
@@ -160,6 +160,52 @@
Charset2 = ISO8859-15
X-FontName2 = -unregistered-Latin_Modern_Roman-medium-o-normal-small_caps-0-0-0-0-p-0-iso8859-15
end
+begin /usr/share/texmf/fonts/type1/public/lm/lmdunh10.pfb
+ FaceNum = 3
+ Inherit = FontName Family GeneralFamily Weight Width Shape Direction Priority AFM
+ FontName = LMRoman10-Dunhill
+ Charset = font-specific
+ Family = Latin_Modern_Roman
+ GeneralFamily = Roman
+ Weight = Medium
+ Width = Variable
+ Shape = Serif Upright
+ Direction = Horizontal
+ Priority = 20
+ X-FontName = -unregistered-Latin_Modern_Roman-medium-r-normal-dunhill-0-0-0-0-p-0-unregistered-font_specific
+ AFM = /usr/share/texmf/fonts/afm/public/lm/lmdunh10.afm
+
+ FontName1 = LMRoman10-Dunhill-ISO8859-1
+ Charset1 = ISO8859-1
+ X-FontName1 = -unregistered-Latin_Modern_Roman-medium-r-normal-dunhill-0-0-0-0-p-0-iso8859-1
+
+ FontName2 = LMRoman10-Dunhill-ISO8859-15
+ Charset2 = ISO8859-15
+ X-FontName2 = -unregistered-Latin_Modern_Roman-medium-r-normal-dunhill-0-0-0-0-p-0-iso8859-15
+end
+begin /usr/share/texmf/fonts/type1/public/lm/lmduno10.pfb
+ FaceNum = 3
+ Inherit = FontName Family GeneralFamily Weight Width Shape Direction Priority AFM
+ FontName = LMRoman10-DunhillOblique
+ Charset = font-specific
+ Family = Latin_Modern_Roman
+ GeneralFamily = Roman
+ Weight = Medium
+ Width = Variable
+ Shape = Serif Oblique
+ Direction = Horizontal
+ Priority = 20
+ X-FontName = -unregistered-Latin_Modern_Roman-medium-o-normal-dunhill-0-0-0-0-p-0-unregistered-font_specific
+ AFM = /usr/share/texmf/fonts/afm/public/lm/lmduno10.afm
+
+ FontName1 = LMRoman10-DunhillOblique-ISO8859-1
+ Charset1 = ISO8859-1
+ X-FontName1 = -unregistered-Latin_Modern_Roman-medium-o-normal-dunhill-0-0-0-0-p-0-iso8859-1
+
+ FontName2 = LMRoman10-DunhillOblique-ISO8859-15
+ Charset2 = ISO8859-15
+ X-FontName2 = -unregistered-Latin_Modern_Roman-medium-o-normal-dunhill-0-0-0-0-p-0-iso8859-15
+end
begin /usr/share/texmf/fonts/type1/public/lm/lmr10.pfb
FaceNum = 3
Inherit = FontName Family GeneralFamily Weight Width Shape Direction Priority AFM
@@ -367,6 +413,98 @@
Charset2 = ISO8859-15
X-FontName2 = -unregistered-Latin_Modern_Sans-medium-o-normal--0-0-0-0-p-0-iso8859-15
end
+begin /usr/share/texmf/fonts/type1/public/lm/lmssq8.pfb
+ FaceNum = 3
+ Inherit = FontName Family GeneralFamily Weight Width Shape Direction Priority AFM
+ FontName = LMSansQuotation8-Regular
+ Charset = font-specific
+ Family = Latin_Modern_SansQuotation
+ GeneralFamily = SansSerif
+ Weight = Medium
+ Width = Variable
+ Shape = NoSerif Upright
+ Direction = Horizontal
+ Priority = 20
+ X-FontName = -unregistered-Latin_Modern_SansQuotation-medium-r-normal--0-0-0-0-p-0-unregistered-font_specific
+ AFM = /usr/share/texmf/fonts/afm/public/lm/lmssq8.afm
+
+ FontName1 = LMSansQuotation8-Regular-ISO8859-1
+ Charset1 = ISO8859-1
+ X-FontName1 = -unregistered-Latin_Modern_SansQuotation-medium-r-normal--0-0-0-0-p-0-iso8859-1
+
+ FontName2 = LMSansQuotation8-Regular-ISO8859-15
+ Charset2 = ISO8859-15
+ X-FontName2 = -unregistered-Latin_Modern_SansQuotation-medium-r-normal--0-0-0-0-p-0-iso8859-15
+end
+begin /usr/share/texmf/fonts/type1/public/lm/lmssqbo8.pfb
+ FaceNum = 3
+ Inherit = FontName Family GeneralFamily Weight Width Shape Direction Priority AFM
+ FontName = LMSansQuotation8-BoldOblique
+ Charset = font-specific
+ Family = Latin_Modern_SansQuotation
+ GeneralFamily = SansSerif
+ Weight = Bold
+ Width = Variable
+ Shape = NoSerif Oblique
+ Direction = Horizontal
+ Priority = 20
+ X-FontName = -unregistered-Latin_Modern_SansQuotation-bold-o-normal--0-0-0-0-p-0-unregistered-font_specific
+ AFM = /usr/share/texmf/fonts/afm/public/lm/lmssqbo8.afm
+
+ FontName1 = LMSansQuotation8-BoldOblique-ISO8859-1
+ Charset1 = ISO8859-1
+ X-FontName1 = -unregistered-Latin_Modern_SansQuotation-bold-o-normal--0-0-0-0-p-0-iso8859-1
+
+ FontName2 = LMSansQuotation8-BoldOblique-ISO8859-15
+ Charset2 = ISO8859-15
+ X-FontName2 = -unregistered-Latin_Modern_SansQuotation-bold-o-normal--0-0-0-0-p-0-iso8859-15
+end
+begin /usr/share/texmf/fonts/type1/public/lm/lmssqbx8.pfb
+ FaceNum = 3
+ Inherit = FontName Family GeneralFamily Weight Width Shape Direction Priority AFM
+ FontName = LMSansQuotation8-Bold
+ Charset = font-specific
+ Family = Latin_Modern_SansQuotation
+ GeneralFamily = SansSerif
+ Weight = Bold
+ Width = Variable
+ Shape = NoSerif Upright Expanded
+ Direction = Horizontal
+ Priority = 20
+ X-FontName = -unregistered-Latin_Modern_SansQuotation-bold-o-expanded--0-0-0-0-p-0-unregistered-font_specific
+ AFM = /usr/share/texmf/fonts/afm/public/lm/lmssqbx8.afm
+
+ FontName1 = LMSansQuotation8-Bold-ISO8859-1
+ Charset1 = ISO8859-1
+ X-FontName1 = -unregistered-Latin_Modern_SansQuotation-bold-o-expanded--0-0-0-0-p-0-iso8859-1
+
+ FontName2 = LMSansQuotation8-Bold-ISO8859-15
+ Charset2 = ISO8859-15
+ X-FontName2 = -unregistered-Latin_Modern_SansQuotation-bold-o-expanded--0-0-0-0-p-0-iso8859-15
+end
+begin /usr/share/texmf/fonts/type1/public/lm/lmssqo8.pfb
+ FaceNum = 3
+ Inherit = FontName Family GeneralFamily Weight Width Shape Direction Priority AFM
+ FontName = LMSansQuotation8-Oblique
+ Charset = font-specific
+ Family = Latin_Modern_SansQuotation
+ GeneralFamily = SansSerif
+ Weight = Medium
+ Width = Variable
+ Shape = NoSerif Oblique
+ Direction = Horizontal
+ Priority = 20
+ X-FontName = -unregistered-Latin_Modern_SansQuotation-medium-o-normal--0-0-0-0-p-0-unregistered-font_specific
+ AFM = /usr/share/texmf/fonts/afm/public/lm/lmssqo8.afm
+
+ FontName1 = LMSansQuotation8-Oblique-ISO8859-1
+ Charset1 = ISO8859-1
+ X-FontName1 = -unregistered-Latin_Modern_SansQuotation-medium-o-normal--0-0-0-0-p-0-iso8859-1
+
+ FontName2 = LMSansQuotation8-Oblique-ISO8859-15
+ Charset2 = ISO8859-15
+ X-FontName2 = -unregistered-Latin_Modern_SansQuotation-medium-o-normal--0-0-0-0-p-0-iso8859-15
+end
begin /usr/share/texmf/fonts/type1/public/lm/lmtcsc10.pfb
FaceNum = 3
Inherit = FontName Family GeneralFamily Weight Width Shape Direction Priority AFM
@@ -620,6 +758,29 @@
Charset2 = ISO8859-15
X-FontName2 = -unregistered-Latin_Modern_Typewriter-medium-o-normal--0-0-0-0-c-0-iso8859-15
end
+begin /usr/share/texmf/fonts/type1/public/lm/lmu10.pfb
+ FaceNum = 3
+ Inherit = FontName Family GeneralFamily Weight Width Shape Direction Priority AFM
+ FontName = LMRoman10-Unslanted
+ Charset = font-specific
+ Family = Latin_Modern_Roman
+ GeneralFamily = Roman
+ Weight = Medium
+ Width = Variable
+ Shape = Serif Upright Unslanted
+ Direction = Horizontal
+ Priority = 20
+ X-FontName = -unregistered-Latin_Modern_Roman-medium-r-normal-unslanted-0-0-0-0-p-0-unregistered-font_specific
+ AFM = /usr/share/texmf/fonts/afm/public/lm/lmu10.afm
+
+ FontName1 = LMRoman10-Unslanted-ISO8859-1
+ Charset1 = ISO8859-1
+ X-FontName1 = -unregistered-Latin_Modern_Roman-medium-r-normal-unslanted-0-0-0-0-p-0-iso8859-1
+
+ FontName2 = LMRoman10-Unslanted-ISO8859-15
+ Charset2 = ISO8859-15
+ X-FontName2 = -unregistered-Latin_Modern_Roman-medium-r-normal-unslanted-0-0-0-0-p-0-iso8859-15
+end
begin /usr/share/texmf/fonts/type1/public/lm/lmvtk10.pfb
FaceNum = 3
Inherit = FontName Family GeneralFamily Weight Width Shape Direction Priority AFM
Added: lmodern/trunk/debian/lmodern.lintian-overrides
===================================================================
--- lmodern/trunk/debian/lmodern.lintian-overrides 2006-06-18 16:40:28 UTC (rev 1439)
+++ lmodern/trunk/debian/lmodern.lintian-overrides 2006-06-18 18:31:21 UTC (rev 1440)
@@ -0,0 +1,4 @@
+# There is no need to depend on ucf: if present (and we are upgrading from
+# lmodern experimental versions 0.92-{4,5,6}), we call it to purge the
+# now-unused data; otherwise, there is nothing to purge anymore.
+lmodern binary: maintainer-script-needs-depends-on-ucf preinst
Modified: lmodern/trunk/debian/rules
===================================================================
--- lmodern/trunk/debian/rules 2006-06-18 16:40:28 UTC (rev 1439)
+++ lmodern/trunk/debian/rules 2006-06-18 18:31:21 UTC (rev 1440)
@@ -11,7 +11,9 @@
# We have nothing to do here but the Debian Policy says this target must
# exist.
-build-indep:
+build-indep: build-indep-stamp
+
+build-indep-stamp:
dh_testdir fonts/type1/public/lm/lmr10.pfb tex/latex/lm/lmodern.sty
# Warn the person building the package if new files were added
# to the .orig.tar.gz + .diff.gz that this script is not aware of.
@@ -24,7 +26,9 @@
-e '^\./fonts/enc/dvips/lm/[^/]*\.enc$$' \
-e '^\./fonts/opentype/public/lm/[^/]*\.otf$$' \
-e '^\./tex/latex/lm/[^/]*\.(fd|sty)$$' \
- -e '^\./(MANIFEST\.txt|README\.eng|README)$$' \
+ -e '^\./(GUST-FONT-SOURCE-LICENSE.txt|MANIFEST\.txt)$$' \
+ -e '^\./(README\.eng|README)$$' \
+ -e '^\./(lm1\.00mt1\.zip)$$' \
-e '^\./doc/fonts/lm/[^/]*\.(tex|dvi|pdf|txt|eng)$$' || true) && \
if [ -n "$$newfiles" ]; then \
{ echo "New files were found in the patched tarball" \
@@ -44,21 +48,28 @@
# lm.map and the lm-rep-*.map in <TEXMFMAIN>/fonts/map/dvips/lm/.
# Note: I don't use uniq because I won't accept an lm.map with
# repeated lines.
+ #
+ # Ah, this revealed that lm.map in LM 1.00 is incomplete.
@export LC_COLLATE=C \
&& a=$$(find fonts/map/dvips/lm \
\( -name "*.map" -not -name lm.map -not -name "lm-rep-*.map" \) \
-print0 | xargs -0r cat | grep -Ev -e '^%' | sort) \
&& b=$$(sort < fonts/map/dvips/lm/lm.map | grep -Ev -e '^%') \
&& if [ "$$a" != "$$b" ]; then \
- { echo "fonts/map/dvips/lm/lm.map does not appear to be equivalent to" \
- "the concatenation"; \
- echo "of the other map files found in fonts/map/dvips/lm/."; \
- echo "Please update the debian/rules file accordingly."; \
- } >&2; \
- exit 1; \
- fi
+ { echo; \
+ echo "Warning: fonts/map/dvips/lm/lm.map does not appear to" \
+ "be equivalent to"; \
+ echo "the concatenation of the other map files found in" \
+ "fonts/map/dvips/lm/."; \
+ echo; \
+ echo "We are going to use the specific map files for LM 1.00," \
+ "but the situation"; \
+ echo "may need to be reexamined for the next upstream" \
+ "release."; \
+ echo; \
+ } >&2; \
+ fi
-
# Generate $(PKG).scale from $(PKG).defoma-hints (since it contains
# nice hand-crafted XLFD names for the fonts).
sed -nf debian/sed_scripts/gen-fonts.scale \
@@ -72,19 +83,31 @@
sed -ne 's/^[[:blank:]]*begin[[:blank:]]\{1,\}.*[/]\([^/]\{1,\}\)\.pfb[[:blank:]]*$$/\1/p' \
< "debian/$(PKG).defoma-hints" > "debian/$(PKG).fontlist-x11"
- # Generate the actual copyright file from copyright.Debian and
+ # Generate the actual copyright file from copyright.in and
# the GUST license
- cat debian/copyright.Debian doc/fonts/lm/GUST-FONT-SOURCE-LICENSE.txt > debian/copyright
+ cat debian/copyright.in doc/fonts/lm/GUST-FONT-SOURCE-LICENSE.txt \
+ > debian/copyright
+ # MANIFEST.txt has CR-LF line endings...
+ recode ASCII/CR-LF..ASCII <MANIFEST.txt >MANIFEST.txt.LF
+
+ touch build-indep-stamp
+
clean:
dh_testdir fonts/type1/public/lm/lmr10.pfb tex/latex/lm/lmodern.sty
dh_testroot
# debian/$(PKG).links is automatically generated from the list of
# fonts to declare to X11 among other things, so we have to delete
# it here.
- rm -f "debian/$(PKG).scale.tmp" "debian/$(PKG).scale" \
- "debian/$(PKG).fontlist-x11" "debian/$(PKG).links" \
- debian/copyright
+ # debian/copyright and debian/lmodern.cfg are automatically generated
+ # from the respective .in files.
+ # MANIFEST.txt.LF is the LF-recoded version of MANIFEST.txt (which
+ # has CR-LF line endings in the upstream distribution).
+ rm -f build-indep-stamp \
+ "debian/$(PKG).scale.tmp" "debian/$(PKG).scale" \
+ "debian/$(PKG).fontlist-x11" "debian/$(PKG).links" \
+ debian/copyright debian/lmodern.cfg \
+ MANIFEST.txt.LF
dh_clean
binary-indep: build-indep
@@ -113,7 +136,8 @@
usr/share/doc/texmf/fonts/lm \
usr/share/doc/$(PKG)/font-substitution \
etc/X11/fonts/Type1 \
- usr/share/fonts/X11/Type1
+ usr/share/fonts/X11/Type1 \
+ usr/share/lintian/overrides
# Note: we won't install the PFM files because we already have the
# AFM files which are preferred in general.
@@ -149,17 +173,26 @@
$(INSTALL_FILE) fonts/enc/dvips/lm/*.enc \
"$(REL_PKG_INSTALL_DIR)/usr/share/texmf/fonts/enc/dvips/lm"
- # Install the monolithic lm.map. I currently don't see any advantage
- # in the encoding-specific map files. In case encodings are added in
- # future versions, they will be available to users without requiring
- # them to change their configuration, in the monolithic approach.
- # So, there is a slight advantage in favor of this approach, besides
- # reducing the number of files...
- #
+ # Install the specific map files because the monolithic lm.map is
+ # incomplete in LM 1.00.
+ find fonts/map/dvips/lm \
+ \( -name "*.map" -not -name lm.map -not -name "lm-rep-*.map" \) \
+ -print0 | xargs -0r $(INSTALL_FILE) \
+ -t "$(REL_PKG_INSTALL_DIR)/usr/share/texmf/fonts/map/dvips/lm"
+
+ # Declare these map files in lmodern.cfg
+ { sed -nf debian/sed_scripts/extract-start \
+ "debian/lmodern.cfg.in" && \
+ find fonts/map/dvips/lm \
+ \( -name "*.map" -not -name lm.map -not -name "lm-rep-*.map" \) \
+ -print | while read f; do echo "Map $$(basename "$$f")"; done \
+ | sort && \
+ sed -nf debian/sed_scripts/extract-end \
+ "debian/lmodern.cfg.in"; \
+ } > "debian/lmodern.cfg"
+
# Also install the map files for replacement fonts for CS, CM, PL and
# VN.
- $(INSTALL_FILE) fonts/map/dvips/lm/lm.map \
- "$(REL_PKG_INSTALL_DIR)/usr/share/texmf/fonts/map/dvips/lm"
$(INSTALL_FILE) fonts/map/dvips/lm/lm-rep-*.map \
"$(REL_PKG_INSTALL_DIR)/usr/share/texmf/fonts/map/dvips/lm"
@@ -188,13 +221,23 @@
dh_installdefoma
- dh_installdocs MANIFEST.txt README debian/NEWS.Debian
+ dh_installdocs debian/NEWS.Debian
+ # The README.eng in doc/fonts/lm/ has Unix-style end-of-line terminators
+ # whereas README{,.eng} in the upstream root directory use the DOS
+ # style... So, let's use doc/fonts/lm/README.eng.
+ $(INSTALL_FILE) doc/fonts/lm/README.eng \
+ "$(REL_PKG_INSTALL_DIR)/usr/share/doc/lmodern/README"
+ $(INSTALL_FILE) MANIFEST.txt.LF \
+ "$(REL_PKG_INSTALL_DIR)/usr/share/doc/lmodern/MANIFEST.txt"
$(INSTALL_FILE) debian/font-substitution/* \
"$(REL_PKG_INSTALL_DIR)/usr/share/doc/$(PKG)/font-substitution"
dh_installchangelogs
+ $(INSTALL_FILE) debian/$(PKG).lintian-overrides \
+ "$(REL_PKG_INSTALL_DIR)/usr/share/lintian/overrides/$(PKG)"
+
dh_compress
dh_fixperms
dh_installdeb
Added: lmodern/trunk/debian/sed_scripts/extract-end
===================================================================
--- lmodern/trunk/debian/sed_scripts/extract-end 2006-06-18 16:40:28 UTC (rev 1439)
+++ lmodern/trunk/debian/sed_scripts/extract-end 2006-06-18 18:31:21 UTC (rev 1440)
@@ -0,0 +1,4 @@
+/^@LMODERN_BASIC_MAP_DECLARATIONS@$/,${
+/^@LMODERN_BASIC_MAP_DECLARATIONS@$/d
+p
+}
Added: lmodern/trunk/debian/sed_scripts/extract-start
===================================================================
--- lmodern/trunk/debian/sed_scripts/extract-start 2006-06-18 16:40:28 UTC (rev 1439)
+++ lmodern/trunk/debian/sed_scripts/extract-start 2006-06-18 18:31:21 UTC (rev 1440)
@@ -0,0 +1,4 @@
+1,/^@LMODERN_BASIC_MAP_DECLARATIONS@$/{
+/^@LMODERN_BASIC_MAP_DECLARATIONS@$/d
+p
+}
More information about the Pkg-tetex-commits
mailing list