mirror/groff
1
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/groff.git synced 2026-01-27 01:44:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

font: Make style fixes.

Browse Source 
* Break excessively long lines in Automake files where possible.
* Flow copyright notices onto one line per the model in the GNU
  Maintainers' Guide.
* Also consistently use four-digit years in copyright notices.
* Migrate comments from `quotes' to 'quotes'.
* Update and parallelize editor aid comments.

Signed-off-by: G. Branden Robinson <g.branden.robinson@gmail.com>
This commit is contained in:
G. Branden Robinson 2017-11-12 17:32:29 -05:00
parent 6df65ebdf5
commit 14320c010a
23 changed files with 288 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
font/devX100-12/devX100-12.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'.
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -47,7 +46,11 @@ EXTRA_DIST += $(DEVX10012FONTS)
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

15
font/devX100/devX100.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'.
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -47,7 +46,11 @@ EXTRA_DIST += $(DEVX100FONTS)
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

15
font/devX75-12/devX75-12.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -45,7 +44,11 @@ EXTRA_DIST += $(DEVX7512FONTS)
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

15
font/devX75/devX75.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-2015
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -47,7 +46,11 @@ EXTRA_DIST += $(DEVX75FONTS)
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

18
font/devascii/devascii.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -45,11 +44,16 @@ font/devascii/DESC: $(devascii_srcdir)/DESC.proto
@echo Making $@
$(MKDIR_P) `dirname $@`
$(SHELL) $(GENDESCSH) $(devascii_srcdir)/DESC.proto \
$(DEVASCIIRES) $(DEVASCIICPI) $(DEVASCIILPI) $(DEVASCIIFONTS) > $@
$(DEVASCIIRES) $(DEVASCIICPI) $(DEVASCIILPI) \
$(DEVASCIIFONTS) > $@
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

18
font/devcp1047/devcp1047.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -43,11 +42,16 @@ font/devcp1047/DESC: $(devcp1047_srcdir)/DESC.proto
@echo Making $@
@$(MKDIR_P) `dirname $@`
@$(SHELL) $(GENDESCSH) $(devcp1047_srcdir)/DESC.proto \
$(DEVCP1047RES) $(DEVCP1047CPI) $(DEVCP1047LPI) $(DEVCP1047FONTS) > $@
$(DEVCP1047RES) $(DEVCP1047CPI) $(DEVCP1047LPI) \
$(DEVCP1047FONTS) > $@
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

15
font/devdvi/devdvi.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -93,7 +92,11 @@ font/devdvi/DESC: $(devdvi_srcdir)/DESC.in
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

10
font/devdvi/generate/Makefile
View File

@ -1,4 +1,4 @@
# Makefile for `font devdvi/generate'
# Makefile for 'font devdvi/generate'
#
# File position: <groff-source>/font/devdvi/generate/Makefile
#
@ -12,8 +12,8 @@
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# groff 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.
#
@ -24,8 +24,8 @@
# make -f generate/Makefile
# in the parent directory of the directory containing this file.
# Note that the following font files have manually added kerning values for
# `` and '': B, BI, I, R.
# Note manually-added kerning values for `` and '' in the font files:
# B, BI, I, R.
srcdir=generate
tfmdir=/usr/local/lib/groff-tfm

15
font/devhtml/devhtml.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -59,7 +58,11 @@ font/devhtml/DESC: $(devhtml_srcdir)/DESC.proto
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

18
font/devlatin1/devlatin1.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -43,11 +42,16 @@ font/devlatin1/DESC: $(devlatin1_srcdir)/DESC.proto
@echo Making $@
@$(MKDIR_P) `dirname $@`
@$(SHELL) $(GENDESCSH) $(devlatin1_srcdir)/DESC.proto \
$(DEVLATIN1RES) $(DEVLATIN1CPI) $(DEVLATIN1LPI) $(DEVLATIN1FONTS) > $@
$(DEVLATIN1RES) $(DEVLATIN1CPI) $(DEVLATIN1LPI) \
$(DEVLATIN1FONTS) > $@
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

15
font/devlbp/devlbp.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -57,7 +56,11 @@ font/devlbp/DESC: $(devlbp_srcdir)/DESC.in
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

20
font/devlj4/devlj4.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -70,7 +69,7 @@ DEVLJ4FONTFILES = \
font/devlj4/WINGDINGS
devlj4fontdir = $(fontdir)/devlj4
dist_devlj4font_DATA = $(DEVLJ4FONTFILES)
dist_devlj4font_DATA = $(DEVLJ4FONTFILES)
nodist_devlj4font_DATA = font/devlj4/DESC
DEVLJ4GENFILES = \
@ -103,11 +102,16 @@ font/devlj4/DESC: $(devlj4_srcdir)/DESC.in
fonts: devlj4_fonts
devlj4_fonts: hpftodit font/devlj4/DESC
$(MAKE) -f $(devlj4_srcdir)/generate/Makefile \
srcdir=$(devlj4_srcdir)/generate HPFTODIT=$(top_builddir)/hpftodit
srcdir=$(devlj4_srcdir)/generate \
HPFTODIT=$(top_builddir)/hpftodit
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

10
font/devlj4/generate/Makefile
View File

@ -1,4 +1,4 @@
# Makefile for `font devlj4 generate'
# Makefile for 'font devlj4 generate'
#
# File position: <groff-source>/font/devlj4/generate/Makefile
#
@ -9,11 +9,11 @@
#
# groff 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, either version 3 of the License, or
# (at your option) any later version.
# Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# groff 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.
#

16
font/devlj4/generate/text.map
View File

@ -2,7 +2,7 @@
#
# Created 30 December 2003 -- you need hpftodit from groff 1.19.1 or newer!
#
# Glyphs marked with an asterisk have (also) an entry in `special.umap'.
# Glyphs marked with an asterisk have (also) an entry in 'special.umap'.
# Unknown MSL numbers are marked with a question mark; glyphs with an
# uncertain Unicode mapping are tagged also with a question mark.
@ -277,7 +277,7 @@
# 225 down arrow *
# 226 right arrow *
# 227 left arrow *
# 228 tick up at left (`logicalnotflopped') *
# 228 tick up at left ('logicalnotflopped') *
# 229 left/right arrow *
# 230 up solid arrowhead *
@ -407,9 +407,9 @@
342 0111 u0111
# 343-369 ?
# 370 `lira' ?
# 370 'lira' ?
# 371-374 ?
# 375 `asciigrave' ?
# 375 'asciigrave' ?
# 376-399 ?
@ -795,12 +795,12 @@
# 1110 medium open bullet *
# 1111 large solid bullet ?
# 1112 visible carriage return *
# 1113 visible tab (`arrowtab') ?
# 1113 visible tab ('arrowtab') ?
# 1114 visible space *
# 1115 visible soft hyphen -- unused
# 1116 visible end-of-file (`embox')?
# 1117 `enspacereverse' ?
# 1118 `emspacereverse' ?
# 1116 visible end-of-file ('embox')?
# 1117 'enspacereverse' ?
# 1118 'emspacereverse' ?
# 1119 ?
# 1120-1399 ?

42
font/devpdf/devpdf.am
View File

@ -1,5 +1,4 @@
# Copyright (C) 2011-2015 Free Software Foundation, Inc.
# Free Software Foundation, Inc.
# Original Makefile.sub written
# by Deri James <deri@chuzzlewit.demon.co.uk>
# Automake migration by Bertrand Garrigues
@ -10,11 +9,11 @@
#
# groff 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, either version 3 of the License, or
# (at your option) any later version.
# Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# groff 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.
#
@ -70,7 +69,8 @@ $(DEVPDFFONTMAP_1):
@cp -f $(top_srcdir)/font/devps/generate/`basename $@` \
$(top_builddir)/font/devpdf/map
font/devpdf/util/BuildFoundries: shdeps.sed $(devpdf_srcdir)/util/BuildFoundries.pl
font/devpdf/util/BuildFoundries: shdeps.sed \
$(devpdf_srcdir)/util/BuildFoundries.pl
@echo Making $@
@$(MKDIR_P) $(top_builddir)/font/devpdf/util
@$(RM) $(top_builddir)/font/devpdf/util/BuildFoundries
@ -104,19 +104,23 @@ font/devpdf/DESC: $(devpdf_srcdir)/DESC.in
font/devpdf/Foundry:
@$(RM) $(top_builddir)/font/devpdf/Foundry
@sed "s|[@]urwfontsdir[@]|$(urwfontsdir)|" $(devpdf_srcdir)/Foundry.in >$(top_builddir)/font/devpdf/Foundry
@sed "s|[@]urwfontsdir[@]|$(urwfontsdir)|" \
$(devpdf_srcdir)/Foundry.in >$(top_builddir)/$@
all: font/devpdf/build_font_files
# PATH : path to find afmtodit. We add $(abs_top_builddir) because afmtodit is
# built in the top builddir.
font/devpdf/build_font_files: afmtodit font/devpdf/DESC $(devpdffontenc_DATA) $(devpdffontmap_DATA) $(devpdffont_DATA) font/devpdf/util/BuildFoundries
# PATH: path to find afmtodit. We add $(abs_top_builddir) because
# afmtodit is built in the top builddir.
font/devpdf/build_font_files: afmtodit font/devpdf/DESC \
$(devpdffontenc_DATA) $(devpdffontmap_DATA) $(devpdffont_DATA) \
font/devpdf/util/BuildFoundries
@echo Making all fonts
@$(RM) $@
@$(MKDIR_P) $(top_builddir)/font/devpdf
@echo "# foundry ps name psfile" > $(top_builddir)/font/devpdf/download
PATH="$(abs_top_builddir)$(GROFF_PATH_SEPARATOR)$(abs_top_builddir)/build-aux$(GROFF_PATH_SEPARATOR)$(PATH)" \
$(abs_top_builddir)/font/devpdf/util/BuildFoundries $(abs_top_builddir)/font/devpdf \
$(abs_top_builddir)/font/devpdf/util/BuildFoundries \
$(abs_top_builddir)/font/devpdf \
'$(abs_top_srcdir)/font/devps : $(abs_top_builddir)/font/devps' \
>> $(top_builddir)/font/devpdf/download
@touch $@
@ -124,7 +128,8 @@ font/devpdf/build_font_files: afmtodit font/devpdf/DESC $(devpdffontenc_DATA) $(
mostlyclean-local: mostlyclean_devpdf_extra
mostlyclean_devpdf_extra:
@echo Cleaning font/devpdf
rm -rf $(top_builddir)/font/devpdf/enc $(top_builddir)/font/devpdf/map;
rm -rf $(top_builddir)/font/devpdf/enc \
$(top_builddir)/font/devpdf/map;
if test -d $(top_builddir)/font/devpdf; then \
for f in $(GROFF_FONT_FILES); do \
rm -f $(top_builddir)/font/devpdf/$$f; \
@ -141,10 +146,12 @@ install_devpdf:
if test -f $$f; then \
$(INSTALL_DATA) $$f $(DESTDIR)$(devpdffontdir)/$$f; \
else \
$(INSTALL_DATA) $(top_builddir)/font/devpdf/$$f $(DESTDIR)$(devpdffontdir)/$$f; \
$(INSTALL_DATA) $(top_builddir)/font/devpdf/$$f \
$(DESTDIR)$(devpdffontdir)/$$f; \
fi; \
done
$(INSTALL_DATA) $(top_builddir)/font/devpdf/download $(DESTDIR)$(devpdffontdir)/
$(INSTALL_DATA) $(top_builddir)/font/devpdf/download \
$(DESTDIR)$(devpdffontdir)/
uninstall_groffdirs: uninstall_devpdf
uninstall_devpdf:
@ -165,8 +172,11 @@ uninstall_devpdf:
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake:
# vim: set filetype=automake textwidth=72:

21
font/devps/devps.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -151,11 +150,11 @@ font/devps/DESC: $(devps_srcdir)/DESC.in
@test -z '$(PSPRINT)' || echo print '$(PSPRINT)' >>$@
fonts: devps_fonts
# We add top_builddir to the PATH in case the only afmtodit available is the
# one in the current build.
# We add top_builddir to the PATH in case the only afmtodit available is
# the one in the current build.
devps_fonts: afmtodit font/devps/DESC
PATH=$(top_builddir)$(GROFF_PATH_SEPARATOR)$(PATH) \
$(MAKE) -f $(devps_srcdir)/generate/Makefile \
$(MAKE) -f $(devps_srcdir)/generate/Makefile \
srcdir=$(devps_srcdir)/generate DESC=$(devps_srcdir)/DESC.in
font/devps/prologue: $(devps_srcdir)/prologue.ps
@ -173,7 +172,11 @@ font/devps/symbolsl.pfa: $(devps_srcdir)/symbolsl.ps
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

132
font/devps/generate/Makefile
View File

@ -10,8 +10,8 @@
# Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# groff 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.
#
@ -27,12 +27,12 @@
SHELL = /bin/sh
# Directory containing AFM files. Must not be current directory.
# Either long names (e.g., Times-Roman.afm) or short names (e.g., timesr.afm)
# may be used. See the afmname script.
# Either long names (e.g., Times-Roman.afm) or short names (e.g.,
# timesr.afm) may be used. See the afmname script.
afmdir=/usr/local/lib/afm
# The symbol font which fits to `Symbol.afm'. For the creation of
# `symbolsl.afm' we need the `printafm' script from ghostscript.
# The symbol font which fits to 'Symbol.afm'. For the creation of
# 'symbolsl.afm' we need the 'printafm' script from ghostscript.
symbolfont=/usr/local/lib/fonts/Symbol.pfb
PRINTAFM=printafm
@ -42,8 +42,15 @@ srcdir=generate
SPECIALFONTS=S
DINGBATSFONTS=ZD ZDR
GREEKFONTS=SS
TEXTFONTS=AB ABI AI AR BMB BMBI BMI BMR CB CBI CI CR HB HBI HI HR HNB HNBI \
HNI HNR NB NBI NI NR PB PBI PI PR TB TBI TI TR ZCMI
TEXTFONTS=AB ABI AI AR \
BMB BMBI BMI BMR \
CB CBI CI CR \
HB HBI HI HR \
HNB HNBI HNI HNR \
NB NBI NI NR \
PB PBI PI PR \
TB TBI TI TR \
ZCMI
FONTS=$(TEXTFONTS) $(SPECIALFONTS) $(GREEKFONTS) $(DINGBATSFONTS) EURO
@ -63,139 +70,173 @@ all: $(FONTS)
TR:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Times-Roman.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Times-Roman.afm` \
$(TEXTMAP) $@
TB:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Times-Bold.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Times-Bold.afm` \
$(TEXTMAP) $@
TI:
$(AFMTODIT) $(EFLAG) $(IFLAG) -a 7 \
`$(AFMNAME) $(afmdir)/Times-Italic.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Times-Italic.afm` \
$(TEXTMAP) $@
TBI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/Times-BoldItalic.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Times-BoldItalic.afm` \
$(TEXTMAP) $@
HR:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Helvetica.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Helvetica.afm` \
$(TEXTMAP) $@
HB:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Helvetica-Bold.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Helvetica-Bold.afm` \
$(TEXTMAP) $@
HI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/Helvetica-Oblique.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Helvetica-Oblique.afm` \
$(TEXTMAP) $@
HBI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/Helvetica-BoldOblique.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Helvetica-BoldOblique.afm` \
$(TEXTMAP) $@
CR:
$(AFMTODIT) $(NOLIGFLAG) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Courier.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Courier.afm` \
$(TEXTMAP) $@
CB:
$(AFMTODIT) $(NOLIGFLAG) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Courier-Bold.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Courier-Bold.afm` \
$(TEXTMAP) $@
CI:
$(AFMTODIT) $(NOLIGFLAG) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/Courier-Oblique.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Courier-Oblique.afm` \
$(TEXTMAP) $@
CBI:
$(AFMTODIT) $(NOLIGFLAG) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/Courier-BoldOblique.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Courier-BoldOblique.afm` \
$(TEXTMAP) $@
PR:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Palatino-Roman.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Palatino-Roman.afm` \
$(TEXTMAP) $@
PB:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Palatino-Bold.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Palatino-Bold.afm` \
$(TEXTMAP) $@
PI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/Palatino-Italic.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Palatino-Italic.afm` \
$(TEXTMAP) $@
PBI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/Palatino-BoldItalic.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Palatino-BoldItalic.afm` \
$(TEXTMAP) $@
NR:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/NewCenturySchlbk-Roman.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/NewCenturySchlbk-Roman.afm` \
$(TEXTMAP) $@
NB:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/NewCenturySchlbk-Bold.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/NewCenturySchlbk-Bold.afm` \
$(TEXTMAP) $@
NI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/NewCenturySchlbk-Italic.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/NewCenturySchlbk-Italic.afm` \
$(TEXTMAP) $@
NBI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/NewCenturySchlbk-BoldItalic.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/NewCenturySchlbk-BoldItalic.afm` \
$(TEXTMAP) $@
BMR:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Bookman-Light.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Bookman-Light.afm` \
$(TEXTMAP) $@
BMB:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Bookman-Demi.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Bookman-Demi.afm` \
$(TEXTMAP) $@
BMI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/Bookman-LightItalic.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Bookman-LightItalic.afm` \
$(TEXTMAP) $@
BMBI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/Bookman-DemiItalic.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Bookman-DemiItalic.afm` \
$(TEXTMAP) $@
AR:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/AvantGarde-Book.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/AvantGarde-Book.afm` \
$(TEXTMAP) $@
AB:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/AvantGarde-Demi.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/AvantGarde-Demi.afm` \
$(TEXTMAP) $@
AI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/AvantGarde-BookOblique.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/AvantGarde-BookOblique.afm` \
$(TEXTMAP) $@
ABI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/AvantGarde-DemiOblique.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/AvantGarde-DemiOblique.afm` \
$(TEXTMAP) $@
HNR:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Helvetica-Narrow.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Helvetica-Narrow.afm` \
$(TEXTMAP) $@
HNB:
$(AFMTODIT) $(EFLAG) $(RFLAG) \
`$(AFMNAME) $(afmdir)/Helvetica-Narrow-Bold.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Helvetica-Narrow-Bold.afm` \
$(TEXTMAP) $@
HNI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/Helvetica-Narrow-Oblique.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Helvetica-Narrow-Oblique.afm` \
$(TEXTMAP) $@
HNBI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/Helvetica-Narrow-BoldOblique.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/Helvetica-Narrow-BoldOblique.afm` \
$(TEXTMAP) $@
ZCMI:
$(AFMTODIT) $(EFLAG) $(IFLAG) \
`$(AFMNAME) $(afmdir)/ZapfChancery-MediumItalic.afm` $(TEXTMAP) $@
`$(AFMNAME) $(afmdir)/ZapfChancery-MediumItalic.afm` \
$(TEXTMAP) $@
ZD:
$(AFMTODIT) -s $(RFLAG) \
`$(AFMNAME) $(afmdir)/ZapfDingbats.afm` $(srcdir)/dingbats.map $@
`$(AFMNAME) $(afmdir)/ZapfDingbats.afm` \
$(srcdir)/dingbats.map $@
SS: symbolsl.afm
$(AFMTODIT) -s -x $(IFLAG) \
@ -219,7 +260,8 @@ freeeuro.afm freeeuro.pfa: $(srcdir)/freeeuro.sfd
symbol.afm: $(srcdir)/symbol.sed
$(RM) $@
sed -f $(srcdir)/symbol.sed `$(AFMNAME) $(afmdir)/Symbol.afm` >$@
sed -f $(srcdir)/symbol.sed `$(AFMNAME) $(afmdir)/Symbol.afm` \
>$@
symbolsl.afm: $(srcdir)/symbolsl.awk $(srcdir)/../symbolsl.ps
$(RM) $@ Fontmap
@ -260,9 +302,11 @@ extraclean: realclean
.PHONY: all clean realclean extraclean
########################################################################
# Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile
# fill-column: 72
# End:
# vim: set textwidth=72:

3
font/devps/generate/make-zapfdr
View File

@ -2,8 +2,7 @@
#
# make-zapfdr -- script for creating the file zapfdr.ps
#
# Copyright (C) 2006, 2009
# Free Software Foundation, Inc.
# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
# Written by Werner Lemberg <wl@gnu.org>
#
# This file is part of groff.

2
font/devps/prologue.ps
View File

@ -170,7 +170,7 @@
setgray fill
} bind def
% fill with the ``current color''
% fill with the "current color"
/FL /fill load def

14
font/devutf8/NOTES
View File

@ -11,8 +11,8 @@ HYPHEN-MINUS is so ambiguous that it is unusable for serious typographic
use.
\[wp] has been mapped to 0x2118, because according to Unicode 4.1's
NamesList.txt, U+2118 SCRIPT CAPITAL P is really a Weierstrass `p',
neither SCRIPT not CAPITAL.
NamesList.txt, U+2118 SCRIPT CAPITAL P is really a Weierstrass 'p',
neither SCRIPT nor CAPITAL.
The following line could be added; \[space] is known to devps but is not
documented and not known to devdvi (actually, there is no space glyph within
@ -20,19 +20,19 @@ the TeX system).
space 24 0 0x0020
devps maps \[a~] and `~' to `asciitilde', which is equivalent to 0x02DC, but
devps maps \[a~] and '~' to 'asciitilde', which is equivalent to 0x02DC, but
this glyph is just too small. We map them to 0x007E instead.
devps maps \[a^] and `^' to `circumflex', which is equivalent to 0x02C6, but
devps maps \[a^] and '^' to 'circumflex', which is equivalent to 0x02C6, but
this glyph is just too small. We map them to 0x005E instead.
devps maps \[*U] to `Upsilon1', which is equivalent to 0x03D2. We map it to
devps maps \[*U] to 'Upsilon1', which is equivalent to 0x03D2. We map it to
0x03A5 instead.
devps maps \[*W] to `Omega', which is equivalent to either 0x2126 or 0x03A9.
devps maps \[*W] to 'Omega', which is equivalent to either 0x2126 or 0x03A9.
We map it to 0x03A9.
devps maps \[*D] to `Delta', which is equivalent to either 0x2206 or 0x0394.
devps maps \[*D] to 'Delta', which is equivalent to either 0x2206 or 0x0394.
We map it to 0x0394.

15
font/devutf8/devutf8.am
View File

@ -1,16 +1,15 @@
# Copyright (C) 2014-15
# Free Software Foundation, Inc.
# Copyright (C) 2014-2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
# This file is part of `groff'
# This file is part of 'groff'.
#
# `groff' is free software; you can redistribute it and/or modify it
# 'groff' 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, either version 3 of the License, or
# (at your option) any later version.
#
# `groff' is distributed in the hope that it will be useful, but
# 'groff' 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.
@ -51,7 +50,11 @@ font/devutf8/DESC: $(devutf8_srcdir)/DESC.proto
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

17
font/scripts/scripts.am
View File

@ -1,5 +1,4 @@
# Copyright (C) 2015
# Free Software Foundation, Inc.
# Copyright (C) 2015 Free Software Foundation, Inc.
#
# Last update: 13 Aug 2015
#
@ -7,11 +6,11 @@
#
# groff 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, either version 2 of the License, or
# (at your option) any later version.
# Software Foundation, either version 2 of the License, or (at your
# option) any later version.
#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# groff 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.
#
@ -24,7 +23,11 @@ GENDESCSH = $(top_srcdir)/font/scripts/gendesc.sh
EXTRA_DIST += $(GENFONTSSH) $(GENDESCSH)
########################################################################
### Emacs settings
# Editor settings
########################################################################
#
# Local Variables:
# mode: makefile-automake
# fill-column: 72
# End:
# vim: set filetype=automake textwidth=72:

17
font/util/make-Rproto
View File

@ -2,19 +2,18 @@
#
# make-Rproto -- script for creating an R.proto file
#
# Copyright (C) 2006, 2009
# Free Software Foundation, Inc.
# Copyright (C) 2006, 2009 Free Software Foundation, Inc.
# Written by Werner Lemberg <wl@gnu.org>
#
# This file is part of groff.
#
# groff 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, either version 3 of the License, or
# (at your option) any later version.
# Software Foundation, either version 3 of the License, or (at your
# option) any later version.
#
# groff is distributed in the hope that it will be useful, but WITHOUT ANY
# WARRANTY; without even the implied warranty of MERCHANTABILITY or
# groff 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.
#
@ -26,10 +25,10 @@
#
# make-Rproto R.proto.in < uniuni.cpp > R.proto
#
# `R.proto.in' contains the device specific part of the R.proto file; it
# should end with a line containing the word `charset'.
# 'R.proto.in' contains the device specific part of the R.proto file; it
# should end with a line containing the word 'charset'.
#
# `uniuni.cpp' is located in directory `src/libs/libgroff'.
# 'uniuni.cpp' is located in directory 'src/libs/libgroff'.
prog="$0"