Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change Tagging of verbatim #1630

Open
wants to merge 18 commits into
base: develop
Choose a base branch
from
+10,137 −10,288
Open

Change Tagging of verbatim #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
61d825a
change verbatim tagging
u-fischer Jan 10, 2025
e72dd8e
update tagpdf to 0.99m
u-fischer Jan 11, 2025
90148fb
update verbatim tests
u-fischer Jan 11, 2025
91e8cab
update verbatim test.
u-fischer Jan 11, 2025
195bde1
update testfiles
u-fischer Jan 11, 2025
cd1a358
adapt fancyvrb
u-fischer Jan 11, 2025
934819f
update testfiles
u-fischer Jan 12, 2025
af79cb2
another block test
u-fischer Jan 12, 2025
1700236
more updates of testfiles.
u-fischer Jan 12, 2025
5ce670e
correct changes entries
u-fischer Jan 12, 2025
4d38bb3
correct another changes entry
u-fischer Jan 12, 2025
f655a0d
update tagpdf
u-fischer Jan 12, 2025
d01780d
Merge branch 'develop' into UF-latex-lab-verbatim
u-fischer Jan 12, 2025
b159ddb
merge develop
u-fischer Jan 20, 2025
cd095c7
update one more testfile
u-fischer Jan 20, 2025
a2191e6
update more testfiles
u-fischer Jan 20, 2025
b05a788
merge develop
u-fischer Jan 30, 2025
0ad4bd2
Merge branch 'develop' into UF-latex-lab-verbatim
u-fischer Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion required/latex-lab/changes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@

2024-01-30 Ulrike Fischer <[email protected]>
* latex-lab-block.dtx, latex-lab-namespace.dtx: change tagging of verbatim.

2025-01-27 Frank Mittelbach <[email protected]>

* latex-lab-firstaid.dtx (subsection{ams classes and amsthm}):
Add missing \par to abstract env (gh/1641)


2025-01-05 Ulrike Fischer <[email protected]>
* latex-lab-sec.dtx: add \par before \mainmatter etc (tagging/777)
* latex-lab-table.dtx: use ARIA-role as default for presentation tables (tagging/778), add option to use Div-structures instead of Table.


2024-12-27 Frank Mittelbach <[email protected]>

* latex-lab-table.dtx,latex-lab-toc-kernel-changes.dtx,
Expand Down
20 changes: 13 additions & 7 deletions required/latex-lab/latex-lab-block.dtx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,9 @@
%
% https://www.latex-project.org/lppl.txt
%
\def\ltlabblockdate{2025-01-18}
\def\ltlabblockversion{0.8z}
\def\ltlabblockdate{2025-01-20}
\def\ltlabblockversion{0.9a}

%<*driver>
\documentclass[kernel]{l3doc}
\usepackage{amstext}
Expand Down Expand Up @@ -3276,6 +3277,7 @@
% of a surrounding list. So instead we need to make sure that the
% paragraph end is executed in a group so that any parshape setup
% is preserved.
% \changes{v0.8x}{2025/01/12}{flattened para inside verbatim using codeline tag}
% \begin{macrocode}
%<@@=>
\def\legacyverbatimsetup{%
Expand All @@ -3294,8 +3296,7 @@
% \end{macrocode}
%
% \begin{macrocode}
\tl_set:Nn \l__tag_para_main_tag_tl {codeline}
\tagtool{paratag=Code}% oder faster: \tl_set:Nn\l__tag_para_tag_tl{Code}
\tl_set:Nn \l__tag_para_tag_tl {codeline}
}
%<@@=block>
% \end{macrocode}
Expand Down Expand Up @@ -3892,17 +3893,22 @@
%
% \begin{instance}{blockenv verbatim}
%
% The rolemapping is currently \struct{verbatim} to \struct{P} and
% The rolemapping is \struct{verbatim} to \struct{Code} and
% \struct{codeline} to \struct{Sub} (which is role mapped
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

closing ) missing?

% to \struct{Span} in pdf 1.7. Alternatives for PDF 1.7: \struct{Div} and \struct{P}.
%
% to \struct{Span} in pdf 1.7. Sub inside Code is allowed according
% the errata of ISO 32005. The paragraphs inside verbatim are flattened.
% Line numbers should inside the \struct{codeline} structure
% and be tagged either as \struct{Lbl} or \struct{Artifact}\struct{Lbl}.
%
% \changes{v0.8x}{2025/01/12}{use flattened para inside verbatim}
% \begin{macrocode}
\DeclareInstance{blockenv}{verbatim}{display}
{
env-name = verbatim,
tag-name = verbatim,
tag-class = ,
tagging-recipe = standard,
para-flattened = true,
inner-level-counter = ,
level-increase = false,
setup-code = ,
Expand Down
4 changes: 2 additions & 2 deletions required/latex-lab/latex-lab-firstaid.dtx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,7 +477,7 @@
% The environments are surrounded by a \texttt{verbatim} structure,
% every line by a \texttt{codeline}
% structure (this requires the block code, but firstaid should be used only with
% phase-III anyway). Line numbers are tagged as Lbl, currently outside of the
% phase-III anyway). Line numbers are tagged as Lbl, inside of the
% \texttt{codeline} structure. The frame lines are marked as artifact.
%
% \begin{macro}{\FV@LeaveVMode}
Expand Down Expand Up @@ -564,6 +564,7 @@
\hbox to \hsize{%
\kern\leftmargin
\hbox to \linewidth{%
\tag_struct_begin:n{tag=codeline}
\cs_if_exist:NT \FV@LeftListNumber
{
\tag_struct_begin:n{tag=Lbl}
Expand All @@ -578,7 +579,6 @@
\FV@LeftListFrame
\tag_mc_end:
}
\tag_struct_begin:n{tag=codeline}
\tag_mc_begin:n{}%
\FancyVerbFormatLine{#1}%
\tag_mc_end:
Expand Down
7 changes: 4 additions & 3 deletions required/latex-lab/latex-lab-namespace.dtx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
% \fi
% \title{Prototype reimplementation of \LaTeXe{}'s role mapping}
% \author{\LaTeX{} Project, initial implementation Ulrike Fischer}
% \date{v0.8b 2024-07-05}
% \date{v0.8c 2025-01-09}
%
% \maketitle
%
Expand All @@ -52,6 +52,7 @@
%
% \end{documentation}
% \begin{implementation}
% \changes{v0.8c}{2025/01/12}{changed mapping of verbatim to Code as Sub is now allowed inside Code}
% \begin{macrocode}
%<*ns-latex-lab>
%% \ProvidesExplFile {tagpdf-ns-latex-lab.def} {2023-09-04} {0.8}
Expand Down Expand Up @@ -88,7 +89,7 @@ enumerate, L, pdf2,
description, L, pdf2,
quote, BlockQuote,pdf,
quotation, BlockQuote,pdf,
verbatim, Div, pdf2, % overwritten by block
verbatim, Code, pdf, % overwritten by block
item, LI, pdf2,
itemlabel, Lbl, pdf2,
itembody, LBody, pdf2,
Expand All @@ -101,7 +102,7 @@ text, P, pdf2,
% \subsection{From block code}
% \begin{macrocode}
theorem-like, Sect, pdf2,
verbatim, P, pdf2,
verbatim, Code, pdf,
codeline, Sub, pdf2,
% \end{macrocode}
% \subsection{From float code}
Expand Down
152 changes: 76 additions & 76 deletions required/latex-lab/testfiles-OR-luatex/memoir-001.tpf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@ endobj
<< /Kids [55 0 R] >>
endobj
7 0 obj
<< /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H2 /subsection /H3 /subsubsection /H4 /paragraph /H5 /subparagraph /H6 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect /chapter /H1 >>
<< /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H2 /subsection /H3 /subsubsection /H4 /paragraph /H5 /subparagraph /H6 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /Code /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect /chapter /H1 >>
endobj
9 0 obj
<< /Type /StructElem /S /Document /P 5 0 R /K [10 0 R 36 0 R] /ID (ID.002) >>
Expand Down Expand Up @@ -1103,92 +1103,92 @@ xref
0000000003 00000 f
0000000004 00000 f
0000000008 00000 f
0000036682 00000 n
0000036685 00000 n
0000030045 00000 n
0000031044 00000 n
0000000000 00000 f
0000031636 00000 n
0000031730 00000 n
0000031817 00000 n
0000032127 00000 n
0000032262 00000 n
0000032438 00000 n
0000032559 00000 n
0000032694 00000 n
0000032870 00000 n
0000032991 00000 n
0000033126 00000 n
0000033302 00000 n
0000033423 00000 n
0000033558 00000 n
0000033734 00000 n
0000033855 00000 n
0000033990 00000 n
0000034166 00000 n
0000034287 00000 n
0000034422 00000 n
0000034598 00000 n
0000034719 00000 n
0000034854 00000 n
0000035030 00000 n
0000035151 00000 n
0000035286 00000 n
0000035462 00000 n
0000035583 00000 n
0000035670 00000 n
0000035851 00000 n
0000035987 00000 n
0000036163 00000 n
0000036284 00000 n
0000036420 00000 n
0000036561 00000 n
0000031639 00000 n
0000031733 00000 n
0000031820 00000 n
0000032130 00000 n
0000032265 00000 n
0000032441 00000 n
0000032562 00000 n
0000032697 00000 n
0000032873 00000 n
0000032994 00000 n
0000033129 00000 n
0000033305 00000 n
0000033426 00000 n
0000033561 00000 n
0000033737 00000 n
0000033858 00000 n
0000033993 00000 n
0000034169 00000 n
0000034290 00000 n
0000034425 00000 n
0000034601 00000 n
0000034722 00000 n
0000034857 00000 n
0000035033 00000 n
0000035154 00000 n
0000035289 00000 n
0000035465 00000 n
0000035586 00000 n
0000035673 00000 n
0000035854 00000 n
0000035990 00000 n
0000036166 00000 n
0000036287 00000 n
0000036423 00000 n
0000036564 00000 n
0000000020 00000 n
0000029827 00000 n
0000029692 00000 n
0000011802 00000 n
0000055982 00000 n
0000048661 00000 n
0000045094 00000 n
0000043021 00000 n
0000039504 00000 n
0000056336 00000 n
0000055985 00000 n
0000048664 00000 n
0000045097 00000 n
0000043024 00000 n
0000039507 00000 n
0000056339 00000 n
0000030009 00000 n
0000030389 00000 n
0000031007 00000 n
0000036783 00000 n
0000038418 00000 n
0000036895 00000 n
0000036970 00000 n
0000038654 00000 n
0000039658 00000 n
0000039858 00000 n
0000041911 00000 n
0000039970 00000 n
0000040046 00000 n
0000042147 00000 n
0000043174 00000 n
0000043373 00000 n
0000044111 00000 n
0000043404 00000 n
0000043470 00000 n
0000044347 00000 n
0000045247 00000 n
0000045446 00000 n
0000047552 00000 n
0000045558 00000 n
0000045634 00000 n
0000047787 00000 n
0000048814 00000 n
0000049013 00000 n
0000054475 00000 n
0000049353 00000 n
0000049481 00000 n
0000054711 00000 n
0000056136 00000 n
0000056398 00000 n
0000056513 00000 n
0000036786 00000 n
0000038421 00000 n
0000036898 00000 n
0000036973 00000 n
0000038657 00000 n
0000039661 00000 n
0000039861 00000 n
0000041914 00000 n
0000039973 00000 n
0000040049 00000 n
0000042150 00000 n
0000043177 00000 n
0000043376 00000 n
0000044114 00000 n
0000043407 00000 n
0000043473 00000 n
0000044350 00000 n
0000045250 00000 n
0000045449 00000 n
0000047555 00000 n
0000045561 00000 n
0000045637 00000 n
0000047790 00000 n
0000048817 00000 n
0000049016 00000 n
0000054478 00000 n
0000049356 00000 n
0000049484 00000 n
0000054714 00000 n
0000056139 00000 n
0000056401 00000 n
0000056516 00000 n
trailer
<< /Size 89 /Root 87 0 R /Info 88 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
56645
56648
%%EOF
Loading