From owner-svn-doc-projects@FreeBSD.ORG  Mon Aug 27 10:15:10 2012
Return-Path: <owner-svn-doc-projects@FreeBSD.ORG>
Delivered-To: svn-doc-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E8716106564A;
	Mon, 27 Aug 2012 10:15:10 +0000 (UTC)
	(envelope-from gabor@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D470E8FC20;
	Mon, 27 Aug 2012 10:15:10 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7RAFAoN078721;
	Mon, 27 Aug 2012 10:15:10 GMT (envelope-from gabor@svn.freebsd.org)
Received: (from gabor@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7RAFAgx078719;
	Mon, 27 Aug 2012 10:15:10 GMT (envelope-from gabor@svn.freebsd.org)
Message-Id: <201208271015.q7RAFAgx078719@svn.freebsd.org>
From: Gabor Kovesdan <gabor@FreeBSD.org>
Date: Mon, 27 Aug 2012 10:15:10 +0000 (UTC)
To: doc-committers@freebsd.org, svn-doc-projects@freebsd.org
X-SVN-Group: doc-projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r39458 - projects/sgml2xml/share/mk
X-BeenThere: svn-doc-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for doc projects trees
	<svn-doc-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-doc-projects>
List-Post: <mailto:svn-doc-projects@freebsd.org>
List-Help: <mailto:svn-doc-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-doc-projects>, 
	<mailto:svn-doc-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 27 Aug 2012 10:15:11 -0000

Author: gabor
Date: Mon Aug 27 10:15:10 2012
New Revision: 39458
URL: http://svn.freebsd.org/changeset/doc/39458

Log:
  - Only drop -raw -preserve tidy flags when the encoding is ISO8859-1.
    For other encodings, it caused rendering problems.
  
  Approved by:	doceng (implicit)

Modified:
  projects/sgml2xml/share/mk/doc.docbook.mk

Modified: projects/sgml2xml/share/mk/doc.docbook.mk
==============================================================================
--- projects/sgml2xml/share/mk/doc.docbook.mk	Mon Aug 27 08:05:18 2012	(r39457)
+++ projects/sgml2xml/share/mk/doc.docbook.mk	Mon Aug 27 10:15:10 2012	(r39458)
@@ -257,7 +257,11 @@ TOUCH?=		/usr/bin/touch
 XARGS?=		/usr/bin/xargs
 
 GROFF?=		groff
-TIDYOPTS?=	-wrap 90 -m -f /dev/null -asxml ${TIDYFLAGS}
+.if empty(LANGCODE:S/./ . /g:MISO8859-1)
+TIDYOPTS?=	-wrap 90 -m -raw -preserve -f /dev/null -asxml ${TIDYFLAGS}
+.else
+TIDYOPTS?=	-wrap 90 -m -f /dev/null -asxml ${TIDYFLAGS
+.endif
 HTML2TXT?=	${PREFIX}/bin/links
 HTML2TXTOPTS?=	-dump -width 72 ${HTML2TXTFLAGS}
 HTML2PDB?=	${PREFIX}/bin/iSiloBSD