From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.7 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0C9BC43381 for ; Thu, 11 Feb 2021 23:36:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 99B246023B for ; Thu, 11 Feb 2021 23:36:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230127AbhBKXgb (ORCPT ); Thu, 11 Feb 2021 18:36:31 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44482 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229844AbhBKXgX (ORCPT ); Thu, 11 Feb 2021 18:36:23 -0500 Received: from mail-ot1-x32b.google.com (mail-ot1-x32b.google.com [IPv6:2607:f8b0:4864:20::32b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CA2CC061756 for ; Thu, 11 Feb 2021 15:35:43 -0800 (PST) Received: by mail-ot1-x32b.google.com with SMTP id y11so6878631otq.1 for ; Thu, 11 Feb 2021 15:35:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=EN3GUn0G+as/kVN2AKBmb8Gvg1vPaJ4dbCT7NtDAVB8=; b=kzl5mq1AJX95+e/hmR2tQ78JQxdx24RzkAvWY1cpvUMv1cV6VdQUsK3wNEGt2SzmFh YcZW3xnufX7pGbiFIhs8/dx+pmuZ1J43HmH83daxjDsQii4wjjQnpt3Vc5NrH0NNi7GL cR1Ks8fBt3SaPqRQNrJicQsuv2/a5YM/GFoHh/xRUzGWSmkQq/lP0qEPJGRDOS8b9gLT NkNh+dbV1N8HmZxZhOuUCvdI+HXjttRLOknwuGW0F0QCaHRZQSqtXYnszg9py3a6twbP e2tCdJZnYb+McqKUq1V8AxjBdYC9h6/ULVthxS7GqQPme2GpgARDreIEtkKX8of9//US Hcbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=EN3GUn0G+as/kVN2AKBmb8Gvg1vPaJ4dbCT7NtDAVB8=; b=dGhBHWZb5wWLFHXsCKaA33a5uQINRgm4B7F7UmsYGlugtTrOkYP8e8uYltlvnOPclj vnYyK9xcXEwRHH0DNBl6noZ62tgDKGztmQCIXPyirbZ4KByRXYC9agX2NMXovDVnefKs ZOcv/TbDvB/ggQjjANU2x50l/qNE+fDbwYbribhOUsq0akMSt4FkfDv1oR9NK5pA+qbx seTLjB49S7/MW0FPP8ovWjxqxpXu/4ipuzxdZzMMfg685gWo6NLG1dmO9CABo6h9KOH1 8wGVFQO3aEjM96vqdnN6+H5WCxkFnNehB2BsovQmUgBloukq9QDE7dK2tFaZ5CN2Z83u W5Eg== X-Gm-Message-State: AOAM533BzRygli3xLQOMUuqGusvMNvbFimP5FKmZfxaKnGRT1h2Xo+Kq ZSanoWEDuxYOzJKhuYhG/U3/nP3wobQHLMA2fV1TtfslrBKg2A== X-Google-Smtp-Source: ABdhPJzfqAKoap3fc4WFjPgAAIxaFKtQYnnxHG+Xn9o1eZtXi9lgQj3nKPeOfXAXpwu7Td06KkuZhNDYuhz5ue7gKEk= X-Received: by 2002:a05:6830:3482:: with SMTP id c2mr294643otu.59.1613086542906; Thu, 11 Feb 2021 15:35:42 -0800 (PST) MIME-Version: 1.0 References: <90473e07-fe79-18d8-4772-52deb4f8e1bd@gmail.com> In-Reply-To: <90473e07-fe79-18d8-4772-52deb4f8e1bd@gmail.com> From: James Carter Date: Thu, 11 Feb 2021 18:35:32 -0500 Message-ID: Subject: Re: [PATCH v2 2/3] secilc/docs: add syntax highlighting for secil To: bauen1 Cc: SElinux list Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: selinux@vger.kernel.org On Sat, Feb 6, 2021 at 4:05 PM bauen1 wrote: > > This is done by creating a somewhat rudimentary KDE syntax xml for > pandoc. > > The default styles provided by pandoc don't look very good and don't > highlight e.g. the strings marked as builtin. > > Signed-off-by: Jonathan Hettwer Acked-by: James Carter > --- > secilc/docs/Makefile | 10 +- > secilc/docs/secil.xml | 236 ++++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 242 insertions(+), 4 deletions(-) > create mode 100644 secilc/docs/secil.xml > > diff --git a/secilc/docs/Makefile b/secilc/docs/Makefile > index 79a165ba..a91bcde0 100644 > --- a/secilc/docs/Makefile > +++ b/secilc/docs/Makefile > @@ -28,6 +28,8 @@ FILE_LIST ?= cil_introduction.md \ > > PANDOC_FILE_LIST = $(addprefix $(TMPDIR)/,$(FILE_LIST)) > > +PANDOC_HIGHLIGHT_STYLE="pygments" > + > PDF_OUT=CIL_Reference_Guide.pdf > HTML_OUT=CIL_Reference_Guide.html > PANDOC = pandoc > @@ -54,13 +56,13 @@ $(TMPDIR)/policy.cil: $(TESTDIR)/policy.cil > $(SED) -i '1i Example Policy\n=========\n```secil' $@ > echo '```' >> $@ > > -html: $(PANDOC_FILE_LIST) $(TMPDIR)/policy.cil > +html: $(PANDOC_FILE_LIST) $(TMPDIR)/policy.cil secil.xml > mkdir -p $(HTMLDIR) > - $(PANDOC) -t html $^ -o $(HTMLDIR)/$(HTML_OUT) > + $(PANDOC) --highlight-style=$(PANDOC_HIGHLIGHT_STYLE) --syntax-definition=secil.xml --standalone --metadata title="CIL Reference Guide" -t html $(PANDOC_FILE_LIST) $(TMPDIR)/policy.cil -o $(HTMLDIR)/$(HTML_OUT) > > -pdf: $(PANDOC_FILE_LIST) $(TMPDIR)/policy.cil > +pdf: $(PANDOC_FILE_LIST) $(TMPDIR)/policy.cil secil.xml > mkdir -p $(PDFDIR) > - $(PANDOC) --standalone --toc $^ -o $(PDFDIR)/$(PDF_OUT) > + $(PANDOC) --highlight-style=$(PANDOC_HIGHLIGHT_STYLE) --syntax-definition=secil.xml --standalone --toc $(PANDOC_FILE_LIST) $(TMPDIR)/policy.cil -o $(PDFDIR)/$(PDF_OUT) > > clean: > rm -rf $(HTMLDIR) > diff --git a/secilc/docs/secil.xml b/secilc/docs/secil.xml > new file mode 100644 > index 00000000..daa80ded > --- /dev/null > +++ b/secilc/docs/secil.xml > @@ -0,0 +1,236 @@ > + > + > + > + > + > + > + allow > + allowx > + auditallow > + auditallowx > + block > + blockabstract > + boolean > + booleanif > + category > + categoryalias > + categoryaliasactual > + categoryorder > + categoryset > + class > + classcommon > + classmap > + classmapping > + classorder > + classpermission > + classpermissionset > + common > + constrain > + context > + defaultrange > + defaultrole > + defaulttype > + defaultuser > + devicetreecon > + dontaudit > + dontauditx > + expandtypeattribute > + false > + filecon > + fsuse > + genfscon > + handleunknown > + ibendportcon > + ibpkeycon > + ioctl > + iomemcon > + ioportcon > + ipaddr > + level > + levelrange > + mls > + mlsconstrain > + mlsvalidatetrans > + netifcon > + neverallow > + neverallowx > + nodecon > + optional > + pcidevicecon > + perm > + permissionx > + pirqcon > + policycap > + portcon > + rangetransition > + role > + roleallow > + roleattribute > + roleattributeset > + rolebounds > + roletransition > + roletype > + selinuxuser > + selinuxuserdefault > + sensitivity > + sensitivityalias > + sensitivityaliasactual > + sensitivitycategory > + sensitivityorder > + sid > + sidcontext > + sidorder > + true > + tunable > + tunableif > + type > + typealias > + typealiasactual > + typeattribute > + typeattributeset > + typebounds > + typechange > + typemember > + typepermissive > + typetransition > + unordered > + user > + userattribute > + userattributeset > + userbounds > + userlevel > + userprefix > + userrange > + userrole > + validatetrans > + > + > + > + blockinherit > + call > + in > + macro > + > + > + > + and > + dom > + domby > + eq > + incomp > + neq > + not > + or > + range > + xor > + > + > + > + > + * > + all > + dccp > + false > + h1 > + h2 > + l1 > + l2 > + object_r > + r1 > + r2 > + r3 > + sctp > + self > + t1 > + t2 > + t3 > + tcp > + true > + u1 > + u2 > + u3 > + udp > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > + > -- > 2.30.0 >