From 0e2e3c958c9861861f0c556eba6e896707978c5c Mon Sep 17 00:00:00 2001
From: Thomas Preudhomme <thomas.preudhomme@foss.arm.com>
Date: Wed, 17 Aug 2016 17:05:07 +0100
Subject: [PATCH] Fix pdf build failure wrt documentation of is*_l functions

make pdf on arm-none-eabi targets fails to build after the reorganization in
baf0c9fcb56e5cf8f54357bf8d8646b51b236886 to fold is*_l documentation in their
is* counterpart. This is due two issues:

1) newlib/libc/ctype/ctype.tex still including the def file for the long versions
2) missing angle brackets in .c files for some of is*_l functions

This patch fixes the issues and allows make pdf to succeeds.
---
 newlib/libc/ctype/ctype.tex  | 99 ------------------------------------
 newlib/libc/ctype/isalpha.c  |  2 +-
 newlib/libc/ctype/isprint.c  |  4 +-
 newlib/libc/stdlib/strtoul.c |  4 +-
 4 files changed, 5 insertions(+), 104 deletions(-)

diff --git a/newlib/libc/ctype/ctype.tex b/newlib/libc/ctype/ctype.tex
index b18f496fa..e30c88510 100644
--- a/newlib/libc/ctype/ctype.tex
+++ b/newlib/libc/ctype/ctype.tex
@@ -78,198 +78,99 @@ The header file @file{ctype.h} defines the macros.
 @page
 @include ctype/isalnum.def
 
-@page
-@include ctype/isalnum_l.def
-
 @page
 @include ctype/isalpha.def
 
-@page
-@include ctype/isalpha_l.def
-
 @page
 @include ctype/isascii.def
 
-@page
-@include ctype/isascii_l.def
-
 @page
 @include ctype/isblank.def
 
-@page
-@include ctype/isblank_l.def
-
 @page
 @include ctype/iscntrl.def
 
-@page
-@include ctype/iscntrl_l.def
-
 @page
 @include ctype/isdigit.def
 
-@page
-@include ctype/isdigit_l.def
-
 @page
 @include ctype/islower.def
 
-@page
-@include ctype/islower_l.def
-
 @page
 @include ctype/isprint.def
 
-@page
-@include ctype/isprint_l.def
-
 @page
 @include ctype/ispunct.def
 
-@page
-@include ctype/ispunct_l.def
-
 @page
 @include ctype/isspace.def
 
-@page
-@include ctype/isspace_l.def
-
 @page
 @include ctype/isupper.def
 
-@page
-@include ctype/isupper_l.def
-
 @page
 @include ctype/isxdigit.def
 
-@page
-@include ctype/isxdigit_l.def
-
 @page
 @include ctype/toascii.def
 
-@page
-@include ctype/toascii_l.def
-
 @page
 @include ctype/tolower.def
 
-@page
-@include ctype/tolower_l.def
-
 @page
 @include ctype/toupper.def
 
-@page
-@include ctype/toupper_l.def
-
 @page
 @include ctype/iswalnum.def
 
-@page
-@include ctype/iswalnum_l.def
-
 @page
 @include ctype/iswalpha.def
 
-@page
-@include ctype/iswalpha_l.def
-
 @page
 @include ctype/iswcntrl.def
 
-@page
-@include ctype/iswcntrl_l.def
-
 @page
 @include ctype/iswblank.def
 
-@page
-@include ctype/iswblank_l.def
-
 @page
 @include ctype/iswdigit.def
 
-@page
-@include ctype/iswdigit_l.def
-
 @page
 @include ctype/iswgraph.def
 
-@page
-@include ctype/iswgraph_l.def
-
 @page
 @include ctype/iswlower.def
 
-@page
-@include ctype/iswlower_l.def
-
 @page
 @include ctype/iswprint.def
 
-@page
-@include ctype/iswprint_l.def
-
 @page
 @include ctype/iswpunct.def
 
-@page
-@include ctype/iswpunct_l.def
-
 @page
 @include ctype/iswspace.def
 
-@page
-@include ctype/iswspace_l.def
-
 @page
 @include ctype/iswupper.def
 
-@page
-@include ctype/iswupper_l.def
-
 @page
 @include ctype/iswxdigit.def
 
-@page
-@include ctype/iswxdigit_l.def
-
 @page
 @include ctype/iswctype.def
 
-@page
-@include ctype/iswctype_l.def
-
 @page
 @include ctype/wctype.def
 
-@page
-@include ctype/wctype_l.def
-
 @page
 @include ctype/towlower.def
 
-@page
-@include ctype/towlower_l.def
-
 @page
 @include ctype/towupper.def
 
-@page
-@include ctype/towupper_l.def
-
 @page
 @include ctype/towctrans.def
 
-@page
-@include ctype/towctrans_l.def
-
 @page
 @include ctype/wctrans.def
 
-@page
-@include ctype/wctrans_l.def
-
diff --git a/newlib/libc/ctype/isalpha.c b/newlib/libc/ctype/isalpha.c
index 221263c2d..59511e18e 100644
--- a/newlib/libc/ctype/isalpha.c
+++ b/newlib/libc/ctype/isalpha.c
@@ -1,6 +1,6 @@
 /*
 FUNCTION
-	<<isalpha>>, <isalpha_l>>---alphabetic character predicate
+	<<isalpha>>, <<isalpha_l>>---alphabetic character predicate
 
 INDEX
 	isalpha
diff --git a/newlib/libc/ctype/isprint.c b/newlib/libc/ctype/isprint.c
index 1ad34c8f9..21fdf5b1d 100644
--- a/newlib/libc/ctype/isprint.c
+++ b/newlib/libc/ctype/isprint.c
@@ -47,8 +47,8 @@ undefining either macro using `<<#undef isprint>>' or `<<#undef isgraph>>',
 or `<<#undef isprint_l>>' or `<<#undef isgraph_l>>'.
 
 RETURNS
-<<isprint>>,<isprint_l> return non-zero if <[c]> is a printing character.
-<<isgraph>>, <<isgraph_l> return non-zero if <[c]> is a printing character
+<<isprint>>, <<isprint_l>> return non-zero if <[c]> is a printing character.
+<<isgraph>>, <<isgraph_l>> return non-zero if <[c]> is a printing character
 except spaces.
 
 PORTABILITY
diff --git a/newlib/libc/stdlib/strtoul.c b/newlib/libc/stdlib/strtoul.c
index 062606f4e..aa5897e13 100644
--- a/newlib/libc/stdlib/strtoul.c
+++ b/newlib/libc/stdlib/strtoul.c
@@ -85,10 +85,10 @@ The alternate function <<_strtoul_r>> is a reentrant version.  The
 extra argument <[reent]> is a pointer to a reentrancy structure.
 
 RETURNS
-<<strtoul>>, <strtoul_l>> return the converted value, if any. If no
+<<strtoul>>, <<strtoul_l>> return the converted value, if any. If no
 conversion was made, <<0>> is returned.
 
-<<strtoul>>, <strtoul_l>> return <<ULONG_MAX>> if the magnitude of the
+<<strtoul>>, <<strtoul_l>> return <<ULONG_MAX>> if the magnitude of the
 converted value is too large, and sets <<errno>> to <<ERANGE>>.
 
 PORTABILITY