Commit graph

1074 commits

Author SHA1 Message Date
Matt Dew
22ba43d198 Cleanup IDs and links in doc
1 - fix the capitalization of the ID attributes to match either the
     <title> or <funcdef> string it goes with.
2 - fix any <linkend>'s that were affected by 1.
3 - any <function> in the docs that has an actual funcdef,
will become an olink.

Signed-off-by: Matt Dew <marcoz@osource.org>
2011-10-07 22:52:30 -06:00
James Cloos
f858f3326a [nls] Fix typo/synco.
The iso8859-1 Compose table includes an optional section which uses
Ctrl<T> as a substitute for <Multi_key>.  In that section the sequence
to generate an @ (at) either was incorrectly copied from the Multi_key
section or was not kept in sync with the Multi_key section.

Fixing this eliminates the warning from compose-check.pl:

┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
┃ Clash with existing sequence in iso8859-1/Compose.pre
┃  on line 661: Ctrl<T> <A> <A>
┃    line #661: Ctrl<T> <A> <A>		: "\305"	Aring
┃    line #480: Ctrl<T> <A> <A>		: "@"	at
┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━

Signed-off-by: James Cloos <cloos@jhcloos.com>
2011-10-04 17:11:11 -04:00
Jeremy Huddleston
7f35f7efc2 Remove conflicting compose sequences for cent and colon
Regression from 4d78ad4bf6
Found by tinderbox

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-09-26 11:32:56 -07:00
Jeremy Huddleston
4d78ad4bf6 Add additional compose sequences for pound sterling, yen, and cent (mixed case)
https://bugs.freedesktop.org/show_bug.cgi?id=1013

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-26 00:37:38 -07:00
Jeremy Huddleston
0ca4153a37 Use a configure check for seteuid
HP-UX doesn't have seteuid

https://bugs.freedesktop.org/show_bug.cgi?id=1497

Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
2011-09-24 16:50:27 -07:00
Gaetan Nadon
79594b4d66 localedb specs: use <copyright> for first holder of multi license
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-20 16:08:21 -04:00
Gaetan Nadon
154430268c libX11 specs: use <copyright> for first holder of multi license
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-20 16:08:21 -04:00
Tollef Fog Heen
66e621f58d NLS: Add more vulgar fractions
Add 1/7, 1/9, 1/10 and 0/3 vulgar fractions.

Signed-off-by: Tollef Fog Heen <tfheen@err.no>
Signed-off-by: James Cloos <cloos@jhcloos.com>
2011-09-20 13:10:03 -04:00
Alexander Polakov
e37a6da814 XGrabKey manual page: change XAllowAccess to XAllowEvents in See Also
There is no XAllowAccess man page to see.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-09-19 15:11:56 -07:00
Gaetan Nadon
a23f3323f2 XKB: provide adequate quotes for the license text
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 15:27:44 -04:00
Gaetan Nadon
a9c7a5cad9 XIM: refactor the multi licensing legal text
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 15:18:53 -04:00
Gaetan Nadon
c46f934ed8 xim trans: restore Fujitsu copyright legal text
Somehow lost during docbook conversion. text from x.org ftp R7.5.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 10:33:30 -04:00
Gaetan Nadon
3d75f99338 xtrans: restore X Consortium original legal text
Asking X Consortium permission to use The Open Group name makes no sense.
Even more so in 1994 before X Window System was passed on to the Open Group.

Using original text from xorg-docs/general/License

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 10:11:46 -04:00
Gaetan Nadon
136a381585 Framework: restore X Consortium copyright
Somewhat dammaged during docbook conversion.
Also restore pasrt of the original license text

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 10:03:21 -04:00
Gaetan Nadon
33f3468784 localedb: restore X Consortium original legal text
Asking X Consortium permission to use The Open Group name makes no sense.
Even more so in 1994 before X Window System was passed on to the Open Group.

Using original text from xorg-docs/general/License

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 09:50:00 -04:00
Gaetan Nadon
e99c9338e4 specs: support multi licensed copyright notice and license text
For documentation having multiple licenses, the copyright and legalnotice
elements sequence cannot instantiated multiple times.
The copyright notice and license text are therefore coded inside a
legalnotice element. The role attribute on the paragraph is used to allow
styling of the copyright notice text which should not be italicized.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 08:27:33 -04:00
Gaetan Nadon
b9dedc757e localedb: add release info to spec
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 08:26:20 -04:00
Gaetan Nadon
4519c89a87 specs: fix The Open Group license text
The warranty referred to the X Consortium

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 08:05:32 -04:00
Gaetan Nadon
08ac378423 specs: The strandard name is still "X Consortium Standard"
This spec, and fsproto spec, are the only two docs with a different
standard name.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-19 08:03:39 -04:00
Gaetan Nadon
8dfbeb1b1b specs: support multi licensed copyright notice and license text
For documentation having multiple licenses, the copyright and legalnotice
elements sequence cannot instantiated multiple times.
The copyright notice and license text are therefore coded inside a legalnotice
element. The role attribute on the paragraph is used to allow styling of the
copyright notice text which should not be italicized.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-18 13:22:34 -04:00
Gaetan Nadon
278ca8947c docs: merge copyright holder under the same copyright notice
As per the docbook markup dtd.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-17 09:44:46 -04:00
Gaetan Nadon
7ff012bb43 specs: handle multiple sets of copyright notice/license/warranty
Docbook groups all the <copyright> elements together and all the
<legalnotice> elements together.

We cannot have a sequence:
<copyright> <legalnotice> <copyright> <legalnotice> [...]

A workaround, which was done in some documents, is to put the copyright
notice inside the legalnotice in plain text without the <copyright> element.
A formal paragraph title is added here which makes the copyright notice bold,
and makes it much easier to locate.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-17 09:44:01 -04:00
Gaetan Nadon
4a550c71b8 specs: remove orphan affiliation.
Authors affiliation are correct.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-14 15:55:42 -04:00
Gaetan Nadon
0cc02a6df6 specs: use appropriate markup for Copyright statements
Also move <releaseinfo> to match order of appearance

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-13 17:39:02 -04:00
Gaetan Nadon
afe13e19eb docs: use the &fullrelvers; entity to set X11 release information
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-12 20:38:12 -04:00
Gaetan Nadon
22a2153282 docs: remove <productnumber> which is not used by default
This element is not rendered by default on the title. A template
customization is required to display it.
X Window System does not have a product number.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-11 19:49:53 -04:00
Gaetan Nadon
719f16570d docs: use the &fullrelvers; entity to set X11 release information
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-11 17:46:59 -04:00
Gaetan Nadon
a6b2992f50 docs: remove orphan <affiliation>
Somehow created during the conversion from roff. Unable to locate
the author to which it belongs.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-11 17:38:42 -04:00
Gaetan Nadon
c7420060b6 docs: remove <productnumber> which is not used by default
This element is not rendered by default on the title. A template
customization is required to display it.
X Window System does not have a product number.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-11 17:38:05 -04:00
Gaetan Nadon
7d5b718c1e docbook.am: embed css styles inside the HTML HEAD element
Rather than referring to the external xorg.css stylesheet, embed the content
of the file in the html output produced. This is accomplished by using
version 1.10 of xorg-xhtml.xsl.

This makes the whole html docs tree much more relocatable.
In addition, it eliminates xorg.css as a runtime file which makes
xorg-sgml-doctools a build time only package.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-09 14:46:39 -04:00
Gaetan Nadon
24632d2804 compose: upgrade makefile to support olinking on chunked html
The essential differences over the regular docbook.am are:
Adding root.filename parameter for naming of chapters html files.
Using xhtml xmlto format and xorg-chunk.xsl stylesheet
Set olink.base.uri for pdf but not for chunked html
Olink is not applicable to ps and txt formats.

Html chapters are added to shelf_DATA as they are also installed.
The xml is generated from a perl script and not distributed.

Requires version 1.10 of xorg-sgml-doctools.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-09-09 14:44:53 -04:00
Gaetan Nadon
93ab0a1c9a docbook.am: refactor common flags for xmlto and xsltproc
Maximize reuse and reduce risk of setting the wrong flag
at the wrong place.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-08-31 19:46:20 -04:00
Gaetan Nadon
85b725aa9e docbook.am: add search path for local entities
Currently, only $(XORG_SGML_PATH)/X11 is searched for xml entities.
A module may want to add entities that apply only to itself and
not to all modules, like the xserver does.

This feature may or may not be used in this module, but all modules
share a copy of docbook.am.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-08-31 15:41:22 -04:00
Gaetan Nadon
b5ed2d368d docbook.am: explicitly list xmlto flags for each target
Normal evolution of make targets make it impractical to factor out
common command flags for xmlto.

The targets now list each command option as its presence or absence
needs to be justified.

xorg.ss is only needed by xmlto for html.
masterdb is only needed by xmlto.
img.src.path must not be used by html.
xsltproc need to use customization layer xorg-*.xsl.
txt format is not required to search masterdb.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-08-25 16:42:34 -04:00
Gaetan Nadon
d5b3605f3b docbook.am: do not generate docs if docbook customization layer is missing
The stylesheets used to be only about style, fonts or colors.
Complex features are now used like olink and chunked html which
may cause a build break when stylesheets are missing or lead to hard
to find problem.

Some modules may be built when stylesheets are present while others
are built without. There is no requirement to build crippled docs.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-08-25 13:12:49 -04:00
Gaetan Nadon
7f23c72c94 libX11 specs: review doclifter generated tables
Many tables had a questionnable layout and some had information dropped.
Each table was cross-referenced with a pre-docbook version
to ensure semantic integrity.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-08-19 21:16:01 -04:00
Gaetan Nadon
1efdbeb8cd credits.xml: remove toc from Acknowledgments
There should be no toc for a simple preface with only one
Acknowledgments section.

Use <simplesect> markup rather than sect1.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-08-19 21:16:01 -04:00
Gaetan Nadon
77cc17ed08 libX11 specs: move </para> above <varaiablelist>
Many, but not all, function synopsis have a paragraph that
nests the variable list. The code was generated by doclifter
and there is no apprent reasons as to why it was done this way.
Found while investigating a spacing issue.

Before the patch:
<para>Some blurb about the function
<funcsynopsis>
</funcsynopsis>
<variablelist>
</variablelist>
</para>

After the patch:
<para>Some blurb about the function</para>
<funcsynopsis>
</funcsynopsis>
<variablelist>
</variablelist>

There are no noticable differences when reading the doc
other than than the removed few pixels of spacing between
the function sysnopsis and the variable list block.

In some cases, there are no "blurb about the fucntion"
and the empty paragraph is removed.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-08-19 21:16:01 -04:00
Gaetan Nadon
18595f0d8f compose specs: generate chunked html
For large 600 page documents such as this one, chunked html
provide faster browser load time and better navigation.

Simply click on the locale of your choice in the toc and
the browser loads just that one file. Being a DocBook,
it benefits from all of the usual features and can be
integrated with the rest of the documentation.

Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-08-19 21:12:10 -04:00
Gaetan Nadon
5cc8815b8a specs: build compose keys tables in specs/i18n/compose
Build the tables article together with the rest of the specs.
Make it transparent that the source in generated in nls.
Reuse docbook.am and get all the features such as olink.

The docbook article file stem and id must be the same. The new name
for the main article is libX11-keys. The new installation location
is $docdir/libX11/i18n/compose.

The nls dir retains the role of generating the DocBook/XML source
but does not build neither installs output formats or generated source.

The tables article now has to specify that each included locale
section is a dependency. It did not matter before as they were web links.

The xorg-sgml-doctools masterdb shall be updated to include this new doc.
Install location moved from doc/libX11/Compose to doc/libX11/i18n/compose.

Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-08-05 12:36:03 -04:00
Gaetan Nadon
adebbe3856 nls: restructure charts as a single article with sections
Looks more like a real article with a toc rather than individual
web pages. Looks nicer in pdf.

Each locale is a "section" rather than an "article".
Using XInclude to aggregate xml source files gets you the toc for free.

The single document is over 600 pages while there were 62 separate
documents previously. FOP version 1.0 is required to handle missing
character like capital sharp s.

Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-08-05 12:36:03 -04:00
Alan Coopersmith
fc74dc12b1 libX11 1.4.4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-07-28 19:32:40 -07:00
Matt Dew
ab1f302317 Add id attributes to error codes to allow linking from other docs.
Signed-off-by: Matt Dew <marcoz@osource.org>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Acked-by: Gaetan Nadon <memsize@videotron.ca>
2011-07-17 10:28:42 -06:00
David Coppa
5c831fef40 Fix libpthread linkage on OpenBSD.
OpenBSD prefers to use the -pthread to fetch pthread libs when needed.

Signed-off-by: Matthieu Herrb <matthieu.herrb@laas.fr>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-07-14 14:04:27 +02:00
Gaetan Nadon
445b0b3efc config: use XORG_WITH_PERL macro to replace custom program check
New in version util-macros 1.15, the macro does the usual checking
for program path and provides an interface for makefile variables.

Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-28 11:29:12 -04:00
Gaetan Nadon
47d99a324d config: update XORG_WITH_FOP macro usage
A new feature to test for a minimum version has been added.

The parameter position changed. Due to limited usage
and requiring 1.15, it turns out to be backward compatible.

There is no functional change to how docs are build.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-28 11:24:52 -04:00
Gaetan Nadon
e659683ad5 Remove unused xmlrules.in in specs, now in /nls
The specs dir has been converted to docbook.am

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-22 20:32:10 -04:00
Gaetan Nadon
9992092609 nls: move xmlrules.in from specs to nls
It is no longer used in the specs dir.
Remove html from CLEANFILES as it breaks. Make do not clean directories
Remove SUFFIXES as pattern rules are used rather than suffix rules.

Other improvements are possible, the first priority is to move it out
of the specs dir.

Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2011-06-15 22:12:39 -04:00
Gaetan Nadon
b370eeb019 Install target dbs alongside generated documents
This matches a change in xorg-sgml-docs whereby the masterdb will look for
the target dbs into the same location as the generated documents.

The target dbs are now installed alongside the generated documents.
Previously they are installed in $prefix/sgml/X11/dbs alongside masterdb which
has the potential of installing outside the package prefix and cause
distcheck to fail when user does not have write permission in this package.

Requires XORG_CHECK_SGML_DOCTOOLS(1.8) which was released 2011-06-11
2011-06-11 19:49:23 -04:00
Alan Coopersmith
4e741654b7 specs/libX11: Turn appendix references into links
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-06-07 18:41:30 -07:00