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 46E62C433E6 for ; Tue, 16 Feb 2021 14:42:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 0E48F64E68 for ; Tue, 16 Feb 2021 14:42:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229895AbhBPOl4 (ORCPT ); Tue, 16 Feb 2021 09:41:56 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54346 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229958AbhBPOlw (ORCPT ); Tue, 16 Feb 2021 09:41:52 -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 7FA83C061574 for ; Tue, 16 Feb 2021 06:41:12 -0800 (PST) Received: by mail-ot1-x32b.google.com with SMTP id 100so9175935otg.3 for ; Tue, 16 Feb 2021 06:41:12 -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=A001vMaPKkrejc2PnvNRSE7uR4tTUYeQmjy5Yi+EBe8=; b=aR7qm3VDdFoNB1zVPA8LgRCchqg/5OC8j549VQ9Yv8ofhVw845xOwsr8N4fdUM5GcU eRp73wHhTKyH0OaW6YdtgFgkJjQeSFkaUzjDIHRpJtAuf7uR/COm/rOXxP45/mjJleTq YAQ4k5DFOKh0rEZ/gYOQ6tx5jnLu3MCvZDWX27IzgR+owi2KYDosqKhCaN+MIOqyowFw IB6H0kc6IeszxOmWgwE+LkQzf+TNygbAWviG2oJmDHzKX/A+bFC9005hsUjwCaiT3vRG zQYUOZzx38g4MeAcCwzPAsE3mzvvzrh3dBxWrf/a8CcbLEK1Hpwu1iaDiPMP24tWWWum JcYQ== 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=A001vMaPKkrejc2PnvNRSE7uR4tTUYeQmjy5Yi+EBe8=; b=tesInPrdARFn76zEJV0vKcwOesfCfsXC7CwYk7zqA9nFmuWBfOP+g//X9C6lffkrBW q+LQnjnIxSnxPXI22BMFChdJocSIxlEpA6DYhMaTpOWACrteF1LgvUlTu34F0ssafQAj AmRk5Iy0nsNy3juuFEgum8NTus9y2YRBw6uYfO477jQSgNj/eO+OaI29W+lxFtvaknQB SN1KxIDHHSHYB95xx1UcXEmT1w/Ky4LIHosIXH7cVQUs0Gr16bZ+vYqdBPvuV20UuTe9 hnOTUsp2bE4ESUzoXWO7/JvjGNlbd9h74P5jTh8bVxozpWiAUCfP9a5etzEOncD+ak6f AlzA== X-Gm-Message-State: AOAM5321ws//o1HniBGv9C8s2JMzESEgMfTlOW1jIOg25FsGzHvMY9fz 0prbIUW23TkBvTBEAnFPEgGxlMSY7KLVqgF5jG4= X-Google-Smtp-Source: ABdhPJzF7McU9k7CEDbEVoZ03w/QUeqwwfT4W8ZDz1M9HMpx4Jcql2bvyBBzDVBz99QLZ2PjmfCjUrs2VQDGNIjykjg= X-Received: by 2002:a05:6830:1db3:: with SMTP id z19mr14924241oti.295.1613486471957; Tue, 16 Feb 2021 06:41:11 -0800 (PST) MIME-Version: 1.0 References: <90473e07-fe79-18d8-4772-52deb4f8e1bd@gmail.com> In-Reply-To: From: James Carter Date: Tue, 16 Feb 2021 09:41:01 -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 Thu, Feb 11, 2021 at 6:35 PM James Carter wrote: > > 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 > Applied. Thanks, Jim > > --- > > 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 > >