[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lon-capa-cvs
Subject:    [LON-CAPA-cvs] cvs: loncom /homework/cleanxml post_xml.pm
From:       damieng <damieng () source ! lon-capa ! org>
Date:       2015-12-18 22:07:42
Message-ID: cvsdamieng1450476462 () cvsserver
[Download RAW message or body]

damieng		Fri Dec 18 22:07:42 2015 EDT

  Modified files:              
    /loncom/homework/cleanxml	post_xml.pm 
  Log:
  changed paragraph transformation for translated and lang
  
Index: loncom/homework/cleanxml/post_xml.pm
diff -u loncom/homework/cleanxml/post_xml.pm:1.3 \
                loncom/homework/cleanxml/post_xml.pm:1.4
--- loncom/homework/cleanxml/post_xml.pm:1.3	Tue Dec 15 15:33:30 2015
+++ loncom/homework/cleanxml/post_xml.pm	Fri Dec 18 22:07:42 2015
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Third step to clean a file.
 #
-# $Id: post_xml.pm,v 1.3 2015/12/15 15:33:30 damieng Exp $
+# $Id: post_xml.pm,v 1.4 2015/12/18 22:07:42 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -45,8 +45,8 @@
 no warnings 'recursion'; # yes, fix_paragraph is using heavy recursion, I know
 
 # these are constants
-my @block_elements = \
('parameter','location','answer','foil','image','polygon','rectangle','text','conceptg \
roup','itemgroup','item','label','data','function','array','unit','answergroup','funct \
ionplotresponse','functionplotruleset','functionplotelements','functionplotcustomrule' \
,'essayresponse','hintpart','formulahint','numericalhint','reactionhint','organichint' \
,'optionhint','radiobuttonhint','stringhint','customhint','mathhint','formulahintcondi \
tion','numericalhintcondition','reactionhintcondition','organichintcondition','optionh \
intcondition','radiobuttonhintcondition','stringhintcondition','customhintcondition',' \
mathhintcondition','imageresponse','foilgroup','datasubmission','textfield','hiddensub \
mission','radiobuttonresponse','rankresponse','matchresponse','import','style','script \
','window','block','library','notsolved','part','postanswerdate','preduedate','problem \
','problemtype','randomlabel','bgimg','labelgroup','randomlist','solved','while','tex','print','web','gnupl!
  ot','curve','Task','IntroParagraph','ClosingParagraph','Question','QuestionText','Se \
tup','Instance','InstanceText','Criteria','CriteriaText','GraderNote','languageblock', \
'translated','lang','instructorcomment','dataresponse','togglebox','standalone','comme \
nt','drawimage','allow','displayduedate','displaytitle','responseparam','organicstruct \
ure','scriptlib','parserlib','drawoptionlist','spline','backgroundplot','plotobject',' \
plotvector','drawvectorsum','functionplotrule','functionplotvectorrule','functionplotv \
ectorsumrule','axis','key','xtics','ytics','title','xlabel','ylabel','hiddenline','dtm');
                
-my @inline_like_block = \
('stringresponse','optionresponse','numericalresponse','formularesponse','mathresponse','organicresponse','reactionresponse','customresponse','externalresponse', \
'hint', 'hintgroup'); # inline elements treated like blocks for pretty print and some \
other things +my @block_elements = \
('parameter','location','answer','foil','image','polygon','rectangle','text','conceptg \
roup','itemgroup','item','label','data','function','array','unit','answergroup','funct \
ionplotresponse','functionplotruleset','functionplotelements','functionplotcustomrule' \
,'essayresponse','hintpart','formulahint','numericalhint','reactionhint','organichint' \
,'optionhint','radiobuttonhint','stringhint','customhint','mathhint','formulahintcondi \
tion','numericalhintcondition','reactionhintcondition','organichintcondition','optionh \
intcondition','radiobuttonhintcondition','stringhintcondition','customhintcondition',' \
mathhintcondition','imageresponse','foilgroup','datasubmission','textfield','hiddensub \
mission','radiobuttonresponse','rankresponse','matchresponse','import','style','script \
','window','block','library','notsolved','part','postanswerdate','preduedate','problem \
','problemtype','randomlabel','bgimg','labelgroup','randomlist','solved','while','tex','print','web','gnupl!
  ot','curve','Task','IntroParagraph','ClosingParagraph','Question','QuestionText','Se \
tup','Instance','InstanceText','Criteria','CriteriaText','GraderNote','languageblock', \
'instructorcomment','dataresponse','togglebox','standalone','comment','drawimage','all \
ow','displayduedate','displaytitle','responseparam','organicstructure','scriptlib','pa \
rserlib','drawoptionlist','spline','backgroundplot','plotobject','plotvector','drawvec \
torsum','functionplotrule','functionplotvectorrule','functionplotvectorsumrule','axis','key','xtics','ytics','title','xlabel','ylabel','hiddenline','dtm');
 +my @inline_like_block = \
('stringresponse','optionresponse','numericalresponse','formularesponse','mathresponse','organicresponse','reactionresponse','customresponse','externalresponse', \
'hint', 'hintgroup','translated','lang'); # inline elements treated like blocks for \
pretty print and some other things  my @responses = \
('stringresponse','optionresponse','numericalresponse','formularesponse','mathresponse \
','organicresponse','reactionresponse','customresponse','externalresponse','essayrespo \
nse','radiobuttonresponse','matchresponse','rankresponse','imageresponse','functionplotresponse');
  my @block_html = ('html','head','body','section','h1','h2','h3','h4','h5','h6','div' \
,'p','ul','ol','li','table','tbody','tr','td','th','dl','dt','dd','pre','noscript','hr \
','address','blockquote','object','applet','embed','map','form','fieldset','iframe','center','frameset');
  my @no_newline_inside = \
('import','parserlib','scriptlib','data','function','label','xlabel','ylabel','tic','text','rectangle','image','title','h1','h2','h3','h4','h5','h6','li','td','p');
 @@ -1812,7 +1812,7 @@
 sub fix_paragraphs_inside {
   my ($node, $all_block) = @_;
   # blocks in which paragrahs will be added:
-  my @blocks_with_p = \
('loncapa','library','problem','part','problemtype','window','block','while','postansw \
erdate','preduedate','solved','notsolved','languageblock','translated','lang','instructorcomment','togglebox','standalone','form');
 +  my @blocks_with_p = \
('loncapa','library','problem','part','problemtype','window','block','while','postansw \
erdate','preduedate','solved','notsolved','languageblock','instructorcomment','togglebox','standalone','form');
  my @fix_p_if_br_or_p = \
(@responses,'foil','item','text','label','hintgroup','hintpart','hint','web','windowlink','div','li','dd','td','th','blockquote');
  if ((string_in_array(\@blocks_with_p, $node->nodeName) && paragraph_needed($node)) \
                ||
       (string_in_array(\@fix_p_if_br_or_p, $node->nodeName) && \
paragraph_inside($node))) {


_______________________________________________
LON-CAPA-cvs mailing list
LON-CAPA-cvs@mail.lon-capa.org
http://mail.lon-capa.org/mailman/listinfo/lon-capa-cvs


[prev in list] [next in list] [prev in thread] [next in thread]