Merge branch 'master' of github.com:w3c/tidy-html5

This commit is contained in:
Michael[tm] Smith 2012-08-21 20:37:24 +09:00
commit 0cf6d99843
73 changed files with 7 additions and 390 deletions

View file

@ -1,11 +1,5 @@
# Makefile - for tidy - HTML parser and pretty printer
#
# CVS Info :
#
# $Author: arnaud02 $
# $Date: 2008/03/22 21:13:38 $
# $Revision: 1.37 $
#
# Copyright (c) 1998-2008 World Wide Web Consortium
# (Massachusetts Institute of Technology, European Research
# Consortium for Informatics and Mathematics, Keio University).

View file

@ -1,11 +1,5 @@
# Makefile [Makefile.am] - for tidy - HTML parser and pretty printer
#
# CVS Info :
#
# $Author: creitzel $
# $Date: 2003/03/19 18:37:37 $
# $Revision: 1.3 $
#
# Copyright (c) 1998-2003 World Wide Web Consortium
# (Massachusetts Institute of Technology, European Research
# Consortium for Informatics and Mathematics, Keio University).

View file

@ -5,12 +5,6 @@
# Consortium for Informatics and Mathematics, Keio University).
# All Rights Reserved.
#
# CVS Info :
#
# $Author: arnaud02 $
# $Date: 2008/03/24 21:08:16 $
# $Revision: 1.4 $
#
AC_INIT([include/tidy.h])

View file

@ -1,11 +1,5 @@
# Makefile [Makefile.am] - for tidy - HTML parser and pretty printer
#
# CVS Info :
#
# $Author: arnaud02 $
# $Date: 2008/03/17 12:49:40 $
# $Revision: 1.3 $
#
# Copyright (c) 1998-2008 World Wide Web Consortium
# (Massachusetts Institute of Technology, European Research
# Consortium for Informatics and Mathematics, Keio University).

View file

@ -1,11 +1,5 @@
# Makefile [Makefile.am] - for tidy - HTML parser and pretty printer
#
# CVS Info :
#
# $Author: arnaud02 $
# $Date: 2006/10/06 09:25:13 $
# $Revision: 1.3 $
#
# Copyright (c) 1998-2006 World Wide Web Consortium
# (Massachusetts Institute of Technology, European Research
# Consortium for Informatics and Mathematics, Keio University).

View file

@ -1,11 +1,5 @@
# Makefile [Makefile.am] - for tidy - HTML parser and pretty printer
#
# CVS Info :
#
# $Author: arnaud02 $
# $Date: 2008/03/17 12:49:41 $
# $Revision: 1.8 $
#
# Copyright (c) 1998-2008 World Wide Web Consortium
# (Massachusetts Institute of Technology, European Research
# Consortium for Informatics and Mathematics, Keio University).

View file

@ -1,15 +1,8 @@
#
# spec file for package tidy
# RPM spec file for tidy
#
# (c) 2006 (W3C) MIT, ERCIM, Keio University
# See tidy.h for the copyright notice.
#
# CVS Info :
#
# $Author: arnaud02 $
# $Date: 2006/02/22 14:21:12 $
# $Revision: 1.2 $
#
# Contributing Author(s):
# Sierk Bornemann <bornemann@users.sourceforge.net>
#

View file

@ -6,11 +6,6 @@
Consortium for Informatics and Mathematics, Keio University).
All Rights Reserved.
CVS Info :
$Author: arnaud02 $
$Date: 2008/03/22 20:53:08 $
$Revision: 1.50 $
*/
#include "tidy.h"

View file

@ -8,12 +8,6 @@
Written by Charles Reitzel and Jelks Cabaniss
CVS Info :
$Author: arnaud02 $
$Date: 2005/04/13 11:10:58 $
$Revision: 1.2 $
-->
<xsl:stylesheet version="1.0"

View file

@ -8,12 +8,6 @@
Written by Jelks Cabaniss and Arnaud Desitter
CVS Info :
$Author: arnaud02 $
$Date: 2007/02/01 12:25:21 $
$Revision: 1.8 $
-->
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">

View file

@ -6,12 +6,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2007/01/23 11:17:45 $
$Revision: 1.9 $
Requires buffer to automatically grow as bytes are added.
Must keep track of current read and write points.

View file

@ -6,12 +6,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2008/03/17 12:57:01 $
$Revision: 1.66 $
*/
#ifdef __cplusplus

View file

@ -16,12 +16,6 @@
Consortium for Informatics and Mathematics, Keio University).
All Rights Reserved.
CVS Info :
$Author: arnaud02 $
$Date: 2008/04/22 11:00:42 $
$Revision: 1.22 $
Contributing Author(s):
Dave Raggett <dsr@w3.org>

View file

@ -11,12 +11,6 @@
Consortium for Informatics and Mathematics, Keio University).
All Rights Reserved.
CVS Info :
$Author: arnaud02 $
$Date: 2008/06/18 20:18:54 $
$Revision: 1.18 $
Contributing Author(s):
Dave Raggett <dsr@w3.org>

View file

@ -4,12 +4,6 @@
Portions (c) 1998-2009 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2009/03/25 22:04:35 $
$Revision: 1.42 $
*/
/*********************************************************************

View file

@ -7,12 +7,6 @@
Portions (c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2006/09/12 15:14:44 $
$Revision: 1.7 $
*/
/*********************************************************************

View file

@ -3,12 +3,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2006/12/29 16:31:07 $
$Revision: 1.7 $
*/
#include "tidy.h"

View file

@ -3,11 +3,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info:
$Author: arnaud02 $
$Date: 2006/09/12 15:14:44 $
$Revision: 1.5 $
*/
#include "tidy-int.h"

View file

@ -3,7 +3,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
$Id: attrdict.c,v 1.7 2006/10/31 10:50:10 arnaud02 Exp $
*/
#include "forward.h"

View file

@ -6,7 +6,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
$Id: attrdict.h,v 1.4 2006/09/12 15:14:44 arnaud02 Exp $
*/
#include "tidy.h"

View file

@ -3,11 +3,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info:
$Author: arnaud02 $
$Date: 2006/09/12 15:14:44 $
$Revision: 1.6 $
*/
#include "tidy-int.h"

View file

@ -3,12 +3,6 @@
(c) 1998-2009 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2009/03/26 13:05:22 $
$Revision: 1.132 $
*/
#include "tidy-int.h"

View file

@ -6,12 +6,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2007/06/14 09:36:06 $
$Revision: 1.29 $
*/
#include "forward.h"

View file

@ -3,12 +3,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2007/01/23 11:17:46 $
$Revision: 1.14 $
Requires buffer to automatically grow as bytes are added.
Must keep track of current read and write points.

View file

@ -3,7 +3,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
$Id: charsets.c,v 1.6 2006/09/18 09:52:33 arnaud02 Exp $
*/
#include "forward.h"

View file

@ -3,7 +3,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
$Id: charsets.h,v 1.2 2006/09/12 15:14:44 arnaud02 Exp $
*/
uint TY_(GetEncodingIdFromName)(ctmbstr name);

View file

@ -4,12 +4,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2008/10/14 12:18:10 $
$Revision: 1.111 $
Filters from other formats such as Microsoft Word
often make excessive use of presentation markup such
as font tags, B, I, and the align attribute. By applying

View file

@ -6,11 +6,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info:
$Author: arnaud02 $
$Date: 2006/09/12 15:14:44 $
$Revision: 1.14 $
*/
void TY_(FixNodeLinks)(Node *node);

View file

@ -4,15 +4,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2008/06/18 20:18:54 $
$Revision: 1.111 $
*/
/*
config files associate a property name with a value.
// comments can start at the beginning of a line

View file

@ -6,12 +6,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2006/12/29 16:31:08 $
$Revision: 1.14 $
config files associate a property name with a value.
// comments can start at the beginning of a line

View file

@ -3,12 +3,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: hoehrmann $
$Date: 2008/08/09 11:55:27 $
$Revision: 1.19 $
Entity handling can be static because there are no config or
document-specific values. Lookup table is 100% defined at
compile time.

View file

@ -6,12 +6,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2006/09/12 15:14:44 $
$Revision: 1.8 $
*/
#include "forward.h"

View file

@ -3,12 +3,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2007/05/30 16:47:31 $
$Revision: 1.17 $
Default implementations of Tidy input sources
and output sinks based on standard C FILE*.

View file

@ -9,10 +9,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info:
$Author: arnaud02 $
$Date: 2007/05/30 16:47:31 $
$Revision: 1.8 $
*/
#include "buffio.h"

View file

@ -6,12 +6,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2007/02/11 09:45:52 $
$Revision: 1.7 $
Avoids many include file circular dependencies.
Try to keep this file down to the minimum to avoid

View file

@ -4,12 +4,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2008/10/14 12:18:10 $
$Revision: 1.111 $
Filters from other formats such as Microsoft Word
often make excessive use of presentation markup such
as font tags, B, I, and the align attribute. By applying

View file

@ -6,21 +6,14 @@
(c) 2012 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info:
$Author: dsr $
$Date: 2012/06/07 13:14:00 $
$Revision: 1.0 $
*/
/* clean html exported by Google Docs
- strip the script element, as the style sheet is a mess
- strip class attributes
- strip span elements, leaving their content in place
- replace <a name=...></a> by id on parent element
- strip empty <p> elements
*/
void TY_(CleanGoogleDocument)( TidyDocImpl* doc );
#endif /* __GDOC_H__ */

View file

@ -3,7 +3,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
$Id: iconvtc.c,v 1.2 2008/08/09 11:55:27 hoehrmann Exp $
*/
#include "tidy.h"

View file

@ -7,7 +7,6 @@
(c) 1998-2003 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
$Id: iconvtc.h,v 1.1 2003/04/28 22:59:41 hoehrmann Exp $
*/

View file

@ -3,12 +3,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2006/12/29 16:31:08 $
$Revision: 1.21 $
*/
#include "tidy-int.h"

View file

@ -3,12 +3,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2008/03/22 21:06:55 $
$Revision: 1.194 $
*/
/*

View file

@ -6,14 +6,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info:
$Author: arnaud02 $
$Date: 2008/03/22 21:06:11 $
$Revision: 1.41 $
*/
/*
Given an input source, it returns a sequence of tokens.
GetToken(source) gets the next token

View file

@ -7,12 +7,6 @@
You should only need to edit this file and tidy.c
to localize HTML tidy. *** This needs checking ***
CVS Info :
$Author: arnaud02 $
$Date: 2008/06/18 20:18:54 $
$Revision: 1.178 $
*/
#include "tidy-int.h"

View file

@ -5,7 +5,6 @@
Originally contributed by Cory Nelson and Nuno Lopes
$Id: mappedio.c,v 1.14 2008/03/18 20:19:35 arnaud02 Exp $
*/
/* keep these here to keep file non-empty */

View file

@ -6,7 +6,6 @@
(c) 2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
$Id: mappedio.h,v 1.2 2006/09/15 16:50:37 arnaud02 Exp $
*/
#if defined(_WIN32)

View file

@ -6,12 +6,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2007/05/30 16:47:31 $
$Revision: 1.29 $
*/
#include "forward.h"

View file

@ -3,12 +3,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: krusch $
$Date: 2009/10/27 19:27:49 $
$Revision: 1.188 $
*/
#include "tidy-int.h"

View file

@ -6,12 +6,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2007/05/30 16:47:31 $
$Revision: 1.14 $
*/
#include "forward.h"

View file

@ -4,12 +4,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2008/03/22 20:23:37 $
$Revision: 1.119 $
*/
#include <stdio.h>

View file

@ -6,11 +6,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info:
$Author: arnaud02 $
$Date: 2007/02/11 09:45:08 $
$Revision: 1.9 $
*/
#include "forward.h"

View file

@ -3,12 +3,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2008/03/22 21:00:18 $
$Revision: 1.43 $
Wrapper around Tidy input source and output sink
that calls appropriate interfaces, and applies
necessary char encoding transformations: to/from

View file

@ -6,12 +6,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2007/07/22 09:33:26 $
$Revision: 1.21 $
Wrapper around Tidy input source and output sink
that calls appropriate interfaces, and applies
necessary char encoding transformations: to/from

View file

@ -3,12 +3,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2006/09/12 15:14:44 $
$Revision: 1.6 $
*/
#include "tidy-int.h"

View file

@ -3,12 +3,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: hoehrmann $
$Date: 2008/08/09 11:55:27 $
$Revision: 1.71 $
The HTML tags are stored as 8 bit ASCII strings.
*/

View file

@ -6,12 +6,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2006/12/15 10:17:55 $
$Revision: 1.20 $
The HTML tags are stored as 8 bit ASCII strings.
Use lookupw() to find a tag given a wide char string.

View file

@ -6,12 +6,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2007/02/11 09:45:52 $
$Revision: 1.13 $
*/
#include "tidy.h"

View file

@ -3,12 +3,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2008/06/18 20:18:54 $
$Revision: 1.75 $
Defines HTML Tidy API implemented by tidy library.
Very rough initial cut for discussion purposes.

View file

@ -3,12 +3,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2006/12/29 16:31:08 $
$Revision: 1.13 $
*/
#include "forward.h"

View file

@ -6,12 +6,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2006/12/29 16:31:09 $
$Revision: 1.11 $
*/
#include "platform.h"

View file

@ -3,12 +3,6 @@
(c) 1998-2007 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2007/05/30 16:47:31 $
$Revision: 1.10 $
Uses public interfaces to abstract input source and output
sink, which may be user supplied or either FILE* or memory
based Tidy implementations. Encoding support is uniform

View file

@ -6,12 +6,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
CVS Info :
$Author: arnaud02 $
$Date: 2006/09/12 15:14:44 $
$Revision: 1.5 $
*/
#include "platform.h"

View file

@ -3,7 +3,6 @@
(c) 1998-2008 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
$Id: win32tc.c,v 1.12 2008/08/09 11:55:27 hoehrmann Exp $
*/
/* keep these here to keep file non-empty */

View file

@ -7,7 +7,6 @@
(c) 1998-2006 (W3C) MIT, ERCIM, Keio University
See tidy.h for the copyright notice.
$Id: win32tc.h,v 1.3 2006/12/29 16:31:09 arnaud02 Exp $
*/
uint TY_(Win32MLangGetCPFromName)(TidyAllocator *allocator,ctmbstr encoding);

View file

@ -7,11 +7,6 @@ REM See tidy.c for the copyright notice.
REM
REM <URL:http://tidy.sourceforge.net/>
REM
REM CVS Info:
REM
REM $Author: arnaud02 $
REM $Date: 2006/10/20 16:44:40 $
REM $Revision: 1.2 $
@REM USER VARIABLES
@REM ##############

View file

@ -7,11 +7,6 @@ REM See tidy.c for the copyright notice.
REM
REM <URL:http://tidy.sourceforge.net/>
REM
REM CVS Info:
REM
REM $Author: arnaud02 $
REM $Date: 2006/12/30 08:36:33 $
REM $Revision: 1.3 $
REM (for MS compiler users):
REM call alltest1 ..\build\msvc\Release\tidy.exe .\tmp

View file

@ -7,11 +7,6 @@ REM See tidy.c for the copyright notice.
REM
REM <URL:http://tidy.sourceforge.net/>
REM
REM CVS Info:
REM
REM $Author: arnaud02 $
REM $Date: 2006/12/28 10:01:45 $
REM $Revision: 1.5 $
@if "%TIDY%." == "." goto Err1
@if NOT EXIST %TIDY% goto Err2

View file

@ -7,11 +7,6 @@ REM See tidy.c for the copyright notice.
REM
REM <URL:http://tidy.sourceforge.net/>
REM
REM CVS Info:
REM
REM $Author: arnaud02 $
REM $Date: 2006/10/20 16:44:40 $
REM $Revision: 1.2 $
echo Testing %1 %2 %3
set TESTNO=%1

View file

@ -8,12 +8,6 @@
#
# <URL:http://tidy.sourceforge.net/>
#
# CVS Info:
#
# $Author: arnaud02 $
# $Date: 2005/03/23 12:57:19 $
# $Revision: 1.1 $
#
# set -x
VERSION='$Id'

View file

@ -8,12 +8,6 @@
#
# <URL:http://tidy.sourceforge.net/>
#
# CVS Info:
#
# $Author: arnaud02 $
# $Date: 2007/02/04 17:35:31 $
# $Revision: 1.2 $
#
# set -x
VERSION='$Id'

View file

@ -8,12 +8,6 @@
#
# <URL:http://tidy.sourceforge.net/>
#
# CVS Info:
#
# $Author: creitzel $
# $Date: 2003/03/19 18:33:12 $
# $Revision: 1.18 $
#
# set -x
VERSION='$Id'

View file

@ -8,12 +8,6 @@
#
# <URL:http://tidy.sourceforge.net/>
#
# CVS Info:
#
# $Author: arnaud02 $
# $Date: 2006/01/04 10:27:12 $
# $Revision: 1.9 $
#
# set -x
VERSION='$Id'

View file

@ -8,12 +8,6 @@
#
# <URL:http://tidy.sourceforge.net/>
#
# CVS Info:
#
# $Author: arnaud02 $
# $Date: 2005/03/08 12:08:00 $
# $Revision: 1.5 $
#
# set -x
VERSION='$Id'

View file

@ -7,10 +7,5 @@ REM See tidy.c for the copyright notice.
REM
REM <URL:http://tidy.sourceforge.net/>
REM
REM CVS Info:
REM
REM $Author: creitzel $
REM $Date: 2003/03/19 18:33:12 $
REM $Revision: 1.1 $
for /F "tokens=1*" %%i in (xmlcases.txt) do call onetest.cmd %%i %%j